Sun, 10 Aug 2008 18:46:32 +0000
Reapplied changes that were overwritten by 91f0294f2377e3870982f3e573e0dfb4230d9c11.
applied changes from b53b1ff4bbd75647c953e5f02eaca17c85d2113e
through 586238415076c2a3a3079812de64aff5841cde39
applied changes from 918c72f0ff7f7e3c545d3baf6368ccbd2ba21427
through e8404ca19a538f5254f1a156feb894d0618588d2
applied changes from e8404ca19a538f5254f1a156feb894d0618588d2
through 398b1414aa67f63ae191264603994be045df42f5
applied changes from 398b1414aa67f63ae191264603994be045df42f5
through b53b1ff4bbd75647c953e5f02eaca17c85d2113e
| 8810 | 1 | /** |
| 2 | * @file cmdproc.c MSN command processor functions | |
| 3 | * | |
| 15884 | 4 | * purple |
| 8810 | 5 | * |
| 15884 | 6 | * Purple is the legal property of its developers, whose names are too numerous |
|
9198
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 | |
|
19859
71d37b57eff2
The FSF changed its address a while ago; our files were out of date.
John Bailey <rekkanoryo@rekkanoryo.org>
parents:
15884
diff
changeset
|
22 | * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA |
| 8810 | 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 | ||
| 15884 | 97 | purple_debug_misc("msn", "%c: %s %03d: %s\n", tmp, |
| 8810 | 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; | |
|
23235
cb7d22017162
When adding outgoing MSN commands to the MsnHistory, free
Mark Doliner <markdoliner@pidgin.im>
parents:
20597
diff
changeset
|
135 | |
|
cb7d22017162
When adding outgoing MSN commands to the MsnHistory, free
Mark Doliner <markdoliner@pidgin.im>
parents:
20597
diff
changeset
|
136 | /* |
|
cb7d22017162
When adding outgoing MSN commands to the MsnHistory, free
Mark Doliner <markdoliner@pidgin.im>
parents:
20597
diff
changeset
|
137 | * We're done with trans->payload. Free it so that the memory |
|
cb7d22017162
When adding outgoing MSN commands to the MsnHistory, free
Mark Doliner <markdoliner@pidgin.im>
parents:
20597
diff
changeset
|
138 | * doesn't sit around in cmdproc->history. |
|
cb7d22017162
When adding outgoing MSN commands to the MsnHistory, free
Mark Doliner <markdoliner@pidgin.im>
parents:
20597
diff
changeset
|
139 | */ |
|
cb7d22017162
When adding outgoing MSN commands to the MsnHistory, free
Mark Doliner <markdoliner@pidgin.im>
parents:
20597
diff
changeset
|
140 | g_free(trans->payload); |
|
cb7d22017162
When adding outgoing MSN commands to the MsnHistory, free
Mark Doliner <markdoliner@pidgin.im>
parents:
20597
diff
changeset
|
141 | trans->payload = NULL; |
|
cb7d22017162
When adding outgoing MSN commands to the MsnHistory, free
Mark Doliner <markdoliner@pidgin.im>
parents:
20597
diff
changeset
|
142 | trans->payload_len = 0; |
| 8810 | 143 | } |
| 144 | ||
| 145 | msn_servconn_write(servconn, data, len); | |
| 146 | ||
| 147 | g_free(data); | |
| 148 | } | |
| 149 | ||
| 150 | void | |
| 151 | msn_cmdproc_send_quick(MsnCmdProc *cmdproc, const char *command, | |
| 152 | const char *format, ...) | |
| 153 | { | |
| 154 | MsnServConn *servconn; | |
| 155 | char *data; | |
| 8830 | 156 | char *params = NULL; |
| 8810 | 157 | va_list arg; |
| 158 | size_t len; | |
| 159 | ||
| 160 | g_return_if_fail(cmdproc != NULL); | |
| 161 | g_return_if_fail(command != NULL); | |
| 162 | ||
| 163 | servconn = cmdproc->servconn; | |
| 164 | ||
|
10481
a5d6b8e1717d
[gaim-migrate @ 11769]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10403
diff
changeset
|
165 | if (!servconn->connected) |
|
a5d6b8e1717d
[gaim-migrate @ 11769]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10403
diff
changeset
|
166 | return; |
|
a5d6b8e1717d
[gaim-migrate @ 11769]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10403
diff
changeset
|
167 | |
|
9158
f8dab42adeaf
[gaim-migrate @ 9942]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
8830
diff
changeset
|
168 | if (format != NULL) |
|
f8dab42adeaf
[gaim-migrate @ 9942]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
8830
diff
changeset
|
169 | { |
| 8830 | 170 | va_start(arg, format); |
| 171 | params = g_strdup_vprintf(format, arg); | |
| 172 | va_end(arg); | |
| 173 | } | |
| 8810 | 174 | |
| 175 | if (params != NULL) | |
| 176 | data = g_strdup_printf("%s %s\r\n", command, params); | |
| 177 | else | |
| 178 | data = g_strdup_printf("%s\r\n", command); | |
| 179 | ||
| 180 | g_free(params); | |
| 181 | ||
| 182 | len = strlen(data); | |
| 183 | ||
| 184 | show_debug_cmd(cmdproc, FALSE, data); | |
| 185 | ||
| 186 | msn_servconn_write(servconn, data, len); | |
| 187 | ||
| 188 | g_free(data); | |
| 189 | } | |
| 190 | ||
| 191 | void | |
| 192 | msn_cmdproc_send(MsnCmdProc *cmdproc, const char *command, | |
| 193 | const char *format, ...) | |
| 194 | { | |
| 195 | MsnTransaction *trans; | |
| 196 | va_list arg; | |
| 197 | ||
| 198 | g_return_if_fail(cmdproc != NULL); | |
| 199 | g_return_if_fail(command != NULL); | |
| 200 | ||
|
10481
a5d6b8e1717d
[gaim-migrate @ 11769]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10403
diff
changeset
|
201 | if (!cmdproc->servconn->connected) |
|
a5d6b8e1717d
[gaim-migrate @ 11769]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10403
diff
changeset
|
202 | return; |
|
a5d6b8e1717d
[gaim-migrate @ 11769]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10403
diff
changeset
|
203 | |
| 8810 | 204 | trans = g_new0(MsnTransaction, 1); |
| 205 | ||
| 206 | trans->command = g_strdup(command); | |
| 207 | ||
|
9158
f8dab42adeaf
[gaim-migrate @ 9942]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
8830
diff
changeset
|
208 | if (format != NULL) |
|
f8dab42adeaf
[gaim-migrate @ 9942]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
8830
diff
changeset
|
209 | { |
| 8830 | 210 | va_start(arg, format); |
| 211 | trans->params = g_strdup_vprintf(format, arg); | |
| 212 | va_end(arg); | |
| 213 | } | |
| 8810 | 214 | |
| 215 | msn_cmdproc_send_trans(cmdproc, trans); | |
| 216 | } | |
| 217 | ||
| 218 | void | |
|
9158
f8dab42adeaf
[gaim-migrate @ 9942]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
8830
diff
changeset
|
219 | msn_cmdproc_process_payload(MsnCmdProc *cmdproc, char *payload, |
|
f8dab42adeaf
[gaim-migrate @ 9942]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
8830
diff
changeset
|
220 | int payload_len) |
|
f8dab42adeaf
[gaim-migrate @ 9942]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
8830
diff
changeset
|
221 | { |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
222 | MsnCommand *last; |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
223 | |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
224 | g_return_if_fail(cmdproc != NULL); |
|
9158
f8dab42adeaf
[gaim-migrate @ 9942]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
8830
diff
changeset
|
225 | |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
226 | last = cmdproc->last_cmd; |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
227 | last->payload = g_memdup(payload, payload_len); |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
228 | last->payload_len = payload_len; |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
229 | |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
230 | if (last->payload_cb != NULL) |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
231 | last->payload_cb(cmdproc, last, payload, payload_len); |
|
9158
f8dab42adeaf
[gaim-migrate @ 9942]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
8830
diff
changeset
|
232 | } |
|
f8dab42adeaf
[gaim-migrate @ 9942]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
8830
diff
changeset
|
233 | |
|
f8dab42adeaf
[gaim-migrate @ 9942]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
8830
diff
changeset
|
234 | void |
| 8810 | 235 | msn_cmdproc_process_msg(MsnCmdProc *cmdproc, MsnMessage *msg) |
| 236 | { | |
|
10345
7d7f8cfa2b4f
[gaim-migrate @ 11556]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10310
diff
changeset
|
237 | MsnMsgTypeCb cb; |
| 8810 | 238 | |
|
9881
c63823101be4
[gaim-migrate @ 10760]
Mark Doliner <markdoliner@pidgin.im>
parents:
9641
diff
changeset
|
239 | if (msn_message_get_content_type(msg) == NULL) |
|
c63823101be4
[gaim-migrate @ 10760]
Mark Doliner <markdoliner@pidgin.im>
parents:
9641
diff
changeset
|
240 | { |
| 15884 | 241 | purple_debug_misc("msn", "failed to find message content\n"); |
|
9881
c63823101be4
[gaim-migrate @ 10760]
Mark Doliner <markdoliner@pidgin.im>
parents:
9641
diff
changeset
|
242 | return; |
|
c63823101be4
[gaim-migrate @ 10760]
Mark Doliner <markdoliner@pidgin.im>
parents:
9641
diff
changeset
|
243 | } |
|
c63823101be4
[gaim-migrate @ 10760]
Mark Doliner <markdoliner@pidgin.im>
parents:
9641
diff
changeset
|
244 | |
| 8810 | 245 | cb = g_hash_table_lookup(cmdproc->cbs_table->msgs, |
| 246 | msn_message_get_content_type(msg)); | |
| 247 | ||
| 248 | if (cb == NULL) | |
| 249 | { | |
| 15884 | 250 | purple_debug_warning("msn", "Unhandled content-type '%s'\n", |
|
9158
f8dab42adeaf
[gaim-migrate @ 9942]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
8830
diff
changeset
|
251 | msn_message_get_content_type(msg)); |
| 8810 | 252 | |
| 253 | return; | |
| 254 | } | |
| 255 | ||
| 256 | cb(cmdproc, msg); | |
| 257 | } | |
| 258 | ||
| 259 | void | |
| 260 | msn_cmdproc_process_cmd(MsnCmdProc *cmdproc, MsnCommand *cmd) | |
| 261 | { | |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
262 | MsnTransCb cb = NULL; |
| 8810 | 263 | MsnTransaction *trans = NULL; |
| 264 | ||
| 265 | if (cmd->trId) | |
|
23864
5fda175ef2e4
Always save the MSN transaction in each command, not just for
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23235
diff
changeset
|
266 | cmd->trans = trans = msn_history_find(cmdproc->history, cmd->trId); |
| 8810 | 267 | |
|
10225
0dfea1bc8695
[gaim-migrate @ 11357]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10043
diff
changeset
|
268 | if (trans != NULL) |
|
20576
285daffed81f
Reset the timer to 0 after removing it. It looks like this may be required here.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
15884
diff
changeset
|
269 | if (trans->timer) { |
| 15884 | 270 | purple_timeout_remove(trans->timer); |
|
20576
285daffed81f
Reset the timer to 0 after removing it. It looks like this may be required here.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
15884
diff
changeset
|
271 | trans->timer = 0; |
|
285daffed81f
Reset the timer to 0 after removing it. It looks like this may be required here.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
15884
diff
changeset
|
272 | } |
|
10225
0dfea1bc8695
[gaim-migrate @ 11357]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10043
diff
changeset
|
273 | |
| 8810 | 274 | if (g_ascii_isdigit(cmd->command[0])) |
| 275 | { | |
| 276 | if (trans != NULL) | |
| 277 | { | |
| 278 | MsnErrorCb error_cb = NULL; | |
| 279 | int error; | |
| 280 | ||
| 281 | error = atoi(cmd->command); | |
|
10225
0dfea1bc8695
[gaim-migrate @ 11357]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10043
diff
changeset
|
282 | |
|
0dfea1bc8695
[gaim-migrate @ 11357]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10043
diff
changeset
|
283 | if (trans->error_cb != NULL) |
|
0dfea1bc8695
[gaim-migrate @ 11357]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10043
diff
changeset
|
284 | error_cb = trans->error_cb; |
|
0dfea1bc8695
[gaim-migrate @ 11357]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10043
diff
changeset
|
285 | |
|
0dfea1bc8695
[gaim-migrate @ 11357]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10043
diff
changeset
|
286 | if (error_cb == NULL && cmdproc->cbs_table->errors != NULL) |
| 8810 | 287 | error_cb = g_hash_table_lookup(cmdproc->cbs_table->errors, trans->command); |
| 288 | ||
| 289 | if (error_cb != NULL) | |
|
10225
0dfea1bc8695
[gaim-migrate @ 11357]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10043
diff
changeset
|
290 | { |
| 8810 | 291 | error_cb(cmdproc, trans, error); |
|
10225
0dfea1bc8695
[gaim-migrate @ 11357]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10043
diff
changeset
|
292 | } |
| 8810 | 293 | else |
| 294 | { | |
| 295 | #if 1 | |
| 296 | msn_error_handle(cmdproc->session, error); | |
| 297 | #else | |
| 15884 | 298 | purple_debug_warning("msn", "Unhandled error '%s'\n", |
| 8810 | 299 | cmd->command); |
| 300 | #endif | |
| 301 | } | |
| 302 | ||
| 303 | return; | |
| 304 | } | |
| 305 | } | |
| 306 | ||
| 307 | if (cmdproc->cbs_table->async != NULL) | |
| 308 | cb = g_hash_table_lookup(cmdproc->cbs_table->async, cmd->command); | |
| 309 | ||
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
310 | if (cb == NULL && trans != NULL) |
| 8810 | 311 | { |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
312 | if (trans->callbacks != NULL) |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
313 | cb = g_hash_table_lookup(trans->callbacks, cmd->command); |
| 8810 | 314 | } |
| 315 | ||
|
10043
4d4cc1ee9b69
[gaim-migrate @ 11002]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9881
diff
changeset
|
316 | if (cb == NULL && cmdproc->cbs_table->fallback != NULL) |
|
4d4cc1ee9b69
[gaim-migrate @ 11002]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9881
diff
changeset
|
317 | 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
|
318 | |
| 8810 | 319 | if (cb != NULL) |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
320 | { |
| 8810 | 321 | cb(cmdproc, cmd); |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
322 | } |
| 8810 | 323 | else |
| 324 | { | |
| 15884 | 325 | purple_debug_warning("msn", "Unhandled command '%s'\n", |
|
9158
f8dab42adeaf
[gaim-migrate @ 9942]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
8830
diff
changeset
|
326 | cmd->command); |
| 8810 | 327 | } |
| 328 | ||
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
329 | if (trans != NULL && trans->pendent_cmd != NULL) |
|
10481
a5d6b8e1717d
[gaim-migrate @ 11769]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10403
diff
changeset
|
330 | msn_transaction_unqueue_cmd(trans, cmdproc); |
| 8810 | 331 | } |
| 332 | ||
| 333 | void | |
| 334 | msn_cmdproc_process_cmd_text(MsnCmdProc *cmdproc, const char *command) | |
| 335 | { | |
| 336 | show_debug_cmd(cmdproc, TRUE, command); | |
| 337 | ||
| 338 | if (cmdproc->last_cmd != NULL) | |
| 339 | msn_command_destroy(cmdproc->last_cmd); | |
| 340 | ||
| 341 | cmdproc->last_cmd = msn_command_from_string(command); | |
| 342 | ||
| 343 | msn_cmdproc_process_cmd(cmdproc, cmdproc->last_cmd); | |
| 344 | } |