Sun, 05 Dec 2010 08:13:13 +0000
Replace the mpop account setting with a session boolean, because I
can't get a good signal for when the user changes an account setting.
| 5309 | 1 | /** |
| 2 | * @file session.c MSN session functions | |
| 3 | * | |
| 15884 | 4 | * purple |
| 5309 | 5 | * |
| 15884 | 6 | * Purple is the legal property of its developers, whose names are too numerous |
|
9198
e8eb6d5eb9eb
[gaim-migrate @ 9993]
Christian Hammond <chipx86@chipx86.com>
parents:
9193
diff
changeset
|
7 | * to list here. Please refer to the COPYRIGHT file distributed with this |
|
e8eb6d5eb9eb
[gaim-migrate @ 9993]
Christian Hammond <chipx86@chipx86.com>
parents:
9193
diff
changeset
|
8 | * source distribution. |
|
6701
7e2db9273748
[gaim-migrate @ 7227]
Christian Hammond <chipx86@chipx86.com>
parents:
5564
diff
changeset
|
9 | * |
| 5309 | 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:
17686
diff
changeset
|
22 | * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA |
| 5309 | 23 | */ |
|
30945
b875cf477e19
Remove unnecesary includes from msn.h.
Jorge Villaseñor <masca@cpw.pidgin.im>
parents:
30944
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:
30945
diff
changeset
|
25 | #include "internal.h" |
|
30945
b875cf477e19
Remove unnecesary includes from msn.h.
Jorge Villaseñor <masca@cpw.pidgin.im>
parents:
30944
diff
changeset
|
26 | #include "debug.h" |
|
b875cf477e19
Remove unnecesary includes from msn.h.
Jorge Villaseñor <masca@cpw.pidgin.im>
parents:
30944
diff
changeset
|
27 | |
|
30911
e0a4f4418d83
msn: Merge dialog and error to get an unified msn_error api.
Jorge Villaseñor <masca@cpw.pidgin.im>
parents:
29447
diff
changeset
|
28 | #include "error.h" |
|
29420
c81c525111db
Initial support for msnp16, based on patch by Masca.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
27635
diff
changeset
|
29 | #include "msnutils.h" |
| 5309 | 30 | #include "session.h" |
|
7288
486e8b44a14b
[gaim-migrate @ 7869]
Christian Hammond <chipx86@chipx86.com>
parents:
6827
diff
changeset
|
31 | #include "notification.h" |
|
21361
f890366c8ec6
oim migrated to new soap code, quadruply duplicated message!
Ka-Hing Cheung <khc@pidgin.im>
parents:
21360
diff
changeset
|
32 | #include "oim.h" |
| 5309 | 33 | |
| 34 | MsnSession * | |
| 15884 | 35 | msn_session_new(PurpleAccount *account) |
| 5309 | 36 | { |
| 37 | MsnSession *session; | |
| 38 | ||
| 39 | g_return_val_if_fail(account != NULL, NULL); | |
| 40 | ||
| 41 | session = g_new0(MsnSession, 1); | |
| 42 | ||
|
10481
a5d6b8e1717d
[gaim-migrate @ 11769]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10463
diff
changeset
|
43 | session->account = account; |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
44 | session->notification = msn_notification_new(session); |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
45 | session->userlist = msn_userlist_new(session); |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
46 | |
|
10481
a5d6b8e1717d
[gaim-migrate @ 11769]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10463
diff
changeset
|
47 | session->user = msn_user_new(session->userlist, |
| 15884 | 48 | purple_account_get_username(account), NULL); |
|
21361
f890366c8ec6
oim migrated to new soap code, quadruply duplicated message!
Ka-Hing Cheung <khc@pidgin.im>
parents:
21360
diff
changeset
|
49 | session->oim = msn_oim_new(session); |
|
10481
a5d6b8e1717d
[gaim-migrate @ 11769]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10463
diff
changeset
|
50 | |
|
29421
4259f9512ab4
Fix MSN protocol version detection to use the best version returned by the
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
29420
diff
changeset
|
51 | session->protocol_ver = 0; |
|
31210
0aa08cb723ac
Replace the mpop account setting with a session boolean, because I
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
31198
diff
changeset
|
52 | session->enable_mpop = TRUE; /* Default only */ |
|
6701
7e2db9273748
[gaim-migrate @ 7227]
Christian Hammond <chipx86@chipx86.com>
parents:
5564
diff
changeset
|
53 | |
|
29420
c81c525111db
Initial support for msnp16, based on patch by Masca.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
27635
diff
changeset
|
54 | session->guid = rand_guid(); |
|
6701
7e2db9273748
[gaim-migrate @ 7227]
Christian Hammond <chipx86@chipx86.com>
parents:
5564
diff
changeset
|
55 | |
| 5309 | 56 | return session; |
| 57 | } | |
| 58 | ||
| 59 | void | |
| 60 | msn_session_destroy(MsnSession *session) | |
| 61 | { | |
| 62 | g_return_if_fail(session != NULL); | |
| 63 | ||
|
10296
9badf1cedc6e
[gaim-migrate @ 11476]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10284
diff
changeset
|
64 | session->destroying = TRUE; |
|
9badf1cedc6e
[gaim-migrate @ 11476]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10284
diff
changeset
|
65 | |
|
30579
458621d24012
Save and cancel-on-exit any URL requests, instead of checking the
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30527
diff
changeset
|
66 | while (session->url_datas) { |
|
458621d24012
Save and cancel-on-exit any URL requests, instead of checking the
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30527
diff
changeset
|
67 | purple_util_fetch_url_cancel(session->url_datas->data); |
|
458621d24012
Save and cancel-on-exit any URL requests, instead of checking the
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30527
diff
changeset
|
68 | session->url_datas = g_slist_delete_link(session->url_datas, session->url_datas); |
|
458621d24012
Save and cancel-on-exit any URL requests, instead of checking the
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30527
diff
changeset
|
69 | } |
|
458621d24012
Save and cancel-on-exit any URL requests, instead of checking the
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30527
diff
changeset
|
70 | |
|
24017
c413ed3e4bdb
I guess I re-arranged a little off. We probably should disconnect
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
24004
diff
changeset
|
71 | if (session->connected) |
|
c413ed3e4bdb
I guess I re-arranged a little off. We probably should disconnect
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
24004
diff
changeset
|
72 | msn_session_disconnect(session); |
|
c413ed3e4bdb
I guess I re-arranged a little off. We probably should disconnect
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
24004
diff
changeset
|
73 | |
|
24004
54237efbb963
Re-arrange msn_session_destroy to avoid use-after-free bugs. I don't
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
24003
diff
changeset
|
74 | if (session->soap_cleanup_handle) |
|
54237efbb963
Re-arrange msn_session_destroy to avoid use-after-free bugs. I don't
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
24003
diff
changeset
|
75 | purple_timeout_remove(session->soap_cleanup_handle); |
|
54237efbb963
Re-arrange msn_session_destroy to avoid use-after-free bugs. I don't
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
24003
diff
changeset
|
76 | |
|
54237efbb963
Re-arrange msn_session_destroy to avoid use-after-free bugs. I don't
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
24003
diff
changeset
|
77 | if (session->soap_table != NULL) |
|
54237efbb963
Re-arrange msn_session_destroy to avoid use-after-free bugs. I don't
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
24003
diff
changeset
|
78 | g_hash_table_destroy(session->soap_table); |
|
54237efbb963
Re-arrange msn_session_destroy to avoid use-after-free bugs. I don't
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
24003
diff
changeset
|
79 | |
|
54237efbb963
Re-arrange msn_session_destroy to avoid use-after-free bugs. I don't
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
24003
diff
changeset
|
80 | while (session->slplinks != NULL) |
|
31032
b25150599f00
Hide msn_slplink_destroy and use the unref version everywhere.
Jorge Villaseñor <masca@cpw.pidgin.im>
parents:
30961
diff
changeset
|
81 | msn_slplink_unref(session->slplinks->data); |
|
24004
54237efbb963
Re-arrange msn_session_destroy to avoid use-after-free bugs. I don't
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
24003
diff
changeset
|
82 | |
|
54237efbb963
Re-arrange msn_session_destroy to avoid use-after-free bugs. I don't
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
24003
diff
changeset
|
83 | while (session->switches != NULL) |
|
54237efbb963
Re-arrange msn_session_destroy to avoid use-after-free bugs. I don't
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
24003
diff
changeset
|
84 | msn_switchboard_destroy(session->switches->data); |
|
54237efbb963
Re-arrange msn_session_destroy to avoid use-after-free bugs. I don't
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
24003
diff
changeset
|
85 | |
|
54237efbb963
Re-arrange msn_session_destroy to avoid use-after-free bugs. I don't
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
24003
diff
changeset
|
86 | if (session->oim != NULL) |
|
54237efbb963
Re-arrange msn_session_destroy to avoid use-after-free bugs. I don't
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
24003
diff
changeset
|
87 | msn_oim_destroy(session->oim); |
|
54237efbb963
Re-arrange msn_session_destroy to avoid use-after-free bugs. I don't
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
24003
diff
changeset
|
88 | |
|
54237efbb963
Re-arrange msn_session_destroy to avoid use-after-free bugs. I don't
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
24003
diff
changeset
|
89 | if (session->nexus != NULL) |
|
54237efbb963
Re-arrange msn_session_destroy to avoid use-after-free bugs. I don't
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
24003
diff
changeset
|
90 | msn_nexus_destroy(session->nexus); |
|
54237efbb963
Re-arrange msn_session_destroy to avoid use-after-free bugs. I don't
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
24003
diff
changeset
|
91 | |
|
54237efbb963
Re-arrange msn_session_destroy to avoid use-after-free bugs. I don't
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
24003
diff
changeset
|
92 | if (session->user != NULL) |
|
30944
4f1fc7c401fd
Remove msn_user_destroy in favor of msn_user_unref.
Jorge Villaseñor <masca@cpw.pidgin.im>
parents:
30929
diff
changeset
|
93 | msn_user_unref(session->user); |
| 5309 | 94 | |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
95 | if (session->notification != NULL) |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
96 | msn_notification_destroy(session->notification); |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
97 | |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
98 | msn_userlist_destroy(session->userlist); |
| 5309 | 99 | |
| 21906 | 100 | g_free(session->psm); |
|
29420
c81c525111db
Initial support for msnp16, based on patch by Masca.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
27635
diff
changeset
|
101 | g_free(session->guid); |
|
25614
36aaca179437
Save and use the CacheKey for ABCH SOAP requests.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
25612
diff
changeset
|
102 | g_free(session->abch_cachekey); |
|
25612
4ae731d8c3da
Comment out this extra string until we need it (if ever).
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
25184
diff
changeset
|
103 | #if 0 |
|
23789
3ef57c5a8d9c
Properly parse (most of) the MSN GCF command. Provides a
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23780
diff
changeset
|
104 | g_free(session->blocked_text); |
|
25612
4ae731d8c3da
Comment out this extra string until we need it (if ever).
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
25184
diff
changeset
|
105 | #endif |
|
23789
3ef57c5a8d9c
Properly parse (most of) the MSN GCF command. Provides a
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23780
diff
changeset
|
106 | |
|
13695
64da09d24cbe
[gaim-migrate @ 16096]
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
13635
diff
changeset
|
107 | g_free(session->passport_info.sid); |
|
64da09d24cbe
[gaim-migrate @ 16096]
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
13635
diff
changeset
|
108 | g_free(session->passport_info.mspauth); |
|
64da09d24cbe
[gaim-migrate @ 16096]
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
13635
diff
changeset
|
109 | g_free(session->passport_info.client_ip); |
|
23924
1f8e75759bf3
Use a URL to open MSN Hotmail inbox instead of a temporary file.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23866
diff
changeset
|
110 | g_free(session->passport_info.mail_url); |
|
5427
a45fa07ef20d
[gaim-migrate @ 5806]
Mark Doliner <markdoliner@pidgin.im>
parents:
5354
diff
changeset
|
111 | |
| 5309 | 112 | g_free(session); |
| 113 | } | |
| 114 | ||
| 115 | gboolean | |
|
10481
a5d6b8e1717d
[gaim-migrate @ 11769]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10463
diff
changeset
|
116 | msn_session_connect(MsnSession *session, const char *host, int port, |
|
a5d6b8e1717d
[gaim-migrate @ 11769]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10463
diff
changeset
|
117 | gboolean http_method) |
| 5309 | 118 | { |
| 119 | g_return_val_if_fail(session != NULL, FALSE); | |
| 120 | g_return_val_if_fail(!session->connected, TRUE); | |
| 121 | ||
| 122 | session->connected = TRUE; | |
|
10481
a5d6b8e1717d
[gaim-migrate @ 11769]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10463
diff
changeset
|
123 | session->http_method = http_method; |
| 5309 | 124 | |
|
10463
f2f97738b401
[gaim-migrate @ 11737]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10345
diff
changeset
|
125 | if (session->notification == NULL) |
|
f2f97738b401
[gaim-migrate @ 11737]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10345
diff
changeset
|
126 | { |
| 15884 | 127 | purple_debug_error("msn", "This shouldn't happen\n"); |
|
10463
f2f97738b401
[gaim-migrate @ 11737]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10345
diff
changeset
|
128 | g_return_val_if_reached(FALSE); |
|
f2f97738b401
[gaim-migrate @ 11737]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10345
diff
changeset
|
129 | } |
|
f2f97738b401
[gaim-migrate @ 11737]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10345
diff
changeset
|
130 | |
|
24605
ad3ade4ebb0b
Get rid of an unnecessary if statement, and don't try to unref a
Mark Doliner <markdoliner@pidgin.im>
parents:
24017
diff
changeset
|
131 | return msn_notification_connect(session->notification, host, port); |
| 5309 | 132 | } |
| 133 | ||
| 134 | void | |
| 135 | msn_session_disconnect(MsnSession *session) | |
| 136 | { | |
| 137 | g_return_if_fail(session != NULL); | |
|
20843
6d796c938192
Prevent an assertion (w/ G_DEBUG=fatal_warnings) when the connection drops.
Daniel Atallah <datallah@pidgin.im>
parents:
20658
diff
changeset
|
138 | |
|
6d796c938192
Prevent an assertion (w/ G_DEBUG=fatal_warnings) when the connection drops.
Daniel Atallah <datallah@pidgin.im>
parents:
20658
diff
changeset
|
139 | if (!session->connected) |
|
6d796c938192
Prevent an assertion (w/ G_DEBUG=fatal_warnings) when the connection drops.
Daniel Atallah <datallah@pidgin.im>
parents:
20658
diff
changeset
|
140 | return; |
| 5309 | 141 | |
|
30527
1f37f8bc501a
Add a timeout which forces the login process to complete. This won't
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30525
diff
changeset
|
142 | if (session->login_timeout) { |
|
1f37f8bc501a
Add a timeout which forces the login process to complete. This won't
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30525
diff
changeset
|
143 | purple_timeout_remove(session->login_timeout); |
|
1f37f8bc501a
Add a timeout which forces the login process to complete. This won't
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30525
diff
changeset
|
144 | session->login_timeout = 0; |
|
1f37f8bc501a
Add a timeout which forces the login process to complete. This won't
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30525
diff
changeset
|
145 | } |
|
1f37f8bc501a
Add a timeout which forces the login process to complete. This won't
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30525
diff
changeset
|
146 | |
|
10481
a5d6b8e1717d
[gaim-migrate @ 11769]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10463
diff
changeset
|
147 | session->connected = FALSE; |
|
a5d6b8e1717d
[gaim-migrate @ 11769]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10463
diff
changeset
|
148 | |
|
9158
f8dab42adeaf
[gaim-migrate @ 9942]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
8831
diff
changeset
|
149 | while (session->switches != NULL) |
|
10463
f2f97738b401
[gaim-migrate @ 11737]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10345
diff
changeset
|
150 | msn_switchboard_close(session->switches->data); |
| 5309 | 151 | |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
152 | if (session->notification != NULL) |
|
10463
f2f97738b401
[gaim-migrate @ 11737]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10345
diff
changeset
|
153 | msn_notification_close(session->notification); |
| 5309 | 154 | } |
| 155 | ||
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
156 | /* TODO: This must go away when conversation is redesigned */ |
| 5309 | 157 | MsnSwitchBoard * |
|
10621
2b214ffb112b
[gaim-migrate @ 12090]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
10602
diff
changeset
|
158 | msn_session_find_swboard(MsnSession *session, const char *username) |
| 5309 | 159 | { |
| 160 | GList *l; | |
| 161 | ||
|
9158
f8dab42adeaf
[gaim-migrate @ 9942]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
8831
diff
changeset
|
162 | g_return_val_if_fail(session != NULL, NULL); |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
163 | g_return_val_if_fail(username != NULL, NULL); |
| 5309 | 164 | |
| 8499 | 165 | for (l = session->switches; l != NULL; l = l->next) |
| 166 | { | |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
167 | MsnSwitchBoard *swboard; |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
168 | |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
169 | swboard = l->data; |
| 5309 | 170 | |
|
10621
2b214ffb112b
[gaim-migrate @ 12090]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
10602
diff
changeset
|
171 | if ((swboard->im_user != NULL) && !strcmp(username, swboard->im_user)) |
|
10602
111ed237f509
[gaim-migrate @ 12032]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10589
diff
changeset
|
172 | return swboard; |
| 5309 | 173 | } |
| 174 | ||
| 175 | return NULL; | |
| 176 | } | |
| 177 | ||
|
20516
3093ff8b5f97
use serv_got_im to report received oim's
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
20515
diff
changeset
|
178 | static PurpleConversation * |
| 13871 | 179 | msn_session_get_conv(MsnSession *session,const char *passport) |
| 180 | { | |
|
20478
46933dc62880
propagate from branch 'im.pidgin.pidgin' (head 88b7040408c88e4516c008f4eac579f98ef53e85)
Richard Laager <rlaager@pidgin.im>
diff
changeset
|
181 | PurpleAccount *account; |
|
46933dc62880
propagate from branch 'im.pidgin.pidgin' (head 88b7040408c88e4516c008f4eac579f98ef53e85)
Richard Laager <rlaager@pidgin.im>
diff
changeset
|
182 | PurpleConversation * conv; |
| 13871 | 183 | |
| 184 | g_return_val_if_fail(session != NULL, NULL); | |
| 185 | account = session->account; | |
| 186 | ||
|
20478
46933dc62880
propagate from branch 'im.pidgin.pidgin' (head 88b7040408c88e4516c008f4eac579f98ef53e85)
Richard Laager <rlaager@pidgin.im>
diff
changeset
|
187 | conv = purple_find_conversation_with_account(PURPLE_CONV_TYPE_IM, |
| 13871 | 188 | passport, account); |
| 189 | if(conv == NULL){ | |
|
20478
46933dc62880
propagate from branch 'im.pidgin.pidgin' (head 88b7040408c88e4516c008f4eac579f98ef53e85)
Richard Laager <rlaager@pidgin.im>
diff
changeset
|
190 | conv = purple_conversation_new(PURPLE_CONV_TYPE_IM, account, passport); |
| 13871 | 191 | } |
| 192 | return conv; | |
| 193 | } | |
| 194 | ||
| 195 | /* put Message to User Conversation | |
| 196 | * | |
| 197 | * passport - the one want to talk to you | |
| 198 | */ | |
| 199 | void | |
|
23802
61305f9c37e1
Make errors when sending OIM's more visible.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23789
diff
changeset
|
200 | msn_session_report_user(MsnSession *session,const char *passport,const char *msg,PurpleMessageFlags flags) |
| 13871 | 201 | { |
|
20478
46933dc62880
propagate from branch 'im.pidgin.pidgin' (head 88b7040408c88e4516c008f4eac579f98ef53e85)
Richard Laager <rlaager@pidgin.im>
diff
changeset
|
202 | PurpleConversation * conv; |
| 13871 | 203 | |
| 204 | if ((conv = msn_session_get_conv(session,passport)) != NULL){ | |
|
20478
46933dc62880
propagate from branch 'im.pidgin.pidgin' (head 88b7040408c88e4516c008f4eac579f98ef53e85)
Richard Laager <rlaager@pidgin.im>
diff
changeset
|
205 | purple_conversation_write(conv, NULL, msg, flags, time(NULL)); |
| 13871 | 206 | } |
| 207 | } | |
| 208 | ||
| 5309 | 209 | MsnSwitchBoard * |
| 15884 | 210 | msn_session_find_swboard_with_conv(MsnSession *session, PurpleConversation *conv) |
|
10621
2b214ffb112b
[gaim-migrate @ 12090]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
10602
diff
changeset
|
211 | { |
|
2b214ffb112b
[gaim-migrate @ 12090]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
10602
diff
changeset
|
212 | GList *l; |
|
2b214ffb112b
[gaim-migrate @ 12090]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
10602
diff
changeset
|
213 | |
|
2b214ffb112b
[gaim-migrate @ 12090]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
10602
diff
changeset
|
214 | g_return_val_if_fail(session != NULL, NULL); |
|
2b214ffb112b
[gaim-migrate @ 12090]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
10602
diff
changeset
|
215 | g_return_val_if_fail(conv != NULL, NULL); |
|
2b214ffb112b
[gaim-migrate @ 12090]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
10602
diff
changeset
|
216 | |
|
2b214ffb112b
[gaim-migrate @ 12090]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
10602
diff
changeset
|
217 | for (l = session->switches; l != NULL; l = l->next) |
|
2b214ffb112b
[gaim-migrate @ 12090]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
10602
diff
changeset
|
218 | { |
|
2b214ffb112b
[gaim-migrate @ 12090]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
10602
diff
changeset
|
219 | MsnSwitchBoard *swboard; |
|
2b214ffb112b
[gaim-migrate @ 12090]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
10602
diff
changeset
|
220 | |
|
2b214ffb112b
[gaim-migrate @ 12090]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
10602
diff
changeset
|
221 | swboard = l->data; |
|
2b214ffb112b
[gaim-migrate @ 12090]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
10602
diff
changeset
|
222 | |
|
2b214ffb112b
[gaim-migrate @ 12090]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
10602
diff
changeset
|
223 | if (swboard->conv == conv) |
|
2b214ffb112b
[gaim-migrate @ 12090]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
10602
diff
changeset
|
224 | return swboard; |
|
2b214ffb112b
[gaim-migrate @ 12090]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
10602
diff
changeset
|
225 | } |
|
2b214ffb112b
[gaim-migrate @ 12090]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
10602
diff
changeset
|
226 | |
|
2b214ffb112b
[gaim-migrate @ 12090]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
10602
diff
changeset
|
227 | return NULL; |
|
2b214ffb112b
[gaim-migrate @ 12090]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
10602
diff
changeset
|
228 | } |
|
2b214ffb112b
[gaim-migrate @ 12090]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
10602
diff
changeset
|
229 | |
|
2b214ffb112b
[gaim-migrate @ 12090]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
10602
diff
changeset
|
230 | MsnSwitchBoard * |
|
2b214ffb112b
[gaim-migrate @ 12090]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
10602
diff
changeset
|
231 | msn_session_find_swboard_with_id(const MsnSession *session, int chat_id) |
| 5309 | 232 | { |
| 233 | GList *l; | |
| 234 | ||
| 235 | g_return_val_if_fail(session != NULL, NULL); | |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
236 | g_return_val_if_fail(chat_id >= 0, NULL); |
| 5309 | 237 | |
|
9158
f8dab42adeaf
[gaim-migrate @ 9942]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
8831
diff
changeset
|
238 | for (l = session->switches; l != NULL; l = l->next) |
|
f8dab42adeaf
[gaim-migrate @ 9942]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
8831
diff
changeset
|
239 | { |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
240 | MsnSwitchBoard *swboard; |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
241 | |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
242 | swboard = l->data; |
| 5309 | 243 | |
|
10621
2b214ffb112b
[gaim-migrate @ 12090]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
10602
diff
changeset
|
244 | if (swboard->chat_id == chat_id) |
| 5309 | 245 | return swboard; |
| 246 | } | |
| 247 | ||
| 248 | return NULL; | |
| 249 | } | |
| 250 | ||
| 251 | MsnSwitchBoard * | |
|
10773
ef88ffed66eb
[gaim-migrate @ 12382]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10751
diff
changeset
|
252 | msn_session_get_swboard(MsnSession *session, const char *username, |
|
ef88ffed66eb
[gaim-migrate @ 12382]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10751
diff
changeset
|
253 | MsnSBFlag flag) |
| 5309 | 254 | { |
| 255 | MsnSwitchBoard *swboard; | |
| 256 | ||
|
13635
dcbce56b7713
[gaim-migrate @ 16032]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
11992
diff
changeset
|
257 | g_return_val_if_fail(session != NULL, NULL); |
|
dcbce56b7713
[gaim-migrate @ 16032]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
11992
diff
changeset
|
258 | |
|
10621
2b214ffb112b
[gaim-migrate @ 12090]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
10602
diff
changeset
|
259 | swboard = msn_session_find_swboard(session, username); |
| 5309 | 260 | |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
261 | if (swboard == NULL) |
|
9158
f8dab42adeaf
[gaim-migrate @ 9942]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
8831
diff
changeset
|
262 | { |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
263 | swboard = msn_switchboard_new(session); |
|
10225
0dfea1bc8695
[gaim-migrate @ 11357]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10112
diff
changeset
|
264 | swboard->im_user = g_strdup(username); |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
265 | msn_switchboard_request(swboard); |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
266 | msn_switchboard_request_add_user(swboard, username); |
| 5309 | 267 | } |
| 268 | ||
|
10773
ef88ffed66eb
[gaim-migrate @ 12382]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10751
diff
changeset
|
269 | swboard->flag |= flag; |
|
ef88ffed66eb
[gaim-migrate @ 12382]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10751
diff
changeset
|
270 | |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
271 | return swboard; |
| 5309 | 272 | } |
|
10044
884c09b189e6
[gaim-migrate @ 11003]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9198
diff
changeset
|
273 | |
|
30527
1f37f8bc501a
Add a timeout which forces the login process to complete. This won't
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30525
diff
changeset
|
274 | static gboolean |
|
1f37f8bc501a
Add a timeout which forces the login process to complete. This won't
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30525
diff
changeset
|
275 | msn_login_timeout_cb(gpointer data) |
|
1f37f8bc501a
Add a timeout which forces the login process to complete. This won't
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30525
diff
changeset
|
276 | { |
|
1f37f8bc501a
Add a timeout which forces the login process to complete. This won't
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30525
diff
changeset
|
277 | MsnSession *session = data; |
|
1f37f8bc501a
Add a timeout which forces the login process to complete. This won't
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30525
diff
changeset
|
278 | /* This forces the login process to finish, even though we haven't heard |
|
1f37f8bc501a
Add a timeout which forces the login process to complete. This won't
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30525
diff
changeset
|
279 | a response for our FQY requests yet. We'll at least end up online to the |
|
1f37f8bc501a
Add a timeout which forces the login process to complete. This won't
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30525
diff
changeset
|
280 | people we've already added. The rest will follow later. */ |
|
1f37f8bc501a
Add a timeout which forces the login process to complete. This won't
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30525
diff
changeset
|
281 | msn_session_finish_login(session); |
|
1f37f8bc501a
Add a timeout which forces the login process to complete. This won't
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30525
diff
changeset
|
282 | session->login_timeout = 0; |
|
1f37f8bc501a
Add a timeout which forces the login process to complete. This won't
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30525
diff
changeset
|
283 | return FALSE; |
|
1f37f8bc501a
Add a timeout which forces the login process to complete. This won't
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30525
diff
changeset
|
284 | } |
|
1f37f8bc501a
Add a timeout which forces the login process to complete. This won't
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30525
diff
changeset
|
285 | |
|
1f37f8bc501a
Add a timeout which forces the login process to complete. This won't
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30525
diff
changeset
|
286 | void |
|
1f37f8bc501a
Add a timeout which forces the login process to complete. This won't
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30525
diff
changeset
|
287 | msn_session_activate_login_timeout(MsnSession *session) |
|
1f37f8bc501a
Add a timeout which forces the login process to complete. This won't
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30525
diff
changeset
|
288 | { |
|
30716
422e72266bd5
Fix a possible crash reported by HanzZ. Fix thanks to HanzZ also.
Jan Kaluza <hanzz.k@gmail.com>
parents:
30579
diff
changeset
|
289 | if (!session->logged_in && session->connected) { |
|
30527
1f37f8bc501a
Add a timeout which forces the login process to complete. This won't
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30525
diff
changeset
|
290 | session->login_timeout = |
|
1f37f8bc501a
Add a timeout which forces the login process to complete. This won't
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30525
diff
changeset
|
291 | purple_timeout_add_seconds(MSN_LOGIN_FQY_TIMEOUT, |
|
1f37f8bc501a
Add a timeout which forces the login process to complete. This won't
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30525
diff
changeset
|
292 | msn_login_timeout_cb, session); |
|
1f37f8bc501a
Add a timeout which forces the login process to complete. This won't
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30525
diff
changeset
|
293 | } |
|
1f37f8bc501a
Add a timeout which forces the login process to complete. This won't
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30525
diff
changeset
|
294 | } |
|
1f37f8bc501a
Add a timeout which forces the login process to complete. This won't
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30525
diff
changeset
|
295 | |
|
10044
884c09b189e6
[gaim-migrate @ 11003]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9198
diff
changeset
|
296 | static void |
|
884c09b189e6
[gaim-migrate @ 11003]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9198
diff
changeset
|
297 | msn_session_sync_users(MsnSession *session) |
|
884c09b189e6
[gaim-migrate @ 11003]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9198
diff
changeset
|
298 | { |
| 15884 | 299 | PurpleConnection *gc = purple_account_get_connection(session->account); |
|
23090
9a987bea8364
Make MSN buddy list synchronization more forgiving, only ask about
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22164
diff
changeset
|
300 | GList *to_remove = NULL; |
|
27199
ab2af9d15cba
Use purple_find_buddies() instead of iterating the buddy list.
Paul Aurich <darkrain42@pidgin.im>
parents:
26726
diff
changeset
|
301 | GSList *buddies; |
|
10044
884c09b189e6
[gaim-migrate @ 11003]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9198
diff
changeset
|
302 | |
|
11992
906176cc9b22
[gaim-migrate @ 14285]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
11303
diff
changeset
|
303 | g_return_if_fail(gc != NULL); |
|
10044
884c09b189e6
[gaim-migrate @ 11003]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9198
diff
changeset
|
304 | |
|
11992
906176cc9b22
[gaim-migrate @ 14285]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
11303
diff
changeset
|
305 | /* The core used to use msn_add_buddy to add all buddies before |
|
906176cc9b22
[gaim-migrate @ 14285]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
11303
diff
changeset
|
306 | * being logged in. This no longer happens, so we manually iterate |
|
20658
91594d39738c
Clear the password consistently when we get a "Signed-On elsewhere" or a "Invalid Password" disconnection. Disconnection reason codes will take care of this in the core, but until then, this is ok. Fixes #3204.
Daniel Atallah <datallah@pidgin.im>
parents:
20597
diff
changeset
|
307 | * over the whole buddy list to identify sync issues. |
| 13899 | 308 | */ |
|
27199
ab2af9d15cba
Use purple_find_buddies() instead of iterating the buddy list.
Paul Aurich <darkrain42@pidgin.im>
parents:
26726
diff
changeset
|
309 | for (buddies = purple_find_buddies(session->account, NULL); buddies; |
|
ab2af9d15cba
Use purple_find_buddies() instead of iterating the buddy list.
Paul Aurich <darkrain42@pidgin.im>
parents:
26726
diff
changeset
|
310 | buddies = g_slist_delete_link(buddies, buddies)) { |
|
ab2af9d15cba
Use purple_find_buddies() instead of iterating the buddy list.
Paul Aurich <darkrain42@pidgin.im>
parents:
26726
diff
changeset
|
311 | PurpleBuddy *buddy = buddies->data; |
|
ab2af9d15cba
Use purple_find_buddies() instead of iterating the buddy list.
Paul Aurich <darkrain42@pidgin.im>
parents:
26726
diff
changeset
|
312 | const gchar *buddy_name = purple_buddy_get_name(buddy); |
|
ab2af9d15cba
Use purple_find_buddies() instead of iterating the buddy list.
Paul Aurich <darkrain42@pidgin.im>
parents:
26726
diff
changeset
|
313 | const gchar *group_name = purple_group_get_name(purple_buddy_get_group(buddy)); |
|
ab2af9d15cba
Use purple_find_buddies() instead of iterating the buddy list.
Paul Aurich <darkrain42@pidgin.im>
parents:
26726
diff
changeset
|
314 | MsnUser *remote_user; |
|
ab2af9d15cba
Use purple_find_buddies() instead of iterating the buddy list.
Paul Aurich <darkrain42@pidgin.im>
parents:
26726
diff
changeset
|
315 | gboolean found = FALSE; |
|
10044
884c09b189e6
[gaim-migrate @ 11003]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9198
diff
changeset
|
316 | |
|
27199
ab2af9d15cba
Use purple_find_buddies() instead of iterating the buddy list.
Paul Aurich <darkrain42@pidgin.im>
parents:
26726
diff
changeset
|
317 | remote_user = msn_userlist_find_user(session->userlist, buddy_name); |
|
ab2af9d15cba
Use purple_find_buddies() instead of iterating the buddy list.
Paul Aurich <darkrain42@pidgin.im>
parents:
26726
diff
changeset
|
318 | if (remote_user && remote_user->list_op & MSN_LIST_FL_OP) { |
|
ab2af9d15cba
Use purple_find_buddies() instead of iterating the buddy list.
Paul Aurich <darkrain42@pidgin.im>
parents:
26726
diff
changeset
|
319 | GList *l; |
|
ab2af9d15cba
Use purple_find_buddies() instead of iterating the buddy list.
Paul Aurich <darkrain42@pidgin.im>
parents:
26726
diff
changeset
|
320 | for (l = remote_user->group_ids; l; l = l->next) { |
|
ab2af9d15cba
Use purple_find_buddies() instead of iterating the buddy list.
Paul Aurich <darkrain42@pidgin.im>
parents:
26726
diff
changeset
|
321 | const char *name = msn_userlist_find_group_name(remote_user->userlist, l->data); |
|
ab2af9d15cba
Use purple_find_buddies() instead of iterating the buddy list.
Paul Aurich <darkrain42@pidgin.im>
parents:
26726
diff
changeset
|
322 | if (name && !g_ascii_strcasecmp(group_name, name)) { |
|
ab2af9d15cba
Use purple_find_buddies() instead of iterating the buddy list.
Paul Aurich <darkrain42@pidgin.im>
parents:
26726
diff
changeset
|
323 | found = TRUE; |
|
ab2af9d15cba
Use purple_find_buddies() instead of iterating the buddy list.
Paul Aurich <darkrain42@pidgin.im>
parents:
26726
diff
changeset
|
324 | break; |
|
ab2af9d15cba
Use purple_find_buddies() instead of iterating the buddy list.
Paul Aurich <darkrain42@pidgin.im>
parents:
26726
diff
changeset
|
325 | } |
|
ab2af9d15cba
Use purple_find_buddies() instead of iterating the buddy list.
Paul Aurich <darkrain42@pidgin.im>
parents:
26726
diff
changeset
|
326 | } |
|
10044
884c09b189e6
[gaim-migrate @ 11003]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9198
diff
changeset
|
327 | |
|
27199
ab2af9d15cba
Use purple_find_buddies() instead of iterating the buddy list.
Paul Aurich <darkrain42@pidgin.im>
parents:
26726
diff
changeset
|
328 | /* We don't care if they're in a different group, as long as they're on the |
|
ab2af9d15cba
Use purple_find_buddies() instead of iterating the buddy list.
Paul Aurich <darkrain42@pidgin.im>
parents:
26726
diff
changeset
|
329 | * list somewhere. If we check for the group, we cause pain, agony and |
|
ab2af9d15cba
Use purple_find_buddies() instead of iterating the buddy list.
Paul Aurich <darkrain42@pidgin.im>
parents:
26726
diff
changeset
|
330 | * suffering for people who decide to re-arrange their buddy list elsewhere. |
|
ab2af9d15cba
Use purple_find_buddies() instead of iterating the buddy list.
Paul Aurich <darkrain42@pidgin.im>
parents:
26726
diff
changeset
|
331 | */ |
|
ab2af9d15cba
Use purple_find_buddies() instead of iterating the buddy list.
Paul Aurich <darkrain42@pidgin.im>
parents:
26726
diff
changeset
|
332 | if (!found) { |
|
ab2af9d15cba
Use purple_find_buddies() instead of iterating the buddy list.
Paul Aurich <darkrain42@pidgin.im>
parents:
26726
diff
changeset
|
333 | if ((remote_user == NULL) || !(remote_user->list_op & MSN_LIST_FL_OP)) { |
|
ab2af9d15cba
Use purple_find_buddies() instead of iterating the buddy list.
Paul Aurich <darkrain42@pidgin.im>
parents:
26726
diff
changeset
|
334 | /* The user is not on the server list */ |
|
30911
e0a4f4418d83
msn: Merge dialog and error to get an unified msn_error api.
Jorge Villaseñor <masca@cpw.pidgin.im>
parents:
29447
diff
changeset
|
335 | msn_error_sync_issue(session, buddy_name, group_name); |
|
27199
ab2af9d15cba
Use purple_find_buddies() instead of iterating the buddy list.
Paul Aurich <darkrain42@pidgin.im>
parents:
26726
diff
changeset
|
336 | } else { |
|
ab2af9d15cba
Use purple_find_buddies() instead of iterating the buddy list.
Paul Aurich <darkrain42@pidgin.im>
parents:
26726
diff
changeset
|
337 | /* The user is not in that group on the server list */ |
|
ab2af9d15cba
Use purple_find_buddies() instead of iterating the buddy list.
Paul Aurich <darkrain42@pidgin.im>
parents:
26726
diff
changeset
|
338 | to_remove = g_list_prepend(to_remove, buddy); |
|
10044
884c09b189e6
[gaim-migrate @ 11003]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9198
diff
changeset
|
339 | } |
|
884c09b189e6
[gaim-migrate @ 11003]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9198
diff
changeset
|
340 | } |
|
884c09b189e6
[gaim-migrate @ 11003]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9198
diff
changeset
|
341 | } |
|
884c09b189e6
[gaim-migrate @ 11003]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9198
diff
changeset
|
342 | } |
|
23090
9a987bea8364
Make MSN buddy list synchronization more forgiving, only ask about
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22164
diff
changeset
|
343 | |
|
9a987bea8364
Make MSN buddy list synchronization more forgiving, only ask about
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22164
diff
changeset
|
344 | if (to_remove != NULL) { |
|
9a987bea8364
Make MSN buddy list synchronization more forgiving, only ask about
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22164
diff
changeset
|
345 | g_list_foreach(to_remove, (GFunc)purple_blist_remove_buddy, NULL); |
|
23092
7e1f02514b9c
unleak (thanks sadrul!)
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
23090
diff
changeset
|
346 | g_list_free(to_remove); |
|
23090
9a987bea8364
Make MSN buddy list synchronization more forgiving, only ask about
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22164
diff
changeset
|
347 | } |
|
10044
884c09b189e6
[gaim-migrate @ 11003]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9198
diff
changeset
|
348 | } |
|
884c09b189e6
[gaim-migrate @ 11003]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9198
diff
changeset
|
349 | |
|
884c09b189e6
[gaim-migrate @ 11003]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9198
diff
changeset
|
350 | void |
|
10481
a5d6b8e1717d
[gaim-migrate @ 11769]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10463
diff
changeset
|
351 | msn_session_set_error(MsnSession *session, MsnErrorType error, |
|
a5d6b8e1717d
[gaim-migrate @ 11769]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10463
diff
changeset
|
352 | const char *info) |
|
a5d6b8e1717d
[gaim-migrate @ 11769]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10463
diff
changeset
|
353 | { |
| 15884 | 354 | PurpleConnection *gc; |
| 21279 | 355 | PurpleConnectionError reason; |
|
10481
a5d6b8e1717d
[gaim-migrate @ 11769]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10463
diff
changeset
|
356 | char *msg; |
|
a5d6b8e1717d
[gaim-migrate @ 11769]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10463
diff
changeset
|
357 | |
|
24003
0676aec9bb8e
Don't try to report a connection error if the MSN session is being
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23924
diff
changeset
|
358 | if (session->destroying) |
|
0676aec9bb8e
Don't try to report a connection error if the MSN session is being
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23924
diff
changeset
|
359 | return; |
|
0676aec9bb8e
Don't try to report a connection error if the MSN session is being
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23924
diff
changeset
|
360 | |
| 15884 | 361 | gc = purple_account_get_connection(session->account); |
|
10481
a5d6b8e1717d
[gaim-migrate @ 11769]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10463
diff
changeset
|
362 | |
|
a5d6b8e1717d
[gaim-migrate @ 11769]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10463
diff
changeset
|
363 | switch (error) |
|
a5d6b8e1717d
[gaim-migrate @ 11769]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10463
diff
changeset
|
364 | { |
|
a5d6b8e1717d
[gaim-migrate @ 11769]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10463
diff
changeset
|
365 | case MSN_ERROR_SERVCONN: |
| 21279 | 366 | reason = PURPLE_CONNECTION_ERROR_NETWORK_ERROR; |
|
10481
a5d6b8e1717d
[gaim-migrate @ 11769]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10463
diff
changeset
|
367 | msg = g_strdup(info); |
|
a5d6b8e1717d
[gaim-migrate @ 11769]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10463
diff
changeset
|
368 | break; |
|
10519
80801a34a246
[gaim-migrate @ 11833]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
10514
diff
changeset
|
369 | case MSN_ERROR_UNSUPPORTED_PROTOCOL: |
| 21279 | 370 | reason = PURPLE_CONNECTION_ERROR_NETWORK_ERROR; |
|
10481
a5d6b8e1717d
[gaim-migrate @ 11769]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10463
diff
changeset
|
371 | msg = g_strdup(_("Our protocol is not supported by the " |
|
27635
0cd19038c417
More uniformity among disconnect error messages
Mark Doliner <markdoliner@pidgin.im>
parents:
27199
diff
changeset
|
372 | "server")); |
|
10481
a5d6b8e1717d
[gaim-migrate @ 11769]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10463
diff
changeset
|
373 | break; |
|
a5d6b8e1717d
[gaim-migrate @ 11769]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10463
diff
changeset
|
374 | case MSN_ERROR_HTTP_MALFORMED: |
| 21279 | 375 | reason = PURPLE_CONNECTION_ERROR_NETWORK_ERROR; |
|
27635
0cd19038c417
More uniformity among disconnect error messages
Mark Doliner <markdoliner@pidgin.im>
parents:
27199
diff
changeset
|
376 | msg = g_strdup(_("Error parsing HTTP")); |
|
10481
a5d6b8e1717d
[gaim-migrate @ 11769]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10463
diff
changeset
|
377 | break; |
|
a5d6b8e1717d
[gaim-migrate @ 11769]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10463
diff
changeset
|
378 | case MSN_ERROR_SIGN_OTHER: |
| 21279 | 379 | reason = PURPLE_CONNECTION_ERROR_NAME_IN_USE; |
|
27635
0cd19038c417
More uniformity among disconnect error messages
Mark Doliner <markdoliner@pidgin.im>
parents:
27199
diff
changeset
|
380 | msg = g_strdup(_("You have signed on from another location")); |
|
20658
91594d39738c
Clear the password consistently when we get a "Signed-On elsewhere" or a "Invalid Password" disconnection. Disconnection reason codes will take care of this in the core, but until then, this is ok. Fixes #3204.
Daniel Atallah <datallah@pidgin.im>
parents:
20597
diff
changeset
|
381 | if (!purple_account_get_remember_password(session->account)) |
|
91594d39738c
Clear the password consistently when we get a "Signed-On elsewhere" or a "Invalid Password" disconnection. Disconnection reason codes will take care of this in the core, but until then, this is ok. Fixes #3204.
Daniel Atallah <datallah@pidgin.im>
parents:
20597
diff
changeset
|
382 | purple_account_set_password(session->account, NULL); |
|
10481
a5d6b8e1717d
[gaim-migrate @ 11769]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10463
diff
changeset
|
383 | break; |
|
10568
15f02c0e7fc1
[gaim-migrate @ 11954]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
10533
diff
changeset
|
384 | case MSN_ERROR_SERV_UNAVAILABLE: |
| 21279 | 385 | reason = PURPLE_CONNECTION_ERROR_NETWORK_ERROR; |
|
10568
15f02c0e7fc1
[gaim-migrate @ 11954]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
10533
diff
changeset
|
386 | msg = g_strdup(_("The MSN servers are temporarily " |
|
15f02c0e7fc1
[gaim-migrate @ 11954]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
10533
diff
changeset
|
387 | "unavailable. Please wait and try " |
|
15f02c0e7fc1
[gaim-migrate @ 11954]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
10533
diff
changeset
|
388 | "again.")); |
|
15f02c0e7fc1
[gaim-migrate @ 11954]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
10533
diff
changeset
|
389 | break; |
|
10481
a5d6b8e1717d
[gaim-migrate @ 11769]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10463
diff
changeset
|
390 | case MSN_ERROR_SERV_DOWN: |
| 21279 | 391 | reason = PURPLE_CONNECTION_ERROR_NETWORK_ERROR; |
|
10481
a5d6b8e1717d
[gaim-migrate @ 11769]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10463
diff
changeset
|
392 | msg = g_strdup(_("The MSN servers are going down " |
|
27635
0cd19038c417
More uniformity among disconnect error messages
Mark Doliner <markdoliner@pidgin.im>
parents:
27199
diff
changeset
|
393 | "temporarily")); |
|
10481
a5d6b8e1717d
[gaim-migrate @ 11769]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10463
diff
changeset
|
394 | break; |
|
a5d6b8e1717d
[gaim-migrate @ 11769]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10463
diff
changeset
|
395 | case MSN_ERROR_AUTH: |
| 21279 | 396 | reason = PURPLE_CONNECTION_ERROR_AUTHENTICATION_FAILED; |
|
10481
a5d6b8e1717d
[gaim-migrate @ 11769]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10463
diff
changeset
|
397 | msg = g_strdup_printf(_("Unable to authenticate: %s"), |
|
a5d6b8e1717d
[gaim-migrate @ 11769]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10463
diff
changeset
|
398 | (info == NULL ) ? |
|
a5d6b8e1717d
[gaim-migrate @ 11769]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10463
diff
changeset
|
399 | _("Unknown error") : info); |
|
30525
09042ad2f660
Clear the password on an MSN account if saving is disabled and the
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30059
diff
changeset
|
400 | /* Clear the password if it isn't being saved */ |
|
09042ad2f660
Clear the password on an MSN account if saving is disabled and the
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30059
diff
changeset
|
401 | if (!purple_account_get_remember_password(session->account)) |
|
09042ad2f660
Clear the password on an MSN account if saving is disabled and the
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30059
diff
changeset
|
402 | purple_account_set_password(session->account, NULL); |
|
10481
a5d6b8e1717d
[gaim-migrate @ 11769]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10463
diff
changeset
|
403 | break; |
|
a5d6b8e1717d
[gaim-migrate @ 11769]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10463
diff
changeset
|
404 | case MSN_ERROR_BAD_BLIST: |
| 21279 | 405 | reason = PURPLE_CONNECTION_ERROR_NETWORK_ERROR; |
|
10481
a5d6b8e1717d
[gaim-migrate @ 11769]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10463
diff
changeset
|
406 | msg = g_strdup(_("Your MSN buddy list is temporarily " |
|
a5d6b8e1717d
[gaim-migrate @ 11769]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10463
diff
changeset
|
407 | "unavailable. Please wait and try " |
|
a5d6b8e1717d
[gaim-migrate @ 11769]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10463
diff
changeset
|
408 | "again.")); |
|
a5d6b8e1717d
[gaim-migrate @ 11769]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10463
diff
changeset
|
409 | break; |
|
a5d6b8e1717d
[gaim-migrate @ 11769]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10463
diff
changeset
|
410 | default: |
| 21279 | 411 | reason = PURPLE_CONNECTION_ERROR_NETWORK_ERROR; |
|
27635
0cd19038c417
More uniformity among disconnect error messages
Mark Doliner <markdoliner@pidgin.im>
parents:
27199
diff
changeset
|
412 | msg = g_strdup(_("Unknown error")); |
|
10481
a5d6b8e1717d
[gaim-migrate @ 11769]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10463
diff
changeset
|
413 | break; |
|
a5d6b8e1717d
[gaim-migrate @ 11769]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10463
diff
changeset
|
414 | } |
|
a5d6b8e1717d
[gaim-migrate @ 11769]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10463
diff
changeset
|
415 | |
|
a5d6b8e1717d
[gaim-migrate @ 11769]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10463
diff
changeset
|
416 | msn_session_disconnect(session); |
|
10533
4c2ad22fad20
[gaim-migrate @ 11862]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10519
diff
changeset
|
417 | |
|
27635
0cd19038c417
More uniformity among disconnect error messages
Mark Doliner <markdoliner@pidgin.im>
parents:
27199
diff
changeset
|
418 | purple_connection_error_reason(gc, reason, msg); |
|
10481
a5d6b8e1717d
[gaim-migrate @ 11769]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10463
diff
changeset
|
419 | |
|
a5d6b8e1717d
[gaim-migrate @ 11769]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10463
diff
changeset
|
420 | g_free(msg); |
|
a5d6b8e1717d
[gaim-migrate @ 11769]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10463
diff
changeset
|
421 | } |
|
a5d6b8e1717d
[gaim-migrate @ 11769]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10463
diff
changeset
|
422 | |
|
a5d6b8e1717d
[gaim-migrate @ 11769]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10463
diff
changeset
|
423 | static const char * |
|
a5d6b8e1717d
[gaim-migrate @ 11769]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10463
diff
changeset
|
424 | get_login_step_text(MsnSession *session) |
|
a5d6b8e1717d
[gaim-migrate @ 11769]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10463
diff
changeset
|
425 | { |
|
a5d6b8e1717d
[gaim-migrate @ 11769]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10463
diff
changeset
|
426 | const char *steps_text[] = { |
|
a5d6b8e1717d
[gaim-migrate @ 11769]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10463
diff
changeset
|
427 | _("Connecting"), |
|
a5d6b8e1717d
[gaim-migrate @ 11769]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10463
diff
changeset
|
428 | _("Handshaking"), |
|
10514
3d6cb5d53e97
[gaim-migrate @ 11814]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
10504
diff
changeset
|
429 | _("Transferring"), |
|
3d6cb5d53e97
[gaim-migrate @ 11814]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
10504
diff
changeset
|
430 | _("Handshaking"), |
|
10481
a5d6b8e1717d
[gaim-migrate @ 11769]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10463
diff
changeset
|
431 | _("Starting authentication"), |
|
a5d6b8e1717d
[gaim-migrate @ 11769]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10463
diff
changeset
|
432 | _("Getting cookie"), |
|
a5d6b8e1717d
[gaim-migrate @ 11769]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10463
diff
changeset
|
433 | _("Authenticating"), |
|
a5d6b8e1717d
[gaim-migrate @ 11769]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10463
diff
changeset
|
434 | _("Sending cookie"), |
|
a5d6b8e1717d
[gaim-migrate @ 11769]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10463
diff
changeset
|
435 | _("Retrieving buddy list") |
|
a5d6b8e1717d
[gaim-migrate @ 11769]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10463
diff
changeset
|
436 | }; |
|
a5d6b8e1717d
[gaim-migrate @ 11769]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10463
diff
changeset
|
437 | |
|
a5d6b8e1717d
[gaim-migrate @ 11769]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10463
diff
changeset
|
438 | return steps_text[session->login_step]; |
|
a5d6b8e1717d
[gaim-migrate @ 11769]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10463
diff
changeset
|
439 | } |
|
a5d6b8e1717d
[gaim-migrate @ 11769]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10463
diff
changeset
|
440 | |
|
a5d6b8e1717d
[gaim-migrate @ 11769]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10463
diff
changeset
|
441 | void |
|
a5d6b8e1717d
[gaim-migrate @ 11769]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10463
diff
changeset
|
442 | msn_session_set_login_step(MsnSession *session, MsnLoginStep step) |
|
a5d6b8e1717d
[gaim-migrate @ 11769]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10463
diff
changeset
|
443 | { |
| 15884 | 444 | PurpleConnection *gc; |
|
10481
a5d6b8e1717d
[gaim-migrate @ 11769]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10463
diff
changeset
|
445 | |
|
10519
80801a34a246
[gaim-migrate @ 11833]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
10514
diff
changeset
|
446 | /* Prevent the connection progress going backwards, eg. if we get |
|
80801a34a246
[gaim-migrate @ 11833]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
10514
diff
changeset
|
447 | * transferred several times during login */ |
|
30059
494d4fe51606
Don't bother updating the login progress if the step didn't change
Mark Doliner <markdoliner@pidgin.im>
parents:
27635
diff
changeset
|
448 | if (session->login_step >= step) |
|
10519
80801a34a246
[gaim-migrate @ 11833]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
10514
diff
changeset
|
449 | return; |
|
80801a34a246
[gaim-migrate @ 11833]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
10514
diff
changeset
|
450 | |
|
80801a34a246
[gaim-migrate @ 11833]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
10514
diff
changeset
|
451 | /* If we're already logged in, we're probably here because of a |
|
80801a34a246
[gaim-migrate @ 11833]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
10514
diff
changeset
|
452 | * mid-session XFR from the notification server, so we don't want to |
|
80801a34a246
[gaim-migrate @ 11833]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
10514
diff
changeset
|
453 | * popup the connection progress dialog */ |
|
80801a34a246
[gaim-migrate @ 11833]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
10514
diff
changeset
|
454 | if (session->logged_in) |
|
80801a34a246
[gaim-migrate @ 11833]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
10514
diff
changeset
|
455 | return; |
|
80801a34a246
[gaim-migrate @ 11833]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
10514
diff
changeset
|
456 | |
|
10481
a5d6b8e1717d
[gaim-migrate @ 11769]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10463
diff
changeset
|
457 | gc = session->account->gc; |
|
a5d6b8e1717d
[gaim-migrate @ 11769]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10463
diff
changeset
|
458 | |
|
a5d6b8e1717d
[gaim-migrate @ 11769]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10463
diff
changeset
|
459 | session->login_step = step; |
|
a5d6b8e1717d
[gaim-migrate @ 11769]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10463
diff
changeset
|
460 | |
| 15884 | 461 | purple_connection_update_progress(gc, get_login_step_text(session), step, |
|
10481
a5d6b8e1717d
[gaim-migrate @ 11769]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10463
diff
changeset
|
462 | MSN_LOGIN_STEPS); |
|
a5d6b8e1717d
[gaim-migrate @ 11769]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10463
diff
changeset
|
463 | } |
|
a5d6b8e1717d
[gaim-migrate @ 11769]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10463
diff
changeset
|
464 | |
|
a5d6b8e1717d
[gaim-migrate @ 11769]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10463
diff
changeset
|
465 | void |
|
10044
884c09b189e6
[gaim-migrate @ 11003]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9198
diff
changeset
|
466 | msn_session_finish_login(MsnSession *session) |
|
884c09b189e6
[gaim-migrate @ 11003]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9198
diff
changeset
|
467 | { |
| 15884 | 468 | PurpleAccount *account; |
| 469 | PurpleConnection *gc; | |
|
16538
c7e61e2917c9
Updates for the account buddy icon stuff. This doesn't yet work fully (and maybe not even partly), but it compiles.
Richard Laager <rlaager@pidgin.im>
parents:
15884
diff
changeset
|
470 | PurpleStoredImage *img; |
|
10044
884c09b189e6
[gaim-migrate @ 11003]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9198
diff
changeset
|
471 | |
|
25184
e984d431ddca
Actually that last change did break regular login, but I don't feel like
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
25182
diff
changeset
|
472 | if (!session->logged_in) { |
|
e984d431ddca
Actually that last change did break regular login, but I don't feel like
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
25182
diff
changeset
|
473 | account = session->account; |
|
e984d431ddca
Actually that last change did break regular login, but I don't feel like
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
25182
diff
changeset
|
474 | gc = purple_account_get_connection(account); |
|
10044
884c09b189e6
[gaim-migrate @ 11003]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9198
diff
changeset
|
475 | |
|
25184
e984d431ddca
Actually that last change did break regular login, but I don't feel like
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
25182
diff
changeset
|
476 | img = purple_buddy_icons_find_account_icon(session->account); |
|
e984d431ddca
Actually that last change did break regular login, but I don't feel like
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
25182
diff
changeset
|
477 | /* TODO: Do we really want to call this if img is NULL? */ |
|
e984d431ddca
Actually that last change did break regular login, but I don't feel like
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
25182
diff
changeset
|
478 | msn_user_set_buddy_icon(session->user, img); |
|
e984d431ddca
Actually that last change did break regular login, but I don't feel like
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
25182
diff
changeset
|
479 | if (img != NULL) |
|
e984d431ddca
Actually that last change did break regular login, but I don't feel like
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
25182
diff
changeset
|
480 | purple_imgstore_unref(img); |
|
10044
884c09b189e6
[gaim-migrate @ 11003]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9198
diff
changeset
|
481 | |
|
25184
e984d431ddca
Actually that last change did break regular login, but I don't feel like
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
25182
diff
changeset
|
482 | session->logged_in = TRUE; |
|
e984d431ddca
Actually that last change did break regular login, but I don't feel like
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
25182
diff
changeset
|
483 | purple_connection_set_state(gc, PURPLE_CONNECTED); |
|
10908
15694532c3c6
[gaim-migrate @ 12640]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
10773
diff
changeset
|
484 | |
|
25184
e984d431ddca
Actually that last change did break regular login, but I don't feel like
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
25182
diff
changeset
|
485 | /* Sync users */ |
|
e984d431ddca
Actually that last change did break regular login, but I don't feel like
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
25182
diff
changeset
|
486 | msn_session_sync_users(session); |
|
e984d431ddca
Actually that last change did break regular login, but I don't feel like
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
25182
diff
changeset
|
487 | } |
|
10044
884c09b189e6
[gaim-migrate @ 11003]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9198
diff
changeset
|
488 | |
|
29420
c81c525111db
Initial support for msnp16, based on patch by Masca.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
27635
diff
changeset
|
489 | if (session->protocol_ver >= 16) { |
|
c81c525111db
Initial support for msnp16, based on patch by Masca.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
27635
diff
changeset
|
490 | /* TODO: Send this when updating status instead? */ |
|
c81c525111db
Initial support for msnp16, based on patch by Masca.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
27635
diff
changeset
|
491 | msn_notification_send_uux_endpointdata(session); |
|
29447
ecb00abe953f
Fix typo in PrivateEndpointData, resulting in the name of the endpoint
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
29421
diff
changeset
|
492 | msn_notification_send_uux_private_endpointdata(session); |
|
29420
c81c525111db
Initial support for msnp16, based on patch by Masca.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
27635
diff
changeset
|
493 | } |
|
25184
e984d431ddca
Actually that last change did break regular login, but I don't feel like
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
25182
diff
changeset
|
494 | msn_change_status(session); |
|
10044
884c09b189e6
[gaim-migrate @ 11003]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9198
diff
changeset
|
495 | } |
|
20473
91e1b3a49d10
msn.tgz from SF Patch #1621854 from Ka-Hing Cheung
Ka-Hing Cheung <khc@pidgin.im>
parents:
20472
diff
changeset
|
496 |