comparison: libpurple/protocols/msn/cmdproc.c
libpurple/protocols/msn/cmdproc.c
- changeset 15884
- 4de1981757fc
- parent 15435
- 4b933b06d75e
- child 16183
- 92409c474659
- child 16238
- 33bf2fd32108
- child 18068
- b6554e3c8224
- child 19859
- 71d37b57eff2
- child 20478
- 46933dc62880
- child 20576
- 285daffed81f
equal
deleted
inserted
replaced
| 15883:969b74a3e27a | 15884:4de1981757fc |
|---|---|
| 1 /** | 1 /** |
| 2 * @file cmdproc.c MSN command processor functions | 2 * @file cmdproc.c MSN command processor functions |
| 3 * | 3 * |
| 4 * gaim | 4 * purple |
| 5 * | 5 * |
| 6 * Gaim is the legal property of its developers, whose names are too numerous | 6 * Purple is the legal property of its developers, whose names are too numerous |
| 7 * to list here. Please refer to the COPYRIGHT file distributed with this | 7 * to list here. Please refer to the COPYRIGHT file distributed with this |
| 8 * source distribution. | 8 * source distribution. |
| 9 * | 9 * |
| 10 * This program is free software; you can redistribute it and/or modify | 10 * This program is free software; you can redistribute it and/or modify |
| 11 * it under the terms of the GNU General Public License as published by | 11 * it under the terms of the GNU General Public License as published by |
| 92 if ((show[len - 1] == '\n') && (show[len - 2] == '\r')) | 92 if ((show[len - 1] == '\n') && (show[len - 2] == '\r')) |
| 93 { | 93 { |
| 94 show[len - 2] = '\0'; | 94 show[len - 2] = '\0'; |
| 95 } | 95 } |
| 96 | 96 |
| 97 gaim_debug_misc("msn", "%c: %s %03d: %s\n", tmp, | 97 purple_debug_misc("msn", "%c: %s %03d: %s\n", tmp, |
| 98 names[servconn->type], servconn->num, show); | 98 names[servconn->type], servconn->num, show); |
| 99 | 99 |
| 100 g_free(show); | 100 g_free(show); |
| 101 } | 101 } |
| 102 | 102 |
| 228 { | 228 { |
| 229 MsnMsgTypeCb cb; | 229 MsnMsgTypeCb cb; |
| 230 | 230 |
| 231 if (msn_message_get_content_type(msg) == NULL) | 231 if (msn_message_get_content_type(msg) == NULL) |
| 232 { | 232 { |
| 233 gaim_debug_misc("msn", "failed to find message content\n"); | 233 purple_debug_misc("msn", "failed to find message content\n"); |
| 234 return; | 234 return; |
| 235 } | 235 } |
| 236 | 236 |
| 237 cb = g_hash_table_lookup(cmdproc->cbs_table->msgs, | 237 cb = g_hash_table_lookup(cmdproc->cbs_table->msgs, |
| 238 msn_message_get_content_type(msg)); | 238 msn_message_get_content_type(msg)); |
| 239 | 239 |
| 240 if (cb == NULL) | 240 if (cb == NULL) |
| 241 { | 241 { |
| 242 gaim_debug_warning("msn", "Unhandled content-type '%s'\n", | 242 purple_debug_warning("msn", "Unhandled content-type '%s'\n", |
| 243 msn_message_get_content_type(msg)); | 243 msn_message_get_content_type(msg)); |
| 244 | 244 |
| 245 return; | 245 return; |
| 246 } | 246 } |
| 247 | 247 |
| 257 if (cmd->trId) | 257 if (cmd->trId) |
| 258 trans = msn_history_find(cmdproc->history, cmd->trId); | 258 trans = msn_history_find(cmdproc->history, cmd->trId); |
| 259 | 259 |
| 260 if (trans != NULL) | 260 if (trans != NULL) |
| 261 if (trans->timer) | 261 if (trans->timer) |
| 262 gaim_timeout_remove(trans->timer); | 262 purple_timeout_remove(trans->timer); |
| 263 | 263 |
| 264 if (g_ascii_isdigit(cmd->command[0])) | 264 if (g_ascii_isdigit(cmd->command[0])) |
| 265 { | 265 { |
| 266 if (trans != NULL) | 266 if (trans != NULL) |
| 267 { | 267 { |
| 283 else | 283 else |
| 284 { | 284 { |
| 285 #if 1 | 285 #if 1 |
| 286 msn_error_handle(cmdproc->session, error); | 286 msn_error_handle(cmdproc->session, error); |
| 287 #else | 287 #else |
| 288 gaim_debug_warning("msn", "Unhandled error '%s'\n", | 288 purple_debug_warning("msn", "Unhandled error '%s'\n", |
| 289 cmd->command); | 289 cmd->command); |
| 290 #endif | 290 #endif |
| 291 } | 291 } |
| 292 | 292 |
| 293 return; | 293 return; |
| 312 { | 312 { |
| 313 cb(cmdproc, cmd); | 313 cb(cmdproc, cmd); |
| 314 } | 314 } |
| 315 else | 315 else |
| 316 { | 316 { |
| 317 gaim_debug_warning("msn", "Unhandled command '%s'\n", | 317 purple_debug_warning("msn", "Unhandled command '%s'\n", |
| 318 cmd->command); | 318 cmd->command); |
| 319 } | 319 } |
| 320 | 320 |
| 321 if (trans != NULL && trans->pendent_cmd != NULL) | 321 if (trans != NULL && trans->pendent_cmd != NULL) |
| 322 msn_transaction_unqueue_cmd(trans, cmdproc); | 322 msn_transaction_unqueue_cmd(trans, cmdproc); |
