Fri, 28 May 2010 08:05:38 +0000
Remove unnecesary includes from msn.h.
Replace msn.h with the needed includes, most of the cases only debug.h
was needed.
| 8810 | 1 | /** |
| 2 | * @file transaction.c MSN transaction 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 | */ |
|
30945
b875cf477e19
Remove unnecesary includes from msn.h.
Jorge Villaseñor <masca@cpw.pidgin.im>
parents:
30915
diff
changeset
|
24 | |
|
b875cf477e19
Remove unnecesary includes from msn.h.
Jorge Villaseñor <masca@cpw.pidgin.im>
parents:
30915
diff
changeset
|
25 | #include "debug.h" |
|
b875cf477e19
Remove unnecesary includes from msn.h.
Jorge Villaseñor <masca@cpw.pidgin.im>
parents:
30915
diff
changeset
|
26 | |
| 8810 | 27 | #include "msn.h" |
| 28 | #include "transaction.h" | |
| 29 | ||
| 30 | MsnTransaction * | |
|
10225
0dfea1bc8695
[gaim-migrate @ 11357]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9218
diff
changeset
|
31 | msn_transaction_new(MsnCmdProc *cmdproc, const char *command, |
|
0dfea1bc8695
[gaim-migrate @ 11357]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9218
diff
changeset
|
32 | const char *format, ...) |
| 8810 | 33 | { |
| 34 | MsnTransaction *trans; | |
| 35 | va_list arg; | |
| 36 | ||
| 37 | g_return_val_if_fail(command != NULL, NULL); | |
| 38 | ||
| 39 | trans = g_new0(MsnTransaction, 1); | |
| 40 | ||
|
10225
0dfea1bc8695
[gaim-migrate @ 11357]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9218
diff
changeset
|
41 | trans->cmdproc = cmdproc; |
| 8810 | 42 | trans->command = g_strdup(command); |
|
30915
56295f0a8ade
I don't really like this name.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30910
diff
changeset
|
43 | trans->saveable = TRUE; |
| 8810 | 44 | |
|
9158
f8dab42adeaf
[gaim-migrate @ 9942]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
8810
diff
changeset
|
45 | if (format != NULL) |
|
f8dab42adeaf
[gaim-migrate @ 9942]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
8810
diff
changeset
|
46 | { |
|
f8dab42adeaf
[gaim-migrate @ 9942]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
8810
diff
changeset
|
47 | va_start(arg, format); |
|
f8dab42adeaf
[gaim-migrate @ 9942]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
8810
diff
changeset
|
48 | trans->params = g_strdup_vprintf(format, arg); |
|
f8dab42adeaf
[gaim-migrate @ 9942]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
8810
diff
changeset
|
49 | va_end(arg); |
|
f8dab42adeaf
[gaim-migrate @ 9942]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
8810
diff
changeset
|
50 | } |
| 8810 | 51 | |
| 52 | /* trans->queue = g_queue_new(); */ | |
|
9198
e8eb6d5eb9eb
[gaim-migrate @ 9993]
Christian Hammond <chipx86@chipx86.com>
parents:
9193
diff
changeset
|
53 | |
| 8810 | 54 | return trans; |
| 55 | } | |
| 56 | ||
| 57 | void | |
| 58 | msn_transaction_destroy(MsnTransaction *trans) | |
| 59 | { | |
| 60 | g_return_if_fail(trans != NULL); | |
| 61 | ||
| 62 | g_free(trans->command); | |
| 63 | g_free(trans->params); | |
| 64 | g_free(trans->payload); | |
| 65 | ||
|
28649
95d25c1e195d
Allow setting a destroy-function for the data. Fixes a leak.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
25583
diff
changeset
|
66 | if (trans->data_free) |
|
95d25c1e195d
Allow setting a destroy-function for the data. Fixes a leak.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
25583
diff
changeset
|
67 | trans->data_free(trans->data); |
|
95d25c1e195d
Allow setting a destroy-function for the data. Fixes a leak.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
25583
diff
changeset
|
68 | |
| 8810 | 69 | #if 0 |
| 70 | if (trans->pendent_cmd != NULL) | |
| 71 | msn_message_unref(trans->pendent_msg); | |
| 72 | #endif | |
| 73 | ||
| 74 | #if 0 | |
| 75 | MsnTransaction *elem; | |
| 76 | if (trans->queue != NULL) | |
|
9198
e8eb6d5eb9eb
[gaim-migrate @ 9993]
Christian Hammond <chipx86@chipx86.com>
parents:
9193
diff
changeset
|
77 | { |
| 8810 | 78 | while ((elem = g_queue_pop_head(trans->queue)) != NULL) |
| 79 | msn_transaction_destroy(elem); | |
|
9198
e8eb6d5eb9eb
[gaim-migrate @ 9993]
Christian Hammond <chipx86@chipx86.com>
parents:
9193
diff
changeset
|
80 | |
| 8810 | 81 | g_queue_free(trans->queue); |
| 82 | } | |
| 83 | #endif | |
| 84 | ||
|
10284
257978b5df5b
[gaim-migrate @ 11454]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
10225
diff
changeset
|
85 | if (trans->callbacks != NULL && trans->has_custom_callbacks) |
|
257978b5df5b
[gaim-migrate @ 11454]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
10225
diff
changeset
|
86 | g_hash_table_destroy(trans->callbacks); |
|
257978b5df5b
[gaim-migrate @ 11454]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
10225
diff
changeset
|
87 | |
|
10225
0dfea1bc8695
[gaim-migrate @ 11357]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9218
diff
changeset
|
88 | if (trans->timer) |
| 15884 | 89 | purple_timeout_remove(trans->timer); |
|
10225
0dfea1bc8695
[gaim-migrate @ 11357]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9218
diff
changeset
|
90 | |
| 8810 | 91 | g_free(trans); |
| 92 | } | |
| 93 | ||
| 94 | char * | |
| 95 | msn_transaction_to_string(MsnTransaction *trans) | |
| 96 | { | |
| 97 | char *str; | |
| 98 | ||
| 99 | g_return_val_if_fail(trans != NULL, FALSE); | |
| 100 | ||
| 101 | if (trans->params != NULL) | |
| 102 | str = g_strdup_printf("%s %u %s\r\n", trans->command, trans->trId, trans->params); | |
|
30915
56295f0a8ade
I don't really like this name.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30910
diff
changeset
|
103 | else if (trans->saveable) |
|
30910
374c457d65b5
We need a way to send commands without transaction ID
Jorge Villaseñor <masca@cpw.pidgin.im>
parents:
28649
diff
changeset
|
104 | str = g_strdup_printf("%s %u\r\n", trans->command, trans->trId); |
| 8810 | 105 | else |
|
30910
374c457d65b5
We need a way to send commands without transaction ID
Jorge Villaseñor <masca@cpw.pidgin.im>
parents:
28649
diff
changeset
|
106 | str = g_strdup_printf("%s\r\n", trans->command); |
| 8810 | 107 | |
| 108 | return str; | |
| 109 | } | |
| 110 | ||
| 111 | void | |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
112 | msn_transaction_queue_cmd(MsnTransaction *trans, MsnCommand *cmd) |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
113 | { |
| 15884 | 114 | purple_debug_info("msn", "queueing command.\n"); |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
115 | trans->pendent_cmd = cmd; |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
116 | msn_command_ref(cmd); |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
117 | } |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
118 | |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
119 | void |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
120 | msn_transaction_unqueue_cmd(MsnTransaction *trans, MsnCmdProc *cmdproc) |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
121 | { |
|
9218
6ebf0fd0df6b
[gaim-migrate @ 10014]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
9198
diff
changeset
|
122 | MsnCommand *cmd; |
|
6ebf0fd0df6b
[gaim-migrate @ 10014]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
9198
diff
changeset
|
123 | |
|
10481
a5d6b8e1717d
[gaim-migrate @ 11769]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10403
diff
changeset
|
124 | if (!cmdproc->servconn->connected) |
|
a5d6b8e1717d
[gaim-migrate @ 11769]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10403
diff
changeset
|
125 | return; |
|
a5d6b8e1717d
[gaim-migrate @ 11769]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10403
diff
changeset
|
126 | |
| 15884 | 127 | purple_debug_info("msn", "unqueueing command.\n"); |
|
9218
6ebf0fd0df6b
[gaim-migrate @ 10014]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
9198
diff
changeset
|
128 | cmd = trans->pendent_cmd; |
|
6ebf0fd0df6b
[gaim-migrate @ 10014]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
9198
diff
changeset
|
129 | |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
130 | g_return_if_fail(cmd != NULL); |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
131 | |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
132 | msn_cmdproc_process_cmd(cmdproc, cmd); |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
133 | msn_command_unref(cmd); |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
134 | |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
135 | trans->pendent_cmd = NULL; |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
136 | } |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
137 | |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
138 | #if 0 |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
139 | void |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
140 | msn_transaction_queue(MsnTransaction *trans, MsnTransaction *elem) |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
141 | { |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
142 | if (trans->queue == NULL) |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
143 | trans->queue = g_queue_new(); |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
144 | |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
145 | g_queue_push_tail(trans->queue, elem); |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
146 | } |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
147 | |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
148 | void |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
149 | msn_transaction_unqueue(MsnTransaction *trans, MsnCmdProc *cmdproc) |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
150 | { |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
151 | MsnTransaction *elem; |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
152 | |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
153 | while ((elem = g_queue_pop_head(trans->queue)) != NULL) |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
154 | msn_cmdproc_send_trans(cmdproc, elem); |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
155 | } |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
156 | #endif |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
157 | |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
158 | void |
| 8810 | 159 | msn_transaction_set_payload(MsnTransaction *trans, |
| 160 | const char *payload, int payload_len) | |
| 161 | { | |
| 162 | g_return_if_fail(trans != NULL); | |
| 163 | g_return_if_fail(payload != NULL); | |
| 164 | ||
| 165 | trans->payload = g_strdup(payload); | |
| 166 | trans->payload_len = payload_len ? payload_len : strlen(trans->payload); | |
| 167 | } | |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
168 | |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
169 | void |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
170 | msn_transaction_set_data(MsnTransaction *trans, void *data) |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
171 | { |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
172 | g_return_if_fail(trans != NULL); |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
173 | |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
174 | trans->data = data; |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
175 | } |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
176 | |
|
28649
95d25c1e195d
Allow setting a destroy-function for the data. Fixes a leak.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
25583
diff
changeset
|
177 | void msn_transaction_set_data_free(MsnTransaction *trans, GDestroyNotify fn) |
|
95d25c1e195d
Allow setting a destroy-function for the data. Fixes a leak.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
25583
diff
changeset
|
178 | { |
|
95d25c1e195d
Allow setting a destroy-function for the data. Fixes a leak.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
25583
diff
changeset
|
179 | g_return_if_fail(trans != NULL); |
|
95d25c1e195d
Allow setting a destroy-function for the data. Fixes a leak.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
25583
diff
changeset
|
180 | trans->data_free = fn; |
|
95d25c1e195d
Allow setting a destroy-function for the data. Fixes a leak.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
25583
diff
changeset
|
181 | } |
|
95d25c1e195d
Allow setting a destroy-function for the data. Fixes a leak.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
25583
diff
changeset
|
182 | |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
183 | void |
|
30915
56295f0a8ade
I don't really like this name.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30910
diff
changeset
|
184 | msn_transaction_set_saveable(MsnTransaction *trans, gboolean saveable) |
|
30910
374c457d65b5
We need a way to send commands without transaction ID
Jorge Villaseñor <masca@cpw.pidgin.im>
parents:
28649
diff
changeset
|
185 | { |
|
374c457d65b5
We need a way to send commands without transaction ID
Jorge Villaseñor <masca@cpw.pidgin.im>
parents:
28649
diff
changeset
|
186 | g_return_if_fail(trans != NULL); |
|
374c457d65b5
We need a way to send commands without transaction ID
Jorge Villaseñor <masca@cpw.pidgin.im>
parents:
28649
diff
changeset
|
187 | |
|
30915
56295f0a8ade
I don't really like this name.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30910
diff
changeset
|
188 | trans->saveable = saveable; |
|
30910
374c457d65b5
We need a way to send commands without transaction ID
Jorge Villaseñor <masca@cpw.pidgin.im>
parents:
28649
diff
changeset
|
189 | } |
|
374c457d65b5
We need a way to send commands without transaction ID
Jorge Villaseñor <masca@cpw.pidgin.im>
parents:
28649
diff
changeset
|
190 | |
|
374c457d65b5
We need a way to send commands without transaction ID
Jorge Villaseñor <masca@cpw.pidgin.im>
parents:
28649
diff
changeset
|
191 | void |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
192 | msn_transaction_add_cb(MsnTransaction *trans, char *answer, |
|
10225
0dfea1bc8695
[gaim-migrate @ 11357]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9218
diff
changeset
|
193 | MsnTransCb cb) |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
194 | { |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
195 | g_return_if_fail(trans != NULL); |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
196 | g_return_if_fail(answer != NULL); |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
197 | |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
198 | if (trans->callbacks == NULL) |
|
10284
257978b5df5b
[gaim-migrate @ 11454]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
10225
diff
changeset
|
199 | { |
|
257978b5df5b
[gaim-migrate @ 11454]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
10225
diff
changeset
|
200 | trans->has_custom_callbacks = TRUE; |
|
257978b5df5b
[gaim-migrate @ 11454]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
10225
diff
changeset
|
201 | trans->callbacks = g_hash_table_new_full(g_str_hash, g_str_equal, NULL, |
|
257978b5df5b
[gaim-migrate @ 11454]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
10225
diff
changeset
|
202 | NULL); |
|
257978b5df5b
[gaim-migrate @ 11454]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
10225
diff
changeset
|
203 | } |
|
257978b5df5b
[gaim-migrate @ 11454]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
10225
diff
changeset
|
204 | else if (trans->has_custom_callbacks != TRUE) |
|
257978b5df5b
[gaim-migrate @ 11454]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
10225
diff
changeset
|
205 | g_return_if_reached (); |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
206 | |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
207 | g_hash_table_insert(trans->callbacks, answer, cb); |
|
10225
0dfea1bc8695
[gaim-migrate @ 11357]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9218
diff
changeset
|
208 | } |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
209 | |
|
10225
0dfea1bc8695
[gaim-migrate @ 11357]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9218
diff
changeset
|
210 | static gboolean |
|
0dfea1bc8695
[gaim-migrate @ 11357]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9218
diff
changeset
|
211 | transaction_timeout(gpointer data) |
|
0dfea1bc8695
[gaim-migrate @ 11357]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9218
diff
changeset
|
212 | { |
|
0dfea1bc8695
[gaim-migrate @ 11357]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9218
diff
changeset
|
213 | MsnTransaction *trans; |
|
0dfea1bc8695
[gaim-migrate @ 11357]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9218
diff
changeset
|
214 | |
|
0dfea1bc8695
[gaim-migrate @ 11357]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9218
diff
changeset
|
215 | trans = data; |
|
0dfea1bc8695
[gaim-migrate @ 11357]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9218
diff
changeset
|
216 | g_return_val_if_fail(trans != NULL, FALSE); |
|
0dfea1bc8695
[gaim-migrate @ 11357]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9218
diff
changeset
|
217 | |
|
10403
4647a87ef73b
[gaim-migrate @ 11648]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10284
diff
changeset
|
218 | #if 0 |
| 15884 | 219 | purple_debug_info("msn", "timed out: %s %d %s\n", trans->command, trans->trId, trans->params); |
|
10403
4647a87ef73b
[gaim-migrate @ 11648]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10284
diff
changeset
|
220 | #endif |
|
10225
0dfea1bc8695
[gaim-migrate @ 11357]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9218
diff
changeset
|
221 | |
|
0dfea1bc8695
[gaim-migrate @ 11357]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9218
diff
changeset
|
222 | if (trans->timeout_cb != NULL) |
|
0dfea1bc8695
[gaim-migrate @ 11357]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9218
diff
changeset
|
223 | trans->timeout_cb(trans->cmdproc, trans); |
|
0dfea1bc8695
[gaim-migrate @ 11357]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9218
diff
changeset
|
224 | |
|
25583
4f63a60ea58b
Set this timer to 0 when we return FALSE
Mark Doliner <markdoliner@pidgin.im>
parents:
24619
diff
changeset
|
225 | trans->timer = 0; |
|
10225
0dfea1bc8695
[gaim-migrate @ 11357]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9218
diff
changeset
|
226 | return FALSE; |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
227 | } |
|
10225
0dfea1bc8695
[gaim-migrate @ 11357]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9218
diff
changeset
|
228 | |
|
0dfea1bc8695
[gaim-migrate @ 11357]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9218
diff
changeset
|
229 | void |
|
0dfea1bc8695
[gaim-migrate @ 11357]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9218
diff
changeset
|
230 | msn_transaction_set_timeout_cb(MsnTransaction *trans, MsnTimeoutCb cb) |
|
0dfea1bc8695
[gaim-migrate @ 11357]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9218
diff
changeset
|
231 | { |
|
0dfea1bc8695
[gaim-migrate @ 11357]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9218
diff
changeset
|
232 | if (trans->timer) |
|
0dfea1bc8695
[gaim-migrate @ 11357]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9218
diff
changeset
|
233 | { |
| 15884 | 234 | purple_debug_error("msn", "This shouldn't be happening\n"); |
| 235 | purple_timeout_remove(trans->timer); | |
|
10225
0dfea1bc8695
[gaim-migrate @ 11357]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9218
diff
changeset
|
236 | } |
|
0dfea1bc8695
[gaim-migrate @ 11357]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9218
diff
changeset
|
237 | trans->timeout_cb = cb; |
|
24619
5ece4c87ea96
Use purple_timeout_add_seconds() instead of purple_timeout_add() in a
Mark Doliner <markdoliner@pidgin.im>
parents:
19859
diff
changeset
|
238 | trans->timer = purple_timeout_add_seconds(60, transaction_timeout, trans); |
|
10225
0dfea1bc8695
[gaim-migrate @ 11357]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9218
diff
changeset
|
239 | } |
|
0dfea1bc8695
[gaim-migrate @ 11357]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9218
diff
changeset
|
240 | |
|
0dfea1bc8695
[gaim-migrate @ 11357]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9218
diff
changeset
|
241 | void |
|
0dfea1bc8695
[gaim-migrate @ 11357]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9218
diff
changeset
|
242 | msn_transaction_set_error_cb(MsnTransaction *trans, MsnErrorCb cb) |
|
0dfea1bc8695
[gaim-migrate @ 11357]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9218
diff
changeset
|
243 | { |
|
0dfea1bc8695
[gaim-migrate @ 11357]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9218
diff
changeset
|
244 | trans->error_cb = cb; |
|
0dfea1bc8695
[gaim-migrate @ 11357]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9218
diff
changeset
|
245 | } |