Mercurial > pidgin
annotate libgaim/protocols/msn/session.c @ 20390:d634f88e25d8
msn.tgz from SF Patch #1621854 from Ka-Hing Cheung
"This tarball brings soc-2006-msnp13 up to head. In addition to that it also
fixes a crash with sending offline messages.
I wasn't able to generate a diff against that branch, svn seems to insist
on diff'ing against HEAD after I run the merge command. After running `svn
merge -r 16309:HEAD https://gaim.svn.sourceforge.net/svnroot/gaim/trunk` on
the soc-2006-msnp13 you can replace the msn directory with the attached
tarball. The fix for offline messaging is on msn.c:901:
if (!session->oim)
session->oim = msn_oim_new(session)"
committer: Richard Laager <rlaager@wiktel.com>
author | Ka-Hing Cheung <khc@hxbc.us> |
---|---|
date | Sun, 15 Apr 2007 02:18:17 +0000 |
parents | e354528c4163 |
children | 9755b2f7bb0f |
rev | line source |
---|---|
14192 | 1 /** |
2 * @file session.c MSN session functions | |
3 * | |
4 * gaim | |
5 * | |
6 * Gaim is the legal property of its developers, whose names are too numerous | |
7 * to list here. Please refer to the COPYRIGHT file distributed with this | |
8 * source distribution. | |
9 * | |
10 * This program is free software; you can redistribute it and/or modify | |
11 * it under the terms of the GNU General Public License as published by | |
12 * the Free Software Foundation; either version 2 of the License, or | |
13 * (at your option) any later version. | |
14 * | |
15 * This program is distributed in the hope that it will be useful, | |
16 * but WITHOUT ANY WARRANTY; without even the implied warranty of | |
17 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
18 * GNU General Public License for more details. | |
19 * | |
20 * You should have received a copy of the GNU General Public License | |
21 * along with this program; if not, write to the Free Software | |
22 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | |
23 */ | |
24 #include "msn.h" | |
25 #include "session.h" | |
26 #include "notification.h" | |
27 | |
28 #include "dialog.h" | |
29 | |
30 MsnSession * | |
31 msn_session_new(GaimAccount *account) | |
32 { | |
33 MsnSession *session; | |
34 | |
35 g_return_val_if_fail(account != NULL, NULL); | |
36 | |
37 session = g_new0(MsnSession, 1); | |
38 | |
39 session->account = account; | |
40 session->notification = msn_notification_new(session); | |
41 session->userlist = msn_userlist_new(session); | |
42 | |
43 session->user = msn_user_new(session->userlist, | |
44 gaim_account_get_username(account), NULL); | |
20389
e354528c4163
propagate from branch 'im.pidgin.gaim' (head 70ac931e4936c7916eec18a07fe46a0af0fd7403)
Richard Laager <rlaager@wiktel.com>
parents:
14192
diff
changeset
|
45 session->bnode = NULL; |
e354528c4163
propagate from branch 'im.pidgin.gaim' (head 70ac931e4936c7916eec18a07fe46a0af0fd7403)
Richard Laager <rlaager@wiktel.com>
parents:
14192
diff
changeset
|
46 |
e354528c4163
propagate from branch 'im.pidgin.gaim' (head 70ac931e4936c7916eec18a07fe46a0af0fd7403)
Richard Laager <rlaager@wiktel.com>
parents:
14192
diff
changeset
|
47 /*if you want to chat with Yahoo Messenger*/ |
e354528c4163
propagate from branch 'im.pidgin.gaim' (head 70ac931e4936c7916eec18a07fe46a0af0fd7403)
Richard Laager <rlaager@wiktel.com>
parents:
14192
diff
changeset
|
48 //session->protocol_ver = WLM_YAHOO_PROT_VER; |
e354528c4163
propagate from branch 'im.pidgin.gaim' (head 70ac931e4936c7916eec18a07fe46a0af0fd7403)
Richard Laager <rlaager@wiktel.com>
parents:
14192
diff
changeset
|
49 session->protocol_ver = WLM_PROT_VER; |
14192 | 50 session->conv_seq = 1; |
51 | |
52 return session; | |
53 } | |
54 | |
55 void | |
56 msn_session_destroy(MsnSession *session) | |
57 { | |
58 g_return_if_fail(session != NULL); | |
59 | |
60 session->destroying = TRUE; | |
61 | |
62 if (session->connected) | |
63 msn_session_disconnect(session); | |
64 | |
65 if (session->notification != NULL) | |
66 msn_notification_destroy(session->notification); | |
67 | |
68 while (session->switches != NULL) | |
69 msn_switchboard_destroy(session->switches->data); | |
70 | |
71 while (session->slplinks != NULL) | |
72 msn_slplink_destroy(session->slplinks->data); | |
73 | |
74 msn_userlist_destroy(session->userlist); | |
75 | |
20389
e354528c4163
propagate from branch 'im.pidgin.gaim' (head 70ac931e4936c7916eec18a07fe46a0af0fd7403)
Richard Laager <rlaager@wiktel.com>
parents:
14192
diff
changeset
|
76 g_free(session->passport_info.t); |
e354528c4163
propagate from branch 'im.pidgin.gaim' (head 70ac931e4936c7916eec18a07fe46a0af0fd7403)
Richard Laager <rlaager@wiktel.com>
parents:
14192
diff
changeset
|
77 g_free(session->passport_info.p); |
14192 | 78 g_free(session->passport_info.kv); |
79 g_free(session->passport_info.sid); | |
80 g_free(session->passport_info.mspauth); | |
81 g_free(session->passport_info.client_ip); | |
82 | |
83 if (session->passport_info.file != NULL) | |
84 { | |
85 g_unlink(session->passport_info.file); | |
86 g_free(session->passport_info.file); | |
87 } | |
88 | |
89 if (session->sync != NULL) | |
90 msn_sync_destroy(session->sync); | |
91 | |
92 if (session->nexus != NULL) | |
93 msn_nexus_destroy(session->nexus); | |
94 | |
20389
e354528c4163
propagate from branch 'im.pidgin.gaim' (head 70ac931e4936c7916eec18a07fe46a0af0fd7403)
Richard Laager <rlaager@wiktel.com>
parents:
14192
diff
changeset
|
95 if (session->contact != NULL) |
e354528c4163
propagate from branch 'im.pidgin.gaim' (head 70ac931e4936c7916eec18a07fe46a0af0fd7403)
Richard Laager <rlaager@wiktel.com>
parents:
14192
diff
changeset
|
96 msn_contact_destroy(session->contact); |
e354528c4163
propagate from branch 'im.pidgin.gaim' (head 70ac931e4936c7916eec18a07fe46a0af0fd7403)
Richard Laager <rlaager@wiktel.com>
parents:
14192
diff
changeset
|
97 if (session->oim != NULL) |
e354528c4163
propagate from branch 'im.pidgin.gaim' (head 70ac931e4936c7916eec18a07fe46a0af0fd7403)
Richard Laager <rlaager@wiktel.com>
parents:
14192
diff
changeset
|
98 msn_oim_destroy(session->oim); |
e354528c4163
propagate from branch 'im.pidgin.gaim' (head 70ac931e4936c7916eec18a07fe46a0af0fd7403)
Richard Laager <rlaager@wiktel.com>
parents:
14192
diff
changeset
|
99 |
14192 | 100 if (session->user != NULL) |
101 msn_user_destroy(session->user); | |
102 | |
103 g_free(session); | |
104 } | |
105 | |
106 gboolean | |
107 msn_session_connect(MsnSession *session, const char *host, int port, | |
108 gboolean http_method) | |
109 { | |
110 g_return_val_if_fail(session != NULL, FALSE); | |
111 g_return_val_if_fail(!session->connected, TRUE); | |
112 | |
113 session->connected = TRUE; | |
114 session->http_method = http_method; | |
115 | |
116 if (session->notification == NULL) | |
117 { | |
118 gaim_debug_error("msn", "This shouldn't happen\n"); | |
119 g_return_val_if_reached(FALSE); | |
120 } | |
121 | |
122 if (msn_notification_connect(session->notification, host, port)) | |
123 { | |
124 return TRUE; | |
125 } | |
126 | |
127 return FALSE; | |
128 } | |
129 | |
130 void | |
131 msn_session_disconnect(MsnSession *session) | |
132 { | |
133 g_return_if_fail(session != NULL); | |
134 g_return_if_fail(session->connected); | |
135 | |
136 session->connected = FALSE; | |
137 | |
138 while (session->switches != NULL) | |
139 msn_switchboard_close(session->switches->data); | |
140 | |
141 if (session->notification != NULL) | |
142 msn_notification_close(session->notification); | |
143 } | |
144 | |
145 /* TODO: This must go away when conversation is redesigned */ | |
146 MsnSwitchBoard * | |
147 msn_session_find_swboard(MsnSession *session, const char *username) | |
148 { | |
149 GList *l; | |
150 | |
151 g_return_val_if_fail(session != NULL, NULL); | |
152 g_return_val_if_fail(username != NULL, NULL); | |
153 | |
154 for (l = session->switches; l != NULL; l = l->next) | |
155 { | |
156 MsnSwitchBoard *swboard; | |
157 | |
158 swboard = l->data; | |
159 | |
160 if ((swboard->im_user != NULL) && !strcmp(username, swboard->im_user)) | |
161 return swboard; | |
162 } | |
163 | |
164 return NULL; | |
165 } | |
166 | |
20389
e354528c4163
propagate from branch 'im.pidgin.gaim' (head 70ac931e4936c7916eec18a07fe46a0af0fd7403)
Richard Laager <rlaager@wiktel.com>
parents:
14192
diff
changeset
|
167 /*get the conversation*/ |
e354528c4163
propagate from branch 'im.pidgin.gaim' (head 70ac931e4936c7916eec18a07fe46a0af0fd7403)
Richard Laager <rlaager@wiktel.com>
parents:
14192
diff
changeset
|
168 GaimConversation * |
e354528c4163
propagate from branch 'im.pidgin.gaim' (head 70ac931e4936c7916eec18a07fe46a0af0fd7403)
Richard Laager <rlaager@wiktel.com>
parents:
14192
diff
changeset
|
169 msn_session_get_conv(MsnSession *session,const char *passport) |
e354528c4163
propagate from branch 'im.pidgin.gaim' (head 70ac931e4936c7916eec18a07fe46a0af0fd7403)
Richard Laager <rlaager@wiktel.com>
parents:
14192
diff
changeset
|
170 { |
e354528c4163
propagate from branch 'im.pidgin.gaim' (head 70ac931e4936c7916eec18a07fe46a0af0fd7403)
Richard Laager <rlaager@wiktel.com>
parents:
14192
diff
changeset
|
171 GaimAccount *account; |
e354528c4163
propagate from branch 'im.pidgin.gaim' (head 70ac931e4936c7916eec18a07fe46a0af0fd7403)
Richard Laager <rlaager@wiktel.com>
parents:
14192
diff
changeset
|
172 GaimConversation * conv; |
e354528c4163
propagate from branch 'im.pidgin.gaim' (head 70ac931e4936c7916eec18a07fe46a0af0fd7403)
Richard Laager <rlaager@wiktel.com>
parents:
14192
diff
changeset
|
173 |
e354528c4163
propagate from branch 'im.pidgin.gaim' (head 70ac931e4936c7916eec18a07fe46a0af0fd7403)
Richard Laager <rlaager@wiktel.com>
parents:
14192
diff
changeset
|
174 g_return_val_if_fail(session != NULL, NULL); |
e354528c4163
propagate from branch 'im.pidgin.gaim' (head 70ac931e4936c7916eec18a07fe46a0af0fd7403)
Richard Laager <rlaager@wiktel.com>
parents:
14192
diff
changeset
|
175 account = session->account; |
e354528c4163
propagate from branch 'im.pidgin.gaim' (head 70ac931e4936c7916eec18a07fe46a0af0fd7403)
Richard Laager <rlaager@wiktel.com>
parents:
14192
diff
changeset
|
176 |
e354528c4163
propagate from branch 'im.pidgin.gaim' (head 70ac931e4936c7916eec18a07fe46a0af0fd7403)
Richard Laager <rlaager@wiktel.com>
parents:
14192
diff
changeset
|
177 conv = gaim_find_conversation_with_account(GAIM_CONV_TYPE_IM, |
e354528c4163
propagate from branch 'im.pidgin.gaim' (head 70ac931e4936c7916eec18a07fe46a0af0fd7403)
Richard Laager <rlaager@wiktel.com>
parents:
14192
diff
changeset
|
178 passport, account); |
e354528c4163
propagate from branch 'im.pidgin.gaim' (head 70ac931e4936c7916eec18a07fe46a0af0fd7403)
Richard Laager <rlaager@wiktel.com>
parents:
14192
diff
changeset
|
179 if(conv == NULL){ |
e354528c4163
propagate from branch 'im.pidgin.gaim' (head 70ac931e4936c7916eec18a07fe46a0af0fd7403)
Richard Laager <rlaager@wiktel.com>
parents:
14192
diff
changeset
|
180 conv = gaim_conversation_new(GAIM_CONV_TYPE_IM, account, passport); |
e354528c4163
propagate from branch 'im.pidgin.gaim' (head 70ac931e4936c7916eec18a07fe46a0af0fd7403)
Richard Laager <rlaager@wiktel.com>
parents:
14192
diff
changeset
|
181 } |
e354528c4163
propagate from branch 'im.pidgin.gaim' (head 70ac931e4936c7916eec18a07fe46a0af0fd7403)
Richard Laager <rlaager@wiktel.com>
parents:
14192
diff
changeset
|
182 return conv; |
e354528c4163
propagate from branch 'im.pidgin.gaim' (head 70ac931e4936c7916eec18a07fe46a0af0fd7403)
Richard Laager <rlaager@wiktel.com>
parents:
14192
diff
changeset
|
183 } |
e354528c4163
propagate from branch 'im.pidgin.gaim' (head 70ac931e4936c7916eec18a07fe46a0af0fd7403)
Richard Laager <rlaager@wiktel.com>
parents:
14192
diff
changeset
|
184 |
e354528c4163
propagate from branch 'im.pidgin.gaim' (head 70ac931e4936c7916eec18a07fe46a0af0fd7403)
Richard Laager <rlaager@wiktel.com>
parents:
14192
diff
changeset
|
185 /* put Message to User Conversation |
e354528c4163
propagate from branch 'im.pidgin.gaim' (head 70ac931e4936c7916eec18a07fe46a0af0fd7403)
Richard Laager <rlaager@wiktel.com>
parents:
14192
diff
changeset
|
186 * |
e354528c4163
propagate from branch 'im.pidgin.gaim' (head 70ac931e4936c7916eec18a07fe46a0af0fd7403)
Richard Laager <rlaager@wiktel.com>
parents:
14192
diff
changeset
|
187 * passport - the one want to talk to you |
e354528c4163
propagate from branch 'im.pidgin.gaim' (head 70ac931e4936c7916eec18a07fe46a0af0fd7403)
Richard Laager <rlaager@wiktel.com>
parents:
14192
diff
changeset
|
188 */ |
e354528c4163
propagate from branch 'im.pidgin.gaim' (head 70ac931e4936c7916eec18a07fe46a0af0fd7403)
Richard Laager <rlaager@wiktel.com>
parents:
14192
diff
changeset
|
189 void |
e354528c4163
propagate from branch 'im.pidgin.gaim' (head 70ac931e4936c7916eec18a07fe46a0af0fd7403)
Richard Laager <rlaager@wiktel.com>
parents:
14192
diff
changeset
|
190 msn_session_report_user(MsnSession *session,const char *passport,char *msg,GaimMessageFlags flags) |
e354528c4163
propagate from branch 'im.pidgin.gaim' (head 70ac931e4936c7916eec18a07fe46a0af0fd7403)
Richard Laager <rlaager@wiktel.com>
parents:
14192
diff
changeset
|
191 { |
e354528c4163
propagate from branch 'im.pidgin.gaim' (head 70ac931e4936c7916eec18a07fe46a0af0fd7403)
Richard Laager <rlaager@wiktel.com>
parents:
14192
diff
changeset
|
192 GaimConversation * conv; |
e354528c4163
propagate from branch 'im.pidgin.gaim' (head 70ac931e4936c7916eec18a07fe46a0af0fd7403)
Richard Laager <rlaager@wiktel.com>
parents:
14192
diff
changeset
|
193 |
e354528c4163
propagate from branch 'im.pidgin.gaim' (head 70ac931e4936c7916eec18a07fe46a0af0fd7403)
Richard Laager <rlaager@wiktel.com>
parents:
14192
diff
changeset
|
194 if ((conv = msn_session_get_conv(session,passport)) != NULL){ |
e354528c4163
propagate from branch 'im.pidgin.gaim' (head 70ac931e4936c7916eec18a07fe46a0af0fd7403)
Richard Laager <rlaager@wiktel.com>
parents:
14192
diff
changeset
|
195 gaim_conversation_write(conv, NULL, msg, flags, time(NULL)); |
e354528c4163
propagate from branch 'im.pidgin.gaim' (head 70ac931e4936c7916eec18a07fe46a0af0fd7403)
Richard Laager <rlaager@wiktel.com>
parents:
14192
diff
changeset
|
196 } |
e354528c4163
propagate from branch 'im.pidgin.gaim' (head 70ac931e4936c7916eec18a07fe46a0af0fd7403)
Richard Laager <rlaager@wiktel.com>
parents:
14192
diff
changeset
|
197 } |
e354528c4163
propagate from branch 'im.pidgin.gaim' (head 70ac931e4936c7916eec18a07fe46a0af0fd7403)
Richard Laager <rlaager@wiktel.com>
parents:
14192
diff
changeset
|
198 |
14192 | 199 MsnSwitchBoard * |
200 msn_session_find_swboard_with_conv(MsnSession *session, GaimConversation *conv) | |
201 { | |
202 GList *l; | |
203 | |
204 g_return_val_if_fail(session != NULL, NULL); | |
205 g_return_val_if_fail(conv != NULL, NULL); | |
206 | |
207 for (l = session->switches; l != NULL; l = l->next) | |
208 { | |
209 MsnSwitchBoard *swboard; | |
210 | |
211 swboard = l->data; | |
212 | |
213 if (swboard->conv == conv) | |
214 return swboard; | |
215 } | |
216 | |
217 return NULL; | |
218 } | |
219 | |
220 MsnSwitchBoard * | |
221 msn_session_find_swboard_with_id(const MsnSession *session, int chat_id) | |
222 { | |
223 GList *l; | |
224 | |
225 g_return_val_if_fail(session != NULL, NULL); | |
226 g_return_val_if_fail(chat_id >= 0, NULL); | |
227 | |
228 for (l = session->switches; l != NULL; l = l->next) | |
229 { | |
230 MsnSwitchBoard *swboard; | |
231 | |
232 swboard = l->data; | |
233 | |
234 if (swboard->chat_id == chat_id) | |
235 return swboard; | |
236 } | |
237 | |
238 return NULL; | |
239 } | |
240 | |
241 MsnSwitchBoard * | |
242 msn_session_get_swboard(MsnSession *session, const char *username, | |
243 MsnSBFlag flag) | |
244 { | |
245 MsnSwitchBoard *swboard; | |
246 | |
247 g_return_val_if_fail(session != NULL, NULL); | |
248 | |
249 swboard = msn_session_find_swboard(session, username); | |
250 | |
251 if (swboard == NULL) | |
252 { | |
253 swboard = msn_switchboard_new(session); | |
254 swboard->im_user = g_strdup(username); | |
255 msn_switchboard_request(swboard); | |
256 msn_switchboard_request_add_user(swboard, username); | |
257 } | |
258 | |
259 swboard->flag |= flag; | |
260 | |
261 return swboard; | |
262 } | |
263 | |
20389
e354528c4163
propagate from branch 'im.pidgin.gaim' (head 70ac931e4936c7916eec18a07fe46a0af0fd7403)
Richard Laager <rlaager@wiktel.com>
parents:
14192
diff
changeset
|
264 /*setup the bnode, for MSN SOAP contact/address book op*/ |
e354528c4163
propagate from branch 'im.pidgin.gaim' (head 70ac931e4936c7916eec18a07fe46a0af0fd7403)
Richard Laager <rlaager@wiktel.com>
parents:
14192
diff
changeset
|
265 void |
e354528c4163
propagate from branch 'im.pidgin.gaim' (head 70ac931e4936c7916eec18a07fe46a0af0fd7403)
Richard Laager <rlaager@wiktel.com>
parents:
14192
diff
changeset
|
266 msn_session_set_bnode(MsnSession *session) |
14192 | 267 { |
268 GaimBlistNode *gnode, *cnode, *bnode; | |
269 GaimConnection *gc = gaim_account_get_connection(session->account); | |
270 | |
271 g_return_if_fail(gc != NULL); | |
272 | |
20390
d634f88e25d8
msn.tgz from SF Patch #1621854 from Ka-Hing Cheung
Ka-Hing Cheung <khc@hxbc.us>
parents:
20389
diff
changeset
|
273 for (gnode = gaim_get_blist()->root; gnode; gnode = gnode->next){ |
14192 | 274 if(!GAIM_BLIST_NODE_IS_GROUP(gnode)) |
275 continue; | |
276 for(cnode = gnode->child; cnode; cnode = cnode->next) { | |
277 if(!GAIM_BLIST_NODE_IS_CONTACT(cnode)) | |
278 continue; | |
279 for(bnode = cnode->child; bnode; bnode = bnode->next) { | |
280 GaimBuddy *b; | |
281 if(!GAIM_BLIST_NODE_IS_BUDDY(bnode)) | |
282 continue; | |
283 b = (GaimBuddy *)bnode; | |
20389
e354528c4163
propagate from branch 'im.pidgin.gaim' (head 70ac931e4936c7916eec18a07fe46a0af0fd7403)
Richard Laager <rlaager@wiktel.com>
parents:
14192
diff
changeset
|
284 if(b->account == gc->account){ |
e354528c4163
propagate from branch 'im.pidgin.gaim' (head 70ac931e4936c7916eec18a07fe46a0af0fd7403)
Richard Laager <rlaager@wiktel.com>
parents:
14192
diff
changeset
|
285 session->bnode = bnode; |
e354528c4163
propagate from branch 'im.pidgin.gaim' (head 70ac931e4936c7916eec18a07fe46a0af0fd7403)
Richard Laager <rlaager@wiktel.com>
parents:
14192
diff
changeset
|
286 return; |
e354528c4163
propagate from branch 'im.pidgin.gaim' (head 70ac931e4936c7916eec18a07fe46a0af0fd7403)
Richard Laager <rlaager@wiktel.com>
parents:
14192
diff
changeset
|
287 } |
e354528c4163
propagate from branch 'im.pidgin.gaim' (head 70ac931e4936c7916eec18a07fe46a0af0fd7403)
Richard Laager <rlaager@wiktel.com>
parents:
14192
diff
changeset
|
288 } |
e354528c4163
propagate from branch 'im.pidgin.gaim' (head 70ac931e4936c7916eec18a07fe46a0af0fd7403)
Richard Laager <rlaager@wiktel.com>
parents:
14192
diff
changeset
|
289 } |
e354528c4163
propagate from branch 'im.pidgin.gaim' (head 70ac931e4936c7916eec18a07fe46a0af0fd7403)
Richard Laager <rlaager@wiktel.com>
parents:
14192
diff
changeset
|
290 } |
e354528c4163
propagate from branch 'im.pidgin.gaim' (head 70ac931e4936c7916eec18a07fe46a0af0fd7403)
Richard Laager <rlaager@wiktel.com>
parents:
14192
diff
changeset
|
291 session->bnode = NULL; |
e354528c4163
propagate from branch 'im.pidgin.gaim' (head 70ac931e4936c7916eec18a07fe46a0af0fd7403)
Richard Laager <rlaager@wiktel.com>
parents:
14192
diff
changeset
|
292 } |
e354528c4163
propagate from branch 'im.pidgin.gaim' (head 70ac931e4936c7916eec18a07fe46a0af0fd7403)
Richard Laager <rlaager@wiktel.com>
parents:
14192
diff
changeset
|
293 |
e354528c4163
propagate from branch 'im.pidgin.gaim' (head 70ac931e4936c7916eec18a07fe46a0af0fd7403)
Richard Laager <rlaager@wiktel.com>
parents:
14192
diff
changeset
|
294 /*get bnode*/ |
e354528c4163
propagate from branch 'im.pidgin.gaim' (head 70ac931e4936c7916eec18a07fe46a0af0fd7403)
Richard Laager <rlaager@wiktel.com>
parents:
14192
diff
changeset
|
295 GaimBlistNode * |
e354528c4163
propagate from branch 'im.pidgin.gaim' (head 70ac931e4936c7916eec18a07fe46a0af0fd7403)
Richard Laager <rlaager@wiktel.com>
parents:
14192
diff
changeset
|
296 msn_session_get_bnode(MsnSession *session) |
e354528c4163
propagate from branch 'im.pidgin.gaim' (head 70ac931e4936c7916eec18a07fe46a0af0fd7403)
Richard Laager <rlaager@wiktel.com>
parents:
14192
diff
changeset
|
297 { |
e354528c4163
propagate from branch 'im.pidgin.gaim' (head 70ac931e4936c7916eec18a07fe46a0af0fd7403)
Richard Laager <rlaager@wiktel.com>
parents:
14192
diff
changeset
|
298 #if 1 |
e354528c4163
propagate from branch 'im.pidgin.gaim' (head 70ac931e4936c7916eec18a07fe46a0af0fd7403)
Richard Laager <rlaager@wiktel.com>
parents:
14192
diff
changeset
|
299 return session->bnode; |
e354528c4163
propagate from branch 'im.pidgin.gaim' (head 70ac931e4936c7916eec18a07fe46a0af0fd7403)
Richard Laager <rlaager@wiktel.com>
parents:
14192
diff
changeset
|
300 #else |
e354528c4163
propagate from branch 'im.pidgin.gaim' (head 70ac931e4936c7916eec18a07fe46a0af0fd7403)
Richard Laager <rlaager@wiktel.com>
parents:
14192
diff
changeset
|
301 return gaim_get_blist()->root; |
e354528c4163
propagate from branch 'im.pidgin.gaim' (head 70ac931e4936c7916eec18a07fe46a0af0fd7403)
Richard Laager <rlaager@wiktel.com>
parents:
14192
diff
changeset
|
302 #endif |
e354528c4163
propagate from branch 'im.pidgin.gaim' (head 70ac931e4936c7916eec18a07fe46a0af0fd7403)
Richard Laager <rlaager@wiktel.com>
parents:
14192
diff
changeset
|
303 } |
e354528c4163
propagate from branch 'im.pidgin.gaim' (head 70ac931e4936c7916eec18a07fe46a0af0fd7403)
Richard Laager <rlaager@wiktel.com>
parents:
14192
diff
changeset
|
304 |
e354528c4163
propagate from branch 'im.pidgin.gaim' (head 70ac931e4936c7916eec18a07fe46a0af0fd7403)
Richard Laager <rlaager@wiktel.com>
parents:
14192
diff
changeset
|
305 static void |
e354528c4163
propagate from branch 'im.pidgin.gaim' (head 70ac931e4936c7916eec18a07fe46a0af0fd7403)
Richard Laager <rlaager@wiktel.com>
parents:
14192
diff
changeset
|
306 msn_session_sync_users(MsnSession *session) |
e354528c4163
propagate from branch 'im.pidgin.gaim' (head 70ac931e4936c7916eec18a07fe46a0af0fd7403)
Richard Laager <rlaager@wiktel.com>
parents:
14192
diff
changeset
|
307 { |
e354528c4163
propagate from branch 'im.pidgin.gaim' (head 70ac931e4936c7916eec18a07fe46a0af0fd7403)
Richard Laager <rlaager@wiktel.com>
parents:
14192
diff
changeset
|
308 GaimBlistNode *gnode, *cnode, *bnode; |
e354528c4163
propagate from branch 'im.pidgin.gaim' (head 70ac931e4936c7916eec18a07fe46a0af0fd7403)
Richard Laager <rlaager@wiktel.com>
parents:
14192
diff
changeset
|
309 GaimConnection *gc = gaim_account_get_connection(session->account); |
e354528c4163
propagate from branch 'im.pidgin.gaim' (head 70ac931e4936c7916eec18a07fe46a0af0fd7403)
Richard Laager <rlaager@wiktel.com>
parents:
14192
diff
changeset
|
310 |
e354528c4163
propagate from branch 'im.pidgin.gaim' (head 70ac931e4936c7916eec18a07fe46a0af0fd7403)
Richard Laager <rlaager@wiktel.com>
parents:
14192
diff
changeset
|
311 g_return_if_fail(gc != NULL); |
e354528c4163
propagate from branch 'im.pidgin.gaim' (head 70ac931e4936c7916eec18a07fe46a0af0fd7403)
Richard Laager <rlaager@wiktel.com>
parents:
14192
diff
changeset
|
312 |
e354528c4163
propagate from branch 'im.pidgin.gaim' (head 70ac931e4936c7916eec18a07fe46a0af0fd7403)
Richard Laager <rlaager@wiktel.com>
parents:
14192
diff
changeset
|
313 /* The core used to use msn_add_buddy to add all buddies before |
e354528c4163
propagate from branch 'im.pidgin.gaim' (head 70ac931e4936c7916eec18a07fe46a0af0fd7403)
Richard Laager <rlaager@wiktel.com>
parents:
14192
diff
changeset
|
314 * being logged in. This no longer happens, so we manually iterate |
e354528c4163
propagate from branch 'im.pidgin.gaim' (head 70ac931e4936c7916eec18a07fe46a0af0fd7403)
Richard Laager <rlaager@wiktel.com>
parents:
14192
diff
changeset
|
315 * over the whole buddy list to identify sync issues. |
e354528c4163
propagate from branch 'im.pidgin.gaim' (head 70ac931e4936c7916eec18a07fe46a0af0fd7403)
Richard Laager <rlaager@wiktel.com>
parents:
14192
diff
changeset
|
316 */ |
e354528c4163
propagate from branch 'im.pidgin.gaim' (head 70ac931e4936c7916eec18a07fe46a0af0fd7403)
Richard Laager <rlaager@wiktel.com>
parents:
14192
diff
changeset
|
317 for (gnode = gaim_get_blist()->root; gnode; gnode = gnode->next){ |
e354528c4163
propagate from branch 'im.pidgin.gaim' (head 70ac931e4936c7916eec18a07fe46a0af0fd7403)
Richard Laager <rlaager@wiktel.com>
parents:
14192
diff
changeset
|
318 GaimGroup *group = (GaimGroup *)gnode; |
e354528c4163
propagate from branch 'im.pidgin.gaim' (head 70ac931e4936c7916eec18a07fe46a0af0fd7403)
Richard Laager <rlaager@wiktel.com>
parents:
14192
diff
changeset
|
319 const char *group_name = group->name; |
e354528c4163
propagate from branch 'im.pidgin.gaim' (head 70ac931e4936c7916eec18a07fe46a0af0fd7403)
Richard Laager <rlaager@wiktel.com>
parents:
14192
diff
changeset
|
320 if(!GAIM_BLIST_NODE_IS_GROUP(gnode)) |
e354528c4163
propagate from branch 'im.pidgin.gaim' (head 70ac931e4936c7916eec18a07fe46a0af0fd7403)
Richard Laager <rlaager@wiktel.com>
parents:
14192
diff
changeset
|
321 continue; |
e354528c4163
propagate from branch 'im.pidgin.gaim' (head 70ac931e4936c7916eec18a07fe46a0af0fd7403)
Richard Laager <rlaager@wiktel.com>
parents:
14192
diff
changeset
|
322 if(!g_strcasecmp(group_name, MSN_INDIVIDUALS_GROUP_NAME) |
e354528c4163
propagate from branch 'im.pidgin.gaim' (head 70ac931e4936c7916eec18a07fe46a0af0fd7403)
Richard Laager <rlaager@wiktel.com>
parents:
14192
diff
changeset
|
323 || !g_strcasecmp(group_name,MSN_NON_IM_GROUP_NAME)){ |
e354528c4163
propagate from branch 'im.pidgin.gaim' (head 70ac931e4936c7916eec18a07fe46a0af0fd7403)
Richard Laager <rlaager@wiktel.com>
parents:
14192
diff
changeset
|
324 continue; |
e354528c4163
propagate from branch 'im.pidgin.gaim' (head 70ac931e4936c7916eec18a07fe46a0af0fd7403)
Richard Laager <rlaager@wiktel.com>
parents:
14192
diff
changeset
|
325 } |
e354528c4163
propagate from branch 'im.pidgin.gaim' (head 70ac931e4936c7916eec18a07fe46a0af0fd7403)
Richard Laager <rlaager@wiktel.com>
parents:
14192
diff
changeset
|
326 for(cnode = gnode->child; cnode; cnode = cnode->next) { |
e354528c4163
propagate from branch 'im.pidgin.gaim' (head 70ac931e4936c7916eec18a07fe46a0af0fd7403)
Richard Laager <rlaager@wiktel.com>
parents:
14192
diff
changeset
|
327 if(!GAIM_BLIST_NODE_IS_CONTACT(cnode)) |
e354528c4163
propagate from branch 'im.pidgin.gaim' (head 70ac931e4936c7916eec18a07fe46a0af0fd7403)
Richard Laager <rlaager@wiktel.com>
parents:
14192
diff
changeset
|
328 continue; |
e354528c4163
propagate from branch 'im.pidgin.gaim' (head 70ac931e4936c7916eec18a07fe46a0af0fd7403)
Richard Laager <rlaager@wiktel.com>
parents:
14192
diff
changeset
|
329 for(bnode = cnode->child; bnode; bnode = bnode->next) { |
e354528c4163
propagate from branch 'im.pidgin.gaim' (head 70ac931e4936c7916eec18a07fe46a0af0fd7403)
Richard Laager <rlaager@wiktel.com>
parents:
14192
diff
changeset
|
330 GaimBuddy *b; |
e354528c4163
propagate from branch 'im.pidgin.gaim' (head 70ac931e4936c7916eec18a07fe46a0af0fd7403)
Richard Laager <rlaager@wiktel.com>
parents:
14192
diff
changeset
|
331 if(!GAIM_BLIST_NODE_IS_BUDDY(bnode)) |
e354528c4163
propagate from branch 'im.pidgin.gaim' (head 70ac931e4936c7916eec18a07fe46a0af0fd7403)
Richard Laager <rlaager@wiktel.com>
parents:
14192
diff
changeset
|
332 continue; |
e354528c4163
propagate from branch 'im.pidgin.gaim' (head 70ac931e4936c7916eec18a07fe46a0af0fd7403)
Richard Laager <rlaager@wiktel.com>
parents:
14192
diff
changeset
|
333 b = (GaimBuddy *)bnode; |
e354528c4163
propagate from branch 'im.pidgin.gaim' (head 70ac931e4936c7916eec18a07fe46a0af0fd7403)
Richard Laager <rlaager@wiktel.com>
parents:
14192
diff
changeset
|
334 if(b->account == gc->account){ |
14192 | 335 MsnUser *remote_user; |
336 gboolean found = FALSE; | |
337 | |
20389
e354528c4163
propagate from branch 'im.pidgin.gaim' (head 70ac931e4936c7916eec18a07fe46a0af0fd7403)
Richard Laager <rlaager@wiktel.com>
parents:
14192
diff
changeset
|
338 gaim_debug_info("MaYuan","buddy name:%s,group name:%s\n",b->name,group_name); |
e354528c4163
propagate from branch 'im.pidgin.gaim' (head 70ac931e4936c7916eec18a07fe46a0af0fd7403)
Richard Laager <rlaager@wiktel.com>
parents:
14192
diff
changeset
|
339 remote_user = msn_userlist_find_user(session->userlist, b->name); |
14192 | 340 |
20389
e354528c4163
propagate from branch 'im.pidgin.gaim' (head 70ac931e4936c7916eec18a07fe46a0af0fd7403)
Richard Laager <rlaager@wiktel.com>
parents:
14192
diff
changeset
|
341 if ((remote_user != NULL) && (remote_user->list_op & MSN_LIST_FL_OP)){ |
e354528c4163
propagate from branch 'im.pidgin.gaim' (head 70ac931e4936c7916eec18a07fe46a0af0fd7403)
Richard Laager <rlaager@wiktel.com>
parents:
14192
diff
changeset
|
342 const char *group_id; |
14192 | 343 GList *l; |
344 | |
20389
e354528c4163
propagate from branch 'im.pidgin.gaim' (head 70ac931e4936c7916eec18a07fe46a0af0fd7403)
Richard Laager <rlaager@wiktel.com>
parents:
14192
diff
changeset
|
345 gaim_debug_info("MaYuan","remote user:{%s}\n",b->name); |
14192 | 346 group_id = msn_userlist_find_group_id(remote_user->userlist, |
347 group_name); | |
20389
e354528c4163
propagate from branch 'im.pidgin.gaim' (head 70ac931e4936c7916eec18a07fe46a0af0fd7403)
Richard Laager <rlaager@wiktel.com>
parents:
14192
diff
changeset
|
348 if(group_id == NULL){ |
e354528c4163
propagate from branch 'im.pidgin.gaim' (head 70ac931e4936c7916eec18a07fe46a0af0fd7403)
Richard Laager <rlaager@wiktel.com>
parents:
14192
diff
changeset
|
349 continue; |
e354528c4163
propagate from branch 'im.pidgin.gaim' (head 70ac931e4936c7916eec18a07fe46a0af0fd7403)
Richard Laager <rlaager@wiktel.com>
parents:
14192
diff
changeset
|
350 } |
e354528c4163
propagate from branch 'im.pidgin.gaim' (head 70ac931e4936c7916eec18a07fe46a0af0fd7403)
Richard Laager <rlaager@wiktel.com>
parents:
14192
diff
changeset
|
351 gaim_debug_info("MaYuan","group_id:{%s}\n",group_id); |
14192 | 352 |
20389
e354528c4163
propagate from branch 'im.pidgin.gaim' (head 70ac931e4936c7916eec18a07fe46a0af0fd7403)
Richard Laager <rlaager@wiktel.com>
parents:
14192
diff
changeset
|
353 for (l = remote_user->group_ids; l != NULL; l = l->next){ |
e354528c4163
propagate from branch 'im.pidgin.gaim' (head 70ac931e4936c7916eec18a07fe46a0af0fd7403)
Richard Laager <rlaager@wiktel.com>
parents:
14192
diff
changeset
|
354 gaim_debug_info("MaYuan","l->data:{%s}\n",l->data); |
e354528c4163
propagate from branch 'im.pidgin.gaim' (head 70ac931e4936c7916eec18a07fe46a0af0fd7403)
Richard Laager <rlaager@wiktel.com>
parents:
14192
diff
changeset
|
355 if (!g_strcasecmp(group_id ,l->data)){ |
14192 | 356 found = TRUE; |
357 break; | |
358 } | |
359 } | |
360 } | |
361 | |
20390
d634f88e25d8
msn.tgz from SF Patch #1621854 from Ka-Hing Cheung
Ka-Hing Cheung <khc@hxbc.us>
parents:
20389
diff
changeset
|
362 if (!found){ |
14192 | 363 /* The user was not on the server list or not in that group |
364 * on the server list */ | |
20389
e354528c4163
propagate from branch 'im.pidgin.gaim' (head 70ac931e4936c7916eec18a07fe46a0af0fd7403)
Richard Laager <rlaager@wiktel.com>
parents:
14192
diff
changeset
|
365 msn_show_sync_issue(session, b->name, group_name); |
14192 | 366 } |
367 } | |
368 } | |
369 } | |
370 } | |
371 } | |
372 | |
373 void | |
374 msn_session_set_error(MsnSession *session, MsnErrorType error, | |
375 const char *info) | |
376 { | |
377 GaimConnection *gc; | |
378 char *msg; | |
379 | |
380 gc = gaim_account_get_connection(session->account); | |
381 | |
382 switch (error) | |
383 { | |
384 case MSN_ERROR_SERVCONN: | |
385 msg = g_strdup(info); | |
386 break; | |
387 case MSN_ERROR_UNSUPPORTED_PROTOCOL: | |
388 msg = g_strdup(_("Our protocol is not supported by the " | |
389 "server.")); | |
390 break; | |
391 case MSN_ERROR_HTTP_MALFORMED: | |
392 msg = g_strdup(_("Error parsing HTTP.")); | |
393 break; | |
394 case MSN_ERROR_SIGN_OTHER: | |
395 gc->wants_to_die = TRUE; | |
396 msg = g_strdup(_("You have signed on from another location.")); | |
397 break; | |
398 case MSN_ERROR_SERV_UNAVAILABLE: | |
399 msg = g_strdup(_("The MSN servers are temporarily " | |
400 "unavailable. Please wait and try " | |
401 "again.")); | |
402 break; | |
403 case MSN_ERROR_SERV_DOWN: | |
404 msg = g_strdup(_("The MSN servers are going down " | |
405 "temporarily.")); | |
406 break; | |
407 case MSN_ERROR_AUTH: | |
408 msg = g_strdup_printf(_("Unable to authenticate: %s"), | |
409 (info == NULL ) ? | |
410 _("Unknown error") : info); | |
411 break; | |
412 case MSN_ERROR_BAD_BLIST: | |
413 msg = g_strdup(_("Your MSN buddy list is temporarily " | |
414 "unavailable. Please wait and try " | |
415 "again.")); | |
416 break; | |
417 default: | |
418 msg = g_strdup(_("Unknown error.")); | |
419 break; | |
420 } | |
421 | |
422 msn_session_disconnect(session); | |
423 | |
424 gaim_connection_error(gc, msg); | |
425 | |
426 g_free(msg); | |
427 } | |
428 | |
429 static const char * | |
430 get_login_step_text(MsnSession *session) | |
431 { | |
432 const char *steps_text[] = { | |
433 _("Connecting"), | |
434 _("Handshaking"), | |
435 _("Transferring"), | |
436 _("Handshaking"), | |
437 _("Starting authentication"), | |
438 _("Getting cookie"), | |
439 _("Authenticating"), | |
440 _("Sending cookie"), | |
441 _("Retrieving buddy list") | |
442 }; | |
443 | |
444 return steps_text[session->login_step]; | |
445 } | |
446 | |
447 void | |
448 msn_session_set_login_step(MsnSession *session, MsnLoginStep step) | |
449 { | |
450 GaimConnection *gc; | |
451 | |
452 /* Prevent the connection progress going backwards, eg. if we get | |
453 * transferred several times during login */ | |
454 if (session->login_step > step) | |
455 return; | |
456 | |
457 /* If we're already logged in, we're probably here because of a | |
458 * mid-session XFR from the notification server, so we don't want to | |
459 * popup the connection progress dialog */ | |
460 if (session->logged_in) | |
461 return; | |
462 | |
463 gc = session->account->gc; | |
464 | |
465 session->login_step = step; | |
466 | |
467 gaim_connection_update_progress(gc, get_login_step_text(session), step, | |
468 MSN_LOGIN_STEPS); | |
469 } | |
470 | |
471 void | |
472 msn_session_finish_login(MsnSession *session) | |
473 { | |
474 GaimAccount *account; | |
475 GaimConnection *gc; | |
476 char *icon; | |
477 | |
478 if (session->logged_in) | |
479 return; | |
480 | |
481 account = session->account; | |
482 gc = gaim_account_get_connection(account); | |
483 | |
484 icon = gaim_buddy_icons_get_full_path(gaim_account_get_buddy_icon(session->account)); | |
485 msn_user_set_buddy_icon(session->user, icon); | |
486 g_free(icon); | |
487 | |
488 session->logged_in = TRUE; | |
489 | |
490 msn_change_status(session); | |
491 | |
492 gaim_connection_set_state(gc, GAIM_CONNECTED); | |
493 | |
494 /* Sync users */ | |
495 msn_session_sync_users(session); | |
496 } | |
20390
d634f88e25d8
msn.tgz from SF Patch #1621854 from Ka-Hing Cheung
Ka-Hing Cheung <khc@hxbc.us>
parents:
20389
diff
changeset
|
497 |