Mon, 21 Aug 2006 22:50:58 +0000
[gaim-migrate @ 16963]
Fix a crazy bug that we found at meebo. I'm not sure it
affects gtk Gaim in quite the same way, but what was
happeing is that the conversation sequence number should
be incremented by 1 each time a new conversation is
created (whether created by someone else or created by
you). However, in one place in Gaim conv_seq was being
incremented BEFORE it was used and in another it was
being incremented AFTER it was used. This can lead to
a sequence number being used twice.
| 8810 | 1 | /** |
| 2 | * @file cmdproc.c MSN command processor functions | |
| 3 | * | |
| 4 | * gaim | |
| 5 | * | |
|
9198
e8eb6d5eb9eb
[gaim-migrate @ 9993]
Christian Hammond <chipx86@chipx86.com>
parents:
9193
diff
changeset
|
6 | * Gaim is the legal property of its developers, whose names are too numerous |
|
e8eb6d5eb9eb
[gaim-migrate @ 9993]
Christian Hammond <chipx86@chipx86.com>
parents:
9193
diff
changeset
|
7 | * to list here. Please refer to the COPYRIGHT file distributed with this |
|
e8eb6d5eb9eb
[gaim-migrate @ 9993]
Christian Hammond <chipx86@chipx86.com>
parents:
9193
diff
changeset
|
8 | * source distribution. |
| 8810 | 9 | * |
| 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 | |
| 12 | * the Free Software Foundation; either version 2 of the License, or | |
| 13 | * (at your option) any later version. | |
| 14 | * | |
| 15 | * This program is distributed in the hope that it will be useful, | |
| 16 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | |
| 17 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
| 18 | * GNU General Public License for more details. | |
| 19 | * | |
| 20 | * You should have received a copy of the GNU General Public License | |
| 21 | * along with this program; if not, write to the Free Software | |
| 22 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | |
| 23 | */ | |
| 24 | #include "msn.h" | |
| 25 | #include "cmdproc.h" | |
| 26 | ||
| 27 | MsnCmdProc * | |
| 28 | msn_cmdproc_new(MsnSession *session) | |
| 29 | { | |
| 30 | MsnCmdProc *cmdproc; | |
| 31 | ||
| 32 | cmdproc = g_new0(MsnCmdProc, 1); | |
| 33 | ||
| 34 | cmdproc->session = session; | |
| 35 | cmdproc->txqueue = g_queue_new(); | |
| 36 | cmdproc->history = msn_history_new(); | |
| 37 | ||
| 38 | return cmdproc; | |
| 39 | } | |
| 40 | ||
| 41 | void | |
| 42 | msn_cmdproc_destroy(MsnCmdProc *cmdproc) | |
| 43 | { | |
| 44 | MsnTransaction *trans; | |
| 45 | ||
| 46 | while ((trans = g_queue_pop_head(cmdproc->txqueue)) != NULL) | |
| 47 | msn_transaction_destroy(trans); | |
| 48 | ||
| 49 | g_queue_free(cmdproc->txqueue); | |
| 50 | ||
| 51 | msn_history_destroy(cmdproc->history); | |
|
10504
eae130eefbfe
[gaim-migrate @ 11796]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
10481
diff
changeset
|
52 | |
|
eae130eefbfe
[gaim-migrate @ 11796]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
10481
diff
changeset
|
53 | if (cmdproc->last_cmd != NULL) |
|
eae130eefbfe
[gaim-migrate @ 11796]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
10481
diff
changeset
|
54 | msn_command_destroy(cmdproc->last_cmd); |
|
eae130eefbfe
[gaim-migrate @ 11796]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
10481
diff
changeset
|
55 | |
|
10481
a5d6b8e1717d
[gaim-migrate @ 11769]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10403
diff
changeset
|
56 | g_free(cmdproc); |
| 8810 | 57 | } |
| 58 | ||
| 59 | void | |
| 60 | msn_cmdproc_process_queue(MsnCmdProc *cmdproc) | |
| 61 | { | |
| 62 | MsnTransaction *trans; | |
| 63 | ||
|
10481
a5d6b8e1717d
[gaim-migrate @ 11769]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10403
diff
changeset
|
64 | while ((trans = g_queue_pop_head(cmdproc->txqueue)) != NULL) |
| 8810 | 65 | msn_cmdproc_send_trans(cmdproc, trans); |
| 66 | } | |
| 67 | ||
| 68 | void | |
| 69 | msn_cmdproc_queue_trans(MsnCmdProc *cmdproc, MsnTransaction *trans) | |
| 70 | { | |
| 71 | g_return_if_fail(cmdproc != NULL); | |
| 72 | g_return_if_fail(trans != NULL); | |
| 73 | ||
| 74 | g_queue_push_tail(cmdproc->txqueue, trans); | |
| 75 | } | |
| 76 | ||
| 77 | static void | |
| 78 | show_debug_cmd(MsnCmdProc *cmdproc, gboolean incoming, const char *command) | |
| 79 | { | |
| 80 | MsnServConn *servconn; | |
| 81 | const char *names[] = { "NS", "SB" }; | |
| 82 | char *show; | |
| 83 | char tmp; | |
| 84 | size_t len; | |
| 85 | ||
| 86 | servconn = cmdproc->servconn; | |
| 87 | len = strlen(command); | |
| 88 | show = g_strdup(command); | |
| 89 | ||
| 90 | tmp = (incoming) ? 'S' : 'C'; | |
| 91 | ||
| 92 | if ((show[len - 1] == '\n') && (show[len - 2] == '\r')) | |
| 93 | { | |
| 94 | show[len - 2] = '\0'; | |
| 95 | } | |
| 96 | ||
| 97 | gaim_debug_misc("msn", "%c: %s %03d: %s\n", tmp, | |
| 98 | names[servconn->type], servconn->num, show); | |
| 99 | ||
| 100 | g_free(show); | |
| 101 | } | |
| 102 | ||
| 103 | void | |
| 104 | msn_cmdproc_send_trans(MsnCmdProc *cmdproc, MsnTransaction *trans) | |
| 105 | { | |
| 106 | MsnServConn *servconn; | |
| 107 | char *data; | |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
108 | size_t len; |
| 8810 | 109 | |
| 110 | g_return_if_fail(cmdproc != NULL); | |
| 111 | g_return_if_fail(trans != NULL); | |
| 112 | ||
| 113 | servconn = cmdproc->servconn; | |
|
10481
a5d6b8e1717d
[gaim-migrate @ 11769]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10403
diff
changeset
|
114 | |
|
a5d6b8e1717d
[gaim-migrate @ 11769]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10403
diff
changeset
|
115 | if (!servconn->connected) |
|
a5d6b8e1717d
[gaim-migrate @ 11769]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10403
diff
changeset
|
116 | return; |
|
a5d6b8e1717d
[gaim-migrate @ 11769]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10403
diff
changeset
|
117 | |
| 8810 | 118 | msn_history_add(cmdproc->history, trans); |
| 119 | ||
| 120 | data = msn_transaction_to_string(trans); | |
|
9158
f8dab42adeaf
[gaim-migrate @ 9942]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
8830
diff
changeset
|
121 | |
| 8810 | 122 | len = strlen(data); |
| 123 | ||
| 124 | show_debug_cmd(cmdproc, FALSE, data); | |
| 125 | ||
| 126 | if (trans->callbacks == NULL) | |
| 127 | trans->callbacks = g_hash_table_lookup(cmdproc->cbs_table->cmds, | |
| 128 | trans->command); | |
| 129 | ||
| 130 | if (trans->payload != NULL) | |
| 131 | { | |
| 132 | data = g_realloc(data, len + trans->payload_len); | |
| 133 | memcpy(data + len, trans->payload, trans->payload_len); | |
| 134 | len += trans->payload_len; | |
| 135 | } | |
| 136 | ||
| 137 | msn_servconn_write(servconn, data, len); | |
| 138 | ||
| 139 | g_free(data); | |
| 140 | } | |
| 141 | ||
| 142 | void | |
| 143 | msn_cmdproc_send_quick(MsnCmdProc *cmdproc, const char *command, | |
| 144 | const char *format, ...) | |
| 145 | { | |
| 146 | MsnServConn *servconn; | |
| 147 | char *data; | |
| 8830 | 148 | char *params = NULL; |
| 8810 | 149 | va_list arg; |
| 150 | size_t len; | |
| 151 | ||
| 152 | g_return_if_fail(cmdproc != NULL); | |
| 153 | g_return_if_fail(command != NULL); | |
| 154 | ||
| 155 | servconn = cmdproc->servconn; | |
| 156 | ||
|
10481
a5d6b8e1717d
[gaim-migrate @ 11769]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10403
diff
changeset
|
157 | if (!servconn->connected) |
|
a5d6b8e1717d
[gaim-migrate @ 11769]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10403
diff
changeset
|
158 | return; |
|
a5d6b8e1717d
[gaim-migrate @ 11769]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10403
diff
changeset
|
159 | |
|
9158
f8dab42adeaf
[gaim-migrate @ 9942]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
8830
diff
changeset
|
160 | if (format != NULL) |
|
f8dab42adeaf
[gaim-migrate @ 9942]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
8830
diff
changeset
|
161 | { |
| 8830 | 162 | va_start(arg, format); |
| 163 | params = g_strdup_vprintf(format, arg); | |
| 164 | va_end(arg); | |
| 165 | } | |
| 8810 | 166 | |
| 167 | if (params != NULL) | |
| 168 | data = g_strdup_printf("%s %s\r\n", command, params); | |
| 169 | else | |
| 170 | data = g_strdup_printf("%s\r\n", command); | |
| 171 | ||
| 172 | g_free(params); | |
| 173 | ||
| 174 | len = strlen(data); | |
| 175 | ||
| 176 | show_debug_cmd(cmdproc, FALSE, data); | |
| 177 | ||
| 178 | msn_servconn_write(servconn, data, len); | |
| 179 | ||
| 180 | g_free(data); | |
| 181 | } | |
| 182 | ||
| 183 | void | |
| 184 | msn_cmdproc_send(MsnCmdProc *cmdproc, const char *command, | |
| 185 | const char *format, ...) | |
| 186 | { | |
| 187 | MsnTransaction *trans; | |
| 188 | va_list arg; | |
| 189 | ||
| 190 | g_return_if_fail(cmdproc != NULL); | |
| 191 | g_return_if_fail(command != NULL); | |
| 192 | ||
|
10481
a5d6b8e1717d
[gaim-migrate @ 11769]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10403
diff
changeset
|
193 | if (!cmdproc->servconn->connected) |
|
a5d6b8e1717d
[gaim-migrate @ 11769]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10403
diff
changeset
|
194 | return; |
|
a5d6b8e1717d
[gaim-migrate @ 11769]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10403
diff
changeset
|
195 | |
| 8810 | 196 | trans = g_new0(MsnTransaction, 1); |
| 197 | ||
| 198 | trans->command = g_strdup(command); | |
| 199 | ||
|
9158
f8dab42adeaf
[gaim-migrate @ 9942]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
8830
diff
changeset
|
200 | if (format != NULL) |
|
f8dab42adeaf
[gaim-migrate @ 9942]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
8830
diff
changeset
|
201 | { |
| 8830 | 202 | va_start(arg, format); |
| 203 | trans->params = g_strdup_vprintf(format, arg); | |
| 204 | va_end(arg); | |
| 205 | } | |
| 8810 | 206 | |
| 207 | msn_cmdproc_send_trans(cmdproc, trans); | |
| 208 | } | |
| 209 | ||
| 210 | void | |
|
9158
f8dab42adeaf
[gaim-migrate @ 9942]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
8830
diff
changeset
|
211 | msn_cmdproc_process_payload(MsnCmdProc *cmdproc, char *payload, |
|
f8dab42adeaf
[gaim-migrate @ 9942]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
8830
diff
changeset
|
212 | int payload_len) |
|
f8dab42adeaf
[gaim-migrate @ 9942]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
8830
diff
changeset
|
213 | { |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
214 | MsnCommand *last; |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
215 | |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
216 | g_return_if_fail(cmdproc != NULL); |
|
9158
f8dab42adeaf
[gaim-migrate @ 9942]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
8830
diff
changeset
|
217 | |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
218 | last = cmdproc->last_cmd; |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
219 | last->payload = g_memdup(payload, payload_len); |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
220 | last->payload_len = payload_len; |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
221 | |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
222 | if (last->payload_cb != NULL) |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
223 | last->payload_cb(cmdproc, last, payload, payload_len); |
|
9158
f8dab42adeaf
[gaim-migrate @ 9942]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
8830
diff
changeset
|
224 | } |
|
f8dab42adeaf
[gaim-migrate @ 9942]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
8830
diff
changeset
|
225 | |
|
f8dab42adeaf
[gaim-migrate @ 9942]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
8830
diff
changeset
|
226 | void |
| 8810 | 227 | msn_cmdproc_process_msg(MsnCmdProc *cmdproc, MsnMessage *msg) |
| 228 | { | |
|
10345
7d7f8cfa2b4f
[gaim-migrate @ 11556]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10310
diff
changeset
|
229 | MsnMsgTypeCb cb; |
| 8810 | 230 | |
|
9881
c63823101be4
[gaim-migrate @ 10760]
Mark Doliner <markdoliner@pidgin.im>
parents:
9641
diff
changeset
|
231 | if (msn_message_get_content_type(msg) == NULL) |
|
c63823101be4
[gaim-migrate @ 10760]
Mark Doliner <markdoliner@pidgin.im>
parents:
9641
diff
changeset
|
232 | { |
|
c63823101be4
[gaim-migrate @ 10760]
Mark Doliner <markdoliner@pidgin.im>
parents:
9641
diff
changeset
|
233 | gaim_debug_misc("msn", "failed to find message content\n"); |
|
c63823101be4
[gaim-migrate @ 10760]
Mark Doliner <markdoliner@pidgin.im>
parents:
9641
diff
changeset
|
234 | return; |
|
c63823101be4
[gaim-migrate @ 10760]
Mark Doliner <markdoliner@pidgin.im>
parents:
9641
diff
changeset
|
235 | } |
|
c63823101be4
[gaim-migrate @ 10760]
Mark Doliner <markdoliner@pidgin.im>
parents:
9641
diff
changeset
|
236 | |
| 8810 | 237 | cb = g_hash_table_lookup(cmdproc->cbs_table->msgs, |
| 238 | msn_message_get_content_type(msg)); | |
| 239 | ||
| 240 | if (cb == NULL) | |
| 241 | { | |
|
9158
f8dab42adeaf
[gaim-migrate @ 9942]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
8830
diff
changeset
|
242 | gaim_debug_warning("msn", "Unhandled content-type '%s'\n", |
|
f8dab42adeaf
[gaim-migrate @ 9942]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
8830
diff
changeset
|
243 | msn_message_get_content_type(msg)); |
| 8810 | 244 | |
| 245 | return; | |
| 246 | } | |
| 247 | ||
| 248 | cb(cmdproc, msg); | |
| 249 | } | |
| 250 | ||
| 251 | void | |
| 252 | msn_cmdproc_process_cmd(MsnCmdProc *cmdproc, MsnCommand *cmd) | |
| 253 | { | |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
254 | MsnTransCb cb = NULL; |
| 8810 | 255 | MsnTransaction *trans = NULL; |
| 256 | ||
| 257 | if (cmd->trId) | |
| 258 | trans = msn_history_find(cmdproc->history, cmd->trId); | |
| 259 | ||
|
10225
0dfea1bc8695
[gaim-migrate @ 11357]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10043
diff
changeset
|
260 | if (trans != NULL) |
|
0dfea1bc8695
[gaim-migrate @ 11357]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10043
diff
changeset
|
261 | if (trans->timer) |
|
0dfea1bc8695
[gaim-migrate @ 11357]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10043
diff
changeset
|
262 | gaim_timeout_remove(trans->timer); |
|
0dfea1bc8695
[gaim-migrate @ 11357]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10043
diff
changeset
|
263 | |
| 8810 | 264 | if (g_ascii_isdigit(cmd->command[0])) |
| 265 | { | |
| 266 | if (trans != NULL) | |
| 267 | { | |
| 268 | MsnErrorCb error_cb = NULL; | |
| 269 | int error; | |
| 270 | ||
| 271 | error = atoi(cmd->command); | |
|
10225
0dfea1bc8695
[gaim-migrate @ 11357]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10043
diff
changeset
|
272 | |
|
0dfea1bc8695
[gaim-migrate @ 11357]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10043
diff
changeset
|
273 | if (trans->error_cb != NULL) |
|
0dfea1bc8695
[gaim-migrate @ 11357]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10043
diff
changeset
|
274 | error_cb = trans->error_cb; |
|
0dfea1bc8695
[gaim-migrate @ 11357]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10043
diff
changeset
|
275 | |
|
0dfea1bc8695
[gaim-migrate @ 11357]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10043
diff
changeset
|
276 | if (error_cb == NULL && cmdproc->cbs_table->errors != NULL) |
| 8810 | 277 | error_cb = g_hash_table_lookup(cmdproc->cbs_table->errors, trans->command); |
| 278 | ||
| 279 | if (error_cb != NULL) | |
|
10225
0dfea1bc8695
[gaim-migrate @ 11357]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10043
diff
changeset
|
280 | { |
| 8810 | 281 | error_cb(cmdproc, trans, error); |
|
10225
0dfea1bc8695
[gaim-migrate @ 11357]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10043
diff
changeset
|
282 | } |
| 8810 | 283 | else |
| 284 | { | |
| 285 | #if 1 | |
| 286 | msn_error_handle(cmdproc->session, error); | |
| 287 | #else | |
| 288 | gaim_debug_warning("msn", "Unhandled error '%s'\n", | |
| 289 | cmd->command); | |
| 290 | #endif | |
| 291 | } | |
| 292 | ||
| 293 | return; | |
| 294 | } | |
| 295 | } | |
| 296 | ||
| 297 | if (cmdproc->cbs_table->async != NULL) | |
| 298 | cb = g_hash_table_lookup(cmdproc->cbs_table->async, cmd->command); | |
| 299 | ||
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
300 | if (cb == NULL && trans != NULL) |
| 8810 | 301 | { |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
302 | cmd->trans = trans; |
| 8810 | 303 | |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
304 | if (trans->callbacks != NULL) |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
305 | cb = g_hash_table_lookup(trans->callbacks, cmd->command); |
| 8810 | 306 | } |
| 307 | ||
|
10043
4d4cc1ee9b69
[gaim-migrate @ 11002]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9881
diff
changeset
|
308 | if (cb == NULL && cmdproc->cbs_table->fallback != NULL) |
|
4d4cc1ee9b69
[gaim-migrate @ 11002]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9881
diff
changeset
|
309 | cb = g_hash_table_lookup(cmdproc->cbs_table->fallback, cmd->command); |
|
4d4cc1ee9b69
[gaim-migrate @ 11002]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9881
diff
changeset
|
310 | |
| 8810 | 311 | if (cb != NULL) |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
312 | { |
| 8810 | 313 | cb(cmdproc, cmd); |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
314 | } |
| 8810 | 315 | else |
| 316 | { | |
| 317 | gaim_debug_warning("msn", "Unhandled command '%s'\n", | |
|
9158
f8dab42adeaf
[gaim-migrate @ 9942]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
8830
diff
changeset
|
318 | cmd->command); |
| 8810 | 319 | } |
| 320 | ||
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
321 | if (trans != NULL && trans->pendent_cmd != NULL) |
|
10481
a5d6b8e1717d
[gaim-migrate @ 11769]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10403
diff
changeset
|
322 | msn_transaction_unqueue_cmd(trans, cmdproc); |
| 8810 | 323 | } |
| 324 | ||
| 325 | void | |
| 326 | msn_cmdproc_process_cmd_text(MsnCmdProc *cmdproc, const char *command) | |
| 327 | { | |
| 328 | show_debug_cmd(cmdproc, TRUE, command); | |
| 329 | ||
| 330 | if (cmdproc->last_cmd != NULL) | |
| 331 | msn_command_destroy(cmdproc->last_cmd); | |
| 332 | ||
| 333 | cmdproc->last_cmd = msn_command_from_string(command); | |
| 334 | ||
| 335 | msn_cmdproc_process_cmd(cmdproc, cmdproc->last_cmd); | |
| 336 | } |