Thu, 23 Feb 2012 08:30:08 +0000
propagate from branch 'im.pidgin.pidgin.2.x.y' (head 34ff16d618b720bebc693b1e5b215ede08dd1403)
to branch 'im.pidgin.pidgin' (head 6ec6d786f812bd9b1ac3e3615f5649f4381e0997)
| 4542 | 1 | /** |
| 2 | * @file switchboard.c MSN switchboard functions | |
| 3 | * | |
| 15884 | 4 | * purple |
| 4542 | 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:
9194
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:
9194
diff
changeset
|
8 | * source distribution. |
|
6668
15875d5cecc4
[gaim-migrate @ 7193]
Christian Hammond <chipx86@chipx86.com>
parents:
6640
diff
changeset
|
9 | * |
| 4542 | 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:
19826
diff
changeset
|
22 | * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA |
| 4542 | 23 | */ |
|
30945
b875cf477e19
Remove unnecesary includes from msn.h.
Jorge Villaseñor <masca@cpw.pidgin.im>
parents:
30943
diff
changeset
|
24 | |
|
30961
885064b16c54
Include internal.h on each c file to avoid windows breakage as recommended by Daniel.
Jorge Villaseñor <masca@cpw.pidgin.im>
parents:
30958
diff
changeset
|
25 | #include "internal.h" |
|
30945
b875cf477e19
Remove unnecesary includes from msn.h.
Jorge Villaseñor <masca@cpw.pidgin.im>
parents:
30943
diff
changeset
|
26 | #include "debug.h" |
|
b875cf477e19
Remove unnecesary includes from msn.h.
Jorge Villaseñor <masca@cpw.pidgin.im>
parents:
30943
diff
changeset
|
27 | |
|
30957
92cc461fa105
Switchboard includes cleanup.
Jorge Villaseñor <masca@cpw.pidgin.im>
parents:
30945
diff
changeset
|
28 | #include "msnutils.h" |
|
5309
3178acad1449
[gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents:
5221
diff
changeset
|
29 | #include "switchboard.h" |
|
31020
c1266a6b7745
Fix integration between Switchboard and SBConn. by setting public some functions on both sides. Regresion introduced in 99802eb80a7acd
Jorge Villaseñor <masca@cpw.pidgin.im>
parents:
31019
diff
changeset
|
30 | #include "sbconn.h" |
|
30958
5426ac690bec
Switchboard: move this includes to the c file.
Jorge Villaseñor <masca@cpw.pidgin.im>
parents:
30957
diff
changeset
|
31 | #include "slplink.h" |
|
5426ac690bec
Switchboard: move this includes to the c file.
Jorge Villaseñor <masca@cpw.pidgin.im>
parents:
30957
diff
changeset
|
32 | #include "user.h" |
|
30938
fe9d2308ab3f
Switchboard->users is now a list of MsnUsers which is a lot more useful and it is already allocated.
Jorge Villaseñor <masca@cpw.pidgin.im>
parents:
30921
diff
changeset
|
33 | #include "userlist.h" |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
34 | |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
35 | static MsnTable *cbs_table; |
|
5309
3178acad1449
[gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents:
5221
diff
changeset
|
36 | |
|
10345
7d7f8cfa2b4f
[gaim-migrate @ 11556]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10306
diff
changeset
|
37 | /************************************************************************** |
|
10481
a5d6b8e1717d
[gaim-migrate @ 11769]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10463
diff
changeset
|
38 | * Main |
|
10345
7d7f8cfa2b4f
[gaim-migrate @ 11556]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10306
diff
changeset
|
39 | **************************************************************************/ |
|
10481
a5d6b8e1717d
[gaim-migrate @ 11769]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10463
diff
changeset
|
40 | |
|
10345
7d7f8cfa2b4f
[gaim-migrate @ 11556]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10306
diff
changeset
|
41 | MsnSwitchBoard * |
|
7d7f8cfa2b4f
[gaim-migrate @ 11556]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10306
diff
changeset
|
42 | msn_switchboard_new(MsnSession *session) |
|
7d7f8cfa2b4f
[gaim-migrate @ 11556]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10306
diff
changeset
|
43 | { |
|
7d7f8cfa2b4f
[gaim-migrate @ 11556]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10306
diff
changeset
|
44 | MsnSwitchBoard *swboard; |
|
7d7f8cfa2b4f
[gaim-migrate @ 11556]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10306
diff
changeset
|
45 | |
|
7d7f8cfa2b4f
[gaim-migrate @ 11556]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10306
diff
changeset
|
46 | g_return_val_if_fail(session != NULL, NULL); |
|
7d7f8cfa2b4f
[gaim-migrate @ 11556]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10306
diff
changeset
|
47 | |
|
7d7f8cfa2b4f
[gaim-migrate @ 11556]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10306
diff
changeset
|
48 | swboard = g_new0(MsnSwitchBoard, 1); |
|
7d7f8cfa2b4f
[gaim-migrate @ 11556]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10306
diff
changeset
|
49 | |
|
7d7f8cfa2b4f
[gaim-migrate @ 11556]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10306
diff
changeset
|
50 | swboard->session = session; |
|
27885
71d85d19eded
Timeout switchboard connections at 60 seconds, should Fixes #3330 for most
Ka-Hing Cheung <khc@pidgin.im>
parents:
27691
diff
changeset
|
51 | swboard->servconn = msn_servconn_new(session, MSN_SERVCONN_SB); |
|
71d85d19eded
Timeout switchboard connections at 60 seconds, should Fixes #3330 for most
Ka-Hing Cheung <khc@pidgin.im>
parents:
27691
diff
changeset
|
52 | msn_servconn_set_idle_timeout(swboard->servconn, 60); |
|
71d85d19eded
Timeout switchboard connections at 60 seconds, should Fixes #3330 for most
Ka-Hing Cheung <khc@pidgin.im>
parents:
27691
diff
changeset
|
53 | swboard->cmdproc = swboard->servconn->cmdproc; |
|
10345
7d7f8cfa2b4f
[gaim-migrate @ 11556]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10306
diff
changeset
|
54 | |
|
10481
a5d6b8e1717d
[gaim-migrate @ 11769]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10463
diff
changeset
|
55 | swboard->msg_queue = g_queue_new(); |
|
10345
7d7f8cfa2b4f
[gaim-migrate @ 11556]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10306
diff
changeset
|
56 | swboard->empty = TRUE; |
|
7d7f8cfa2b4f
[gaim-migrate @ 11556]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10306
diff
changeset
|
57 | |
|
10463
f2f97738b401
[gaim-migrate @ 11737]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10451
diff
changeset
|
58 | swboard->cmdproc->data = swboard; |
|
f2f97738b401
[gaim-migrate @ 11737]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10451
diff
changeset
|
59 | swboard->cmdproc->cbs_table = cbs_table; |
|
10345
7d7f8cfa2b4f
[gaim-migrate @ 11556]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10306
diff
changeset
|
60 | |
|
24218
8e128219c671
Stu's idea, I sort of did it the other way. I don't know if it will help
Ka-Hing Cheung <khc@pidgin.im>
parents:
24068
diff
changeset
|
61 | session->switches = g_list_prepend(session->switches, swboard); |
|
10345
7d7f8cfa2b4f
[gaim-migrate @ 11556]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10306
diff
changeset
|
62 | |
|
27691
d77b2890043e
Change all MSN_DEBUG_* messages to use the new purple_debug_is_verbose call
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
27569
diff
changeset
|
63 | if (purple_debug_is_verbose()) |
|
d77b2890043e
Change all MSN_DEBUG_* messages to use the new purple_debug_is_verbose call
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
27569
diff
changeset
|
64 | purple_debug_info("msn", "switchboard new: swboard(%p)\n", swboard); |
|
d77b2890043e
Change all MSN_DEBUG_* messages to use the new purple_debug_is_verbose call
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
27569
diff
changeset
|
65 | |
|
10345
7d7f8cfa2b4f
[gaim-migrate @ 11556]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10306
diff
changeset
|
66 | return swboard; |
|
7d7f8cfa2b4f
[gaim-migrate @ 11556]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10306
diff
changeset
|
67 | } |
|
7d7f8cfa2b4f
[gaim-migrate @ 11556]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10306
diff
changeset
|
68 | |
|
7d7f8cfa2b4f
[gaim-migrate @ 11556]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10306
diff
changeset
|
69 | void |
|
7d7f8cfa2b4f
[gaim-migrate @ 11556]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10306
diff
changeset
|
70 | msn_switchboard_destroy(MsnSwitchBoard *swboard) |
|
7d7f8cfa2b4f
[gaim-migrate @ 11556]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10306
diff
changeset
|
71 | { |
|
7d7f8cfa2b4f
[gaim-migrate @ 11556]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10306
diff
changeset
|
72 | MsnSession *session; |
|
7d7f8cfa2b4f
[gaim-migrate @ 11556]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10306
diff
changeset
|
73 | MsnMessage *msg; |
|
7d7f8cfa2b4f
[gaim-migrate @ 11556]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10306
diff
changeset
|
74 | GList *l; |
|
7d7f8cfa2b4f
[gaim-migrate @ 11556]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10306
diff
changeset
|
75 | |
|
27691
d77b2890043e
Change all MSN_DEBUG_* messages to use the new purple_debug_is_verbose call
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
27569
diff
changeset
|
76 | if (purple_debug_is_verbose()) |
|
d77b2890043e
Change all MSN_DEBUG_* messages to use the new purple_debug_is_verbose call
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
27569
diff
changeset
|
77 | purple_debug_info("msn", "switchboard destroy: swboard(%p)\n", swboard); |
|
10773
ef88ffed66eb
[gaim-migrate @ 12382]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10732
diff
changeset
|
78 | |
|
10345
7d7f8cfa2b4f
[gaim-migrate @ 11556]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10306
diff
changeset
|
79 | g_return_if_fail(swboard != NULL); |
|
7d7f8cfa2b4f
[gaim-migrate @ 11556]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10306
diff
changeset
|
80 | |
|
10773
ef88ffed66eb
[gaim-migrate @ 12382]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10732
diff
changeset
|
81 | if (swboard->destroying) |
|
ef88ffed66eb
[gaim-migrate @ 12382]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10732
diff
changeset
|
82 | return; |
|
ef88ffed66eb
[gaim-migrate @ 12382]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10732
diff
changeset
|
83 | |
|
ef88ffed66eb
[gaim-migrate @ 12382]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10732
diff
changeset
|
84 | swboard->destroying = TRUE; |
|
ef88ffed66eb
[gaim-migrate @ 12382]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10732
diff
changeset
|
85 | |
|
24798
4a0c57b22a65
Remove this timer when the switchboard is destroyed. Fixes a crash
Mark Doliner <markdoliner@pidgin.im>
parents:
24767
diff
changeset
|
86 | if (swboard->reconn_timeout_h > 0) |
|
4a0c57b22a65
Remove this timer when the switchboard is destroyed. Fixes a crash
Mark Doliner <markdoliner@pidgin.im>
parents:
24767
diff
changeset
|
87 | purple_timeout_remove(swboard->reconn_timeout_h); |
|
4a0c57b22a65
Remove this timer when the switchboard is destroyed. Fixes a crash
Mark Doliner <markdoliner@pidgin.im>
parents:
24767
diff
changeset
|
88 | |
|
10345
7d7f8cfa2b4f
[gaim-migrate @ 11556]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10306
diff
changeset
|
89 | /* If it linked us is because its looking for trouble */ |
|
30066
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
29138
diff
changeset
|
90 | while (swboard->slplinks != NULL) { |
|
30081
a0f194e8dbb9
Remove old code that was commented out, but is really just not necessary.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30066
diff
changeset
|
91 | MsnSlpLink *slplink = swboard->slplinks->data; |
|
a0f194e8dbb9
Remove old code that was commented out, but is really just not necessary.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30066
diff
changeset
|
92 | |
|
31032
b25150599f00
Hide msn_slplink_destroy and use the unref version everywhere.
Jorge Villaseñor <masca@cpw.pidgin.im>
parents:
31020
diff
changeset
|
93 | swboard->slplinks = g_list_remove(swboard->slplinks, slplink); |
|
b25150599f00
Hide msn_slplink_destroy and use the unref version everywhere.
Jorge Villaseñor <masca@cpw.pidgin.im>
parents:
31020
diff
changeset
|
94 | |
|
30066
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
29138
diff
changeset
|
95 | /* Destroy only those slplinks which use the switchboard */ |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
29138
diff
changeset
|
96 | if (slplink->dc == NULL) |
|
31032
b25150599f00
Hide msn_slplink_destroy and use the unref version everywhere.
Jorge Villaseñor <masca@cpw.pidgin.im>
parents:
31020
diff
changeset
|
97 | msn_slplink_unref(slplink); |
|
30066
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
29138
diff
changeset
|
98 | else { |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
29138
diff
changeset
|
99 | swboard->slplinks = g_list_remove(swboard->slplinks, slplink); |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
29138
diff
changeset
|
100 | slplink->swboard = NULL; |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
29138
diff
changeset
|
101 | } |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
29138
diff
changeset
|
102 | } |
|
10345
7d7f8cfa2b4f
[gaim-migrate @ 11556]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10306
diff
changeset
|
103 | |
|
7d7f8cfa2b4f
[gaim-migrate @ 11556]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10306
diff
changeset
|
104 | /* Destroy the message queue */ |
|
10481
a5d6b8e1717d
[gaim-migrate @ 11769]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10463
diff
changeset
|
105 | while ((msg = g_queue_pop_head(swboard->msg_queue)) != NULL) |
|
10345
7d7f8cfa2b4f
[gaim-migrate @ 11556]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10306
diff
changeset
|
106 | { |
|
7d7f8cfa2b4f
[gaim-migrate @ 11556]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10306
diff
changeset
|
107 | if (swboard->error != MSN_SB_ERROR_NONE) |
|
7d7f8cfa2b4f
[gaim-migrate @ 11556]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10306
diff
changeset
|
108 | { |
|
7d7f8cfa2b4f
[gaim-migrate @ 11556]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10306
diff
changeset
|
109 | /* The messages could not be sent due to a switchboard error */ |
|
10463
f2f97738b401
[gaim-migrate @ 11737]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10451
diff
changeset
|
110 | msg_error_helper(swboard->cmdproc, msg, |
|
10345
7d7f8cfa2b4f
[gaim-migrate @ 11556]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10306
diff
changeset
|
111 | MSN_MSG_ERROR_SB); |
|
7d7f8cfa2b4f
[gaim-migrate @ 11556]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10306
diff
changeset
|
112 | } |
|
10403
4647a87ef73b
[gaim-migrate @ 11648]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10391
diff
changeset
|
113 | msn_message_unref(msg); |
|
10345
7d7f8cfa2b4f
[gaim-migrate @ 11556]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10306
diff
changeset
|
114 | } |
|
7d7f8cfa2b4f
[gaim-migrate @ 11556]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10306
diff
changeset
|
115 | |
|
10481
a5d6b8e1717d
[gaim-migrate @ 11769]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10463
diff
changeset
|
116 | g_queue_free(swboard->msg_queue); |
|
10345
7d7f8cfa2b4f
[gaim-migrate @ 11556]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10306
diff
changeset
|
117 | |
|
12236
8dceb9c5e15f
[gaim-migrate @ 14538]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
12211
diff
changeset
|
118 | /* msg_error_helper will both remove the msg from ack_list and |
|
8dceb9c5e15f
[gaim-migrate @ 14538]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
12211
diff
changeset
|
119 | unref it, so we don't need to do either here */ |
|
8dceb9c5e15f
[gaim-migrate @ 14538]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
12211
diff
changeset
|
120 | while ((l = swboard->ack_list) != NULL) |
|
8dceb9c5e15f
[gaim-migrate @ 14538]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
12211
diff
changeset
|
121 | msg_error_helper(swboard->cmdproc, l->data, MSN_MSG_ERROR_SB); |
|
10403
4647a87ef73b
[gaim-migrate @ 11648]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10391
diff
changeset
|
122 | |
|
13695
64da09d24cbe
[gaim-migrate @ 16096]
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
13628
diff
changeset
|
123 | g_free(swboard->im_user); |
|
64da09d24cbe
[gaim-migrate @ 16096]
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
13628
diff
changeset
|
124 | g_free(swboard->auth_key); |
|
64da09d24cbe
[gaim-migrate @ 16096]
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
13628
diff
changeset
|
125 | g_free(swboard->session_id); |
|
10345
7d7f8cfa2b4f
[gaim-migrate @ 11556]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10306
diff
changeset
|
126 | |
|
21063
911e85f207c7
Fix some leaks caused by misuse of g_list_remove_link() instead of g_list_delete_link().
Daniel Atallah <datallah@pidgin.im>
parents:
21019
diff
changeset
|
127 | for (; swboard->users; swboard->users = g_list_delete_link(swboard->users, swboard->users)) |
|
30943
c505e5a35e55
Manage switchboards with users not on our list.
Jorge Villaseñor <masca@cpw.pidgin.im>
parents:
30940
diff
changeset
|
128 | msn_user_unref(swboard->users->data); |
|
10345
7d7f8cfa2b4f
[gaim-migrate @ 11556]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10306
diff
changeset
|
129 | |
|
7d7f8cfa2b4f
[gaim-migrate @ 11556]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10306
diff
changeset
|
130 | session = swboard->session; |
|
7d7f8cfa2b4f
[gaim-migrate @ 11556]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10306
diff
changeset
|
131 | session->switches = g_list_remove(session->switches, swboard); |
|
7d7f8cfa2b4f
[gaim-migrate @ 11556]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10306
diff
changeset
|
132 | |
|
24055
88d38a33d079
This should fix a crash that I've been seeing. I am not sure if this is the
Ka-Hing Cheung <khc@pidgin.im>
parents:
23876
diff
changeset
|
133 | for (l = session->slplinks; l; l = l->next) { |
|
88d38a33d079
This should fix a crash that I've been seeing. I am not sure if this is the
Ka-Hing Cheung <khc@pidgin.im>
parents:
23876
diff
changeset
|
134 | MsnSlpLink *slplink = l->data; |
|
88d38a33d079
This should fix a crash that I've been seeing. I am not sure if this is the
Ka-Hing Cheung <khc@pidgin.im>
parents:
23876
diff
changeset
|
135 | if (slplink->swboard == swboard) slplink->swboard = NULL; |
|
88d38a33d079
This should fix a crash that I've been seeing. I am not sure if this is the
Ka-Hing Cheung <khc@pidgin.im>
parents:
23876
diff
changeset
|
136 | } |
|
88d38a33d079
This should fix a crash that I've been seeing. I am not sure if this is the
Ka-Hing Cheung <khc@pidgin.im>
parents:
23876
diff
changeset
|
137 | |
|
10481
a5d6b8e1717d
[gaim-migrate @ 11769]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10463
diff
changeset
|
138 | #if 0 |
|
a5d6b8e1717d
[gaim-migrate @ 11769]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10463
diff
changeset
|
139 | /* This should never happen or we are in trouble. */ |
|
10345
7d7f8cfa2b4f
[gaim-migrate @ 11556]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10306
diff
changeset
|
140 | if (swboard->servconn != NULL) |
|
7d7f8cfa2b4f
[gaim-migrate @ 11556]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10306
diff
changeset
|
141 | msn_servconn_destroy(swboard->servconn); |
|
10481
a5d6b8e1717d
[gaim-migrate @ 11769]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10463
diff
changeset
|
142 | #endif |
|
a5d6b8e1717d
[gaim-migrate @ 11769]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10463
diff
changeset
|
143 | |
|
a5d6b8e1717d
[gaim-migrate @ 11769]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10463
diff
changeset
|
144 | swboard->cmdproc->data = NULL; |
|
a5d6b8e1717d
[gaim-migrate @ 11769]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10463
diff
changeset
|
145 | |
|
a5d6b8e1717d
[gaim-migrate @ 11769]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10463
diff
changeset
|
146 | msn_servconn_set_disconnect_cb(swboard->servconn, NULL); |
|
a5d6b8e1717d
[gaim-migrate @ 11769]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10463
diff
changeset
|
147 | |
|
a5d6b8e1717d
[gaim-migrate @ 11769]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10463
diff
changeset
|
148 | msn_servconn_destroy(swboard->servconn); |
|
10345
7d7f8cfa2b4f
[gaim-migrate @ 11556]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10306
diff
changeset
|
149 | |
|
7d7f8cfa2b4f
[gaim-migrate @ 11556]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10306
diff
changeset
|
150 | g_free(swboard); |
|
7d7f8cfa2b4f
[gaim-migrate @ 11556]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10306
diff
changeset
|
151 | } |
|
7d7f8cfa2b4f
[gaim-migrate @ 11556]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10306
diff
changeset
|
152 | |
|
7d7f8cfa2b4f
[gaim-migrate @ 11556]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10306
diff
changeset
|
153 | void |
|
7d7f8cfa2b4f
[gaim-migrate @ 11556]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10306
diff
changeset
|
154 | msn_switchboard_set_auth_key(MsnSwitchBoard *swboard, const char *key) |
|
7d7f8cfa2b4f
[gaim-migrate @ 11556]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10306
diff
changeset
|
155 | { |
|
7d7f8cfa2b4f
[gaim-migrate @ 11556]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10306
diff
changeset
|
156 | g_return_if_fail(swboard != NULL); |
|
7d7f8cfa2b4f
[gaim-migrate @ 11556]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10306
diff
changeset
|
157 | g_return_if_fail(key != NULL); |
|
7d7f8cfa2b4f
[gaim-migrate @ 11556]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10306
diff
changeset
|
158 | |
|
7d7f8cfa2b4f
[gaim-migrate @ 11556]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10306
diff
changeset
|
159 | swboard->auth_key = g_strdup(key); |
|
7d7f8cfa2b4f
[gaim-migrate @ 11556]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10306
diff
changeset
|
160 | } |
|
7d7f8cfa2b4f
[gaim-migrate @ 11556]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10306
diff
changeset
|
161 | |
|
7d7f8cfa2b4f
[gaim-migrate @ 11556]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10306
diff
changeset
|
162 | const char * |
|
7d7f8cfa2b4f
[gaim-migrate @ 11556]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10306
diff
changeset
|
163 | msn_switchboard_get_auth_key(MsnSwitchBoard *swboard) |
|
7d7f8cfa2b4f
[gaim-migrate @ 11556]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10306
diff
changeset
|
164 | { |
|
7d7f8cfa2b4f
[gaim-migrate @ 11556]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10306
diff
changeset
|
165 | g_return_val_if_fail(swboard != NULL, NULL); |
|
7d7f8cfa2b4f
[gaim-migrate @ 11556]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10306
diff
changeset
|
166 | |
|
7d7f8cfa2b4f
[gaim-migrate @ 11556]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10306
diff
changeset
|
167 | return swboard->auth_key; |
|
7d7f8cfa2b4f
[gaim-migrate @ 11556]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10306
diff
changeset
|
168 | } |
|
7d7f8cfa2b4f
[gaim-migrate @ 11556]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10306
diff
changeset
|
169 | |
|
7d7f8cfa2b4f
[gaim-migrate @ 11556]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10306
diff
changeset
|
170 | void |
|
7d7f8cfa2b4f
[gaim-migrate @ 11556]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10306
diff
changeset
|
171 | msn_switchboard_set_session_id(MsnSwitchBoard *swboard, const char *id) |
|
7d7f8cfa2b4f
[gaim-migrate @ 11556]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10306
diff
changeset
|
172 | { |
|
7d7f8cfa2b4f
[gaim-migrate @ 11556]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10306
diff
changeset
|
173 | g_return_if_fail(swboard != NULL); |
|
7d7f8cfa2b4f
[gaim-migrate @ 11556]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10306
diff
changeset
|
174 | g_return_if_fail(id != NULL); |
|
7d7f8cfa2b4f
[gaim-migrate @ 11556]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10306
diff
changeset
|
175 | |
|
21067
97a745428ab0
Cleanup some unnecessary NULL checks in g_strdup()/g_free().
Daniel Atallah <datallah@pidgin.im>
parents:
21063
diff
changeset
|
176 | g_free(swboard->session_id); |
|
10345
7d7f8cfa2b4f
[gaim-migrate @ 11556]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10306
diff
changeset
|
177 | swboard->session_id = g_strdup(id); |
|
7d7f8cfa2b4f
[gaim-migrate @ 11556]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10306
diff
changeset
|
178 | } |
|
7d7f8cfa2b4f
[gaim-migrate @ 11556]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10306
diff
changeset
|
179 | |
|
7d7f8cfa2b4f
[gaim-migrate @ 11556]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10306
diff
changeset
|
180 | const char * |
|
7d7f8cfa2b4f
[gaim-migrate @ 11556]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10306
diff
changeset
|
181 | msn_switchboard_get_session_id(MsnSwitchBoard *swboard) |
|
7d7f8cfa2b4f
[gaim-migrate @ 11556]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10306
diff
changeset
|
182 | { |
|
7d7f8cfa2b4f
[gaim-migrate @ 11556]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10306
diff
changeset
|
183 | g_return_val_if_fail(swboard != NULL, NULL); |
|
7d7f8cfa2b4f
[gaim-migrate @ 11556]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10306
diff
changeset
|
184 | |
|
7d7f8cfa2b4f
[gaim-migrate @ 11556]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10306
diff
changeset
|
185 | return swboard->session_id; |
|
7d7f8cfa2b4f
[gaim-migrate @ 11556]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10306
diff
changeset
|
186 | } |
|
7d7f8cfa2b4f
[gaim-migrate @ 11556]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10306
diff
changeset
|
187 | |
|
22164
2307c0c05225
Use a unique chat id across all sessions for multi-user chats, probably
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
21067
diff
changeset
|
188 | int |
|
2307c0c05225
Use a unique chat id across all sessions for multi-user chats, probably
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
21067
diff
changeset
|
189 | msn_switchboard_get_chat_id(void) |
|
2307c0c05225
Use a unique chat id across all sessions for multi-user chats, probably
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
21067
diff
changeset
|
190 | { |
|
2307c0c05225
Use a unique chat id across all sessions for multi-user chats, probably
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
21067
diff
changeset
|
191 | static int chat_id = 1; |
|
2307c0c05225
Use a unique chat id across all sessions for multi-user chats, probably
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
21067
diff
changeset
|
192 | |
|
2307c0c05225
Use a unique chat id across all sessions for multi-user chats, probably
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
21067
diff
changeset
|
193 | return chat_id++; |
|
2307c0c05225
Use a unique chat id across all sessions for multi-user chats, probably
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
21067
diff
changeset
|
194 | } |
|
2307c0c05225
Use a unique chat id across all sessions for multi-user chats, probably
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
21067
diff
changeset
|
195 | |
|
10345
7d7f8cfa2b4f
[gaim-migrate @ 11556]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10306
diff
changeset
|
196 | void |
|
7d7f8cfa2b4f
[gaim-migrate @ 11556]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10306
diff
changeset
|
197 | msn_switchboard_set_invited(MsnSwitchBoard *swboard, gboolean invited) |
|
7d7f8cfa2b4f
[gaim-migrate @ 11556]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10306
diff
changeset
|
198 | { |
|
7d7f8cfa2b4f
[gaim-migrate @ 11556]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10306
diff
changeset
|
199 | g_return_if_fail(swboard != NULL); |
|
7d7f8cfa2b4f
[gaim-migrate @ 11556]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10306
diff
changeset
|
200 | |
|
7d7f8cfa2b4f
[gaim-migrate @ 11556]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10306
diff
changeset
|
201 | swboard->invited = invited; |
|
7d7f8cfa2b4f
[gaim-migrate @ 11556]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10306
diff
changeset
|
202 | } |
|
7d7f8cfa2b4f
[gaim-migrate @ 11556]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10306
diff
changeset
|
203 | |
|
7d7f8cfa2b4f
[gaim-migrate @ 11556]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10306
diff
changeset
|
204 | gboolean |
|
7d7f8cfa2b4f
[gaim-migrate @ 11556]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10306
diff
changeset
|
205 | msn_switchboard_is_invited(MsnSwitchBoard *swboard) |
|
7d7f8cfa2b4f
[gaim-migrate @ 11556]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10306
diff
changeset
|
206 | { |
|
7d7f8cfa2b4f
[gaim-migrate @ 11556]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10306
diff
changeset
|
207 | g_return_val_if_fail(swboard != NULL, FALSE); |
|
7d7f8cfa2b4f
[gaim-migrate @ 11556]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10306
diff
changeset
|
208 | |
|
7d7f8cfa2b4f
[gaim-migrate @ 11556]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10306
diff
changeset
|
209 | return swboard->invited; |
|
7d7f8cfa2b4f
[gaim-migrate @ 11556]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10306
diff
changeset
|
210 | } |
|
10225
0dfea1bc8695
[gaim-migrate @ 11357]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10112
diff
changeset
|
211 | |
|
5316
ec9cbe50e70c
[gaim-migrate @ 5688]
Christian Hammond <chipx86@chipx86.com>
parents:
5309
diff
changeset
|
212 | /************************************************************************** |
|
10481
a5d6b8e1717d
[gaim-migrate @ 11769]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10463
diff
changeset
|
213 | * Utility |
|
5316
ec9cbe50e70c
[gaim-migrate @ 5688]
Christian Hammond <chipx86@chipx86.com>
parents:
5309
diff
changeset
|
214 | **************************************************************************/ |
|
10481
a5d6b8e1717d
[gaim-migrate @ 11769]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10463
diff
changeset
|
215 | |
|
8808
1cb5ddf6b625
[gaim-migrate @ 9570]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
8663
diff
changeset
|
216 | static void |
|
5793
28d84d5e5663
[gaim-migrate @ 6218]
Christian Hammond <chipx86@chipx86.com>
parents:
5679
diff
changeset
|
217 | send_clientcaps(MsnSwitchBoard *swboard) |
|
5316
ec9cbe50e70c
[gaim-migrate @ 5688]
Christian Hammond <chipx86@chipx86.com>
parents:
5309
diff
changeset
|
218 | { |
|
ec9cbe50e70c
[gaim-migrate @ 5688]
Christian Hammond <chipx86@chipx86.com>
parents:
5309
diff
changeset
|
219 | MsnMessage *msg; |
|
ec9cbe50e70c
[gaim-migrate @ 5688]
Christian Hammond <chipx86@chipx86.com>
parents:
5309
diff
changeset
|
220 | |
|
10225
0dfea1bc8695
[gaim-migrate @ 11357]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10112
diff
changeset
|
221 | msg = msn_message_new(MSN_MSG_CAPS); |
|
5475
a2f856cac665
[gaim-migrate @ 5871]
Christian Hammond <chipx86@chipx86.com>
parents:
5454
diff
changeset
|
222 | msn_message_set_content_type(msg, "text/x-clientcaps"); |
|
9158
f8dab42adeaf
[gaim-migrate @ 9942]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9083
diff
changeset
|
223 | msn_message_set_flag(msg, 'U'); |
|
f8dab42adeaf
[gaim-migrate @ 9942]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9083
diff
changeset
|
224 | msn_message_set_bin_data(msg, MSN_CLIENTINFO, strlen(MSN_CLIENTINFO)); |
|
5316
ec9cbe50e70c
[gaim-migrate @ 5688]
Christian Hammond <chipx86@chipx86.com>
parents:
5309
diff
changeset
|
225 | |
|
10481
a5d6b8e1717d
[gaim-migrate @ 11769]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10463
diff
changeset
|
226 | msn_switchboard_send_msg(swboard, msg, TRUE); |
|
5316
ec9cbe50e70c
[gaim-migrate @ 5688]
Christian Hammond <chipx86@chipx86.com>
parents:
5309
diff
changeset
|
227 | |
|
31162
2c596217766b
msn_message_destroy() calls msn_message_unref() if refcount>0. This is
Mark Doliner <markdoliner@pidgin.im>
parents:
31136
diff
changeset
|
228 | msn_message_unref(msg); |
|
5309
3178acad1449
[gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents:
5221
diff
changeset
|
229 | } |
|
3178acad1449
[gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents:
5221
diff
changeset
|
230 | |
|
12323
f52908fb23b0
[gaim-migrate @ 14627]
Richard Laager <rlaager@pidgin.im>
parents:
12236
diff
changeset
|
231 | static void |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
232 | msn_switchboard_add_user(MsnSwitchBoard *swboard, const char *user) |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
233 | { |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
234 | MsnCmdProc *cmdproc; |
| 15884 | 235 | PurpleAccount *account; |
|
30938
fe9d2308ab3f
Switchboard->users is now a list of MsnUsers which is a lot more useful and it is already allocated.
Jorge Villaseñor <masca@cpw.pidgin.im>
parents:
30921
diff
changeset
|
236 | MsnUserList *userlist; |
|
fe9d2308ab3f
Switchboard->users is now a list of MsnUsers which is a lot more useful and it is already allocated.
Jorge Villaseñor <masca@cpw.pidgin.im>
parents:
30921
diff
changeset
|
237 | MsnUser *msnuser; |
|
29138
9e89f5ee9268
*** Plucked rev 9115475787375850b563a1ec0b2007eaa463483e (qulogic@pidgin.im):
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
28475
diff
changeset
|
238 | char *semicolon; |
|
9e89f5ee9268
*** Plucked rev 9115475787375850b563a1ec0b2007eaa463483e (qulogic@pidgin.im):
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
28475
diff
changeset
|
239 | char *passport; |
|
9198
e8eb6d5eb9eb
[gaim-migrate @ 9993]
Christian Hammond <chipx86@chipx86.com>
parents:
9194
diff
changeset
|
240 | |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
241 | g_return_if_fail(swboard != NULL); |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
242 | |
|
10463
f2f97738b401
[gaim-migrate @ 11737]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10451
diff
changeset
|
243 | cmdproc = swboard->cmdproc; |
|
f2f97738b401
[gaim-migrate @ 11737]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10451
diff
changeset
|
244 | account = cmdproc->session->account; |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
245 | |
|
29138
9e89f5ee9268
*** Plucked rev 9115475787375850b563a1ec0b2007eaa463483e (qulogic@pidgin.im):
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
28475
diff
changeset
|
246 | semicolon = strchr(user, ';'); |
|
9e89f5ee9268
*** Plucked rev 9115475787375850b563a1ec0b2007eaa463483e (qulogic@pidgin.im):
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
28475
diff
changeset
|
247 | /* We don't really care about the machine ID. */ |
|
9e89f5ee9268
*** Plucked rev 9115475787375850b563a1ec0b2007eaa463483e (qulogic@pidgin.im):
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
28475
diff
changeset
|
248 | if (semicolon) |
|
9e89f5ee9268
*** Plucked rev 9115475787375850b563a1ec0b2007eaa463483e (qulogic@pidgin.im):
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
28475
diff
changeset
|
249 | passport = g_strndup(user, semicolon - user); |
|
9e89f5ee9268
*** Plucked rev 9115475787375850b563a1ec0b2007eaa463483e (qulogic@pidgin.im):
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
28475
diff
changeset
|
250 | else |
|
9e89f5ee9268
*** Plucked rev 9115475787375850b563a1ec0b2007eaa463483e (qulogic@pidgin.im):
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
28475
diff
changeset
|
251 | passport = g_strdup(user); |
|
9e89f5ee9268
*** Plucked rev 9115475787375850b563a1ec0b2007eaa463483e (qulogic@pidgin.im):
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
28475
diff
changeset
|
252 | |
|
30938
fe9d2308ab3f
Switchboard->users is now a list of MsnUsers which is a lot more useful and it is already allocated.
Jorge Villaseñor <masca@cpw.pidgin.im>
parents:
30921
diff
changeset
|
253 | userlist = swboard->session->userlist; |
|
fe9d2308ab3f
Switchboard->users is now a list of MsnUsers which is a lot more useful and it is already allocated.
Jorge Villaseñor <masca@cpw.pidgin.im>
parents:
30921
diff
changeset
|
254 | msnuser = msn_userlist_find_user(userlist, passport); |
|
fe9d2308ab3f
Switchboard->users is now a list of MsnUsers which is a lot more useful and it is already allocated.
Jorge Villaseñor <masca@cpw.pidgin.im>
parents:
30921
diff
changeset
|
255 | |
|
29138
9e89f5ee9268
*** Plucked rev 9115475787375850b563a1ec0b2007eaa463483e (qulogic@pidgin.im):
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
28475
diff
changeset
|
256 | /* Don't add multiple endpoints to the conversation. */ |
|
31019
d5560bd5f1c0
Move an user utility function to User.
Jorge Villaseñor <masca@cpw.pidgin.im>
parents:
31017
diff
changeset
|
257 | if (g_list_find_custom(swboard->users, passport, (GCompareFunc)msn_user_passport_cmp)) { |
|
29138
9e89f5ee9268
*** Plucked rev 9115475787375850b563a1ec0b2007eaa463483e (qulogic@pidgin.im):
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
28475
diff
changeset
|
258 | g_free(passport); |
|
9e89f5ee9268
*** Plucked rev 9115475787375850b563a1ec0b2007eaa463483e (qulogic@pidgin.im):
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
28475
diff
changeset
|
259 | return; |
|
9e89f5ee9268
*** Plucked rev 9115475787375850b563a1ec0b2007eaa463483e (qulogic@pidgin.im):
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
28475
diff
changeset
|
260 | } |
|
9e89f5ee9268
*** Plucked rev 9115475787375850b563a1ec0b2007eaa463483e (qulogic@pidgin.im):
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
28475
diff
changeset
|
261 | |
|
29441
23390e8f463f
Don't add ourselves to our own conversation.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
29440
diff
changeset
|
262 | /* Don't add ourselves either... */ |
|
23390e8f463f
Don't add ourselves to our own conversation.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
29440
diff
changeset
|
263 | if (g_str_equal(passport, purple_account_get_username(account))) { |
|
23390e8f463f
Don't add ourselves to our own conversation.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
29440
diff
changeset
|
264 | g_free(passport); |
|
23390e8f463f
Don't add ourselves to our own conversation.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
29440
diff
changeset
|
265 | return; |
|
23390e8f463f
Don't add ourselves to our own conversation.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
29440
diff
changeset
|
266 | } |
|
23390e8f463f
Don't add ourselves to our own conversation.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
29440
diff
changeset
|
267 | |
|
30943
c505e5a35e55
Manage switchboards with users not on our list.
Jorge Villaseñor <masca@cpw.pidgin.im>
parents:
30940
diff
changeset
|
268 | if (!msnuser) { |
|
c505e5a35e55
Manage switchboards with users not on our list.
Jorge Villaseñor <masca@cpw.pidgin.im>
parents:
30940
diff
changeset
|
269 | purple_debug_info("msn","User %s is not on our list.\n", passport); |
|
c505e5a35e55
Manage switchboards with users not on our list.
Jorge Villaseñor <masca@cpw.pidgin.im>
parents:
30940
diff
changeset
|
270 | msnuser = msn_user_new(userlist, passport, NULL); |
|
c505e5a35e55
Manage switchboards with users not on our list.
Jorge Villaseñor <masca@cpw.pidgin.im>
parents:
30940
diff
changeset
|
271 | } else |
|
c505e5a35e55
Manage switchboards with users not on our list.
Jorge Villaseñor <masca@cpw.pidgin.im>
parents:
30940
diff
changeset
|
272 | msn_user_ref(msnuser); |
|
c505e5a35e55
Manage switchboards with users not on our list.
Jorge Villaseñor <masca@cpw.pidgin.im>
parents:
30940
diff
changeset
|
273 | |
|
30938
fe9d2308ab3f
Switchboard->users is now a list of MsnUsers which is a lot more useful and it is already allocated.
Jorge Villaseñor <masca@cpw.pidgin.im>
parents:
30921
diff
changeset
|
274 | g_free(passport); |
|
29441
23390e8f463f
Don't add ourselves to our own conversation.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
29440
diff
changeset
|
275 | |
|
30938
fe9d2308ab3f
Switchboard->users is now a list of MsnUsers which is a lot more useful and it is already allocated.
Jorge Villaseñor <masca@cpw.pidgin.im>
parents:
30921
diff
changeset
|
276 | swboard->users = g_list_prepend(swboard->users, msnuser); |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
277 | swboard->current_users++; |
|
10346
9c65a007b4a5
[gaim-migrate @ 11560]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10345
diff
changeset
|
278 | swboard->empty = FALSE; |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
279 | |
|
27691
d77b2890043e
Change all MSN_DEBUG_* messages to use the new purple_debug_is_verbose call
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
27569
diff
changeset
|
280 | if (purple_debug_is_verbose()) |
|
d77b2890043e
Change all MSN_DEBUG_* messages to use the new purple_debug_is_verbose call
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
27569
diff
changeset
|
281 | purple_debug_info("msn", "user=[%s], total=%d\n", |
|
d77b2890043e
Change all MSN_DEBUG_* messages to use the new purple_debug_is_verbose call
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
27569
diff
changeset
|
282 | user, swboard->current_users); |
|
10773
ef88ffed66eb
[gaim-migrate @ 12382]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10732
diff
changeset
|
283 | |
|
10806
a0e659875d46
[gaim-migrate @ 12455]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
10773
diff
changeset
|
284 | if (!(swboard->flag & MSN_SB_FLAG_IM) && (swboard->conv != NULL)) |
|
10773
ef88ffed66eb
[gaim-migrate @ 12382]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10732
diff
changeset
|
285 | { |
|
ef88ffed66eb
[gaim-migrate @ 12382]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10732
diff
changeset
|
286 | /* This is a helper switchboard. */ |
| 15884 | 287 | purple_debug_error("msn", "switchboard_add_user: conv != NULL\n"); |
|
10773
ef88ffed66eb
[gaim-migrate @ 12382]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10732
diff
changeset
|
288 | return; |
|
ef88ffed66eb
[gaim-migrate @ 12382]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10732
diff
changeset
|
289 | } |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
290 | |
|
10345
7d7f8cfa2b4f
[gaim-migrate @ 11556]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10306
diff
changeset
|
291 | if ((swboard->conv != NULL) && |
| 15884 | 292 | (purple_conversation_get_type(swboard->conv) == PURPLE_CONV_TYPE_CHAT)) |
|
9363
605961038476
[gaim-migrate @ 10171]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9218
diff
changeset
|
293 | { |
|
30938
fe9d2308ab3f
Switchboard->users is now a list of MsnUsers which is a lot more useful and it is already allocated.
Jorge Villaseñor <masca@cpw.pidgin.im>
parents:
30921
diff
changeset
|
294 | purple_conv_chat_add_user(PURPLE_CONV_CHAT(swboard->conv), msnuser->passport, NULL, |
| 15884 | 295 | PURPLE_CBFLAGS_NONE, TRUE); |
|
28475
cd336f4d5fca
Don't auto-close MSN switchboard connections for chats, because that means
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
28460
diff
changeset
|
296 | msn_servconn_set_idle_timeout(swboard->servconn, 0); |
|
9363
605961038476
[gaim-migrate @ 10171]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9218
diff
changeset
|
297 | } |
|
29442
a046f53c5d8a
Don't check the total number of users in an MSN switchboard when converting
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
29441
diff
changeset
|
298 | else if (swboard->current_users > 1) |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
299 | { |
|
28475
cd336f4d5fca
Don't auto-close MSN switchboard connections for chats, because that means
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
28460
diff
changeset
|
300 | msn_servconn_set_idle_timeout(swboard->servconn, 0); |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
301 | if (swboard->conv == NULL || |
| 15884 | 302 | purple_conversation_get_type(swboard->conv) != PURPLE_CONV_TYPE_CHAT) |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
303 | { |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
304 | GList *l; |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
305 | |
|
10533
4c2ad22fad20
[gaim-migrate @ 11862]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10504
diff
changeset
|
306 | #if 0 |
|
4c2ad22fad20
[gaim-migrate @ 11862]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10504
diff
changeset
|
307 | /* this is bad - it causes msn_switchboard_close to be called on the |
|
4c2ad22fad20
[gaim-migrate @ 11862]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10504
diff
changeset
|
308 | * switchboard we're in the middle of using :( */ |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
309 | if (swboard->conv != NULL) |
| 15884 | 310 | purple_conversation_destroy(swboard->conv); |
|
10533
4c2ad22fad20
[gaim-migrate @ 11862]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10504
diff
changeset
|
311 | #endif |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
312 | |
|
22164
2307c0c05225
Use a unique chat id across all sessions for multi-user chats, probably
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
21067
diff
changeset
|
313 | swboard->chat_id = msn_switchboard_get_chat_id(); |
|
10806
a0e659875d46
[gaim-migrate @ 12455]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
10773
diff
changeset
|
314 | swboard->flag |= MSN_SB_FLAG_IM; |
|
32624
f957ad287bcc
Convert code to use the purple_account accessor functions.
Andrew Victor <andrew.victor@mxit.com>
parents:
32013
diff
changeset
|
315 | swboard->conv = serv_got_joined_chat(purple_account_get_connection(account), |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
316 | swboard->chat_id, |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
317 | "MSN Chat"); |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
318 | |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
319 | for (l = swboard->users; l != NULL; l = l->next) |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
320 | { |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
321 | const char *tmp_user; |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
322 | |
|
31103
30a86b3a4e51
Add switchboard users to the chat instead of adding always the same user as Elliot and Stu pointed out.
Jorge Villaseñor <masca@cpw.pidgin.im>
parents:
31077
diff
changeset
|
323 | tmp_user = ((MsnUser*)l->data)->passport; |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
324 | |
| 15884 | 325 | purple_conv_chat_add_user(PURPLE_CONV_CHAT(swboard->conv), |
| 326 | tmp_user, NULL, PURPLE_CBFLAGS_NONE, TRUE); | |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
327 | } |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
328 | |
| 15884 | 329 | purple_conv_chat_add_user(PURPLE_CONV_CHAT(swboard->conv), |
| 330 | purple_account_get_username(account), | |
| 331 | NULL, PURPLE_CBFLAGS_NONE, TRUE); | |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
332 | |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
333 | g_free(swboard->im_user); |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
334 | swboard->im_user = NULL; |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
335 | } |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
336 | } |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
337 | else if (swboard->conv == NULL) |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
338 | { |
| 15884 | 339 | swboard->conv = purple_find_conversation_with_account(PURPLE_CONV_TYPE_IM, |
|
30938
fe9d2308ab3f
Switchboard->users is now a list of MsnUsers which is a lot more useful and it is already allocated.
Jorge Villaseñor <masca@cpw.pidgin.im>
parents:
30921
diff
changeset
|
340 | msnuser->passport, account); |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
341 | } |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
342 | else |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
343 | { |
| 15884 | 344 | purple_debug_warning("msn", "switchboard_add_user: This should not happen!\n"); |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
345 | } |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
346 | } |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
347 | |
| 15884 | 348 | static PurpleConversation * |
|
10225
0dfea1bc8695
[gaim-migrate @ 11357]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10112
diff
changeset
|
349 | msn_switchboard_get_conv(MsnSwitchBoard *swboard) |
|
0dfea1bc8695
[gaim-migrate @ 11357]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10112
diff
changeset
|
350 | { |
| 15884 | 351 | PurpleAccount *account; |
|
10225
0dfea1bc8695
[gaim-migrate @ 11357]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10112
diff
changeset
|
352 | |
|
0dfea1bc8695
[gaim-migrate @ 11357]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10112
diff
changeset
|
353 | g_return_val_if_fail(swboard != NULL, NULL); |
|
0dfea1bc8695
[gaim-migrate @ 11357]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10112
diff
changeset
|
354 | |
|
0dfea1bc8695
[gaim-migrate @ 11357]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10112
diff
changeset
|
355 | if (swboard->conv != NULL) |
|
0dfea1bc8695
[gaim-migrate @ 11357]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10112
diff
changeset
|
356 | return swboard->conv; |
|
0dfea1bc8695
[gaim-migrate @ 11357]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10112
diff
changeset
|
357 | |
| 15884 | 358 | purple_debug_error("msn", "Switchboard with unassigned conversation\n"); |
|
10345
7d7f8cfa2b4f
[gaim-migrate @ 11556]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10306
diff
changeset
|
359 | |
|
10225
0dfea1bc8695
[gaim-migrate @ 11357]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10112
diff
changeset
|
360 | account = swboard->session->account; |
|
0dfea1bc8695
[gaim-migrate @ 11357]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10112
diff
changeset
|
361 | |
| 15884 | 362 | return (swboard->conv = purple_conversation_new(PURPLE_CONV_TYPE_IM, |
|
13450
1bd45ebde8bd
[gaim-migrate @ 15824]
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
13246
diff
changeset
|
363 | account, swboard->im_user)); |
|
10225
0dfea1bc8695
[gaim-migrate @ 11357]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10112
diff
changeset
|
364 | } |
|
0dfea1bc8695
[gaim-migrate @ 11357]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10112
diff
changeset
|
365 | |
|
12323
f52908fb23b0
[gaim-migrate @ 14627]
Richard Laager <rlaager@pidgin.im>
parents:
12236
diff
changeset
|
366 | static void |
| 15884 | 367 | msn_switchboard_report_user(MsnSwitchBoard *swboard, PurpleMessageFlags flags, const char *msg) |
|
10225
0dfea1bc8695
[gaim-migrate @ 11357]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10112
diff
changeset
|
368 | { |
| 15884 | 369 | PurpleConversation *conv; |
|
10225
0dfea1bc8695
[gaim-migrate @ 11357]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10112
diff
changeset
|
370 | |
|
0dfea1bc8695
[gaim-migrate @ 11357]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10112
diff
changeset
|
371 | g_return_if_fail(swboard != NULL); |
|
0dfea1bc8695
[gaim-migrate @ 11357]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10112
diff
changeset
|
372 | g_return_if_fail(msg != NULL); |
|
0dfea1bc8695
[gaim-migrate @ 11357]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10112
diff
changeset
|
373 | |
|
0dfea1bc8695
[gaim-migrate @ 11357]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10112
diff
changeset
|
374 | if ((conv = msn_switchboard_get_conv(swboard)) != NULL) |
|
0dfea1bc8695
[gaim-migrate @ 11357]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10112
diff
changeset
|
375 | { |
| 15884 | 376 | purple_conversation_write(conv, NULL, msg, flags, time(NULL)); |
|
10225
0dfea1bc8695
[gaim-migrate @ 11357]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10112
diff
changeset
|
377 | } |
|
0dfea1bc8695
[gaim-migrate @ 11357]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10112
diff
changeset
|
378 | } |
|
0dfea1bc8695
[gaim-migrate @ 11357]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10112
diff
changeset
|
379 | |
|
8808
1cb5ddf6b625
[gaim-migrate @ 9570]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
8663
diff
changeset
|
380 | static void |
|
10345
7d7f8cfa2b4f
[gaim-migrate @ 11556]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10306
diff
changeset
|
381 | swboard_error_helper(MsnSwitchBoard *swboard, int reason, const char *passport) |
|
7d7f8cfa2b4f
[gaim-migrate @ 11556]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10306
diff
changeset
|
382 | { |
|
10451
2df35a139363
[gaim-migrate @ 11717]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10434
diff
changeset
|
383 | g_return_if_fail(swboard != NULL); |
|
2df35a139363
[gaim-migrate @ 11717]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10434
diff
changeset
|
384 | |
|
23830
1436e3de5d6c
The great MSN debug message cleanup! Threw in a few whitespace fixes,
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23826
diff
changeset
|
385 | purple_debug_warning("msn", "Error: Unable to call the user %s for reason %i\n", |
|
13246
5f5797c0d38b
[gaim-migrate @ 15611]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
13244
diff
changeset
|
386 | passport ? passport : "(null)", reason); |
|
10345
7d7f8cfa2b4f
[gaim-migrate @ 11556]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10306
diff
changeset
|
387 | |
|
10533
4c2ad22fad20
[gaim-migrate @ 11862]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10504
diff
changeset
|
388 | /* TODO: if current_users > 0, this is probably a chat and an invite failed, |
|
4c2ad22fad20
[gaim-migrate @ 11862]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10504
diff
changeset
|
389 | * we should report that in the chat or something */ |
|
4c2ad22fad20
[gaim-migrate @ 11862]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10504
diff
changeset
|
390 | if (swboard->current_users == 0) |
|
10345
7d7f8cfa2b4f
[gaim-migrate @ 11556]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10306
diff
changeset
|
391 | { |
|
7d7f8cfa2b4f
[gaim-migrate @ 11556]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10306
diff
changeset
|
392 | swboard->error = reason; |
|
10463
f2f97738b401
[gaim-migrate @ 11737]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10451
diff
changeset
|
393 | msn_switchboard_close(swboard); |
|
10345
7d7f8cfa2b4f
[gaim-migrate @ 11556]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10306
diff
changeset
|
394 | } |
|
7d7f8cfa2b4f
[gaim-migrate @ 11556]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10306
diff
changeset
|
395 | } |
|
7d7f8cfa2b4f
[gaim-migrate @ 11556]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10306
diff
changeset
|
396 | |
|
7d7f8cfa2b4f
[gaim-migrate @ 11556]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10306
diff
changeset
|
397 | static void |
|
7d7f8cfa2b4f
[gaim-migrate @ 11556]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10306
diff
changeset
|
398 | cal_error_helper(MsnTransaction *trans, int reason) |
|
7d7f8cfa2b4f
[gaim-migrate @ 11556]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10306
diff
changeset
|
399 | { |
|
7d7f8cfa2b4f
[gaim-migrate @ 11556]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10306
diff
changeset
|
400 | MsnSwitchBoard *swboard; |
|
7d7f8cfa2b4f
[gaim-migrate @ 11556]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10306
diff
changeset
|
401 | const char *passport; |
|
7d7f8cfa2b4f
[gaim-migrate @ 11556]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10306
diff
changeset
|
402 | char **params; |
|
7d7f8cfa2b4f
[gaim-migrate @ 11556]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10306
diff
changeset
|
403 | |
|
7d7f8cfa2b4f
[gaim-migrate @ 11556]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10306
diff
changeset
|
404 | params = g_strsplit(trans->params, " ", 0); |
|
7d7f8cfa2b4f
[gaim-migrate @ 11556]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10306
diff
changeset
|
405 | |
|
7d7f8cfa2b4f
[gaim-migrate @ 11556]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10306
diff
changeset
|
406 | passport = params[0]; |
|
7d7f8cfa2b4f
[gaim-migrate @ 11556]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10306
diff
changeset
|
407 | |
|
7d7f8cfa2b4f
[gaim-migrate @ 11556]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10306
diff
changeset
|
408 | swboard = trans->data; |
|
7d7f8cfa2b4f
[gaim-migrate @ 11556]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10306
diff
changeset
|
409 | |
| 15884 | 410 | purple_debug_warning("msn", "cal_error_helper: command %s failed for reason %i\n",trans->command,reason); |
|
13126
afce0fe97885
[gaim-migrate @ 15487]
Evan Schoenberg <evands@pidgin.im>
parents:
12323
diff
changeset
|
411 | |
|
10345
7d7f8cfa2b4f
[gaim-migrate @ 11556]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10306
diff
changeset
|
412 | swboard_error_helper(swboard, reason, passport); |
|
7d7f8cfa2b4f
[gaim-migrate @ 11556]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10306
diff
changeset
|
413 | |
|
7d7f8cfa2b4f
[gaim-migrate @ 11556]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10306
diff
changeset
|
414 | g_strfreev(params); |
|
7d7f8cfa2b4f
[gaim-migrate @ 11556]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10306
diff
changeset
|
415 | } |
|
7d7f8cfa2b4f
[gaim-migrate @ 11556]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10306
diff
changeset
|
416 | |
|
24420
e83317602b22
attempts to resend message on switchboard error once, tested by maually
Ka-Hing Cheung <khc@pidgin.im>
parents:
24218
diff
changeset
|
417 | static gboolean |
|
e83317602b22
attempts to resend message on switchboard error once, tested by maually
Ka-Hing Cheung <khc@pidgin.im>
parents:
24218
diff
changeset
|
418 | msg_resend_cb(gpointer data) |
|
e83317602b22
attempts to resend message on switchboard error once, tested by maually
Ka-Hing Cheung <khc@pidgin.im>
parents:
24218
diff
changeset
|
419 | { |
|
e83317602b22
attempts to resend message on switchboard error once, tested by maually
Ka-Hing Cheung <khc@pidgin.im>
parents:
24218
diff
changeset
|
420 | MsnSwitchBoard *swboard = data; |
|
e83317602b22
attempts to resend message on switchboard error once, tested by maually
Ka-Hing Cheung <khc@pidgin.im>
parents:
24218
diff
changeset
|
421 | |
|
25686
5392767b8adc
These debug messages need newlines.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
25538
diff
changeset
|
422 | purple_debug_info("msn", "unqueuing unsent message to %s\n", swboard->im_user); |
|
24420
e83317602b22
attempts to resend message on switchboard error once, tested by maually
Ka-Hing Cheung <khc@pidgin.im>
parents:
24218
diff
changeset
|
423 | |
|
32008
56d1c64759d6
Fix a crash when the account is disconnected and we have requested a SB. (Hanzz, ported by shlomif)(Fixes #12431)
Jorge Villaseñor <masca@cpw.pidgin.im>
parents:
31739
diff
changeset
|
424 | if (msn_switchboard_request(swboard)) { |
|
56d1c64759d6
Fix a crash when the account is disconnected and we have requested a SB. (Hanzz, ported by shlomif)(Fixes #12431)
Jorge Villaseñor <masca@cpw.pidgin.im>
parents:
31739
diff
changeset
|
425 | msn_switchboard_request_add_user(swboard, swboard->im_user); |
|
56d1c64759d6
Fix a crash when the account is disconnected and we have requested a SB. (Hanzz, ported by shlomif)(Fixes #12431)
Jorge Villaseñor <masca@cpw.pidgin.im>
parents:
31739
diff
changeset
|
426 | swboard->reconn_timeout_h = 0; |
|
56d1c64759d6
Fix a crash when the account is disconnected and we have requested a SB. (Hanzz, ported by shlomif)(Fixes #12431)
Jorge Villaseñor <masca@cpw.pidgin.im>
parents:
31739
diff
changeset
|
427 | } |
|
24420
e83317602b22
attempts to resend message on switchboard error once, tested by maually
Ka-Hing Cheung <khc@pidgin.im>
parents:
24218
diff
changeset
|
428 | return FALSE; |
|
e83317602b22
attempts to resend message on switchboard error once, tested by maually
Ka-Hing Cheung <khc@pidgin.im>
parents:
24218
diff
changeset
|
429 | } |
|
e83317602b22
attempts to resend message on switchboard error once, tested by maually
Ka-Hing Cheung <khc@pidgin.im>
parents:
24218
diff
changeset
|
430 | |
|
31020
c1266a6b7745
Fix integration between Switchboard and SBConn. by setting public some functions on both sides. Regresion introduced in 99802eb80a7acd
Jorge Villaseñor <masca@cpw.pidgin.im>
parents:
31019
diff
changeset
|
431 | void |
|
10345
7d7f8cfa2b4f
[gaim-migrate @ 11556]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10306
diff
changeset
|
432 | msg_error_helper(MsnCmdProc *cmdproc, MsnMessage *msg, MsnMsgErrorType error) |
|
7d7f8cfa2b4f
[gaim-migrate @ 11556]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10306
diff
changeset
|
433 | { |
|
10403
4647a87ef73b
[gaim-migrate @ 11648]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10391
diff
changeset
|
434 | MsnSwitchBoard *swboard; |
|
4647a87ef73b
[gaim-migrate @ 11648]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10391
diff
changeset
|
435 | |
|
10345
7d7f8cfa2b4f
[gaim-migrate @ 11556]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10306
diff
changeset
|
436 | g_return_if_fail(cmdproc != NULL); |
|
7d7f8cfa2b4f
[gaim-migrate @ 11556]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10306
diff
changeset
|
437 | g_return_if_fail(msg != NULL); |
|
7d7f8cfa2b4f
[gaim-migrate @ 11556]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10306
diff
changeset
|
438 | |
|
10403
4647a87ef73b
[gaim-migrate @ 11648]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10391
diff
changeset
|
439 | if ((error != MSN_MSG_ERROR_SB) && (msg->nak_cb != NULL)) |
|
10345
7d7f8cfa2b4f
[gaim-migrate @ 11556]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10306
diff
changeset
|
440 | msg->nak_cb(msg, msg->ack_data); |
|
7d7f8cfa2b4f
[gaim-migrate @ 11556]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10306
diff
changeset
|
441 | |
|
10463
f2f97738b401
[gaim-migrate @ 11737]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10451
diff
changeset
|
442 | swboard = cmdproc->data; |
|
10403
4647a87ef73b
[gaim-migrate @ 11648]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10391
diff
changeset
|
443 | |
|
10773
ef88ffed66eb
[gaim-migrate @ 12382]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10732
diff
changeset
|
444 | /* This is not good, and should be fixed somewhere else. */ |
|
ef88ffed66eb
[gaim-migrate @ 12382]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10732
diff
changeset
|
445 | g_return_if_fail(swboard != NULL); |
|
ef88ffed66eb
[gaim-migrate @ 12382]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10732
diff
changeset
|
446 | |
|
10345
7d7f8cfa2b4f
[gaim-migrate @ 11556]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10306
diff
changeset
|
447 | if (msg->type == MSN_MSG_TEXT) |
|
7d7f8cfa2b4f
[gaim-migrate @ 11556]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10306
diff
changeset
|
448 | { |
|
10504
eae130eefbfe
[gaim-migrate @ 11796]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
10487
diff
changeset
|
449 | const char *format, *str_reason; |
|
10346
9c65a007b4a5
[gaim-migrate @ 11560]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10345
diff
changeset
|
450 | char *body_str, *body_enc, *pre, *post; |
|
10345
7d7f8cfa2b4f
[gaim-migrate @ 11556]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10306
diff
changeset
|
451 | |
|
7d7f8cfa2b4f
[gaim-migrate @ 11556]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10306
diff
changeset
|
452 | #if 0 |
|
7d7f8cfa2b4f
[gaim-migrate @ 11556]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10306
diff
changeset
|
453 | if (swboard->conv == NULL) |
|
7d7f8cfa2b4f
[gaim-migrate @ 11556]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10306
diff
changeset
|
454 | { |
|
10346
9c65a007b4a5
[gaim-migrate @ 11560]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10345
diff
changeset
|
455 | if (msg->ack_ref) |
|
10403
4647a87ef73b
[gaim-migrate @ 11648]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10391
diff
changeset
|
456 | msn_message_unref(msg); |
|
10346
9c65a007b4a5
[gaim-migrate @ 11560]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10345
diff
changeset
|
457 | |
|
10345
7d7f8cfa2b4f
[gaim-migrate @ 11556]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10306
diff
changeset
|
458 | return; |
|
7d7f8cfa2b4f
[gaim-migrate @ 11556]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10306
diff
changeset
|
459 | } |
|
7d7f8cfa2b4f
[gaim-migrate @ 11556]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10306
diff
changeset
|
460 | #endif |
|
7d7f8cfa2b4f
[gaim-migrate @ 11556]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10306
diff
changeset
|
461 | |
|
10346
9c65a007b4a5
[gaim-migrate @ 11560]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10345
diff
changeset
|
462 | if (error == MSN_MSG_ERROR_TIMEOUT) |
|
10345
7d7f8cfa2b4f
[gaim-migrate @ 11556]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10306
diff
changeset
|
463 | { |
|
7d7f8cfa2b4f
[gaim-migrate @ 11556]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10306
diff
changeset
|
464 | str_reason = _("Message may have not been sent " |
|
10451
2df35a139363
[gaim-migrate @ 11717]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10434
diff
changeset
|
465 | "because a timeout occurred:"); |
|
10345
7d7f8cfa2b4f
[gaim-migrate @ 11556]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10306
diff
changeset
|
466 | } |
|
10346
9c65a007b4a5
[gaim-migrate @ 11560]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10345
diff
changeset
|
467 | else if (error == MSN_MSG_ERROR_SB) |
|
10345
7d7f8cfa2b4f
[gaim-migrate @ 11556]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10306
diff
changeset
|
468 | { |
|
24420
e83317602b22
attempts to resend message on switchboard error once, tested by maually
Ka-Hing Cheung <khc@pidgin.im>
parents:
24218
diff
changeset
|
469 | MsnSession *session = swboard->session; |
|
e83317602b22
attempts to resend message on switchboard error once, tested by maually
Ka-Hing Cheung <khc@pidgin.im>
parents:
24218
diff
changeset
|
470 | |
|
e83317602b22
attempts to resend message on switchboard error once, tested by maually
Ka-Hing Cheung <khc@pidgin.im>
parents:
24218
diff
changeset
|
471 | if (!session->destroying && msg->retries && swboard->im_user && |
|
e83317602b22
attempts to resend message on switchboard error once, tested by maually
Ka-Hing Cheung <khc@pidgin.im>
parents:
24218
diff
changeset
|
472 | (swboard->error == MSN_SB_ERROR_CONNECTION || |
|
e83317602b22
attempts to resend message on switchboard error once, tested by maually
Ka-Hing Cheung <khc@pidgin.im>
parents:
24218
diff
changeset
|
473 | swboard->error == MSN_SB_ERROR_UNKNOWN)) { |
|
e83317602b22
attempts to resend message on switchboard error once, tested by maually
Ka-Hing Cheung <khc@pidgin.im>
parents:
24218
diff
changeset
|
474 | MsnSwitchBoard *new_sw = msn_session_find_swboard(session, |
|
e83317602b22
attempts to resend message on switchboard error once, tested by maually
Ka-Hing Cheung <khc@pidgin.im>
parents:
24218
diff
changeset
|
475 | swboard->im_user); |
|
e83317602b22
attempts to resend message on switchboard error once, tested by maually
Ka-Hing Cheung <khc@pidgin.im>
parents:
24218
diff
changeset
|
476 | |
|
e83317602b22
attempts to resend message on switchboard error once, tested by maually
Ka-Hing Cheung <khc@pidgin.im>
parents:
24218
diff
changeset
|
477 | if (new_sw == NULL || new_sw->reconn_timeout_h == 0) { |
|
e83317602b22
attempts to resend message on switchboard error once, tested by maually
Ka-Hing Cheung <khc@pidgin.im>
parents:
24218
diff
changeset
|
478 | new_sw = msn_switchboard_new(session); |
|
e83317602b22
attempts to resend message on switchboard error once, tested by maually
Ka-Hing Cheung <khc@pidgin.im>
parents:
24218
diff
changeset
|
479 | new_sw->im_user = g_strdup(swboard->im_user); |
|
e83317602b22
attempts to resend message on switchboard error once, tested by maually
Ka-Hing Cheung <khc@pidgin.im>
parents:
24218
diff
changeset
|
480 | new_sw->reconn_timeout_h = purple_timeout_add_seconds(3, msg_resend_cb, new_sw); |
|
e83317602b22
attempts to resend message on switchboard error once, tested by maually
Ka-Hing Cheung <khc@pidgin.im>
parents:
24218
diff
changeset
|
481 | new_sw->flag |= MSN_SB_FLAG_IM; |
|
e83317602b22
attempts to resend message on switchboard error once, tested by maually
Ka-Hing Cheung <khc@pidgin.im>
parents:
24218
diff
changeset
|
482 | } |
|
e83317602b22
attempts to resend message on switchboard error once, tested by maually
Ka-Hing Cheung <khc@pidgin.im>
parents:
24218
diff
changeset
|
483 | |
|
e83317602b22
attempts to resend message on switchboard error once, tested by maually
Ka-Hing Cheung <khc@pidgin.im>
parents:
24218
diff
changeset
|
484 | body_str = msn_message_to_string(msg); |
|
e83317602b22
attempts to resend message on switchboard error once, tested by maually
Ka-Hing Cheung <khc@pidgin.im>
parents:
24218
diff
changeset
|
485 | body_enc = g_markup_escape_text(body_str, -1); |
|
e83317602b22
attempts to resend message on switchboard error once, tested by maually
Ka-Hing Cheung <khc@pidgin.im>
parents:
24218
diff
changeset
|
486 | g_free(body_str); |
|
e83317602b22
attempts to resend message on switchboard error once, tested by maually
Ka-Hing Cheung <khc@pidgin.im>
parents:
24218
diff
changeset
|
487 | |
|
25686
5392767b8adc
These debug messages need newlines.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
25538
diff
changeset
|
488 | purple_debug_info("msn", "queuing unsent message to %s: %s\n", |
|
24420
e83317602b22
attempts to resend message on switchboard error once, tested by maually
Ka-Hing Cheung <khc@pidgin.im>
parents:
24218
diff
changeset
|
489 | swboard->im_user, body_enc); |
|
e83317602b22
attempts to resend message on switchboard error once, tested by maually
Ka-Hing Cheung <khc@pidgin.im>
parents:
24218
diff
changeset
|
490 | g_free(body_enc); |
|
e83317602b22
attempts to resend message on switchboard error once, tested by maually
Ka-Hing Cheung <khc@pidgin.im>
parents:
24218
diff
changeset
|
491 | msn_send_im_message(session, msg); |
|
e83317602b22
attempts to resend message on switchboard error once, tested by maually
Ka-Hing Cheung <khc@pidgin.im>
parents:
24218
diff
changeset
|
492 | msg->retries--; |
|
e83317602b22
attempts to resend message on switchboard error once, tested by maually
Ka-Hing Cheung <khc@pidgin.im>
parents:
24218
diff
changeset
|
493 | |
|
e83317602b22
attempts to resend message on switchboard error once, tested by maually
Ka-Hing Cheung <khc@pidgin.im>
parents:
24218
diff
changeset
|
494 | return; |
|
e83317602b22
attempts to resend message on switchboard error once, tested by maually
Ka-Hing Cheung <khc@pidgin.im>
parents:
24218
diff
changeset
|
495 | } |
|
e83317602b22
attempts to resend message on switchboard error once, tested by maually
Ka-Hing Cheung <khc@pidgin.im>
parents:
24218
diff
changeset
|
496 | |
|
10345
7d7f8cfa2b4f
[gaim-migrate @ 11556]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10306
diff
changeset
|
497 | switch (swboard->error) |
|
7d7f8cfa2b4f
[gaim-migrate @ 11556]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10306
diff
changeset
|
498 | { |
|
7d7f8cfa2b4f
[gaim-migrate @ 11556]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10306
diff
changeset
|
499 | case MSN_SB_ERROR_OFFLINE: |
|
7d7f8cfa2b4f
[gaim-migrate @ 11556]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10306
diff
changeset
|
500 | str_reason = _("Message could not be sent, " |
|
10346
9c65a007b4a5
[gaim-migrate @ 11560]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10345
diff
changeset
|
501 | "not allowed while invisible:"); |
|
10345
7d7f8cfa2b4f
[gaim-migrate @ 11556]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10306
diff
changeset
|
502 | break; |
|
7d7f8cfa2b4f
[gaim-migrate @ 11556]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10306
diff
changeset
|
503 | case MSN_SB_ERROR_USER_OFFLINE: |
|
7d7f8cfa2b4f
[gaim-migrate @ 11556]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10306
diff
changeset
|
504 | str_reason = _("Message could not be sent " |
|
10346
9c65a007b4a5
[gaim-migrate @ 11560]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10345
diff
changeset
|
505 | "because the user is offline:"); |
|
10345
7d7f8cfa2b4f
[gaim-migrate @ 11556]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10306
diff
changeset
|
506 | break; |
|
7d7f8cfa2b4f
[gaim-migrate @ 11556]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10306
diff
changeset
|
507 | case MSN_SB_ERROR_CONNECTION: |
|
7d7f8cfa2b4f
[gaim-migrate @ 11556]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10306
diff
changeset
|
508 | str_reason = _("Message could not be sent " |
|
10391
d7bb3097f2c1
[gaim-migrate @ 11619]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
10346
diff
changeset
|
509 | "because a connection error occurred:"); |
|
10345
7d7f8cfa2b4f
[gaim-migrate @ 11556]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10306
diff
changeset
|
510 | break; |
|
13126
afce0fe97885
[gaim-migrate @ 15487]
Evan Schoenberg <evands@pidgin.im>
parents:
12323
diff
changeset
|
511 | case MSN_SB_ERROR_TOO_FAST: |
|
afce0fe97885
[gaim-migrate @ 15487]
Evan Schoenberg <evands@pidgin.im>
parents:
12323
diff
changeset
|
512 | str_reason = _("Message could not be sent " |
|
afce0fe97885
[gaim-migrate @ 15487]
Evan Schoenberg <evands@pidgin.im>
parents:
12323
diff
changeset
|
513 | "because we are sending too quickly:"); |
|
17532
1d4984e7dfeb
Handle problems initiating or joining a switchboard session more gracefully.
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
16007
diff
changeset
|
514 | break; |
|
1d4984e7dfeb
Handle problems initiating or joining a switchboard session more gracefully.
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
16007
diff
changeset
|
515 | case MSN_SB_ERROR_AUTHFAILED: |
|
1d4984e7dfeb
Handle problems initiating or joining a switchboard session more gracefully.
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
16007
diff
changeset
|
516 | str_reason = _("Message could not be sent " |
|
18167
f1979177eb0e
Replace "wer" with "were"
Richard Laager <rlaager@pidgin.im>
parents:
17532
diff
changeset
|
517 | "because we were unable to establish a " |
|
17532
1d4984e7dfeb
Handle problems initiating or joining a switchboard session more gracefully.
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
16007
diff
changeset
|
518 | "session with the server. This is " |
|
1d4984e7dfeb
Handle problems initiating or joining a switchboard session more gracefully.
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
16007
diff
changeset
|
519 | "likely a server problem, try again in " |
|
1d4984e7dfeb
Handle problems initiating or joining a switchboard session more gracefully.
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
16007
diff
changeset
|
520 | "a few minutes:"); |
|
1d4984e7dfeb
Handle problems initiating or joining a switchboard session more gracefully.
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
16007
diff
changeset
|
521 | break; |
|
10345
7d7f8cfa2b4f
[gaim-migrate @ 11556]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10306
diff
changeset
|
522 | default: |
|
7d7f8cfa2b4f
[gaim-migrate @ 11556]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10306
diff
changeset
|
523 | str_reason = _("Message could not be sent " |
|
7d7f8cfa2b4f
[gaim-migrate @ 11556]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10306
diff
changeset
|
524 | "because an error with " |
|
10391
d7bb3097f2c1
[gaim-migrate @ 11619]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
10346
diff
changeset
|
525 | "the switchboard occurred:"); |
|
10345
7d7f8cfa2b4f
[gaim-migrate @ 11556]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10306
diff
changeset
|
526 | break; |
|
7d7f8cfa2b4f
[gaim-migrate @ 11556]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10306
diff
changeset
|
527 | } |
|
7d7f8cfa2b4f
[gaim-migrate @ 11556]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10306
diff
changeset
|
528 | } |
|
7d7f8cfa2b4f
[gaim-migrate @ 11556]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10306
diff
changeset
|
529 | else |
|
7d7f8cfa2b4f
[gaim-migrate @ 11556]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10306
diff
changeset
|
530 | { |
|
7d7f8cfa2b4f
[gaim-migrate @ 11556]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10306
diff
changeset
|
531 | str_reason = _("Message may have not been sent " |
|
10391
d7bb3097f2c1
[gaim-migrate @ 11619]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
10346
diff
changeset
|
532 | "because an unknown error occurred:"); |
|
10345
7d7f8cfa2b4f
[gaim-migrate @ 11556]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10306
diff
changeset
|
533 | } |
|
7d7f8cfa2b4f
[gaim-migrate @ 11556]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10306
diff
changeset
|
534 | |
|
10346
9c65a007b4a5
[gaim-migrate @ 11560]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10345
diff
changeset
|
535 | body_str = msn_message_to_string(msg); |
|
10732
5e314ab498bf
[gaim-migrate @ 12334]
Richard Laager <rlaager@pidgin.im>
parents:
10621
diff
changeset
|
536 | body_enc = g_markup_escape_text(body_str, -1); |
|
10346
9c65a007b4a5
[gaim-migrate @ 11560]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10345
diff
changeset
|
537 | g_free(body_str); |
|
9c65a007b4a5
[gaim-migrate @ 11560]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10345
diff
changeset
|
538 | |
|
29457
15f977c9ac76
Rename "attribute" to "header" in a bunch of places. The SLP protocol
Mark Doliner <markdoliner@pidgin.im>
parents:
29455
diff
changeset
|
539 | format = msn_message_get_header_value(msg, "X-MMS-IM-Format"); |
|
10346
9c65a007b4a5
[gaim-migrate @ 11560]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10345
diff
changeset
|
540 | msn_parse_format(format, &pre, &post); |
|
10568
15f02c0e7fc1
[gaim-migrate @ 11954]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
10533
diff
changeset
|
541 | body_str = g_strdup_printf("%s%s%s", pre ? pre : "", |
|
15f02c0e7fc1
[gaim-migrate @ 11954]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
10533
diff
changeset
|
542 | body_enc ? body_enc : "", post ? post : ""); |
|
10346
9c65a007b4a5
[gaim-migrate @ 11560]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10345
diff
changeset
|
543 | g_free(body_enc); |
|
9c65a007b4a5
[gaim-migrate @ 11560]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10345
diff
changeset
|
544 | g_free(pre); |
|
9c65a007b4a5
[gaim-migrate @ 11560]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10345
diff
changeset
|
545 | g_free(post); |
|
10345
7d7f8cfa2b4f
[gaim-migrate @ 11556]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10306
diff
changeset
|
546 | |
| 15884 | 547 | msn_switchboard_report_user(swboard, PURPLE_MESSAGE_ERROR, |
|
10403
4647a87ef73b
[gaim-migrate @ 11648]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10391
diff
changeset
|
548 | str_reason); |
| 15884 | 549 | msn_switchboard_report_user(swboard, PURPLE_MESSAGE_RAW, |
|
10403
4647a87ef73b
[gaim-migrate @ 11648]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10391
diff
changeset
|
550 | body_str); |
|
10345
7d7f8cfa2b4f
[gaim-migrate @ 11556]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10306
diff
changeset
|
551 | |
|
10346
9c65a007b4a5
[gaim-migrate @ 11560]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10345
diff
changeset
|
552 | g_free(body_str); |
|
10345
7d7f8cfa2b4f
[gaim-migrate @ 11556]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10306
diff
changeset
|
553 | } |
|
7d7f8cfa2b4f
[gaim-migrate @ 11556]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10306
diff
changeset
|
554 | |
|
10403
4647a87ef73b
[gaim-migrate @ 11648]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10391
diff
changeset
|
555 | /* If a timeout occures we will want the msg around just in case we |
|
4647a87ef73b
[gaim-migrate @ 11648]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10391
diff
changeset
|
556 | * receive the ACK after the timeout. */ |
|
4647a87ef73b
[gaim-migrate @ 11648]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10391
diff
changeset
|
557 | if (msg->ack_ref && error != MSN_MSG_ERROR_TIMEOUT) |
|
4647a87ef73b
[gaim-migrate @ 11648]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10391
diff
changeset
|
558 | { |
|
4647a87ef73b
[gaim-migrate @ 11648]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10391
diff
changeset
|
559 | swboard->ack_list = g_list_remove(swboard->ack_list, msg); |
|
10346
9c65a007b4a5
[gaim-migrate @ 11560]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10345
diff
changeset
|
560 | msn_message_unref(msg); |
|
10403
4647a87ef73b
[gaim-migrate @ 11648]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10391
diff
changeset
|
561 | } |
|
10345
7d7f8cfa2b4f
[gaim-migrate @ 11556]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10306
diff
changeset
|
562 | } |
|
7d7f8cfa2b4f
[gaim-migrate @ 11556]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10306
diff
changeset
|
563 | |
|
7d7f8cfa2b4f
[gaim-migrate @ 11556]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10306
diff
changeset
|
564 | /************************************************************************** |
|
10481
a5d6b8e1717d
[gaim-migrate @ 11769]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10463
diff
changeset
|
565 | * Message Stuff |
|
a5d6b8e1717d
[gaim-migrate @ 11769]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10463
diff
changeset
|
566 | **************************************************************************/ |
|
a5d6b8e1717d
[gaim-migrate @ 11769]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10463
diff
changeset
|
567 | |
|
a5d6b8e1717d
[gaim-migrate @ 11769]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10463
diff
changeset
|
568 | /** Called when we receive an error of a message. */ |
|
a5d6b8e1717d
[gaim-migrate @ 11769]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10463
diff
changeset
|
569 | static void |
|
a5d6b8e1717d
[gaim-migrate @ 11769]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10463
diff
changeset
|
570 | msg_error(MsnCmdProc *cmdproc, MsnTransaction *trans, int error) |
|
a5d6b8e1717d
[gaim-migrate @ 11769]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10463
diff
changeset
|
571 | { |
|
a5d6b8e1717d
[gaim-migrate @ 11769]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10463
diff
changeset
|
572 | msg_error_helper(cmdproc, trans->data, MSN_MSG_ERROR_UNKNOWN); |
|
a5d6b8e1717d
[gaim-migrate @ 11769]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10463
diff
changeset
|
573 | } |
|
a5d6b8e1717d
[gaim-migrate @ 11769]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10463
diff
changeset
|
574 | |
|
a5d6b8e1717d
[gaim-migrate @ 11769]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10463
diff
changeset
|
575 | gboolean |
|
a5d6b8e1717d
[gaim-migrate @ 11769]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10463
diff
changeset
|
576 | msn_switchboard_can_send(MsnSwitchBoard *swboard) |
|
a5d6b8e1717d
[gaim-migrate @ 11769]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10463
diff
changeset
|
577 | { |
|
a5d6b8e1717d
[gaim-migrate @ 11769]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10463
diff
changeset
|
578 | g_return_val_if_fail(swboard != NULL, FALSE); |
|
a5d6b8e1717d
[gaim-migrate @ 11769]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10463
diff
changeset
|
579 | |
|
a5d6b8e1717d
[gaim-migrate @ 11769]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10463
diff
changeset
|
580 | if (swboard->empty || !g_queue_is_empty(swboard->msg_queue)) |
|
a5d6b8e1717d
[gaim-migrate @ 11769]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10463
diff
changeset
|
581 | return FALSE; |
|
a5d6b8e1717d
[gaim-migrate @ 11769]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10463
diff
changeset
|
582 | |
|
a5d6b8e1717d
[gaim-migrate @ 11769]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10463
diff
changeset
|
583 | return TRUE; |
|
a5d6b8e1717d
[gaim-migrate @ 11769]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10463
diff
changeset
|
584 | } |
|
a5d6b8e1717d
[gaim-migrate @ 11769]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10463
diff
changeset
|
585 | |
|
a5d6b8e1717d
[gaim-migrate @ 11769]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10463
diff
changeset
|
586 | /************************************************************************** |
|
10345
7d7f8cfa2b4f
[gaim-migrate @ 11556]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10306
diff
changeset
|
587 | * Switchboard Commands |
|
7d7f8cfa2b4f
[gaim-migrate @ 11556]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10306
diff
changeset
|
588 | **************************************************************************/ |
|
10481
a5d6b8e1717d
[gaim-migrate @ 11769]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10463
diff
changeset
|
589 | |
|
10345
7d7f8cfa2b4f
[gaim-migrate @ 11556]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10306
diff
changeset
|
590 | static void |
|
7d7f8cfa2b4f
[gaim-migrate @ 11556]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10306
diff
changeset
|
591 | ans_cmd(MsnCmdProc *cmdproc, MsnCommand *cmd) |
|
7d7f8cfa2b4f
[gaim-migrate @ 11556]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10306
diff
changeset
|
592 | { |
|
7d7f8cfa2b4f
[gaim-migrate @ 11556]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10306
diff
changeset
|
593 | MsnSwitchBoard *swboard; |
|
7d7f8cfa2b4f
[gaim-migrate @ 11556]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10306
diff
changeset
|
594 | |
|
10463
f2f97738b401
[gaim-migrate @ 11737]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10451
diff
changeset
|
595 | swboard = cmdproc->data; |
|
10345
7d7f8cfa2b4f
[gaim-migrate @ 11556]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10306
diff
changeset
|
596 | swboard->ready = TRUE; |
|
7d7f8cfa2b4f
[gaim-migrate @ 11556]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10306
diff
changeset
|
597 | } |
|
7d7f8cfa2b4f
[gaim-migrate @ 11556]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10306
diff
changeset
|
598 | |
|
7d7f8cfa2b4f
[gaim-migrate @ 11556]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10306
diff
changeset
|
599 | static void |
|
8808
1cb5ddf6b625
[gaim-migrate @ 9570]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
8663
diff
changeset
|
600 | bye_cmd(MsnCmdProc *cmdproc, MsnCommand *cmd) |
|
5309
3178acad1449
[gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents:
5221
diff
changeset
|
601 | { |
|
8808
1cb5ddf6b625
[gaim-migrate @ 9570]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
8663
diff
changeset
|
602 | MsnSwitchBoard *swboard; |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
603 | const char *user; |
|
8808
1cb5ddf6b625
[gaim-migrate @ 9570]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
8663
diff
changeset
|
604 | |
|
10463
f2f97738b401
[gaim-migrate @ 11737]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10451
diff
changeset
|
605 | swboard = cmdproc->data; |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
606 | user = cmd->params[0]; |
|
5309
3178acad1449
[gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents:
5221
diff
changeset
|
607 | |
|
15347
d0e0f67e1c2b
[gaim-migrate @ 18075]
Evan Schoenberg <evands@pidgin.im>
parents:
14340
diff
changeset
|
608 | /* cmdproc->data is set to NULL when the switchboard is destroyed; |
|
d0e0f67e1c2b
[gaim-migrate @ 18075]
Evan Schoenberg <evands@pidgin.im>
parents:
14340
diff
changeset
|
609 | * we may get a bye shortly thereafter. */ |
|
d0e0f67e1c2b
[gaim-migrate @ 18075]
Evan Schoenberg <evands@pidgin.im>
parents:
14340
diff
changeset
|
610 | g_return_if_fail(swboard != NULL); |
|
d0e0f67e1c2b
[gaim-migrate @ 18075]
Evan Schoenberg <evands@pidgin.im>
parents:
14340
diff
changeset
|
611 | |
|
11321
a93121c0ea16
[gaim-migrate @ 13525]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
10806
diff
changeset
|
612 | if (!(swboard->flag & MSN_SB_FLAG_IM) && (swboard->conv != NULL)) |
|
23830
1436e3de5d6c
The great MSN debug message cleanup! Threw in a few whitespace fixes,
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23826
diff
changeset
|
613 | purple_debug_error("msn", "bye_cmd: helper bug\n"); |
|
10773
ef88ffed66eb
[gaim-migrate @ 12382]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10732
diff
changeset
|
614 | |
|
10345
7d7f8cfa2b4f
[gaim-migrate @ 11556]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10306
diff
changeset
|
615 | if (swboard->conv == NULL) |
|
9158
f8dab42adeaf
[gaim-migrate @ 9942]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9083
diff
changeset
|
616 | { |
|
10345
7d7f8cfa2b4f
[gaim-migrate @ 11556]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10306
diff
changeset
|
617 | /* This is a helper switchboard */ |
|
10434
17665eed4948
[gaim-migrate @ 11691]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10403
diff
changeset
|
618 | msn_switchboard_destroy(swboard); |
|
10345
7d7f8cfa2b4f
[gaim-migrate @ 11556]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10306
diff
changeset
|
619 | } |
|
10533
4c2ad22fad20
[gaim-migrate @ 11862]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10504
diff
changeset
|
620 | else if ((swboard->current_users > 1) || |
| 15884 | 621 | (purple_conversation_get_type(swboard->conv) == PURPLE_CONV_TYPE_CHAT)) |
|
10345
7d7f8cfa2b4f
[gaim-migrate @ 11556]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10306
diff
changeset
|
622 | { |
|
30528
8ebd24be8388
Remove a buddy that left a chat from an internal list. Otherwise, the
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30089
diff
changeset
|
623 | GList *passport; |
|
10345
7d7f8cfa2b4f
[gaim-migrate @ 11556]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10306
diff
changeset
|
624 | /* This is a switchboard used for a chat */ |
| 15884 | 625 | purple_conv_chat_remove_user(PURPLE_CONV_CHAT(swboard->conv), user, NULL); |
|
30528
8ebd24be8388
Remove a buddy that left a chat from an internal list. Otherwise, the
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30089
diff
changeset
|
626 | |
|
8ebd24be8388
Remove a buddy that left a chat from an internal list. Otherwise, the
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30089
diff
changeset
|
627 | passport = g_list_find_custom(swboard->users, user, (GCompareFunc)strcmp); |
|
31077
f957ef5f187d
Fix a crash when we want to remove a user that is not in the switchboard.
Jorge Villaseñor <masca@cpw.pidgin.im>
parents:
31076
diff
changeset
|
628 | if (passport) |
|
f957ef5f187d
Fix a crash when we want to remove a user that is not in the switchboard.
Jorge Villaseñor <masca@cpw.pidgin.im>
parents:
31076
diff
changeset
|
629 | g_free(passport->data); |
|
f957ef5f187d
Fix a crash when we want to remove a user that is not in the switchboard.
Jorge Villaseñor <masca@cpw.pidgin.im>
parents:
31076
diff
changeset
|
630 | else |
|
f957ef5f187d
Fix a crash when we want to remove a user that is not in the switchboard.
Jorge Villaseñor <masca@cpw.pidgin.im>
parents:
31076
diff
changeset
|
631 | purple_debug_warning("msn", "Can't find user %s in the switchboard\n", user); |
|
30528
8ebd24be8388
Remove a buddy that left a chat from an internal list. Otherwise, the
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30089
diff
changeset
|
632 | swboard->users = g_list_delete_link(swboard->users, passport); |
|
10533
4c2ad22fad20
[gaim-migrate @ 11862]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10504
diff
changeset
|
633 | swboard->current_users--; |
|
4c2ad22fad20
[gaim-migrate @ 11862]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10504
diff
changeset
|
634 | if (swboard->current_users == 0) |
|
4c2ad22fad20
[gaim-migrate @ 11862]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10504
diff
changeset
|
635 | msn_switchboard_destroy(swboard); |
|
9158
f8dab42adeaf
[gaim-migrate @ 9942]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9083
diff
changeset
|
636 | } |
|
8372
c861368e51d0
[gaim-migrate @ 9099]
Christian Hammond <chipx86@chipx86.com>
parents:
8207
diff
changeset
|
637 | else |
|
c861368e51d0
[gaim-migrate @ 9099]
Christian Hammond <chipx86@chipx86.com>
parents:
8207
diff
changeset
|
638 | { |
|
10345
7d7f8cfa2b4f
[gaim-migrate @ 11556]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10306
diff
changeset
|
639 | /* This is a switchboard used for a im session */ |
|
10434
17665eed4948
[gaim-migrate @ 11691]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10403
diff
changeset
|
640 | msn_switchboard_destroy(swboard); |
| 4542 | 641 | } |
|
5309
3178acad1449
[gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents:
5221
diff
changeset
|
642 | } |
|
3178acad1449
[gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents:
5221
diff
changeset
|
643 | |
|
8808
1cb5ddf6b625
[gaim-migrate @ 9570]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
8663
diff
changeset
|
644 | static void |
|
1cb5ddf6b625
[gaim-migrate @ 9570]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
8663
diff
changeset
|
645 | iro_cmd(MsnCmdProc *cmdproc, MsnCommand *cmd) |
|
5309
3178acad1449
[gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents:
5221
diff
changeset
|
646 | { |
|
8808
1cb5ddf6b625
[gaim-migrate @ 9570]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
8663
diff
changeset
|
647 | MsnSwitchBoard *swboard; |
|
5309
3178acad1449
[gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents:
5221
diff
changeset
|
648 | |
|
10463
f2f97738b401
[gaim-migrate @ 11737]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10451
diff
changeset
|
649 | swboard = cmdproc->data; |
|
5309
3178acad1449
[gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents:
5221
diff
changeset
|
650 | |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
651 | swboard->total_users = atoi(cmd->params[2]); |
|
6026
b11d9f2fd725
[gaim-migrate @ 6476]
Christian Hammond <chipx86@chipx86.com>
parents:
6025
diff
changeset
|
652 | |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
653 | msn_switchboard_add_user(swboard, cmd->params[3]); |
| 4542 | 654 | } |
| 655 | ||
|
8808
1cb5ddf6b625
[gaim-migrate @ 9570]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
8663
diff
changeset
|
656 | static void |
|
1cb5ddf6b625
[gaim-migrate @ 9570]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
8663
diff
changeset
|
657 | joi_cmd(MsnCmdProc *cmdproc, MsnCommand *cmd) |
| 4542 | 658 | { |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
659 | MsnSession *session; |
|
8808
1cb5ddf6b625
[gaim-migrate @ 9570]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
8663
diff
changeset
|
660 | MsnSwitchBoard *swboard; |
|
5309
3178acad1449
[gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents:
5221
diff
changeset
|
661 | const char *passport; |
| 4542 | 662 | |
|
8808
1cb5ddf6b625
[gaim-migrate @ 9570]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
8663
diff
changeset
|
663 | passport = cmd->params[0]; |
| 4542 | 664 | |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
665 | session = cmdproc->session; |
|
10463
f2f97738b401
[gaim-migrate @ 11737]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10451
diff
changeset
|
666 | swboard = cmdproc->data; |
|
6026
b11d9f2fd725
[gaim-migrate @ 6476]
Christian Hammond <chipx86@chipx86.com>
parents:
6025
diff
changeset
|
667 | |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
668 | msn_switchboard_add_user(swboard, passport); |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
669 | |
|
31020
c1266a6b7745
Fix integration between Switchboard and SBConn. by setting public some functions on both sides. Regresion introduced in 99802eb80a7acd
Jorge Villaseñor <masca@cpw.pidgin.im>
parents:
31019
diff
changeset
|
670 | msn_sbconn_process_queue(swboard); |
|
9198
e8eb6d5eb9eb
[gaim-migrate @ 9993]
Christian Hammond <chipx86@chipx86.com>
parents:
9194
diff
changeset
|
671 | |
|
10463
f2f97738b401
[gaim-migrate @ 11737]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10451
diff
changeset
|
672 | if (!session->http_method) |
|
f2f97738b401
[gaim-migrate @ 11737]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10451
diff
changeset
|
673 | send_clientcaps(swboard); |
|
10403
4647a87ef73b
[gaim-migrate @ 11648]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10391
diff
changeset
|
674 | |
|
4647a87ef73b
[gaim-migrate @ 11648]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10391
diff
changeset
|
675 | if (swboard->closed) |
|
4647a87ef73b
[gaim-migrate @ 11648]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10391
diff
changeset
|
676 | msn_switchboard_close(swboard); |
|
5309
3178acad1449
[gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents:
5221
diff
changeset
|
677 | } |
|
3178acad1449
[gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents:
5221
diff
changeset
|
678 | |
|
8646
74d0e7406e3b
[gaim-migrate @ 9398]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
8583
diff
changeset
|
679 | static void |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
680 | msg_cmd_post(MsnCmdProc *cmdproc, MsnCommand *cmd, char *payload, size_t len) |
|
8646
74d0e7406e3b
[gaim-migrate @ 9398]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
8583
diff
changeset
|
681 | { |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
682 | MsnMessage *msg; |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
683 | |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
684 | msg = msn_message_new_from_cmd(cmdproc->session, cmd); |
|
8646
74d0e7406e3b
[gaim-migrate @ 9398]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
8583
diff
changeset
|
685 | |
| 13886 | 686 | msn_message_parse_payload(msg, payload, len, |
| 687 | MSG_LINE_DEM,MSG_BODY_DEM); | |
|
27691
d77b2890043e
Change all MSN_DEBUG_* messages to use the new purple_debug_is_verbose call
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
27569
diff
changeset
|
688 | if (purple_debug_is_verbose()) |
|
d77b2890043e
Change all MSN_DEBUG_* messages to use the new purple_debug_is_verbose call
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
27569
diff
changeset
|
689 | msn_message_show_readable(msg, "SB RECV", FALSE); |
|
8646
74d0e7406e3b
[gaim-migrate @ 9398]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
8583
diff
changeset
|
690 | |
|
21063
911e85f207c7
Fix some leaks caused by misuse of g_list_remove_link() instead of g_list_delete_link().
Daniel Atallah <datallah@pidgin.im>
parents:
21019
diff
changeset
|
691 | g_free (msg->remote_user); |
|
911e85f207c7
Fix some leaks caused by misuse of g_list_remove_link() instead of g_list_delete_link().
Daniel Atallah <datallah@pidgin.im>
parents:
21019
diff
changeset
|
692 | msg->remote_user = g_strdup(cmd->params[0]); |
|
10284
257978b5df5b
[gaim-migrate @ 11454]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
10280
diff
changeset
|
693 | |
|
8808
1cb5ddf6b625
[gaim-migrate @ 9570]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
8663
diff
changeset
|
694 | msn_cmdproc_process_msg(cmdproc, msg); |
|
8646
74d0e7406e3b
[gaim-migrate @ 9398]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
8583
diff
changeset
|
695 | |
|
25473
9da14c8bae20
Missed a file in previous commit. Avoids a double-free.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
24798
diff
changeset
|
696 | msn_message_unref(msg); |
|
8646
74d0e7406e3b
[gaim-migrate @ 9398]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
8583
diff
changeset
|
697 | } |
|
74d0e7406e3b
[gaim-migrate @ 9398]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
8583
diff
changeset
|
698 | |
|
8808
1cb5ddf6b625
[gaim-migrate @ 9570]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
8663
diff
changeset
|
699 | static void |
|
1cb5ddf6b625
[gaim-migrate @ 9570]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
8663
diff
changeset
|
700 | msg_cmd(MsnCmdProc *cmdproc, MsnCommand *cmd) |
|
5309
3178acad1449
[gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents:
5221
diff
changeset
|
701 | { |
|
23826
3eeaac42358f
Get rid of that whole msn_set_payload_len thing and correctly set the
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23816
diff
changeset
|
702 | cmd->payload_len = atoi(cmd->params[2]); |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
703 | cmdproc->last_cmd->payload_cb = msg_cmd_post; |
|
5309
3178acad1449
[gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents:
5221
diff
changeset
|
704 | } |
|
3178acad1449
[gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents:
5221
diff
changeset
|
705 | |
|
8808
1cb5ddf6b625
[gaim-migrate @ 9570]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
8663
diff
changeset
|
706 | static void |
| 13870 | 707 | ubm_cmd(MsnCmdProc *cmdproc, MsnCommand *cmd) |
| 708 | { | |
|
23830
1436e3de5d6c
The great MSN debug message cleanup! Threw in a few whitespace fixes,
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23826
diff
changeset
|
709 | purple_debug_misc("msn", "get UBM...\n"); |
|
32091
5061380d9fee
Pluck all MSNP18 changes. This is pretty much to fix sending OIMs.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
32013
diff
changeset
|
710 | cmd->payload_len = atoi(cmd->params[5]); |
| 13870 | 711 | cmdproc->last_cmd->payload_cb = msg_cmd_post; |
| 712 | } | |
| 713 | ||
| 714 | static void | |
|
8808
1cb5ddf6b625
[gaim-migrate @ 9570]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
8663
diff
changeset
|
715 | nak_cmd(MsnCmdProc *cmdproc, MsnCommand *cmd) |
|
5309
3178acad1449
[gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents:
5221
diff
changeset
|
716 | { |
|
10345
7d7f8cfa2b4f
[gaim-migrate @ 11556]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10306
diff
changeset
|
717 | MsnMessage *msg; |
|
7d7f8cfa2b4f
[gaim-migrate @ 11556]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10306
diff
changeset
|
718 | |
|
7d7f8cfa2b4f
[gaim-migrate @ 11556]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10306
diff
changeset
|
719 | msg = cmd->trans->data; |
|
7d7f8cfa2b4f
[gaim-migrate @ 11556]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10306
diff
changeset
|
720 | g_return_if_fail(msg != NULL); |
|
7d7f8cfa2b4f
[gaim-migrate @ 11556]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10306
diff
changeset
|
721 | |
|
7d7f8cfa2b4f
[gaim-migrate @ 11556]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10306
diff
changeset
|
722 | msg_error_helper(cmdproc, msg, MSN_MSG_ERROR_NAK); |
|
31562
025a90755639
Clear out transaction data, just in case the server does weird things
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
31476
diff
changeset
|
723 | cmd->trans->data = NULL; |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
724 | } |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
725 | |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
726 | static void |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
727 | ack_cmd(MsnCmdProc *cmdproc, MsnCommand *cmd) |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
728 | { |
|
10403
4647a87ef73b
[gaim-migrate @ 11648]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10391
diff
changeset
|
729 | MsnSwitchBoard *swboard; |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
730 | MsnMessage *msg; |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
731 | |
|
10345
7d7f8cfa2b4f
[gaim-migrate @ 11556]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10306
diff
changeset
|
732 | msg = cmd->trans->data; |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
733 | |
|
31039
c6fe9d44bf81
Use the real ack callback.
Jorge Villaseñor <masca@cpw.pidgin.im>
parents:
31032
diff
changeset
|
734 | if (msg->part && msg->part->ack_cb != NULL) |
|
c6fe9d44bf81
Use the real ack callback.
Jorge Villaseñor <masca@cpw.pidgin.im>
parents:
31032
diff
changeset
|
735 | msg->part->ack_cb(msg->part, msg->part->ack_data); |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
736 | |
|
10463
f2f97738b401
[gaim-migrate @ 11737]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10451
diff
changeset
|
737 | swboard = cmdproc->data; |
|
19826
fd6596d64331
Deal better with receiving a msn ACK when there is no switchboard connected. Fixes #2640.
Daniel Atallah <datallah@pidgin.im>
parents:
19643
diff
changeset
|
738 | if (swboard) |
|
fd6596d64331
Deal better with receiving a msn ACK when there is no switchboard connected. Fixes #2640.
Daniel Atallah <datallah@pidgin.im>
parents:
19643
diff
changeset
|
739 | swboard->ack_list = g_list_remove(swboard->ack_list, msg); |
|
10345
7d7f8cfa2b4f
[gaim-migrate @ 11556]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10306
diff
changeset
|
740 | msn_message_unref(msg); |
|
31562
025a90755639
Clear out transaction data, just in case the server does weird things
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
31476
diff
changeset
|
741 | cmd->trans->data = NULL; |
| 4542 | 742 | } |
| 743 | ||
|
8808
1cb5ddf6b625
[gaim-migrate @ 9570]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
8663
diff
changeset
|
744 | static void |
|
1cb5ddf6b625
[gaim-migrate @ 9570]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
8663
diff
changeset
|
745 | out_cmd(MsnCmdProc *cmdproc, MsnCommand *cmd) |
|
5309
3178acad1449
[gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents:
5221
diff
changeset
|
746 | { |
| 15884 | 747 | PurpleConnection *gc; |
|
8808
1cb5ddf6b625
[gaim-migrate @ 9570]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
8663
diff
changeset
|
748 | MsnSwitchBoard *swboard; |
|
1cb5ddf6b625
[gaim-migrate @ 9570]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
8663
diff
changeset
|
749 | |
|
32624
f957ad287bcc
Convert code to use the purple_account accessor functions.
Andrew Victor <andrew.victor@mxit.com>
parents:
32013
diff
changeset
|
750 | gc = purple_account_get_connection(cmdproc->session->account); |
|
10463
f2f97738b401
[gaim-migrate @ 11737]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10451
diff
changeset
|
751 | swboard = cmdproc->data; |
|
5309
3178acad1449
[gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents:
5221
diff
changeset
|
752 | |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
753 | if (swboard->current_users > 1) |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
754 | serv_got_chat_left(gc, swboard->chat_id); |
|
5309
3178acad1449
[gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents:
5221
diff
changeset
|
755 | |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
756 | msn_switchboard_disconnect(swboard); |
|
5309
3178acad1449
[gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents:
5221
diff
changeset
|
757 | } |
|
3178acad1449
[gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents:
5221
diff
changeset
|
758 | |
|
8808
1cb5ddf6b625
[gaim-migrate @ 9570]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
8663
diff
changeset
|
759 | static void |
|
1cb5ddf6b625
[gaim-migrate @ 9570]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
8663
diff
changeset
|
760 | usr_cmd(MsnCmdProc *cmdproc, MsnCommand *cmd) |
| 4542 | 761 | { |
|
8808
1cb5ddf6b625
[gaim-migrate @ 9570]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
8663
diff
changeset
|
762 | MsnSwitchBoard *swboard; |
|
5309
3178acad1449
[gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents:
5221
diff
changeset
|
763 | |
|
10463
f2f97738b401
[gaim-migrate @ 11737]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10451
diff
changeset
|
764 | swboard = cmdproc->data; |
|
5309
3178acad1449
[gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents:
5221
diff
changeset
|
765 | |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
766 | #if 0 |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
767 | GList *l; |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
768 | |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
769 | for (l = swboard->users; l != NULL; l = l->next) |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
770 | { |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
771 | const char *user; |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
772 | user = l->data; |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
773 | |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
774 | msn_cmdproc_send(cmdproc, "CAL", "%s", user); |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
775 | } |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
776 | #endif |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
777 | |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
778 | swboard->ready = TRUE; |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
779 | msn_cmdproc_process_queue(cmdproc); |
|
5309
3178acad1449
[gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents:
5221
diff
changeset
|
780 | } |
|
3178acad1449
[gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents:
5221
diff
changeset
|
781 | |
|
3178acad1449
[gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents:
5221
diff
changeset
|
782 | /************************************************************************** |
|
10345
7d7f8cfa2b4f
[gaim-migrate @ 11556]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10306
diff
changeset
|
783 | * Message Handlers |
|
5309
3178acad1449
[gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents:
5221
diff
changeset
|
784 | **************************************************************************/ |
|
8808
1cb5ddf6b625
[gaim-migrate @ 9570]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
8663
diff
changeset
|
785 | static void |
|
1cb5ddf6b625
[gaim-migrate @ 9570]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
8663
diff
changeset
|
786 | clientcaps_msg(MsnCmdProc *cmdproc, MsnMessage *msg) |
|
5316
ec9cbe50e70c
[gaim-migrate @ 5688]
Christian Hammond <chipx86@chipx86.com>
parents:
5309
diff
changeset
|
787 | { |
|
6845
3706464f79f7
[gaim-migrate @ 7390]
Christian Hammond <chipx86@chipx86.com>
parents:
6842
diff
changeset
|
788 | #if 0 |
|
8808
1cb5ddf6b625
[gaim-migrate @ 9570]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
8663
diff
changeset
|
789 | MsnSession *session; |
|
1cb5ddf6b625
[gaim-migrate @ 9570]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
8663
diff
changeset
|
790 | MsnSwitchBoard *swboard; |
|
5316
ec9cbe50e70c
[gaim-migrate @ 5688]
Christian Hammond <chipx86@chipx86.com>
parents:
5309
diff
changeset
|
791 | MsnUser *user; |
|
5475
a2f856cac665
[gaim-migrate @ 5871]
Christian Hammond <chipx86@chipx86.com>
parents:
5454
diff
changeset
|
792 | GHashTable *clientcaps; |
|
5351
cb12105b532b
[gaim-migrate @ 5727]
Christian Hammond <chipx86@chipx86.com>
parents:
5342
diff
changeset
|
793 | const char *value; |
|
5316
ec9cbe50e70c
[gaim-migrate @ 5688]
Christian Hammond <chipx86@chipx86.com>
parents:
5309
diff
changeset
|
794 | |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
795 | char *passport = msg->sender; |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
796 | |
|
8808
1cb5ddf6b625
[gaim-migrate @ 9570]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
8663
diff
changeset
|
797 | session = cmdproc->session; |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
798 | swboard = cmdproc->servconn->swboard; |
|
5316
ec9cbe50e70c
[gaim-migrate @ 5688]
Christian Hammond <chipx86@chipx86.com>
parents:
5309
diff
changeset
|
799 | |
|
5475
a2f856cac665
[gaim-migrate @ 5871]
Christian Hammond <chipx86@chipx86.com>
parents:
5454
diff
changeset
|
800 | clientcaps = msn_message_get_hashtable_from_body(msg); |
|
6845
3706464f79f7
[gaim-migrate @ 7390]
Christian Hammond <chipx86@chipx86.com>
parents:
6842
diff
changeset
|
801 | #endif |
|
5316
ec9cbe50e70c
[gaim-migrate @ 5688]
Christian Hammond <chipx86@chipx86.com>
parents:
5309
diff
changeset
|
802 | } |
|
ec9cbe50e70c
[gaim-migrate @ 5688]
Christian Hammond <chipx86@chipx86.com>
parents:
5309
diff
changeset
|
803 | |
|
27569
7f08e35e35ac
Add support for receiving handwritten (Ink) messages from MSN buddies.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
26739
diff
changeset
|
804 | void |
|
7f08e35e35ac
Add support for receiving handwritten (Ink) messages from MSN buddies.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
26739
diff
changeset
|
805 | msn_switchboard_show_ink(MsnSwitchBoard *swboard, const char *passport, |
|
7f08e35e35ac
Add support for receiving handwritten (Ink) messages from MSN buddies.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
26739
diff
changeset
|
806 | const char *data) |
|
7f08e35e35ac
Add support for receiving handwritten (Ink) messages from MSN buddies.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
26739
diff
changeset
|
807 | { |
|
7f08e35e35ac
Add support for receiving handwritten (Ink) messages from MSN buddies.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
26739
diff
changeset
|
808 | PurpleConnection *gc; |
|
7f08e35e35ac
Add support for receiving handwritten (Ink) messages from MSN buddies.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
26739
diff
changeset
|
809 | guchar *image_data; |
|
7f08e35e35ac
Add support for receiving handwritten (Ink) messages from MSN buddies.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
26739
diff
changeset
|
810 | size_t image_len; |
|
7f08e35e35ac
Add support for receiving handwritten (Ink) messages from MSN buddies.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
26739
diff
changeset
|
811 | int imgid; |
|
7f08e35e35ac
Add support for receiving handwritten (Ink) messages from MSN buddies.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
26739
diff
changeset
|
812 | char *image_msg; |
|
7f08e35e35ac
Add support for receiving handwritten (Ink) messages from MSN buddies.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
26739
diff
changeset
|
813 | |
|
7f08e35e35ac
Add support for receiving handwritten (Ink) messages from MSN buddies.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
26739
diff
changeset
|
814 | if (!purple_str_has_prefix(data, "base64:")) |
|
7f08e35e35ac
Add support for receiving handwritten (Ink) messages from MSN buddies.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
26739
diff
changeset
|
815 | { |
|
7f08e35e35ac
Add support for receiving handwritten (Ink) messages from MSN buddies.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
26739
diff
changeset
|
816 | purple_debug_error("msn", "Ignoring Ink not in Base64 format.\n"); |
|
7f08e35e35ac
Add support for receiving handwritten (Ink) messages from MSN buddies.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
26739
diff
changeset
|
817 | return; |
|
7f08e35e35ac
Add support for receiving handwritten (Ink) messages from MSN buddies.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
26739
diff
changeset
|
818 | } |
|
7f08e35e35ac
Add support for receiving handwritten (Ink) messages from MSN buddies.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
26739
diff
changeset
|
819 | |
|
7f08e35e35ac
Add support for receiving handwritten (Ink) messages from MSN buddies.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
26739
diff
changeset
|
820 | gc = purple_account_get_connection(swboard->session->account); |
|
7f08e35e35ac
Add support for receiving handwritten (Ink) messages from MSN buddies.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
26739
diff
changeset
|
821 | |
|
7f08e35e35ac
Add support for receiving handwritten (Ink) messages from MSN buddies.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
26739
diff
changeset
|
822 | data += sizeof("base64:") - 1; |
|
7f08e35e35ac
Add support for receiving handwritten (Ink) messages from MSN buddies.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
26739
diff
changeset
|
823 | image_data = purple_base64_decode(data, &image_len); |
|
31294
73607ab89c6f
Remove trailing whitespace
Richard Laager <rlaager@pidgin.im>
parents:
31236
diff
changeset
|
824 | if (!image_data || !image_len) |
|
27569
7f08e35e35ac
Add support for receiving handwritten (Ink) messages from MSN buddies.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
26739
diff
changeset
|
825 | { |
|
7f08e35e35ac
Add support for receiving handwritten (Ink) messages from MSN buddies.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
26739
diff
changeset
|
826 | purple_debug_error("msn", "Unable to decode Ink from Base64 format.\n"); |
|
7f08e35e35ac
Add support for receiving handwritten (Ink) messages from MSN buddies.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
26739
diff
changeset
|
827 | return; |
|
7f08e35e35ac
Add support for receiving handwritten (Ink) messages from MSN buddies.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
26739
diff
changeset
|
828 | } |
|
7f08e35e35ac
Add support for receiving handwritten (Ink) messages from MSN buddies.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
26739
diff
changeset
|
829 | |
|
7f08e35e35ac
Add support for receiving handwritten (Ink) messages from MSN buddies.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
26739
diff
changeset
|
830 | imgid = purple_imgstore_add_with_id(image_data, image_len, NULL); |
|
30023
d2e218d669c8
Those Adium guys don't like this slash.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
29138
diff
changeset
|
831 | image_msg = g_strdup_printf("<IMG ID='%d'>", imgid); |
|
27569
7f08e35e35ac
Add support for receiving handwritten (Ink) messages from MSN buddies.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
26739
diff
changeset
|
832 | |
|
7f08e35e35ac
Add support for receiving handwritten (Ink) messages from MSN buddies.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
26739
diff
changeset
|
833 | if (swboard->current_users > 1 || |
|
7f08e35e35ac
Add support for receiving handwritten (Ink) messages from MSN buddies.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
26739
diff
changeset
|
834 | ((swboard->conv != NULL) && |
|
7f08e35e35ac
Add support for receiving handwritten (Ink) messages from MSN buddies.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
26739
diff
changeset
|
835 | purple_conversation_get_type(swboard->conv) == PURPLE_CONV_TYPE_CHAT)) |
|
7f08e35e35ac
Add support for receiving handwritten (Ink) messages from MSN buddies.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
26739
diff
changeset
|
836 | serv_got_chat_in(gc, swboard->chat_id, passport, 0, image_msg, |
|
7f08e35e35ac
Add support for receiving handwritten (Ink) messages from MSN buddies.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
26739
diff
changeset
|
837 | time(NULL)); |
|
7f08e35e35ac
Add support for receiving handwritten (Ink) messages from MSN buddies.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
26739
diff
changeset
|
838 | else |
|
7f08e35e35ac
Add support for receiving handwritten (Ink) messages from MSN buddies.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
26739
diff
changeset
|
839 | serv_got_im(gc, passport, image_msg, 0, time(NULL)); |
|
7f08e35e35ac
Add support for receiving handwritten (Ink) messages from MSN buddies.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
26739
diff
changeset
|
840 | |
|
7f08e35e35ac
Add support for receiving handwritten (Ink) messages from MSN buddies.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
26739
diff
changeset
|
841 | purple_imgstore_unref_by_id(imgid); |
|
7f08e35e35ac
Add support for receiving handwritten (Ink) messages from MSN buddies.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
26739
diff
changeset
|
842 | g_free(image_msg); |
|
7f08e35e35ac
Add support for receiving handwritten (Ink) messages from MSN buddies.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
26739
diff
changeset
|
843 | } |
|
7f08e35e35ac
Add support for receiving handwritten (Ink) messages from MSN buddies.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
26739
diff
changeset
|
844 | |
|
10345
7d7f8cfa2b4f
[gaim-migrate @ 11556]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10306
diff
changeset
|
845 | /************************************************************************** |
|
5309
3178acad1449
[gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents:
5221
diff
changeset
|
846 | * Connect stuff |
|
3178acad1449
[gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents:
5221
diff
changeset
|
847 | **************************************************************************/ |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
848 | static void |
|
17532
1d4984e7dfeb
Handle problems initiating or joining a switchboard session more gracefully.
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
16007
diff
changeset
|
849 | ans_usr_error(MsnCmdProc *cmdproc, MsnTransaction *trans, int error); |
|
1d4984e7dfeb
Handle problems initiating or joining a switchboard session more gracefully.
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
16007
diff
changeset
|
850 | |
|
1d4984e7dfeb
Handle problems initiating or joining a switchboard session more gracefully.
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
16007
diff
changeset
|
851 | static void |
|
8583
56f69df8f12f
[gaim-migrate @ 9333]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
8499
diff
changeset
|
852 | connect_cb(MsnServConn *servconn) |
|
5309
3178acad1449
[gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents:
5221
diff
changeset
|
853 | { |
|
9158
f8dab42adeaf
[gaim-migrate @ 9942]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9083
diff
changeset
|
854 | MsnSwitchBoard *swboard; |
|
17532
1d4984e7dfeb
Handle problems initiating or joining a switchboard session more gracefully.
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
16007
diff
changeset
|
855 | MsnTransaction *trans; |
|
9158
f8dab42adeaf
[gaim-migrate @ 9942]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9083
diff
changeset
|
856 | MsnCmdProc *cmdproc; |
| 15884 | 857 | PurpleAccount *account; |
|
29420
c81c525111db
Initial support for msnp16, based on patch by Masca.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
28475
diff
changeset
|
858 | char *username; |
|
9158
f8dab42adeaf
[gaim-migrate @ 9942]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9083
diff
changeset
|
859 | |
|
f8dab42adeaf
[gaim-migrate @ 9942]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9083
diff
changeset
|
860 | cmdproc = servconn->cmdproc; |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
861 | g_return_if_fail(cmdproc != NULL); |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
862 | |
|
10463
f2f97738b401
[gaim-migrate @ 11737]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10451
diff
changeset
|
863 | account = cmdproc->session->account; |
|
f2f97738b401
[gaim-migrate @ 11737]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10451
diff
changeset
|
864 | swboard = cmdproc->data; |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
865 | g_return_if_fail(swboard != NULL); |
|
9158
f8dab42adeaf
[gaim-migrate @ 9942]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9083
diff
changeset
|
866 | |
|
32091
5061380d9fee
Pluck all MSNP18 changes. This is pretty much to fix sending OIMs.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
32013
diff
changeset
|
867 | username = g_strdup_printf("%s;{%s}", |
|
5061380d9fee
Pluck all MSNP18 changes. This is pretty much to fix sending OIMs.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
32013
diff
changeset
|
868 | purple_account_get_username(account), |
|
5061380d9fee
Pluck all MSNP18 changes. This is pretty much to fix sending OIMs.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
32013
diff
changeset
|
869 | servconn->session->guid); |
|
29420
c81c525111db
Initial support for msnp16, based on patch by Masca.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
28475
diff
changeset
|
870 | |
|
8808
1cb5ddf6b625
[gaim-migrate @ 9570]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
8663
diff
changeset
|
871 | if (msn_switchboard_is_invited(swboard)) |
|
1cb5ddf6b625
[gaim-migrate @ 9570]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
8663
diff
changeset
|
872 | { |
|
10346
9c65a007b4a5
[gaim-migrate @ 11560]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10345
diff
changeset
|
873 | swboard->empty = FALSE; |
|
9c65a007b4a5
[gaim-migrate @ 11560]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10345
diff
changeset
|
874 | |
|
17532
1d4984e7dfeb
Handle problems initiating or joining a switchboard session more gracefully.
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
16007
diff
changeset
|
875 | trans = msn_transaction_new(cmdproc, "ANS", "%s %s %s", |
|
29420
c81c525111db
Initial support for msnp16, based on patch by Masca.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
28475
diff
changeset
|
876 | username, |
|
17532
1d4984e7dfeb
Handle problems initiating or joining a switchboard session more gracefully.
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
16007
diff
changeset
|
877 | swboard->auth_key, swboard->session_id); |
|
5309
3178acad1449
[gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents:
5221
diff
changeset
|
878 | } |
|
8808
1cb5ddf6b625
[gaim-migrate @ 9570]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
8663
diff
changeset
|
879 | else |
|
1cb5ddf6b625
[gaim-migrate @ 9570]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
8663
diff
changeset
|
880 | { |
|
17532
1d4984e7dfeb
Handle problems initiating or joining a switchboard session more gracefully.
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
16007
diff
changeset
|
881 | trans = msn_transaction_new(cmdproc, "USR", "%s %s", |
|
29420
c81c525111db
Initial support for msnp16, based on patch by Masca.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
28475
diff
changeset
|
882 | username, |
|
17532
1d4984e7dfeb
Handle problems initiating or joining a switchboard session more gracefully.
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
16007
diff
changeset
|
883 | swboard->auth_key); |
|
8808
1cb5ddf6b625
[gaim-migrate @ 9570]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
8663
diff
changeset
|
884 | } |
|
17532
1d4984e7dfeb
Handle problems initiating or joining a switchboard session more gracefully.
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
16007
diff
changeset
|
885 | |
|
1d4984e7dfeb
Handle problems initiating or joining a switchboard session more gracefully.
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
16007
diff
changeset
|
886 | msn_transaction_set_error_cb(trans, ans_usr_error); |
|
1d4984e7dfeb
Handle problems initiating or joining a switchboard session more gracefully.
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
16007
diff
changeset
|
887 | msn_transaction_set_data(trans, swboard); |
|
1d4984e7dfeb
Handle problems initiating or joining a switchboard session more gracefully.
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
16007
diff
changeset
|
888 | msn_cmdproc_send_trans(cmdproc, trans); |
|
29420
c81c525111db
Initial support for msnp16, based on patch by Masca.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
28475
diff
changeset
|
889 | |
|
c81c525111db
Initial support for msnp16, based on patch by Masca.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
28475
diff
changeset
|
890 | g_free(username); |
|
17532
1d4984e7dfeb
Handle problems initiating or joining a switchboard session more gracefully.
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
16007
diff
changeset
|
891 | } |
|
1d4984e7dfeb
Handle problems initiating or joining a switchboard session more gracefully.
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
16007
diff
changeset
|
892 | |
|
1d4984e7dfeb
Handle problems initiating or joining a switchboard session more gracefully.
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
16007
diff
changeset
|
893 | static void |
|
1d4984e7dfeb
Handle problems initiating or joining a switchboard session more gracefully.
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
16007
diff
changeset
|
894 | ans_usr_error(MsnCmdProc *cmdproc, MsnTransaction *trans, int error) |
|
1d4984e7dfeb
Handle problems initiating or joining a switchboard session more gracefully.
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
16007
diff
changeset
|
895 | { |
|
1d4984e7dfeb
Handle problems initiating or joining a switchboard session more gracefully.
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
16007
diff
changeset
|
896 | MsnSwitchBoard *swboard; |
|
1d4984e7dfeb
Handle problems initiating or joining a switchboard session more gracefully.
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
16007
diff
changeset
|
897 | char **params; |
|
1d4984e7dfeb
Handle problems initiating or joining a switchboard session more gracefully.
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
16007
diff
changeset
|
898 | char *passport; |
|
1d4984e7dfeb
Handle problems initiating or joining a switchboard session more gracefully.
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
16007
diff
changeset
|
899 | int reason = MSN_SB_ERROR_UNKNOWN; |
|
1d4984e7dfeb
Handle problems initiating or joining a switchboard session more gracefully.
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
16007
diff
changeset
|
900 | |
|
1d4984e7dfeb
Handle problems initiating or joining a switchboard session more gracefully.
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
16007
diff
changeset
|
901 | if (error == 911) |
|
1d4984e7dfeb
Handle problems initiating or joining a switchboard session more gracefully.
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
16007
diff
changeset
|
902 | { |
|
1d4984e7dfeb
Handle problems initiating or joining a switchboard session more gracefully.
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
16007
diff
changeset
|
903 | reason = MSN_SB_ERROR_AUTHFAILED; |
|
1d4984e7dfeb
Handle problems initiating or joining a switchboard session more gracefully.
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
16007
diff
changeset
|
904 | } |
|
1d4984e7dfeb
Handle problems initiating or joining a switchboard session more gracefully.
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
16007
diff
changeset
|
905 | |
|
1d4984e7dfeb
Handle problems initiating or joining a switchboard session more gracefully.
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
16007
diff
changeset
|
906 | purple_debug_warning("msn", "ans_usr_error: command %s gave error %i\n", trans->command, error); |
|
1d4984e7dfeb
Handle problems initiating or joining a switchboard session more gracefully.
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
16007
diff
changeset
|
907 | |
|
1d4984e7dfeb
Handle problems initiating or joining a switchboard session more gracefully.
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
16007
diff
changeset
|
908 | params = g_strsplit(trans->params, " ", 0); |
|
1d4984e7dfeb
Handle problems initiating or joining a switchboard session more gracefully.
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
16007
diff
changeset
|
909 | passport = params[0]; |
|
1d4984e7dfeb
Handle problems initiating or joining a switchboard session more gracefully.
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
16007
diff
changeset
|
910 | swboard = trans->data; |
|
1d4984e7dfeb
Handle problems initiating or joining a switchboard session more gracefully.
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
16007
diff
changeset
|
911 | |
|
1d4984e7dfeb
Handle problems initiating or joining a switchboard session more gracefully.
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
16007
diff
changeset
|
912 | swboard_error_helper(swboard, reason, passport); |
|
1d4984e7dfeb
Handle problems initiating or joining a switchboard session more gracefully.
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
16007
diff
changeset
|
913 | |
|
1d4984e7dfeb
Handle problems initiating or joining a switchboard session more gracefully.
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
16007
diff
changeset
|
914 | g_strfreev(params); |
| 4542 | 915 | } |
| 916 | ||
| 917 | static void | |
|
8583
56f69df8f12f
[gaim-migrate @ 9333]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
8499
diff
changeset
|
918 | disconnect_cb(MsnServConn *servconn) |
|
5309
3178acad1449
[gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents:
5221
diff
changeset
|
919 | { |
|
8583
56f69df8f12f
[gaim-migrate @ 9333]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
8499
diff
changeset
|
920 | MsnSwitchBoard *swboard; |
|
5309
3178acad1449
[gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents:
5221
diff
changeset
|
921 | |
|
10463
f2f97738b401
[gaim-migrate @ 11737]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10451
diff
changeset
|
922 | swboard = servconn->cmdproc->data; |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
923 | g_return_if_fail(swboard != NULL); |
|
8808
1cb5ddf6b625
[gaim-migrate @ 9570]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
8663
diff
changeset
|
924 | |
|
10481
a5d6b8e1717d
[gaim-migrate @ 11769]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10463
diff
changeset
|
925 | msn_servconn_set_disconnect_cb(swboard->servconn, NULL); |
|
a5d6b8e1717d
[gaim-migrate @ 11769]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10463
diff
changeset
|
926 | |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
927 | msn_switchboard_destroy(swboard); |
|
5309
3178acad1449
[gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents:
5221
diff
changeset
|
928 | } |
|
3178acad1449
[gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents:
5221
diff
changeset
|
929 | |
|
10345
7d7f8cfa2b4f
[gaim-migrate @ 11556]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10306
diff
changeset
|
930 | gboolean |
|
7d7f8cfa2b4f
[gaim-migrate @ 11556]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10306
diff
changeset
|
931 | msn_switchboard_connect(MsnSwitchBoard *swboard, const char *host, int port) |
|
8808
1cb5ddf6b625
[gaim-migrate @ 9570]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
8663
diff
changeset
|
932 | { |
|
10345
7d7f8cfa2b4f
[gaim-migrate @ 11556]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10306
diff
changeset
|
933 | g_return_val_if_fail(swboard != NULL, FALSE); |
|
8808
1cb5ddf6b625
[gaim-migrate @ 9570]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
8663
diff
changeset
|
934 | |
|
10345
7d7f8cfa2b4f
[gaim-migrate @ 11556]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10306
diff
changeset
|
935 | msn_servconn_set_connect_cb(swboard->servconn, connect_cb); |
|
10434
17665eed4948
[gaim-migrate @ 11691]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10403
diff
changeset
|
936 | msn_servconn_set_disconnect_cb(swboard->servconn, disconnect_cb); |
|
9198
e8eb6d5eb9eb
[gaim-migrate @ 9993]
Christian Hammond <chipx86@chipx86.com>
parents:
9194
diff
changeset
|
937 | |
|
23816
fd601d075bd0
Allow forcing an MSN HTTP connection to connect to a new server. This
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23815
diff
changeset
|
938 | return msn_servconn_connect(swboard->servconn, host, port, FALSE); |
|
8808
1cb5ddf6b625
[gaim-migrate @ 9570]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
8663
diff
changeset
|
939 | } |
|
1cb5ddf6b625
[gaim-migrate @ 9570]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
8663
diff
changeset
|
940 | |
|
1cb5ddf6b625
[gaim-migrate @ 9570]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
8663
diff
changeset
|
941 | void |
|
10345
7d7f8cfa2b4f
[gaim-migrate @ 11556]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10306
diff
changeset
|
942 | msn_switchboard_disconnect(MsnSwitchBoard *swboard) |
| 4542 | 943 | { |
|
10345
7d7f8cfa2b4f
[gaim-migrate @ 11556]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10306
diff
changeset
|
944 | g_return_if_fail(swboard != NULL); |
|
5309
3178acad1449
[gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents:
5221
diff
changeset
|
945 | |
|
10345
7d7f8cfa2b4f
[gaim-migrate @ 11556]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10306
diff
changeset
|
946 | msn_servconn_disconnect(swboard->servconn); |
| 4542 | 947 | } |
| 948 | ||
|
10345
7d7f8cfa2b4f
[gaim-migrate @ 11556]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10306
diff
changeset
|
949 | /************************************************************************** |
|
7d7f8cfa2b4f
[gaim-migrate @ 11556]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10306
diff
changeset
|
950 | * Call stuff |
|
7d7f8cfa2b4f
[gaim-migrate @ 11556]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10306
diff
changeset
|
951 | **************************************************************************/ |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
952 | static void |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
953 | got_cal(MsnCmdProc *cmdproc, MsnCommand *cmd) |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
954 | { |
|
10403
4647a87ef73b
[gaim-migrate @ 11648]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10391
diff
changeset
|
955 | #if 0 |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
956 | MsnSwitchBoard *swboard; |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
957 | const char *user; |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
958 | |
|
10463
f2f97738b401
[gaim-migrate @ 11737]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10451
diff
changeset
|
959 | swboard = cmdproc->data; |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
960 | |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
961 | user = cmd->params[0]; |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
962 | |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
963 | msn_switchboard_add_user(swboard, user); |
|
10403
4647a87ef73b
[gaim-migrate @ 11648]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10391
diff
changeset
|
964 | #endif |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
965 | } |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
966 | |
|
10225
0dfea1bc8695
[gaim-migrate @ 11357]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10112
diff
changeset
|
967 | static void |
|
0dfea1bc8695
[gaim-migrate @ 11357]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10112
diff
changeset
|
968 | cal_timeout(MsnCmdProc *cmdproc, MsnTransaction *trans) |
|
0dfea1bc8695
[gaim-migrate @ 11357]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10112
diff
changeset
|
969 | { |
| 15884 | 970 | purple_debug_warning("msn", "cal_timeout: command %s timed out\n", trans->command); |
|
13126
afce0fe97885
[gaim-migrate @ 15487]
Evan Schoenberg <evands@pidgin.im>
parents:
12323
diff
changeset
|
971 | |
|
10225
0dfea1bc8695
[gaim-migrate @ 11357]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10112
diff
changeset
|
972 | cal_error_helper(trans, MSN_SB_ERROR_UNKNOWN); |
|
0dfea1bc8695
[gaim-migrate @ 11357]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10112
diff
changeset
|
973 | } |
|
0dfea1bc8695
[gaim-migrate @ 11357]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10112
diff
changeset
|
974 | |
|
0dfea1bc8695
[gaim-migrate @ 11357]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10112
diff
changeset
|
975 | static void |
|
0dfea1bc8695
[gaim-migrate @ 11357]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10112
diff
changeset
|
976 | cal_error(MsnCmdProc *cmdproc, MsnTransaction *trans, int error) |
|
0dfea1bc8695
[gaim-migrate @ 11357]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10112
diff
changeset
|
977 | { |
|
0dfea1bc8695
[gaim-migrate @ 11357]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10112
diff
changeset
|
978 | int reason = MSN_SB_ERROR_UNKNOWN; |
| 13861 | 979 | MsnMessage *msg; |
| 980 | MsnSwitchBoard *swboard = trans->data; | |
|
10225
0dfea1bc8695
[gaim-migrate @ 11357]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10112
diff
changeset
|
981 | |
|
10451
2df35a139363
[gaim-migrate @ 11717]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10434
diff
changeset
|
982 | if (error == 215) |
|
2df35a139363
[gaim-migrate @ 11717]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10434
diff
changeset
|
983 | { |
| 15884 | 984 | purple_debug_info("msn", "Invited user already in switchboard\n"); |
|
10451
2df35a139363
[gaim-migrate @ 11717]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10434
diff
changeset
|
985 | return; |
|
2df35a139363
[gaim-migrate @ 11717]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10434
diff
changeset
|
986 | } |
|
2df35a139363
[gaim-migrate @ 11717]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10434
diff
changeset
|
987 | else if (error == 217) |
|
2df35a139363
[gaim-migrate @ 11717]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10434
diff
changeset
|
988 | { |
|
10225
0dfea1bc8695
[gaim-migrate @ 11357]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10112
diff
changeset
|
989 | reason = MSN_SB_ERROR_USER_OFFLINE; |
|
10451
2df35a139363
[gaim-migrate @ 11717]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10434
diff
changeset
|
990 | } |
|
10225
0dfea1bc8695
[gaim-migrate @ 11357]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10112
diff
changeset
|
991 | |
| 15884 | 992 | purple_debug_warning("msn", "cal_error: command %s gave error %i\n", trans->command, error); |
| 13861 | 993 | |
| 994 | while ((msg = g_queue_pop_head(swboard->msg_queue)) != NULL){ | |
|
23830
1436e3de5d6c
The great MSN debug message cleanup! Threw in a few whitespace fixes,
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23826
diff
changeset
|
995 | purple_debug_warning("msn", "Unable to send msg: {%s}\n", msg->body); |
| 13861 | 996 | /* The messages could not be sent due to a switchboard error */ |
| 997 | swboard->error = MSN_SB_ERROR_USER_OFFLINE; | |
| 998 | msg_error_helper(swboard->cmdproc, msg, | |
| 999 | MSN_MSG_ERROR_SB); | |
| 1000 | } | |
|
10225
0dfea1bc8695
[gaim-migrate @ 11357]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10112
diff
changeset
|
1001 | cal_error_helper(trans, reason); |
|
0dfea1bc8695
[gaim-migrate @ 11357]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10112
diff
changeset
|
1002 | } |
|
0dfea1bc8695
[gaim-migrate @ 11357]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10112
diff
changeset
|
1003 | |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
1004 | void |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
1005 | msn_switchboard_request_add_user(MsnSwitchBoard *swboard, const char *user) |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
1006 | { |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
1007 | MsnTransaction *trans; |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
1008 | MsnCmdProc *cmdproc; |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
1009 | |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
1010 | g_return_if_fail(swboard != NULL); |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
1011 | |
|
10463
f2f97738b401
[gaim-migrate @ 11737]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10451
diff
changeset
|
1012 | cmdproc = swboard->cmdproc; |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
1013 | |
|
10225
0dfea1bc8695
[gaim-migrate @ 11357]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10112
diff
changeset
|
1014 | trans = msn_transaction_new(cmdproc, "CAL", "%s", user); |
|
10403
4647a87ef73b
[gaim-migrate @ 11648]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10391
diff
changeset
|
1015 | /* this doesn't do anything, but users seem to think that |
|
4647a87ef73b
[gaim-migrate @ 11648]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10391
diff
changeset
|
1016 | * 'Unhandled command' is some kind of error, so we don't report it */ |
|
4647a87ef73b
[gaim-migrate @ 11648]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10391
diff
changeset
|
1017 | msn_transaction_add_cb(trans, "CAL", got_cal); |
|
10225
0dfea1bc8695
[gaim-migrate @ 11357]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10112
diff
changeset
|
1018 | |
|
0dfea1bc8695
[gaim-migrate @ 11357]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10112
diff
changeset
|
1019 | msn_transaction_set_data(trans, swboard); |
|
0dfea1bc8695
[gaim-migrate @ 11357]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10112
diff
changeset
|
1020 | msn_transaction_set_timeout_cb(trans, cal_timeout); |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
1021 | |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
1022 | if (swboard->ready) |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
1023 | msn_cmdproc_send_trans(cmdproc, trans); |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
1024 | else |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
1025 | msn_cmdproc_queue_trans(cmdproc, trans); |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
1026 | } |
| 4542 | 1027 | |
|
10345
7d7f8cfa2b4f
[gaim-migrate @ 11556]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10306
diff
changeset
|
1028 | /************************************************************************** |
|
7d7f8cfa2b4f
[gaim-migrate @ 11556]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10306
diff
changeset
|
1029 | * Create & Transfer stuff |
|
7d7f8cfa2b4f
[gaim-migrate @ 11556]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10306
diff
changeset
|
1030 | **************************************************************************/ |
|
10481
a5d6b8e1717d
[gaim-migrate @ 11769]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10463
diff
changeset
|
1031 | |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
1032 | static void |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
1033 | got_swboard(MsnCmdProc *cmdproc, MsnCommand *cmd) |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
1034 | { |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
1035 | MsnSwitchBoard *swboard; |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
1036 | char *host; |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
1037 | int port; |
|
9218
6ebf0fd0df6b
[gaim-migrate @ 10014]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
9198
diff
changeset
|
1038 | swboard = cmd->trans->data; |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
1039 | |
|
10403
4647a87ef73b
[gaim-migrate @ 11648]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10391
diff
changeset
|
1040 | if (g_list_find(cmdproc->session->switches, swboard) == NULL) |
|
4647a87ef73b
[gaim-migrate @ 11648]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10391
diff
changeset
|
1041 | /* The conversation window was closed. */ |
|
4647a87ef73b
[gaim-migrate @ 11648]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10391
diff
changeset
|
1042 | return; |
|
4647a87ef73b
[gaim-migrate @ 11648]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10391
diff
changeset
|
1043 | |
|
23830
1436e3de5d6c
The great MSN debug message cleanup! Threw in a few whitespace fixes,
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23826
diff
changeset
|
1044 | purple_debug_info("msn", "Switchboard:auth:{%s} socket:{%s}\n", cmd->params[4], cmd->params[2]); |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
1045 | msn_switchboard_set_auth_key(swboard, cmd->params[4]); |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
1046 | |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
1047 | msn_parse_socket(cmd->params[2], &host, &port); |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
1048 | |
|
10568
15f02c0e7fc1
[gaim-migrate @ 11954]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
10533
diff
changeset
|
1049 | if (!msn_switchboard_connect(swboard, host, port)) |
|
15f02c0e7fc1
[gaim-migrate @ 11954]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
10533
diff
changeset
|
1050 | msn_switchboard_destroy(swboard); |
|
10093
e22f76d46b0b
[gaim-migrate @ 11111]
Evan Schoenberg <evands@pidgin.im>
parents:
10044
diff
changeset
|
1051 | |
|
e22f76d46b0b
[gaim-migrate @ 11111]
Evan Schoenberg <evands@pidgin.im>
parents:
10044
diff
changeset
|
1052 | g_free(host); |
|
5309
3178acad1449
[gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents:
5221
diff
changeset
|
1053 | } |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
1054 | |
|
10225
0dfea1bc8695
[gaim-migrate @ 11357]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10112
diff
changeset
|
1055 | static void |
|
0dfea1bc8695
[gaim-migrate @ 11357]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10112
diff
changeset
|
1056 | xfr_error(MsnCmdProc *cmdproc, MsnTransaction *trans, int error) |
|
0dfea1bc8695
[gaim-migrate @ 11357]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10112
diff
changeset
|
1057 | { |
|
0dfea1bc8695
[gaim-migrate @ 11357]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10112
diff
changeset
|
1058 | MsnSwitchBoard *swboard; |
|
0dfea1bc8695
[gaim-migrate @ 11357]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10112
diff
changeset
|
1059 | int reason = MSN_SB_ERROR_UNKNOWN; |
|
0dfea1bc8695
[gaim-migrate @ 11357]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10112
diff
changeset
|
1060 | |
|
0dfea1bc8695
[gaim-migrate @ 11357]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10112
diff
changeset
|
1061 | if (error == 913) |
|
0dfea1bc8695
[gaim-migrate @ 11357]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10112
diff
changeset
|
1062 | reason = MSN_SB_ERROR_OFFLINE; |
|
13126
afce0fe97885
[gaim-migrate @ 15487]
Evan Schoenberg <evands@pidgin.im>
parents:
12323
diff
changeset
|
1063 | else if (error == 800) |
|
afce0fe97885
[gaim-migrate @ 15487]
Evan Schoenberg <evands@pidgin.im>
parents:
12323
diff
changeset
|
1064 | reason = MSN_SB_ERROR_TOO_FAST; |
|
10225
0dfea1bc8695
[gaim-migrate @ 11357]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10112
diff
changeset
|
1065 | |
|
0dfea1bc8695
[gaim-migrate @ 11357]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10112
diff
changeset
|
1066 | swboard = trans->data; |
|
0dfea1bc8695
[gaim-migrate @ 11357]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10112
diff
changeset
|
1067 | |
|
22670
2ad82dd45c56
Another patch from Maiku that improves the way we send mobile messages, this
Ka-Hing Cheung <khc@pidgin.im>
parents:
22164
diff
changeset
|
1068 | purple_debug_info("msn", |
|
2ad82dd45c56
Another patch from Maiku that improves the way we send mobile messages, this
Ka-Hing Cheung <khc@pidgin.im>
parents:
22164
diff
changeset
|
1069 | "xfr_error %i for %s: trans %p, command %s, reason %i\n", |
|
2ad82dd45c56
Another patch from Maiku that improves the way we send mobile messages, this
Ka-Hing Cheung <khc@pidgin.im>
parents:
22164
diff
changeset
|
1070 | error, (swboard->im_user ? swboard->im_user : "(null)"), trans, |
|
2ad82dd45c56
Another patch from Maiku that improves the way we send mobile messages, this
Ka-Hing Cheung <khc@pidgin.im>
parents:
22164
diff
changeset
|
1071 | (trans->command ? trans->command : "(null)"), reason); |
|
13126
afce0fe97885
[gaim-migrate @ 15487]
Evan Schoenberg <evands@pidgin.im>
parents:
12323
diff
changeset
|
1072 | |
|
10225
0dfea1bc8695
[gaim-migrate @ 11357]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10112
diff
changeset
|
1073 | swboard_error_helper(swboard, reason, swboard->im_user); |
|
0dfea1bc8695
[gaim-migrate @ 11357]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10112
diff
changeset
|
1074 | } |
|
0dfea1bc8695
[gaim-migrate @ 11357]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10112
diff
changeset
|
1075 | |
|
32008
56d1c64759d6
Fix a crash when the account is disconnected and we have requested a SB. (Hanzz, ported by shlomif)(Fixes #12431)
Jorge Villaseñor <masca@cpw.pidgin.im>
parents:
31739
diff
changeset
|
1076 | gboolean |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
1077 | msn_switchboard_request(MsnSwitchBoard *swboard) |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
1078 | { |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
1079 | MsnCmdProc *cmdproc; |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
1080 | MsnTransaction *trans; |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
1081 | |
|
32013
f85d42933682
Fix this compile warning:
Mark Doliner <markdoliner@pidgin.im>
parents:
32008
diff
changeset
|
1082 | g_return_val_if_fail(swboard != NULL, FALSE); |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
1083 | |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
1084 | cmdproc = swboard->session->notification->cmdproc; |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
1085 | |
|
10225
0dfea1bc8695
[gaim-migrate @ 11357]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10112
diff
changeset
|
1086 | trans = msn_transaction_new(cmdproc, "XFR", "%s", "SB"); |
|
0dfea1bc8695
[gaim-migrate @ 11357]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10112
diff
changeset
|
1087 | msn_transaction_add_cb(trans, "XFR", got_swboard); |
|
10403
4647a87ef73b
[gaim-migrate @ 11648]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10391
diff
changeset
|
1088 | |
|
10225
0dfea1bc8695
[gaim-migrate @ 11357]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10112
diff
changeset
|
1089 | msn_transaction_set_data(trans, swboard); |
|
0dfea1bc8695
[gaim-migrate @ 11357]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10112
diff
changeset
|
1090 | msn_transaction_set_error_cb(trans, xfr_error); |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
1091 | |
|
32008
56d1c64759d6
Fix a crash when the account is disconnected and we have requested a SB. (Hanzz, ported by shlomif)(Fixes #12431)
Jorge Villaseñor <masca@cpw.pidgin.im>
parents:
31739
diff
changeset
|
1092 | return msn_cmdproc_send_trans(cmdproc, trans); |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
1093 | } |
|
10345
7d7f8cfa2b4f
[gaim-migrate @ 11556]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10306
diff
changeset
|
1094 | |
|
10403
4647a87ef73b
[gaim-migrate @ 11648]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10391
diff
changeset
|
1095 | void |
|
4647a87ef73b
[gaim-migrate @ 11648]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10391
diff
changeset
|
1096 | msn_switchboard_close(MsnSwitchBoard *swboard) |
|
4647a87ef73b
[gaim-migrate @ 11648]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10391
diff
changeset
|
1097 | { |
|
4647a87ef73b
[gaim-migrate @ 11648]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10391
diff
changeset
|
1098 | g_return_if_fail(swboard != NULL); |
|
4647a87ef73b
[gaim-migrate @ 11648]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10391
diff
changeset
|
1099 | |
|
10481
a5d6b8e1717d
[gaim-migrate @ 11769]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10463
diff
changeset
|
1100 | if (swboard->error != MSN_SB_ERROR_NONE) |
|
a5d6b8e1717d
[gaim-migrate @ 11769]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10463
diff
changeset
|
1101 | { |
|
a5d6b8e1717d
[gaim-migrate @ 11769]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10463
diff
changeset
|
1102 | msn_switchboard_destroy(swboard); |
|
a5d6b8e1717d
[gaim-migrate @ 11769]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10463
diff
changeset
|
1103 | } |
|
a5d6b8e1717d
[gaim-migrate @ 11769]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10463
diff
changeset
|
1104 | else if (g_queue_is_empty(swboard->msg_queue) || |
|
a5d6b8e1717d
[gaim-migrate @ 11769]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10463
diff
changeset
|
1105 | !swboard->session->connected) |
|
10403
4647a87ef73b
[gaim-migrate @ 11648]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10391
diff
changeset
|
1106 | { |
|
4647a87ef73b
[gaim-migrate @ 11648]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10391
diff
changeset
|
1107 | MsnCmdProc *cmdproc; |
|
30909
db4b1876a304
msn: Remove msn_cmdproc_send_quick in favor of msn_cmdproc_send_trans
Jorge Villaseñor <masca@cpw.pidgin.im>
parents:
29457
diff
changeset
|
1108 | MsnTransaction *trans; |
|
10463
f2f97738b401
[gaim-migrate @ 11737]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10451
diff
changeset
|
1109 | cmdproc = swboard->cmdproc; |
|
30910
374c457d65b5
We need a way to send commands without transaction ID
Jorge Villaseñor <masca@cpw.pidgin.im>
parents:
30909
diff
changeset
|
1110 | trans = msn_transaction_new(cmdproc, "OUT", NULL); |
|
30915
56295f0a8ade
I don't really like this name.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30910
diff
changeset
|
1111 | msn_transaction_set_saveable(trans, FALSE); |
|
30909
db4b1876a304
msn: Remove msn_cmdproc_send_quick in favor of msn_cmdproc_send_trans
Jorge Villaseñor <masca@cpw.pidgin.im>
parents:
29457
diff
changeset
|
1112 | msn_cmdproc_send_trans(cmdproc, trans); |
|
10403
4647a87ef73b
[gaim-migrate @ 11648]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10391
diff
changeset
|
1113 | |
|
4647a87ef73b
[gaim-migrate @ 11648]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10391
diff
changeset
|
1114 | msn_switchboard_destroy(swboard); |
|
4647a87ef73b
[gaim-migrate @ 11648]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10391
diff
changeset
|
1115 | } |
|
4647a87ef73b
[gaim-migrate @ 11648]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10391
diff
changeset
|
1116 | else |
|
10481
a5d6b8e1717d
[gaim-migrate @ 11769]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10463
diff
changeset
|
1117 | { |
|
10403
4647a87ef73b
[gaim-migrate @ 11648]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10391
diff
changeset
|
1118 | swboard->closed = TRUE; |
|
10481
a5d6b8e1717d
[gaim-migrate @ 11769]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10463
diff
changeset
|
1119 | } |
|
10403
4647a87ef73b
[gaim-migrate @ 11648]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10391
diff
changeset
|
1120 | } |
|
4647a87ef73b
[gaim-migrate @ 11648]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10391
diff
changeset
|
1121 | |
|
24615
9a156dbd94c4
msn_slplink_remove_slpcall() shouldn't be responsible for setting
Mark Doliner <markdoliner@pidgin.im>
parents:
24420
diff
changeset
|
1122 | void |
|
10773
ef88ffed66eb
[gaim-migrate @ 12382]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10732
diff
changeset
|
1123 | msn_switchboard_release(MsnSwitchBoard *swboard, MsnSBFlag flag) |
|
ef88ffed66eb
[gaim-migrate @ 12382]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10732
diff
changeset
|
1124 | { |
|
24615
9a156dbd94c4
msn_slplink_remove_slpcall() shouldn't be responsible for setting
Mark Doliner <markdoliner@pidgin.im>
parents:
24420
diff
changeset
|
1125 | g_return_if_fail(swboard != NULL); |
|
10773
ef88ffed66eb
[gaim-migrate @ 12382]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10732
diff
changeset
|
1126 | |
|
ef88ffed66eb
[gaim-migrate @ 12382]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10732
diff
changeset
|
1127 | swboard->flag &= ~flag; |
|
ef88ffed66eb
[gaim-migrate @ 12382]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10732
diff
changeset
|
1128 | |
|
ef88ffed66eb
[gaim-migrate @ 12382]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10732
diff
changeset
|
1129 | if (flag == MSN_SB_FLAG_IM) |
|
ef88ffed66eb
[gaim-migrate @ 12382]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10732
diff
changeset
|
1130 | /* Forget any conversation that used to be associated with this |
|
ef88ffed66eb
[gaim-migrate @ 12382]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10732
diff
changeset
|
1131 | * swboard. */ |
|
ef88ffed66eb
[gaim-migrate @ 12382]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10732
diff
changeset
|
1132 | swboard->conv = NULL; |
|
ef88ffed66eb
[gaim-migrate @ 12382]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10732
diff
changeset
|
1133 | |
|
ef88ffed66eb
[gaim-migrate @ 12382]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10732
diff
changeset
|
1134 | if (swboard->flag == 0) |
|
24615
9a156dbd94c4
msn_slplink_remove_slpcall() shouldn't be responsible for setting
Mark Doliner <markdoliner@pidgin.im>
parents:
24420
diff
changeset
|
1135 | /* Nothing else is using this switchboard, so close it */ |
|
10773
ef88ffed66eb
[gaim-migrate @ 12382]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10732
diff
changeset
|
1136 | msn_switchboard_close(swboard); |
|
ef88ffed66eb
[gaim-migrate @ 12382]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10732
diff
changeset
|
1137 | } |
|
ef88ffed66eb
[gaim-migrate @ 12382]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10732
diff
changeset
|
1138 | |
|
10345
7d7f8cfa2b4f
[gaim-migrate @ 11556]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10306
diff
changeset
|
1139 | /************************************************************************** |
|
7d7f8cfa2b4f
[gaim-migrate @ 11556]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10306
diff
changeset
|
1140 | * Init stuff |
|
7d7f8cfa2b4f
[gaim-migrate @ 11556]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10306
diff
changeset
|
1141 | **************************************************************************/ |
|
10481
a5d6b8e1717d
[gaim-migrate @ 11769]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10463
diff
changeset
|
1142 | |
|
10345
7d7f8cfa2b4f
[gaim-migrate @ 11556]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10306
diff
changeset
|
1143 | void |
|
7d7f8cfa2b4f
[gaim-migrate @ 11556]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10306
diff
changeset
|
1144 | msn_switchboard_init(void) |
|
7d7f8cfa2b4f
[gaim-migrate @ 11556]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10306
diff
changeset
|
1145 | { |
|
7d7f8cfa2b4f
[gaim-migrate @ 11556]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10306
diff
changeset
|
1146 | cbs_table = msn_table_new(); |
|
7d7f8cfa2b4f
[gaim-migrate @ 11556]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10306
diff
changeset
|
1147 | |
|
7d7f8cfa2b4f
[gaim-migrate @ 11556]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10306
diff
changeset
|
1148 | msn_table_add_cmd(cbs_table, "ANS", "ANS", ans_cmd); |
|
7d7f8cfa2b4f
[gaim-migrate @ 11556]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10306
diff
changeset
|
1149 | msn_table_add_cmd(cbs_table, "ANS", "IRO", iro_cmd); |
|
7d7f8cfa2b4f
[gaim-migrate @ 11556]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10306
diff
changeset
|
1150 | |
|
7d7f8cfa2b4f
[gaim-migrate @ 11556]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10306
diff
changeset
|
1151 | msn_table_add_cmd(cbs_table, "MSG", "ACK", ack_cmd); |
|
7d7f8cfa2b4f
[gaim-migrate @ 11556]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10306
diff
changeset
|
1152 | msn_table_add_cmd(cbs_table, "MSG", "NAK", nak_cmd); |
|
7d7f8cfa2b4f
[gaim-migrate @ 11556]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10306
diff
changeset
|
1153 | |
|
7d7f8cfa2b4f
[gaim-migrate @ 11556]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10306
diff
changeset
|
1154 | msn_table_add_cmd(cbs_table, "USR", "USR", usr_cmd); |
|
7d7f8cfa2b4f
[gaim-migrate @ 11556]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10306
diff
changeset
|
1155 | |
|
7d7f8cfa2b4f
[gaim-migrate @ 11556]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10306
diff
changeset
|
1156 | msn_table_add_cmd(cbs_table, NULL, "MSG", msg_cmd); |
| 13870 | 1157 | msn_table_add_cmd(cbs_table, NULL, "UBM", ubm_cmd); |
|
10345
7d7f8cfa2b4f
[gaim-migrate @ 11556]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10306
diff
changeset
|
1158 | msn_table_add_cmd(cbs_table, NULL, "JOI", joi_cmd); |
|
7d7f8cfa2b4f
[gaim-migrate @ 11556]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10306
diff
changeset
|
1159 | msn_table_add_cmd(cbs_table, NULL, "BYE", bye_cmd); |
|
7d7f8cfa2b4f
[gaim-migrate @ 11556]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10306
diff
changeset
|
1160 | msn_table_add_cmd(cbs_table, NULL, "OUT", out_cmd); |
|
7d7f8cfa2b4f
[gaim-migrate @ 11556]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10306
diff
changeset
|
1161 | |
|
7d7f8cfa2b4f
[gaim-migrate @ 11556]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10306
diff
changeset
|
1162 | #if 0 |
|
7d7f8cfa2b4f
[gaim-migrate @ 11556]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10306
diff
changeset
|
1163 | /* They might skip the history */ |
|
7d7f8cfa2b4f
[gaim-migrate @ 11556]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10306
diff
changeset
|
1164 | msn_table_add_cmd(cbs_table, NULL, "ACK", NULL); |
|
7d7f8cfa2b4f
[gaim-migrate @ 11556]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10306
diff
changeset
|
1165 | #endif |
|
7d7f8cfa2b4f
[gaim-migrate @ 11556]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10306
diff
changeset
|
1166 | |
|
7d7f8cfa2b4f
[gaim-migrate @ 11556]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10306
diff
changeset
|
1167 | msn_table_add_error(cbs_table, "MSG", msg_error); |
|
7d7f8cfa2b4f
[gaim-migrate @ 11556]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10306
diff
changeset
|
1168 | msn_table_add_error(cbs_table, "CAL", cal_error); |
|
7d7f8cfa2b4f
[gaim-migrate @ 11556]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10306
diff
changeset
|
1169 | |
|
7d7f8cfa2b4f
[gaim-migrate @ 11556]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10306
diff
changeset
|
1170 | /* Register the message type callbacks. */ |
|
7d7f8cfa2b4f
[gaim-migrate @ 11556]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10306
diff
changeset
|
1171 | msn_table_add_msg_type(cbs_table, "text/plain", |
|
25538
22182aef4300
Move some MSN message handlers from switchboard to general msg.c.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
25473
diff
changeset
|
1172 | msn_plain_msg); |
|
10345
7d7f8cfa2b4f
[gaim-migrate @ 11556]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10306
diff
changeset
|
1173 | msn_table_add_msg_type(cbs_table, "text/x-msmsgscontrol", |
|
25538
22182aef4300
Move some MSN message handlers from switchboard to general msg.c.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
25473
diff
changeset
|
1174 | msn_control_msg); |
|
10345
7d7f8cfa2b4f
[gaim-migrate @ 11556]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10306
diff
changeset
|
1175 | msn_table_add_msg_type(cbs_table, "text/x-clientcaps", |
|
7d7f8cfa2b4f
[gaim-migrate @ 11556]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10306
diff
changeset
|
1176 | clientcaps_msg); |
|
7d7f8cfa2b4f
[gaim-migrate @ 11556]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10306
diff
changeset
|
1177 | msn_table_add_msg_type(cbs_table, "text/x-clientinfo", |
|
7d7f8cfa2b4f
[gaim-migrate @ 11556]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10306
diff
changeset
|
1178 | clientcaps_msg); |
|
7d7f8cfa2b4f
[gaim-migrate @ 11556]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10306
diff
changeset
|
1179 | msn_table_add_msg_type(cbs_table, "application/x-msnmsgrp2p", |
|
7d7f8cfa2b4f
[gaim-migrate @ 11556]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10306
diff
changeset
|
1180 | msn_p2p_msg); |
|
7d7f8cfa2b4f
[gaim-migrate @ 11556]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10306
diff
changeset
|
1181 | msn_table_add_msg_type(cbs_table, "text/x-mms-emoticon", |
|
7d7f8cfa2b4f
[gaim-migrate @ 11556]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10306
diff
changeset
|
1182 | msn_emoticon_msg); |
|
11518
c1c6ea0117d8
[gaim-migrate @ 13763]
Francesco Fracassi <ffracassi@users.sourceforge.net>
parents:
11338
diff
changeset
|
1183 | msn_table_add_msg_type(cbs_table, "text/x-mms-animemoticon", |
|
25538
22182aef4300
Move some MSN message handlers from switchboard to general msg.c.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
25473
diff
changeset
|
1184 | msn_emoticon_msg); |
|
11321
a93121c0ea16
[gaim-migrate @ 13525]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
10806
diff
changeset
|
1185 | msn_table_add_msg_type(cbs_table, "text/x-msnmsgr-datacast", |
|
25538
22182aef4300
Move some MSN message handlers from switchboard to general msg.c.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
25473
diff
changeset
|
1186 | msn_datacast_msg); |
|
26739
ee13fa0be1a6
Notify the user if a contact invites them to a voice call over MSN.
Michael Ruprecht <maiku@pidgin.im>
parents:
26474
diff
changeset
|
1187 | msn_table_add_msg_type(cbs_table, "text/x-msmsgsinvite", |
|
10345
7d7f8cfa2b4f
[gaim-migrate @ 11556]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10306
diff
changeset
|
1188 | msn_invite_msg); |
|
27569
7f08e35e35ac
Add support for receiving handwritten (Ink) messages from MSN buddies.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
26739
diff
changeset
|
1189 | msn_table_add_msg_type(cbs_table, "image/gif", |
|
7f08e35e35ac
Add support for receiving handwritten (Ink) messages from MSN buddies.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
26739
diff
changeset
|
1190 | msn_handwritten_msg); |
|
10345
7d7f8cfa2b4f
[gaim-migrate @ 11556]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10306
diff
changeset
|
1191 | } |
|
7d7f8cfa2b4f
[gaim-migrate @ 11556]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10306
diff
changeset
|
1192 | |
|
7d7f8cfa2b4f
[gaim-migrate @ 11556]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10306
diff
changeset
|
1193 | void |
|
7d7f8cfa2b4f
[gaim-migrate @ 11556]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10306
diff
changeset
|
1194 | msn_switchboard_end(void) |
|
7d7f8cfa2b4f
[gaim-migrate @ 11556]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10306
diff
changeset
|
1195 | { |
|
7d7f8cfa2b4f
[gaim-migrate @ 11556]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10306
diff
changeset
|
1196 | msn_table_destroy(cbs_table); |
|
7d7f8cfa2b4f
[gaim-migrate @ 11556]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10306
diff
changeset
|
1197 | } |