Mercurial > pidgin
annotate libpurple/protocols/msn/contact.c @ 28049:867b4cdc01bf
Fix some more incorrect addresses.
author | Paul Aurich <paul@darkrain42.org> |
---|---|
date | Sat, 22 Aug 2009 02:57:41 +0000 |
parents | 975fc5f64438 |
children | 7921a53b94b3 |
rev | line source |
---|---|
20394
4a099e4d0d09
propagate from branch 'im.pidgin.pidgin' (head 98b6b547b29ea1192b73cc4e1de1e674edef4328)
Richard Laager <rlaager@wiktel.com>
parents:
diff
changeset
|
1 /** |
4a099e4d0d09
propagate from branch 'im.pidgin.pidgin' (head 98b6b547b29ea1192b73cc4e1de1e674edef4328)
Richard Laager <rlaager@wiktel.com>
parents:
diff
changeset
|
2 * @file contact.c |
4a099e4d0d09
propagate from branch 'im.pidgin.pidgin' (head 98b6b547b29ea1192b73cc4e1de1e674edef4328)
Richard Laager <rlaager@wiktel.com>
parents:
diff
changeset
|
3 * get MSN contacts via SOAP request |
4a099e4d0d09
propagate from branch 'im.pidgin.pidgin' (head 98b6b547b29ea1192b73cc4e1de1e674edef4328)
Richard Laager <rlaager@wiktel.com>
parents:
diff
changeset
|
4 * created by MaYuan<mayuan2006@gmail.com> |
4a099e4d0d09
propagate from branch 'im.pidgin.pidgin' (head 98b6b547b29ea1192b73cc4e1de1e674edef4328)
Richard Laager <rlaager@wiktel.com>
parents:
diff
changeset
|
5 * |
20401
4ddc27c18781
Fix up some gaim -> purple issues.
Richard Laager <rlaager@wiktel.com>
parents:
20394
diff
changeset
|
6 * purple |
20394
4a099e4d0d09
propagate from branch 'im.pidgin.pidgin' (head 98b6b547b29ea1192b73cc4e1de1e674edef4328)
Richard Laager <rlaager@wiktel.com>
parents:
diff
changeset
|
7 * |
20401
4ddc27c18781
Fix up some gaim -> purple issues.
Richard Laager <rlaager@wiktel.com>
parents:
20394
diff
changeset
|
8 * Purple is the legal property of its developers, whose names are too numerous |
20394
4a099e4d0d09
propagate from branch 'im.pidgin.pidgin' (head 98b6b547b29ea1192b73cc4e1de1e674edef4328)
Richard Laager <rlaager@wiktel.com>
parents:
diff
changeset
|
9 * to list here. Please refer to the COPYRIGHT file distributed with this |
4a099e4d0d09
propagate from branch 'im.pidgin.pidgin' (head 98b6b547b29ea1192b73cc4e1de1e674edef4328)
Richard Laager <rlaager@wiktel.com>
parents:
diff
changeset
|
10 * source distribution. |
4a099e4d0d09
propagate from branch 'im.pidgin.pidgin' (head 98b6b547b29ea1192b73cc4e1de1e674edef4328)
Richard Laager <rlaager@wiktel.com>
parents:
diff
changeset
|
11 * |
4a099e4d0d09
propagate from branch 'im.pidgin.pidgin' (head 98b6b547b29ea1192b73cc4e1de1e674edef4328)
Richard Laager <rlaager@wiktel.com>
parents:
diff
changeset
|
12 * This program is free software; you can redistribute it and/or modify |
4a099e4d0d09
propagate from branch 'im.pidgin.pidgin' (head 98b6b547b29ea1192b73cc4e1de1e674edef4328)
Richard Laager <rlaager@wiktel.com>
parents:
diff
changeset
|
13 * it under the terms of the GNU General Public License as published by |
4a099e4d0d09
propagate from branch 'im.pidgin.pidgin' (head 98b6b547b29ea1192b73cc4e1de1e674edef4328)
Richard Laager <rlaager@wiktel.com>
parents:
diff
changeset
|
14 * the Free Software Foundation; either version 2 of the License, or |
4a099e4d0d09
propagate from branch 'im.pidgin.pidgin' (head 98b6b547b29ea1192b73cc4e1de1e674edef4328)
Richard Laager <rlaager@wiktel.com>
parents:
diff
changeset
|
15 * (at your option) any later version. |
4a099e4d0d09
propagate from branch 'im.pidgin.pidgin' (head 98b6b547b29ea1192b73cc4e1de1e674edef4328)
Richard Laager <rlaager@wiktel.com>
parents:
diff
changeset
|
16 * |
4a099e4d0d09
propagate from branch 'im.pidgin.pidgin' (head 98b6b547b29ea1192b73cc4e1de1e674edef4328)
Richard Laager <rlaager@wiktel.com>
parents:
diff
changeset
|
17 * This program is distributed in the hope that it will be useful, |
4a099e4d0d09
propagate from branch 'im.pidgin.pidgin' (head 98b6b547b29ea1192b73cc4e1de1e674edef4328)
Richard Laager <rlaager@wiktel.com>
parents:
diff
changeset
|
18 * but WITHOUT ANY WARRANTY; without even the implied warranty of |
4a099e4d0d09
propagate from branch 'im.pidgin.pidgin' (head 98b6b547b29ea1192b73cc4e1de1e674edef4328)
Richard Laager <rlaager@wiktel.com>
parents:
diff
changeset
|
19 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
4a099e4d0d09
propagate from branch 'im.pidgin.pidgin' (head 98b6b547b29ea1192b73cc4e1de1e674edef4328)
Richard Laager <rlaager@wiktel.com>
parents:
diff
changeset
|
20 * GNU General Public License for more details. |
4a099e4d0d09
propagate from branch 'im.pidgin.pidgin' (head 98b6b547b29ea1192b73cc4e1de1e674edef4328)
Richard Laager <rlaager@wiktel.com>
parents:
diff
changeset
|
21 * |
4a099e4d0d09
propagate from branch 'im.pidgin.pidgin' (head 98b6b547b29ea1192b73cc4e1de1e674edef4328)
Richard Laager <rlaager@wiktel.com>
parents:
diff
changeset
|
22 * You should have received a copy of the GNU General Public License |
4a099e4d0d09
propagate from branch 'im.pidgin.pidgin' (head 98b6b547b29ea1192b73cc4e1de1e674edef4328)
Richard Laager <rlaager@wiktel.com>
parents:
diff
changeset
|
23 * along with this program; if not, write to the Free Software |
28049
867b4cdc01bf
Fix some more incorrect addresses.
Paul Aurich <paul@darkrain42.org>
parents:
27845
diff
changeset
|
24 * Foundation, Inc., 51 Franklin Street, Fifth Floor Boston, MA 02110-1301, USA |
20394
4a099e4d0d09
propagate from branch 'im.pidgin.pidgin' (head 98b6b547b29ea1192b73cc4e1de1e674edef4328)
Richard Laager <rlaager@wiktel.com>
parents:
diff
changeset
|
25 */ |
4a099e4d0d09
propagate from branch 'im.pidgin.pidgin' (head 98b6b547b29ea1192b73cc4e1de1e674edef4328)
Richard Laager <rlaager@wiktel.com>
parents:
diff
changeset
|
26 |
4a099e4d0d09
propagate from branch 'im.pidgin.pidgin' (head 98b6b547b29ea1192b73cc4e1de1e674edef4328)
Richard Laager <rlaager@wiktel.com>
parents:
diff
changeset
|
27 #include "msn.h" |
4a099e4d0d09
propagate from branch 'im.pidgin.pidgin' (head 98b6b547b29ea1192b73cc4e1de1e674edef4328)
Richard Laager <rlaager@wiktel.com>
parents:
diff
changeset
|
28 #include "contact.h" |
4a099e4d0d09
propagate from branch 'im.pidgin.pidgin' (head 98b6b547b29ea1192b73cc4e1de1e674edef4328)
Richard Laager <rlaager@wiktel.com>
parents:
diff
changeset
|
29 #include "xmlnode.h" |
4a099e4d0d09
propagate from branch 'im.pidgin.pidgin' (head 98b6b547b29ea1192b73cc4e1de1e674edef4328)
Richard Laager <rlaager@wiktel.com>
parents:
diff
changeset
|
30 #include "group.h" |
23507
711773577380
Clean up some MSN SOAP stuff.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23478
diff
changeset
|
31 #include "soap.h" |
23445
b70f30dd4753
Patch 3 from Qulogic, this one updates contact list actions to use ticket
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
21833
diff
changeset
|
32 #include "nexus.h" |
20394
4a099e4d0d09
propagate from branch 'im.pidgin.pidgin' (head 98b6b547b29ea1192b73cc4e1de1e674edef4328)
Richard Laager <rlaager@wiktel.com>
parents:
diff
changeset
|
33 |
20484
98613886411a
Handle special cases in buddy/group management (wrt MSN_INDIVIDUALS_GROUP and MSN_NON_IM_GROUP).
Carlos Silva <typ0@pidgin.im>
parents:
20481
diff
changeset
|
34 const char *MsnSoapPartnerScenarioText[] = |
20481
eb93710aec4d
Make buddy and group management actually work, add some SOAP templates, redesign some parts of code and separate some bigger functions into its smaller tasks which are completely unrelated to each other
Carlos Silva <typ0@pidgin.im>
parents:
20479
diff
changeset
|
35 { |
20666
0e1bc5c51030
A few leak plugs, some unnecessary allocation prevention, null pointer deref fixes and general robustness fixes. I'm sure there is more to do here, I got tired... Fixes #3308
Daniel Atallah <daniel.atallah@gmail.com>
parents:
20539
diff
changeset
|
36 "Initial", |
0e1bc5c51030
A few leak plugs, some unnecessary allocation prevention, null pointer deref fixes and general robustness fixes. I'm sure there is more to do here, I got tired... Fixes #3308
Daniel Atallah <daniel.atallah@gmail.com>
parents:
20539
diff
changeset
|
37 "ContactSave", |
20486
ff4ae9dde291
Make block/unblock work right, as well as being add by a buddy. Finally fixes #723
Carlos Silva <typ0@pidgin.im>
parents:
20484
diff
changeset
|
38 "MessengerPendingList", |
ff4ae9dde291
Make block/unblock work right, as well as being add by a buddy. Finally fixes #723
Carlos Silva <typ0@pidgin.im>
parents:
20484
diff
changeset
|
39 "ContactMsgrAPI", |
ff4ae9dde291
Make block/unblock work right, as well as being add by a buddy. Finally fixes #723
Carlos Silva <typ0@pidgin.im>
parents:
20484
diff
changeset
|
40 "BlockUnblock" |
20481
eb93710aec4d
Make buddy and group management actually work, add some SOAP templates, redesign some parts of code and separate some bigger functions into its smaller tasks which are completely unrelated to each other
Carlos Silva <typ0@pidgin.im>
parents:
20479
diff
changeset
|
41 }; |
eb93710aec4d
Make buddy and group management actually work, add some SOAP templates, redesign some parts of code and separate some bigger functions into its smaller tasks which are completely unrelated to each other
Carlos Silva <typ0@pidgin.im>
parents:
20479
diff
changeset
|
42 |
20486
ff4ae9dde291
Make block/unblock work right, as well as being add by a buddy. Finally fixes #723
Carlos Silva <typ0@pidgin.im>
parents:
20484
diff
changeset
|
43 const char *MsnMemberRole[] = |
ff4ae9dde291
Make block/unblock work right, as well as being add by a buddy. Finally fixes #723
Carlos Silva <typ0@pidgin.im>
parents:
20484
diff
changeset
|
44 { |
ff4ae9dde291
Make block/unblock work right, as well as being add by a buddy. Finally fixes #723
Carlos Silva <typ0@pidgin.im>
parents:
20484
diff
changeset
|
45 "Forward", |
ff4ae9dde291
Make block/unblock work right, as well as being add by a buddy. Finally fixes #723
Carlos Silva <typ0@pidgin.im>
parents:
20484
diff
changeset
|
46 "Allow", |
ff4ae9dde291
Make block/unblock work right, as well as being add by a buddy. Finally fixes #723
Carlos Silva <typ0@pidgin.im>
parents:
20484
diff
changeset
|
47 "Block", |
ff4ae9dde291
Make block/unblock work right, as well as being add by a buddy. Finally fixes #723
Carlos Silva <typ0@pidgin.im>
parents:
20484
diff
changeset
|
48 "Reverse", |
ff4ae9dde291
Make block/unblock work right, as well as being add by a buddy. Finally fixes #723
Carlos Silva <typ0@pidgin.im>
parents:
20484
diff
changeset
|
49 "Pending" |
ff4ae9dde291
Make block/unblock work right, as well as being add by a buddy. Finally fixes #723
Carlos Silva <typ0@pidgin.im>
parents:
20484
diff
changeset
|
50 }; |
20481
eb93710aec4d
Make buddy and group management actually work, add some SOAP templates, redesign some parts of code and separate some bigger functions into its smaller tasks which are completely unrelated to each other
Carlos Silva <typ0@pidgin.im>
parents:
20479
diff
changeset
|
51 |
20538
90fd0826c6ce
finish converting the rest of stuff to the new soap api, signing on, getting
Ka-Hing Cheung <khc@hxbc.us>
parents:
20501
diff
changeset
|
52 typedef struct { |
23459
69af5301e1a7
killing MsnContact which just wraps MsnSession
Ka-Hing Cheung <khc@hxbc.us>
parents:
23453
diff
changeset
|
53 MsnSession *session; |
20538
90fd0826c6ce
finish converting the rest of stuff to the new soap api, signing on, getting
Ka-Hing Cheung <khc@hxbc.us>
parents:
20501
diff
changeset
|
54 MsnSoapPartnerScenario which; |
90fd0826c6ce
finish converting the rest of stuff to the new soap api, signing on, getting
Ka-Hing Cheung <khc@hxbc.us>
parents:
20501
diff
changeset
|
55 } GetContactListCbData; |
90fd0826c6ce
finish converting the rest of stuff to the new soap api, signing on, getting
Ka-Hing Cheung <khc@hxbc.us>
parents:
20501
diff
changeset
|
56 |
20481
eb93710aec4d
Make buddy and group management actually work, add some SOAP templates, redesign some parts of code and separate some bigger functions into its smaller tasks which are completely unrelated to each other
Carlos Silva <typ0@pidgin.im>
parents:
20479
diff
changeset
|
57 MsnCallbackState * |
20538
90fd0826c6ce
finish converting the rest of stuff to the new soap api, signing on, getting
Ka-Hing Cheung <khc@hxbc.us>
parents:
20501
diff
changeset
|
58 msn_callback_state_new(MsnSession *session) |
20481
eb93710aec4d
Make buddy and group management actually work, add some SOAP templates, redesign some parts of code and separate some bigger functions into its smaller tasks which are completely unrelated to each other
Carlos Silva <typ0@pidgin.im>
parents:
20479
diff
changeset
|
59 { |
20538
90fd0826c6ce
finish converting the rest of stuff to the new soap api, signing on, getting
Ka-Hing Cheung <khc@hxbc.us>
parents:
20501
diff
changeset
|
60 MsnCallbackState *state = g_new0(MsnCallbackState, 1); |
90fd0826c6ce
finish converting the rest of stuff to the new soap api, signing on, getting
Ka-Hing Cheung <khc@hxbc.us>
parents:
20501
diff
changeset
|
61 |
90fd0826c6ce
finish converting the rest of stuff to the new soap api, signing on, getting
Ka-Hing Cheung <khc@hxbc.us>
parents:
20501
diff
changeset
|
62 state->session = session; |
90fd0826c6ce
finish converting the rest of stuff to the new soap api, signing on, getting
Ka-Hing Cheung <khc@hxbc.us>
parents:
20501
diff
changeset
|
63 |
90fd0826c6ce
finish converting the rest of stuff to the new soap api, signing on, getting
Ka-Hing Cheung <khc@hxbc.us>
parents:
20501
diff
changeset
|
64 return state; |
23298
5cdd93dac7a2
Delete trailing whitespace
Mark Doliner <mark@kingant.net>
parents:
22832
diff
changeset
|
65 } |
20481
eb93710aec4d
Make buddy and group management actually work, add some SOAP templates, redesign some parts of code and separate some bigger functions into its smaller tasks which are completely unrelated to each other
Carlos Silva <typ0@pidgin.im>
parents:
20479
diff
changeset
|
66 |
23470
eb8bd060b987
Update MSN Contact tokens when an invalid token error is returned.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
67 MsnCallbackState * |
eb8bd060b987
Update MSN Contact tokens when an invalid token error is returned.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
68 msn_callback_state_dup(MsnCallbackState *state) |
eb8bd060b987
Update MSN Contact tokens when an invalid token error is returned.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
69 { |
eb8bd060b987
Update MSN Contact tokens when an invalid token error is returned.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
70 MsnCallbackState *new_state = g_new0(MsnCallbackState, 1); |
eb8bd060b987
Update MSN Contact tokens when an invalid token error is returned.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
71 |
eb8bd060b987
Update MSN Contact tokens when an invalid token error is returned.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
72 new_state->session = state->session; |
eb8bd060b987
Update MSN Contact tokens when an invalid token error is returned.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
73 new_state->who = g_strdup(state->who); |
eb8bd060b987
Update MSN Contact tokens when an invalid token error is returned.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
74 new_state->uid = g_strdup(state->uid); |
eb8bd060b987
Update MSN Contact tokens when an invalid token error is returned.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
75 new_state->old_group_name = g_strdup(state->old_group_name); |
eb8bd060b987
Update MSN Contact tokens when an invalid token error is returned.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
76 new_state->new_group_name = g_strdup(state->new_group_name); |
eb8bd060b987
Update MSN Contact tokens when an invalid token error is returned.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
77 new_state->guid = g_strdup(state->guid); |
eb8bd060b987
Update MSN Contact tokens when an invalid token error is returned.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
78 /* The rest should be made new */ |
eb8bd060b987
Update MSN Contact tokens when an invalid token error is returned.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
79 |
eb8bd060b987
Update MSN Contact tokens when an invalid token error is returned.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
80 return new_state; |
23507
711773577380
Clean up some MSN SOAP stuff.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23478
diff
changeset
|
81 } |
20481
eb93710aec4d
Make buddy and group management actually work, add some SOAP templates, redesign some parts of code and separate some bigger functions into its smaller tasks which are completely unrelated to each other
Carlos Silva <typ0@pidgin.im>
parents:
20479
diff
changeset
|
82 |
eb93710aec4d
Make buddy and group management actually work, add some SOAP templates, redesign some parts of code and separate some bigger functions into its smaller tasks which are completely unrelated to each other
Carlos Silva <typ0@pidgin.im>
parents:
20479
diff
changeset
|
83 void |
eb93710aec4d
Make buddy and group management actually work, add some SOAP templates, redesign some parts of code and separate some bigger functions into its smaller tasks which are completely unrelated to each other
Carlos Silva <typ0@pidgin.im>
parents:
20479
diff
changeset
|
84 msn_callback_state_free(MsnCallbackState *state) |
eb93710aec4d
Make buddy and group management actually work, add some SOAP templates, redesign some parts of code and separate some bigger functions into its smaller tasks which are completely unrelated to each other
Carlos Silva <typ0@pidgin.im>
parents:
20479
diff
changeset
|
85 { |
20501
f6dff814d95f
cleans up ownership of soap callback data, this soap stuff is perfect
Ka-Hing Cheung <khc@hxbc.us>
parents:
20495
diff
changeset
|
86 if (state == NULL) |
f6dff814d95f
cleans up ownership of soap callback data, this soap stuff is perfect
Ka-Hing Cheung <khc@hxbc.us>
parents:
20495
diff
changeset
|
87 return; |
20539
2c8c6d77f12c
Make use of the GQueue in MsnSoapConn to manage the SOAP requests, allowing them to work perfectly even when dispatching multiple requests at once.
Carlos Silva <typ0@pidgin.im>
parents:
20501
diff
changeset
|
88 |
20666
0e1bc5c51030
A few leak plugs, some unnecessary allocation prevention, null pointer deref fixes and general robustness fixes. I'm sure there is more to do here, I got tired... Fixes #3308
Daniel Atallah <daniel.atallah@gmail.com>
parents:
20539
diff
changeset
|
89 g_free(state->who); |
0e1bc5c51030
A few leak plugs, some unnecessary allocation prevention, null pointer deref fixes and general robustness fixes. I'm sure there is more to do here, I got tired... Fixes #3308
Daniel Atallah <daniel.atallah@gmail.com>
parents:
20539
diff
changeset
|
90 g_free(state->uid); |
0e1bc5c51030
A few leak plugs, some unnecessary allocation prevention, null pointer deref fixes and general robustness fixes. I'm sure there is more to do here, I got tired... Fixes #3308
Daniel Atallah <daniel.atallah@gmail.com>
parents:
20539
diff
changeset
|
91 g_free(state->old_group_name); |
0e1bc5c51030
A few leak plugs, some unnecessary allocation prevention, null pointer deref fixes and general robustness fixes. I'm sure there is more to do here, I got tired... Fixes #3308
Daniel Atallah <daniel.atallah@gmail.com>
parents:
20539
diff
changeset
|
92 g_free(state->new_group_name); |
0e1bc5c51030
A few leak plugs, some unnecessary allocation prevention, null pointer deref fixes and general robustness fixes. I'm sure there is more to do here, I got tired... Fixes #3308
Daniel Atallah <daniel.atallah@gmail.com>
parents:
20539
diff
changeset
|
93 g_free(state->guid); |
23470
eb8bd060b987
Update MSN Contact tokens when an invalid token error is returned.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
94 xmlnode_free(state->body); |
20539
2c8c6d77f12c
Make use of the GQueue in MsnSoapConn to manage the SOAP requests, allowing them to work perfectly even when dispatching multiple requests at once.
Carlos Silva <typ0@pidgin.im>
parents:
20501
diff
changeset
|
95 |
20481
eb93710aec4d
Make buddy and group management actually work, add some SOAP templates, redesign some parts of code and separate some bigger functions into its smaller tasks which are completely unrelated to each other
Carlos Silva <typ0@pidgin.im>
parents:
20479
diff
changeset
|
96 g_free(state); |
eb93710aec4d
Make buddy and group management actually work, add some SOAP templates, redesign some parts of code and separate some bigger functions into its smaller tasks which are completely unrelated to each other
Carlos Silva <typ0@pidgin.im>
parents:
20479
diff
changeset
|
97 } |
20666
0e1bc5c51030
A few leak plugs, some unnecessary allocation prevention, null pointer deref fixes and general robustness fixes. I'm sure there is more to do here, I got tired... Fixes #3308
Daniel Atallah <daniel.atallah@gmail.com>
parents:
20539
diff
changeset
|
98 |
20481
eb93710aec4d
Make buddy and group management actually work, add some SOAP templates, redesign some parts of code and separate some bigger functions into its smaller tasks which are completely unrelated to each other
Carlos Silva <typ0@pidgin.im>
parents:
20479
diff
changeset
|
99 void |
eb93710aec4d
Make buddy and group management actually work, add some SOAP templates, redesign some parts of code and separate some bigger functions into its smaller tasks which are completely unrelated to each other
Carlos Silva <typ0@pidgin.im>
parents:
20479
diff
changeset
|
100 msn_callback_state_set_who(MsnCallbackState *state, const gchar *who) |
eb93710aec4d
Make buddy and group management actually work, add some SOAP templates, redesign some parts of code and separate some bigger functions into its smaller tasks which are completely unrelated to each other
Carlos Silva <typ0@pidgin.im>
parents:
20479
diff
changeset
|
101 { |
eb93710aec4d
Make buddy and group management actually work, add some SOAP templates, redesign some parts of code and separate some bigger functions into its smaller tasks which are completely unrelated to each other
Carlos Silva <typ0@pidgin.im>
parents:
20479
diff
changeset
|
102 g_return_if_fail(state != NULL); |
20489
321d25932f5e
Fix a bug where we were g_strdup'ing a previously freed pointer. Thanks to khc for the debugging.
Carlos Silva <typ0@pidgin.im>
parents:
20486
diff
changeset
|
103 |
20666
0e1bc5c51030
A few leak plugs, some unnecessary allocation prevention, null pointer deref fixes and general robustness fixes. I'm sure there is more to do here, I got tired... Fixes #3308
Daniel Atallah <daniel.atallah@gmail.com>
parents:
20539
diff
changeset
|
104 g_free(state->who); |
20991
c8f99cb61dc9
Cleanup some unnecessary NULL checks in g_strdup()/g_free().
Daniel Atallah <daniel.atallah@gmail.com>
parents:
20855
diff
changeset
|
105 state->who = g_strdup(who); |
20481
eb93710aec4d
Make buddy and group management actually work, add some SOAP templates, redesign some parts of code and separate some bigger functions into its smaller tasks which are completely unrelated to each other
Carlos Silva <typ0@pidgin.im>
parents:
20479
diff
changeset
|
106 } |
eb93710aec4d
Make buddy and group management actually work, add some SOAP templates, redesign some parts of code and separate some bigger functions into its smaller tasks which are completely unrelated to each other
Carlos Silva <typ0@pidgin.im>
parents:
20479
diff
changeset
|
107 |
eb93710aec4d
Make buddy and group management actually work, add some SOAP templates, redesign some parts of code and separate some bigger functions into its smaller tasks which are completely unrelated to each other
Carlos Silva <typ0@pidgin.im>
parents:
20479
diff
changeset
|
108 void |
20539
2c8c6d77f12c
Make use of the GQueue in MsnSoapConn to manage the SOAP requests, allowing them to work perfectly even when dispatching multiple requests at once.
Carlos Silva <typ0@pidgin.im>
parents:
20501
diff
changeset
|
109 msn_callback_state_set_uid(MsnCallbackState *state, const gchar *uid) |
2c8c6d77f12c
Make use of the GQueue in MsnSoapConn to manage the SOAP requests, allowing them to work perfectly even when dispatching multiple requests at once.
Carlos Silva <typ0@pidgin.im>
parents:
20501
diff
changeset
|
110 { |
20666
0e1bc5c51030
A few leak plugs, some unnecessary allocation prevention, null pointer deref fixes and general robustness fixes. I'm sure there is more to do here, I got tired... Fixes #3308
Daniel Atallah <daniel.atallah@gmail.com>
parents:
20539
diff
changeset
|
111 g_return_if_fail(state != NULL); |
20539
2c8c6d77f12c
Make use of the GQueue in MsnSoapConn to manage the SOAP requests, allowing them to work perfectly even when dispatching multiple requests at once.
Carlos Silva <typ0@pidgin.im>
parents:
20501
diff
changeset
|
112 |
20666
0e1bc5c51030
A few leak plugs, some unnecessary allocation prevention, null pointer deref fixes and general robustness fixes. I'm sure there is more to do here, I got tired... Fixes #3308
Daniel Atallah <daniel.atallah@gmail.com>
parents:
20539
diff
changeset
|
113 g_free(state->uid); |
20991
c8f99cb61dc9
Cleanup some unnecessary NULL checks in g_strdup()/g_free().
Daniel Atallah <daniel.atallah@gmail.com>
parents:
20855
diff
changeset
|
114 state->uid = g_strdup(uid); |
20539
2c8c6d77f12c
Make use of the GQueue in MsnSoapConn to manage the SOAP requests, allowing them to work perfectly even when dispatching multiple requests at once.
Carlos Silva <typ0@pidgin.im>
parents:
20501
diff
changeset
|
115 } |
2c8c6d77f12c
Make use of the GQueue in MsnSoapConn to manage the SOAP requests, allowing them to work perfectly even when dispatching multiple requests at once.
Carlos Silva <typ0@pidgin.im>
parents:
20501
diff
changeset
|
116 |
2c8c6d77f12c
Make use of the GQueue in MsnSoapConn to manage the SOAP requests, allowing them to work perfectly even when dispatching multiple requests at once.
Carlos Silva <typ0@pidgin.im>
parents:
20501
diff
changeset
|
117 void |
20481
eb93710aec4d
Make buddy and group management actually work, add some SOAP templates, redesign some parts of code and separate some bigger functions into its smaller tasks which are completely unrelated to each other
Carlos Silva <typ0@pidgin.im>
parents:
20479
diff
changeset
|
118 msn_callback_state_set_old_group_name(MsnCallbackState *state, const gchar *old_group_name) |
eb93710aec4d
Make buddy and group management actually work, add some SOAP templates, redesign some parts of code and separate some bigger functions into its smaller tasks which are completely unrelated to each other
Carlos Silva <typ0@pidgin.im>
parents:
20479
diff
changeset
|
119 { |
eb93710aec4d
Make buddy and group management actually work, add some SOAP templates, redesign some parts of code and separate some bigger functions into its smaller tasks which are completely unrelated to each other
Carlos Silva <typ0@pidgin.im>
parents:
20479
diff
changeset
|
120 g_return_if_fail(state != NULL); |
20489
321d25932f5e
Fix a bug where we were g_strdup'ing a previously freed pointer. Thanks to khc for the debugging.
Carlos Silva <typ0@pidgin.im>
parents:
20486
diff
changeset
|
121 |
20666
0e1bc5c51030
A few leak plugs, some unnecessary allocation prevention, null pointer deref fixes and general robustness fixes. I'm sure there is more to do here, I got tired... Fixes #3308
Daniel Atallah <daniel.atallah@gmail.com>
parents:
20539
diff
changeset
|
122 g_free(state->old_group_name); |
20991
c8f99cb61dc9
Cleanup some unnecessary NULL checks in g_strdup()/g_free().
Daniel Atallah <daniel.atallah@gmail.com>
parents:
20855
diff
changeset
|
123 state->old_group_name = g_strdup(old_group_name); |
20481
eb93710aec4d
Make buddy and group management actually work, add some SOAP templates, redesign some parts of code and separate some bigger functions into its smaller tasks which are completely unrelated to each other
Carlos Silva <typ0@pidgin.im>
parents:
20479
diff
changeset
|
124 } |
eb93710aec4d
Make buddy and group management actually work, add some SOAP templates, redesign some parts of code and separate some bigger functions into its smaller tasks which are completely unrelated to each other
Carlos Silva <typ0@pidgin.im>
parents:
20479
diff
changeset
|
125 |
eb93710aec4d
Make buddy and group management actually work, add some SOAP templates, redesign some parts of code and separate some bigger functions into its smaller tasks which are completely unrelated to each other
Carlos Silva <typ0@pidgin.im>
parents:
20479
diff
changeset
|
126 void |
eb93710aec4d
Make buddy and group management actually work, add some SOAP templates, redesign some parts of code and separate some bigger functions into its smaller tasks which are completely unrelated to each other
Carlos Silva <typ0@pidgin.im>
parents:
20479
diff
changeset
|
127 msn_callback_state_set_new_group_name(MsnCallbackState *state, const gchar *new_group_name) |
eb93710aec4d
Make buddy and group management actually work, add some SOAP templates, redesign some parts of code and separate some bigger functions into its smaller tasks which are completely unrelated to each other
Carlos Silva <typ0@pidgin.im>
parents:
20479
diff
changeset
|
128 { |
eb93710aec4d
Make buddy and group management actually work, add some SOAP templates, redesign some parts of code and separate some bigger functions into its smaller tasks which are completely unrelated to each other
Carlos Silva <typ0@pidgin.im>
parents:
20479
diff
changeset
|
129 g_return_if_fail(state != NULL); |
20489
321d25932f5e
Fix a bug where we were g_strdup'ing a previously freed pointer. Thanks to khc for the debugging.
Carlos Silva <typ0@pidgin.im>
parents:
20486
diff
changeset
|
130 |
20666
0e1bc5c51030
A few leak plugs, some unnecessary allocation prevention, null pointer deref fixes and general robustness fixes. I'm sure there is more to do here, I got tired... Fixes #3308
Daniel Atallah <daniel.atallah@gmail.com>
parents:
20539
diff
changeset
|
131 g_free(state->new_group_name); |
20991
c8f99cb61dc9
Cleanup some unnecessary NULL checks in g_strdup()/g_free().
Daniel Atallah <daniel.atallah@gmail.com>
parents:
20855
diff
changeset
|
132 state->new_group_name = g_strdup(new_group_name); |
20481
eb93710aec4d
Make buddy and group management actually work, add some SOAP templates, redesign some parts of code and separate some bigger functions into its smaller tasks which are completely unrelated to each other
Carlos Silva <typ0@pidgin.im>
parents:
20479
diff
changeset
|
133 } |
eb93710aec4d
Make buddy and group management actually work, add some SOAP templates, redesign some parts of code and separate some bigger functions into its smaller tasks which are completely unrelated to each other
Carlos Silva <typ0@pidgin.im>
parents:
20479
diff
changeset
|
134 |
eb93710aec4d
Make buddy and group management actually work, add some SOAP templates, redesign some parts of code and separate some bigger functions into its smaller tasks which are completely unrelated to each other
Carlos Silva <typ0@pidgin.im>
parents:
20479
diff
changeset
|
135 void |
eb93710aec4d
Make buddy and group management actually work, add some SOAP templates, redesign some parts of code and separate some bigger functions into its smaller tasks which are completely unrelated to each other
Carlos Silva <typ0@pidgin.im>
parents:
20479
diff
changeset
|
136 msn_callback_state_set_guid(MsnCallbackState *state, const gchar *guid) |
eb93710aec4d
Make buddy and group management actually work, add some SOAP templates, redesign some parts of code and separate some bigger functions into its smaller tasks which are completely unrelated to each other
Carlos Silva <typ0@pidgin.im>
parents:
20479
diff
changeset
|
137 { |
eb93710aec4d
Make buddy and group management actually work, add some SOAP templates, redesign some parts of code and separate some bigger functions into its smaller tasks which are completely unrelated to each other
Carlos Silva <typ0@pidgin.im>
parents:
20479
diff
changeset
|
138 g_return_if_fail(state != NULL); |
20489
321d25932f5e
Fix a bug where we were g_strdup'ing a previously freed pointer. Thanks to khc for the debugging.
Carlos Silva <typ0@pidgin.im>
parents:
20486
diff
changeset
|
139 |
20666
0e1bc5c51030
A few leak plugs, some unnecessary allocation prevention, null pointer deref fixes and general robustness fixes. I'm sure there is more to do here, I got tired... Fixes #3308
Daniel Atallah <daniel.atallah@gmail.com>
parents:
20539
diff
changeset
|
140 g_free(state->guid); |
20991
c8f99cb61dc9
Cleanup some unnecessary NULL checks in g_strdup()/g_free().
Daniel Atallah <daniel.atallah@gmail.com>
parents:
20855
diff
changeset
|
141 state->guid = g_strdup(guid); |
20481
eb93710aec4d
Make buddy and group management actually work, add some SOAP templates, redesign some parts of code and separate some bigger functions into its smaller tasks which are completely unrelated to each other
Carlos Silva <typ0@pidgin.im>
parents:
20479
diff
changeset
|
142 } |
eb93710aec4d
Make buddy and group management actually work, add some SOAP templates, redesign some parts of code and separate some bigger functions into its smaller tasks which are completely unrelated to each other
Carlos Silva <typ0@pidgin.im>
parents:
20479
diff
changeset
|
143 |
eb93710aec4d
Make buddy and group management actually work, add some SOAP templates, redesign some parts of code and separate some bigger functions into its smaller tasks which are completely unrelated to each other
Carlos Silva <typ0@pidgin.im>
parents:
20479
diff
changeset
|
144 |
eb93710aec4d
Make buddy and group management actually work, add some SOAP templates, redesign some parts of code and separate some bigger functions into its smaller tasks which are completely unrelated to each other
Carlos Silva <typ0@pidgin.im>
parents:
20479
diff
changeset
|
145 void |
eb93710aec4d
Make buddy and group management actually work, add some SOAP templates, redesign some parts of code and separate some bigger functions into its smaller tasks which are completely unrelated to each other
Carlos Silva <typ0@pidgin.im>
parents:
20479
diff
changeset
|
146 msn_callback_state_set_list_id(MsnCallbackState *state, MsnListId list_id) |
eb93710aec4d
Make buddy and group management actually work, add some SOAP templates, redesign some parts of code and separate some bigger functions into its smaller tasks which are completely unrelated to each other
Carlos Silva <typ0@pidgin.im>
parents:
20479
diff
changeset
|
147 { |
eb93710aec4d
Make buddy and group management actually work, add some SOAP templates, redesign some parts of code and separate some bigger functions into its smaller tasks which are completely unrelated to each other
Carlos Silva <typ0@pidgin.im>
parents:
20479
diff
changeset
|
148 g_return_if_fail(state != NULL); |
20666
0e1bc5c51030
A few leak plugs, some unnecessary allocation prevention, null pointer deref fixes and general robustness fixes. I'm sure there is more to do here, I got tired... Fixes #3308
Daniel Atallah <daniel.atallah@gmail.com>
parents:
20539
diff
changeset
|
149 |
20481
eb93710aec4d
Make buddy and group management actually work, add some SOAP templates, redesign some parts of code and separate some bigger functions into its smaller tasks which are completely unrelated to each other
Carlos Silva <typ0@pidgin.im>
parents:
20479
diff
changeset
|
150 state->list_id = list_id; |
eb93710aec4d
Make buddy and group management actually work, add some SOAP templates, redesign some parts of code and separate some bigger functions into its smaller tasks which are completely unrelated to each other
Carlos Silva <typ0@pidgin.im>
parents:
20479
diff
changeset
|
151 } |
eb93710aec4d
Make buddy and group management actually work, add some SOAP templates, redesign some parts of code and separate some bigger functions into its smaller tasks which are completely unrelated to each other
Carlos Silva <typ0@pidgin.im>
parents:
20479
diff
changeset
|
152 |
eb93710aec4d
Make buddy and group management actually work, add some SOAP templates, redesign some parts of code and separate some bigger functions into its smaller tasks which are completely unrelated to each other
Carlos Silva <typ0@pidgin.im>
parents:
20479
diff
changeset
|
153 void |
eb93710aec4d
Make buddy and group management actually work, add some SOAP templates, redesign some parts of code and separate some bigger functions into its smaller tasks which are completely unrelated to each other
Carlos Silva <typ0@pidgin.im>
parents:
20479
diff
changeset
|
154 msn_callback_state_set_action(MsnCallbackState *state, MsnCallbackAction action) |
eb93710aec4d
Make buddy and group management actually work, add some SOAP templates, redesign some parts of code and separate some bigger functions into its smaller tasks which are completely unrelated to each other
Carlos Silva <typ0@pidgin.im>
parents:
20479
diff
changeset
|
155 { |
eb93710aec4d
Make buddy and group management actually work, add some SOAP templates, redesign some parts of code and separate some bigger functions into its smaller tasks which are completely unrelated to each other
Carlos Silva <typ0@pidgin.im>
parents:
20479
diff
changeset
|
156 g_return_if_fail(state != NULL); |
20666
0e1bc5c51030
A few leak plugs, some unnecessary allocation prevention, null pointer deref fixes and general robustness fixes. I'm sure there is more to do here, I got tired... Fixes #3308
Daniel Atallah <daniel.atallah@gmail.com>
parents:
20539
diff
changeset
|
157 |
20481
eb93710aec4d
Make buddy and group management actually work, add some SOAP templates, redesign some parts of code and separate some bigger functions into its smaller tasks which are completely unrelated to each other
Carlos Silva <typ0@pidgin.im>
parents:
20479
diff
changeset
|
158 state->action |= action; |
eb93710aec4d
Make buddy and group management actually work, add some SOAP templates, redesign some parts of code and separate some bigger functions into its smaller tasks which are completely unrelated to each other
Carlos Silva <typ0@pidgin.im>
parents:
20479
diff
changeset
|
159 } |
20394
4a099e4d0d09
propagate from branch 'im.pidgin.pidgin' (head 98b6b547b29ea1192b73cc4e1de1e674edef4328)
Richard Laager <rlaager@wiktel.com>
parents:
diff
changeset
|
160 |
25396
06a802d32d71
I incorrectly assumed that the FindMembership and ABFindAll SOAP requests
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
25395
diff
changeset
|
161 /*************************************************************** |
06a802d32d71
I incorrectly assumed that the FindMembership and ABFindAll SOAP requests
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
25395
diff
changeset
|
162 * General SOAP handling |
06a802d32d71
I incorrectly assumed that the FindMembership and ABFindAll SOAP requests
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
25395
diff
changeset
|
163 ***************************************************************/ |
06a802d32d71
I incorrectly assumed that the FindMembership and ABFindAll SOAP requests
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
25395
diff
changeset
|
164 |
06a802d32d71
I incorrectly assumed that the FindMembership and ABFindAll SOAP requests
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
25395
diff
changeset
|
165 static const char * |
06a802d32d71
I incorrectly assumed that the FindMembership and ABFindAll SOAP requests
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
25395
diff
changeset
|
166 msn_contact_operation_str(MsnCallbackAction action) |
06a802d32d71
I incorrectly assumed that the FindMembership and ABFindAll SOAP requests
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
25395
diff
changeset
|
167 { |
06a802d32d71
I incorrectly assumed that the FindMembership and ABFindAll SOAP requests
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
25395
diff
changeset
|
168 /* Make sure this is large enough when adding more */ |
06a802d32d71
I incorrectly assumed that the FindMembership and ABFindAll SOAP requests
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
25395
diff
changeset
|
169 static char buf[BUF_LEN]; |
06a802d32d71
I incorrectly assumed that the FindMembership and ABFindAll SOAP requests
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
25395
diff
changeset
|
170 buf[0] = '\0'; |
06a802d32d71
I incorrectly assumed that the FindMembership and ABFindAll SOAP requests
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
25395
diff
changeset
|
171 |
06a802d32d71
I incorrectly assumed that the FindMembership and ABFindAll SOAP requests
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
25395
diff
changeset
|
172 if (action & MSN_ADD_BUDDY) |
06a802d32d71
I incorrectly assumed that the FindMembership and ABFindAll SOAP requests
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
25395
diff
changeset
|
173 strcat(buf, "Adding Buddy,"); |
06a802d32d71
I incorrectly assumed that the FindMembership and ABFindAll SOAP requests
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
25395
diff
changeset
|
174 if (action & MSN_MOVE_BUDDY) |
06a802d32d71
I incorrectly assumed that the FindMembership and ABFindAll SOAP requests
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
25395
diff
changeset
|
175 strcat(buf, "Moving Buddy,"); |
06a802d32d71
I incorrectly assumed that the FindMembership and ABFindAll SOAP requests
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
25395
diff
changeset
|
176 if (action & MSN_ACCEPTED_BUDDY) |
06a802d32d71
I incorrectly assumed that the FindMembership and ABFindAll SOAP requests
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
25395
diff
changeset
|
177 strcat(buf, "Accepted Buddy,"); |
06a802d32d71
I incorrectly assumed that the FindMembership and ABFindAll SOAP requests
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
25395
diff
changeset
|
178 if (action & MSN_DENIED_BUDDY) |
06a802d32d71
I incorrectly assumed that the FindMembership and ABFindAll SOAP requests
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
25395
diff
changeset
|
179 strcat(buf, "Denied Buddy,"); |
06a802d32d71
I incorrectly assumed that the FindMembership and ABFindAll SOAP requests
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
25395
diff
changeset
|
180 if (action & MSN_ADD_GROUP) |
06a802d32d71
I incorrectly assumed that the FindMembership and ABFindAll SOAP requests
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
25395
diff
changeset
|
181 strcat(buf, "Adding Group,"); |
06a802d32d71
I incorrectly assumed that the FindMembership and ABFindAll SOAP requests
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
25395
diff
changeset
|
182 if (action & MSN_DEL_GROUP) |
06a802d32d71
I incorrectly assumed that the FindMembership and ABFindAll SOAP requests
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
25395
diff
changeset
|
183 strcat(buf, "Deleting Group,"); |
06a802d32d71
I incorrectly assumed that the FindMembership and ABFindAll SOAP requests
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
25395
diff
changeset
|
184 if (action & MSN_RENAME_GROUP) |
06a802d32d71
I incorrectly assumed that the FindMembership and ABFindAll SOAP requests
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
25395
diff
changeset
|
185 strcat(buf, "Renaming Group,"); |
06a802d32d71
I incorrectly assumed that the FindMembership and ABFindAll SOAP requests
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
25395
diff
changeset
|
186 if (action & MSN_UPDATE_INFO) |
06a802d32d71
I incorrectly assumed that the FindMembership and ABFindAll SOAP requests
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
25395
diff
changeset
|
187 strcat(buf, "Updating Contact Info,"); |
06a802d32d71
I incorrectly assumed that the FindMembership and ABFindAll SOAP requests
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
25395
diff
changeset
|
188 |
06a802d32d71
I incorrectly assumed that the FindMembership and ABFindAll SOAP requests
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
25395
diff
changeset
|
189 return buf; |
06a802d32d71
I incorrectly assumed that the FindMembership and ABFindAll SOAP requests
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
25395
diff
changeset
|
190 } |
06a802d32d71
I incorrectly assumed that the FindMembership and ABFindAll SOAP requests
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
25395
diff
changeset
|
191 |
06a802d32d71
I incorrectly assumed that the FindMembership and ABFindAll SOAP requests
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
25395
diff
changeset
|
192 static gboolean msn_contact_request(MsnCallbackState *state); |
06a802d32d71
I incorrectly assumed that the FindMembership and ABFindAll SOAP requests
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
25395
diff
changeset
|
193 |
06a802d32d71
I incorrectly assumed that the FindMembership and ABFindAll SOAP requests
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
25395
diff
changeset
|
194 static void |
06a802d32d71
I incorrectly assumed that the FindMembership and ABFindAll SOAP requests
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
25395
diff
changeset
|
195 msn_contact_request_cb(MsnSoapMessage *req, MsnSoapMessage *resp, |
06a802d32d71
I incorrectly assumed that the FindMembership and ABFindAll SOAP requests
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
25395
diff
changeset
|
196 gpointer data) |
06a802d32d71
I incorrectly assumed that the FindMembership and ABFindAll SOAP requests
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
25395
diff
changeset
|
197 { |
06a802d32d71
I incorrectly assumed that the FindMembership and ABFindAll SOAP requests
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
25395
diff
changeset
|
198 MsnCallbackState *state = data; |
06a802d32d71
I incorrectly assumed that the FindMembership and ABFindAll SOAP requests
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
25395
diff
changeset
|
199 xmlnode *fault; |
06a802d32d71
I incorrectly assumed that the FindMembership and ABFindAll SOAP requests
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
25395
diff
changeset
|
200 char *faultcode_str; |
25458
b1080a1a2cb0
Save and use the CacheKey for ABCH SOAP requests.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
25455
diff
changeset
|
201 xmlnode *cachekey; |
b1080a1a2cb0
Save and use the CacheKey for ABCH SOAP requests.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
25455
diff
changeset
|
202 char *changed; |
25396
06a802d32d71
I incorrectly assumed that the FindMembership and ABFindAll SOAP requests
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
25395
diff
changeset
|
203 |
06a802d32d71
I incorrectly assumed that the FindMembership and ABFindAll SOAP requests
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
25395
diff
changeset
|
204 if (resp == NULL) { |
06a802d32d71
I incorrectly assumed that the FindMembership and ABFindAll SOAP requests
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
25395
diff
changeset
|
205 purple_debug_error("msn", |
06a802d32d71
I incorrectly assumed that the FindMembership and ABFindAll SOAP requests
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
25395
diff
changeset
|
206 "Operation {%s} failed. No response received from server.\n", |
06a802d32d71
I incorrectly assumed that the FindMembership and ABFindAll SOAP requests
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
25395
diff
changeset
|
207 msn_contact_operation_str(state->action)); |
25491
c729cdeb88c8
Set an error if you're unable to connect to the contact server, or are not
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
25458
diff
changeset
|
208 msn_session_set_error(state->session, MSN_ERROR_BAD_BLIST, NULL); |
25396
06a802d32d71
I incorrectly assumed that the FindMembership and ABFindAll SOAP requests
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
25395
diff
changeset
|
209 return; |
06a802d32d71
I incorrectly assumed that the FindMembership and ABFindAll SOAP requests
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
25395
diff
changeset
|
210 } |
06a802d32d71
I incorrectly assumed that the FindMembership and ABFindAll SOAP requests
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
25395
diff
changeset
|
211 |
25458
b1080a1a2cb0
Save and use the CacheKey for ABCH SOAP requests.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
25455
diff
changeset
|
212 /* Update CacheKey if necessary */ |
b1080a1a2cb0
Save and use the CacheKey for ABCH SOAP requests.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
25455
diff
changeset
|
213 cachekey = xmlnode_get_child(resp->xml, "Header/ServiceHeader/CacheKeyChanged"); |
b1080a1a2cb0
Save and use the CacheKey for ABCH SOAP requests.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
25455
diff
changeset
|
214 if (cachekey != NULL) { |
b1080a1a2cb0
Save and use the CacheKey for ABCH SOAP requests.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
25455
diff
changeset
|
215 changed = xmlnode_get_data(cachekey); |
b1080a1a2cb0
Save and use the CacheKey for ABCH SOAP requests.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
25455
diff
changeset
|
216 if (changed && !strcmp(changed, "true")) { |
b1080a1a2cb0
Save and use the CacheKey for ABCH SOAP requests.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
25455
diff
changeset
|
217 cachekey = xmlnode_get_child(resp->xml, "Header/ServiceHeader/CacheKey"); |
b1080a1a2cb0
Save and use the CacheKey for ABCH SOAP requests.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
25455
diff
changeset
|
218 g_free(state->session->abch_cachekey); |
b1080a1a2cb0
Save and use the CacheKey for ABCH SOAP requests.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
25455
diff
changeset
|
219 state->session->abch_cachekey = xmlnode_get_data(cachekey); |
b1080a1a2cb0
Save and use the CacheKey for ABCH SOAP requests.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
25455
diff
changeset
|
220 purple_debug_info("msn", "Updated CacheKey for %s to '%s'.\n", |
b1080a1a2cb0
Save and use the CacheKey for ABCH SOAP requests.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
25455
diff
changeset
|
221 purple_account_get_username(state->session->account), |
b1080a1a2cb0
Save and use the CacheKey for ABCH SOAP requests.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
25455
diff
changeset
|
222 state->session->abch_cachekey); |
b1080a1a2cb0
Save and use the CacheKey for ABCH SOAP requests.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
25455
diff
changeset
|
223 } |
b1080a1a2cb0
Save and use the CacheKey for ABCH SOAP requests.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
25455
diff
changeset
|
224 g_free(changed); |
b1080a1a2cb0
Save and use the CacheKey for ABCH SOAP requests.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
25455
diff
changeset
|
225 } |
b1080a1a2cb0
Save and use the CacheKey for ABCH SOAP requests.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
25455
diff
changeset
|
226 |
25396
06a802d32d71
I incorrectly assumed that the FindMembership and ABFindAll SOAP requests
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
25395
diff
changeset
|
227 fault = xmlnode_get_child(resp->xml, "Body/Fault"); |
06a802d32d71
I incorrectly assumed that the FindMembership and ABFindAll SOAP requests
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
25395
diff
changeset
|
228 |
06a802d32d71
I incorrectly assumed that the FindMembership and ABFindAll SOAP requests
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
25395
diff
changeset
|
229 if (fault == NULL) { |
06a802d32d71
I incorrectly assumed that the FindMembership and ABFindAll SOAP requests
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
25395
diff
changeset
|
230 /* No errors */ |
06a802d32d71
I incorrectly assumed that the FindMembership and ABFindAll SOAP requests
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
25395
diff
changeset
|
231 if (state->cb) |
25455
8387f195c4af
This casting is no longer necessary.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
25397
diff
changeset
|
232 state->cb(req, resp, data); |
25396
06a802d32d71
I incorrectly assumed that the FindMembership and ABFindAll SOAP requests
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
25395
diff
changeset
|
233 msn_callback_state_free(state); |
06a802d32d71
I incorrectly assumed that the FindMembership and ABFindAll SOAP requests
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
25395
diff
changeset
|
234 return; |
06a802d32d71
I incorrectly assumed that the FindMembership and ABFindAll SOAP requests
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
25395
diff
changeset
|
235 } |
06a802d32d71
I incorrectly assumed that the FindMembership and ABFindAll SOAP requests
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
25395
diff
changeset
|
236 |
06a802d32d71
I incorrectly assumed that the FindMembership and ABFindAll SOAP requests
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
25395
diff
changeset
|
237 faultcode_str = xmlnode_get_data(xmlnode_get_child(fault, "faultcode")); |
06a802d32d71
I incorrectly assumed that the FindMembership and ABFindAll SOAP requests
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
25395
diff
changeset
|
238 |
06a802d32d71
I incorrectly assumed that the FindMembership and ABFindAll SOAP requests
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
25395
diff
changeset
|
239 if (faultcode_str && g_str_equal(faultcode_str, "q0:BadContextToken")) { |
06a802d32d71
I incorrectly assumed that the FindMembership and ABFindAll SOAP requests
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
25395
diff
changeset
|
240 purple_debug_info("msn", |
06a802d32d71
I incorrectly assumed that the FindMembership and ABFindAll SOAP requests
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
25395
diff
changeset
|
241 "Contact Operation {%s} failed because of bad token." |
06a802d32d71
I incorrectly assumed that the FindMembership and ABFindAll SOAP requests
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
25395
diff
changeset
|
242 " Updating token now and retrying operation.\n", |
06a802d32d71
I incorrectly assumed that the FindMembership and ABFindAll SOAP requests
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
25395
diff
changeset
|
243 msn_contact_operation_str(state->action)); |
06a802d32d71
I incorrectly assumed that the FindMembership and ABFindAll SOAP requests
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
25395
diff
changeset
|
244 /* Token has expired, so renew it, and try again later */ |
06a802d32d71
I incorrectly assumed that the FindMembership and ABFindAll SOAP requests
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
25395
diff
changeset
|
245 msn_nexus_update_token(state->session->nexus, MSN_AUTH_CONTACTS, |
06a802d32d71
I incorrectly assumed that the FindMembership and ABFindAll SOAP requests
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
25395
diff
changeset
|
246 (GSourceFunc)msn_contact_request, data); |
06a802d32d71
I incorrectly assumed that the FindMembership and ABFindAll SOAP requests
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
25395
diff
changeset
|
247 } |
06a802d32d71
I incorrectly assumed that the FindMembership and ABFindAll SOAP requests
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
25395
diff
changeset
|
248 else |
06a802d32d71
I incorrectly assumed that the FindMembership and ABFindAll SOAP requests
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
25395
diff
changeset
|
249 { |
06a802d32d71
I incorrectly assumed that the FindMembership and ABFindAll SOAP requests
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
25395
diff
changeset
|
250 if (state->cb) { |
25455
8387f195c4af
This casting is no longer necessary.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
25397
diff
changeset
|
251 state->cb(req, resp, data); |
25396
06a802d32d71
I incorrectly assumed that the FindMembership and ABFindAll SOAP requests
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
25395
diff
changeset
|
252 } else { |
06a802d32d71
I incorrectly assumed that the FindMembership and ABFindAll SOAP requests
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
25395
diff
changeset
|
253 /* We don't know how to respond to this faultcode, so log it */ |
06a802d32d71
I incorrectly assumed that the FindMembership and ABFindAll SOAP requests
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
25395
diff
changeset
|
254 char *str = xmlnode_to_str(fault, NULL); |
06a802d32d71
I incorrectly assumed that the FindMembership and ABFindAll SOAP requests
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
25395
diff
changeset
|
255 purple_debug_error("msn", "Operation {%s} Failed, SOAP Fault was: %s\n", |
06a802d32d71
I incorrectly assumed that the FindMembership and ABFindAll SOAP requests
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
25395
diff
changeset
|
256 msn_contact_operation_str(state->action), str); |
06a802d32d71
I incorrectly assumed that the FindMembership and ABFindAll SOAP requests
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
25395
diff
changeset
|
257 g_free(str); |
06a802d32d71
I incorrectly assumed that the FindMembership and ABFindAll SOAP requests
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
25395
diff
changeset
|
258 } |
06a802d32d71
I incorrectly assumed that the FindMembership and ABFindAll SOAP requests
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
25395
diff
changeset
|
259 msn_callback_state_free(state); |
06a802d32d71
I incorrectly assumed that the FindMembership and ABFindAll SOAP requests
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
25395
diff
changeset
|
260 } |
06a802d32d71
I incorrectly assumed that the FindMembership and ABFindAll SOAP requests
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
25395
diff
changeset
|
261 |
06a802d32d71
I incorrectly assumed that the FindMembership and ABFindAll SOAP requests
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
25395
diff
changeset
|
262 g_free(faultcode_str); |
06a802d32d71
I incorrectly assumed that the FindMembership and ABFindAll SOAP requests
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
25395
diff
changeset
|
263 } |
06a802d32d71
I incorrectly assumed that the FindMembership and ABFindAll SOAP requests
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
25395
diff
changeset
|
264 |
06a802d32d71
I incorrectly assumed that the FindMembership and ABFindAll SOAP requests
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
25395
diff
changeset
|
265 static gboolean |
06a802d32d71
I incorrectly assumed that the FindMembership and ABFindAll SOAP requests
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
25395
diff
changeset
|
266 msn_contact_request(MsnCallbackState *state) |
06a802d32d71
I incorrectly assumed that the FindMembership and ABFindAll SOAP requests
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
25395
diff
changeset
|
267 { |
25458
b1080a1a2cb0
Save and use the CacheKey for ABCH SOAP requests.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
25455
diff
changeset
|
268 xmlnode *cachekey = xmlnode_get_child(state->body, |
b1080a1a2cb0
Save and use the CacheKey for ABCH SOAP requests.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
25455
diff
changeset
|
269 "Header/ABApplicationHeader/CacheKey"); |
b1080a1a2cb0
Save and use the CacheKey for ABCH SOAP requests.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
25455
diff
changeset
|
270 if (cachekey != NULL) |
b1080a1a2cb0
Save and use the CacheKey for ABCH SOAP requests.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
25455
diff
changeset
|
271 xmlnode_free(cachekey); |
b1080a1a2cb0
Save and use the CacheKey for ABCH SOAP requests.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
25455
diff
changeset
|
272 if (state->session->abch_cachekey != NULL) { |
b1080a1a2cb0
Save and use the CacheKey for ABCH SOAP requests.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
25455
diff
changeset
|
273 cachekey = xmlnode_new_child(xmlnode_get_child(state->body, "Header/ABApplicationHeader"), "CacheKey"); |
b1080a1a2cb0
Save and use the CacheKey for ABCH SOAP requests.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
25455
diff
changeset
|
274 xmlnode_insert_data(cachekey, state->session->abch_cachekey, -1); |
b1080a1a2cb0
Save and use the CacheKey for ABCH SOAP requests.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
25455
diff
changeset
|
275 } |
25396
06a802d32d71
I incorrectly assumed that the FindMembership and ABFindAll SOAP requests
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
25395
diff
changeset
|
276 if (state->token == NULL) |
06a802d32d71
I incorrectly assumed that the FindMembership and ABFindAll SOAP requests
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
25395
diff
changeset
|
277 state->token = xmlnode_get_child(state->body, |
06a802d32d71
I incorrectly assumed that the FindMembership and ABFindAll SOAP requests
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
25395
diff
changeset
|
278 "Header/ABAuthHeader/TicketToken"); |
06a802d32d71
I incorrectly assumed that the FindMembership and ABFindAll SOAP requests
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
25395
diff
changeset
|
279 /* delete old & replace with new token */ |
06a802d32d71
I incorrectly assumed that the FindMembership and ABFindAll SOAP requests
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
25395
diff
changeset
|
280 xmlnode_free(state->token->child); |
06a802d32d71
I incorrectly assumed that the FindMembership and ABFindAll SOAP requests
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
25395
diff
changeset
|
281 xmlnode_insert_data(state->token, |
06a802d32d71
I incorrectly assumed that the FindMembership and ABFindAll SOAP requests
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
25395
diff
changeset
|
282 msn_nexus_get_token_str(state->session->nexus, MSN_AUTH_CONTACTS), -1); |
06a802d32d71
I incorrectly assumed that the FindMembership and ABFindAll SOAP requests
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
25395
diff
changeset
|
283 msn_soap_message_send(state->session, |
06a802d32d71
I incorrectly assumed that the FindMembership and ABFindAll SOAP requests
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
25395
diff
changeset
|
284 msn_soap_message_new(state->post_action, xmlnode_copy(state->body)), |
06a802d32d71
I incorrectly assumed that the FindMembership and ABFindAll SOAP requests
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
25395
diff
changeset
|
285 MSN_CONTACT_SERVER, state->post_url, FALSE, |
06a802d32d71
I incorrectly assumed that the FindMembership and ABFindAll SOAP requests
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
25395
diff
changeset
|
286 msn_contact_request_cb, state); |
06a802d32d71
I incorrectly assumed that the FindMembership and ABFindAll SOAP requests
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
25395
diff
changeset
|
287 return FALSE; |
06a802d32d71
I incorrectly assumed that the FindMembership and ABFindAll SOAP requests
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
25395
diff
changeset
|
288 } |
06a802d32d71
I incorrectly assumed that the FindMembership and ABFindAll SOAP requests
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
25395
diff
changeset
|
289 |
06a802d32d71
I incorrectly assumed that the FindMembership and ABFindAll SOAP requests
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
25395
diff
changeset
|
290 /*************************************************************** |
06a802d32d71
I incorrectly assumed that the FindMembership and ABFindAll SOAP requests
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
25395
diff
changeset
|
291 * Address Book and Membership List Operations |
06a802d32d71
I incorrectly assumed that the FindMembership and ABFindAll SOAP requests
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
25395
diff
changeset
|
292 ***************************************************************/ |
06a802d32d71
I incorrectly assumed that the FindMembership and ABFindAll SOAP requests
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
25395
diff
changeset
|
293 |
20394
4a099e4d0d09
propagate from branch 'im.pidgin.pidgin' (head 98b6b547b29ea1192b73cc4e1de1e674edef4328)
Richard Laager <rlaager@wiktel.com>
parents:
diff
changeset
|
294 /*get MSN member role utility*/ |
20486
ff4ae9dde291
Make block/unblock work right, as well as being add by a buddy. Finally fixes #723
Carlos Silva <typ0@pidgin.im>
parents:
20484
diff
changeset
|
295 static MsnListId |
20789 | 296 msn_get_memberrole(const char *role) |
20394
4a099e4d0d09
propagate from branch 'im.pidgin.pidgin' (head 98b6b547b29ea1192b73cc4e1de1e674edef4328)
Richard Laager <rlaager@wiktel.com>
parents:
diff
changeset
|
297 { |
20666
0e1bc5c51030
A few leak plugs, some unnecessary allocation prevention, null pointer deref fixes and general robustness fixes. I'm sure there is more to do here, I got tired... Fixes #3308
Daniel Atallah <daniel.atallah@gmail.com>
parents:
20539
diff
changeset
|
298 g_return_val_if_fail(role != NULL, 0); |
0e1bc5c51030
A few leak plugs, some unnecessary allocation prevention, null pointer deref fixes and general robustness fixes. I'm sure there is more to do here, I got tired... Fixes #3308
Daniel Atallah <daniel.atallah@gmail.com>
parents:
20539
diff
changeset
|
299 |
20481
eb93710aec4d
Make buddy and group management actually work, add some SOAP templates, redesign some parts of code and separate some bigger functions into its smaller tasks which are completely unrelated to each other
Carlos Silva <typ0@pidgin.im>
parents:
20479
diff
changeset
|
300 if (!strcmp(role,"Allow")) { |
20486
ff4ae9dde291
Make block/unblock work right, as well as being add by a buddy. Finally fixes #723
Carlos Silva <typ0@pidgin.im>
parents:
20484
diff
changeset
|
301 return MSN_LIST_AL; |
20481
eb93710aec4d
Make buddy and group management actually work, add some SOAP templates, redesign some parts of code and separate some bigger functions into its smaller tasks which are completely unrelated to each other
Carlos Silva <typ0@pidgin.im>
parents:
20479
diff
changeset
|
302 } else if (!strcmp(role,"Block")) { |
20486
ff4ae9dde291
Make block/unblock work right, as well as being add by a buddy. Finally fixes #723
Carlos Silva <typ0@pidgin.im>
parents:
20484
diff
changeset
|
303 return MSN_LIST_BL; |
20481
eb93710aec4d
Make buddy and group management actually work, add some SOAP templates, redesign some parts of code and separate some bigger functions into its smaller tasks which are completely unrelated to each other
Carlos Silva <typ0@pidgin.im>
parents:
20479
diff
changeset
|
304 } else if (!strcmp(role,"Reverse")) { |
20486
ff4ae9dde291
Make block/unblock work right, as well as being add by a buddy. Finally fixes #723
Carlos Silva <typ0@pidgin.im>
parents:
20484
diff
changeset
|
305 return MSN_LIST_RL; |
20481
eb93710aec4d
Make buddy and group management actually work, add some SOAP templates, redesign some parts of code and separate some bigger functions into its smaller tasks which are completely unrelated to each other
Carlos Silva <typ0@pidgin.im>
parents:
20479
diff
changeset
|
306 } else if (!strcmp(role,"Pending")) { |
20486
ff4ae9dde291
Make block/unblock work right, as well as being add by a buddy. Finally fixes #723
Carlos Silva <typ0@pidgin.im>
parents:
20484
diff
changeset
|
307 return MSN_LIST_PL; |
20394
4a099e4d0d09
propagate from branch 'im.pidgin.pidgin' (head 98b6b547b29ea1192b73cc4e1de1e674edef4328)
Richard Laager <rlaager@wiktel.com>
parents:
diff
changeset
|
308 } |
4a099e4d0d09
propagate from branch 'im.pidgin.pidgin' (head 98b6b547b29ea1192b73cc4e1de1e674edef4328)
Richard Laager <rlaager@wiktel.com>
parents:
diff
changeset
|
309 return 0; |
4a099e4d0d09
propagate from branch 'im.pidgin.pidgin' (head 98b6b547b29ea1192b73cc4e1de1e674edef4328)
Richard Laager <rlaager@wiktel.com>
parents:
diff
changeset
|
310 } |
4a099e4d0d09
propagate from branch 'im.pidgin.pidgin' (head 98b6b547b29ea1192b73cc4e1de1e674edef4328)
Richard Laager <rlaager@wiktel.com>
parents:
diff
changeset
|
311 |
20477
9a2a4a0c0003
Add the possibility to create an Address Book, useful for newly registered MSN users.
Carlos Silva <typ0@pidgin.im>
parents:
20471
diff
changeset
|
312 /* Create the AddressBook in the server, if we don't have one */ |
9a2a4a0c0003
Add the possibility to create an Address Book, useful for newly registered MSN users.
Carlos Silva <typ0@pidgin.im>
parents:
20471
diff
changeset
|
313 static void |
20538
90fd0826c6ce
finish converting the rest of stuff to the new soap api, signing on, getting
Ka-Hing Cheung <khc@hxbc.us>
parents:
20501
diff
changeset
|
314 msn_create_address_cb(MsnSoapMessage *req, MsnSoapMessage *resp, gpointer data) |
20477
9a2a4a0c0003
Add the possibility to create an Address Book, useful for newly registered MSN users.
Carlos Silva <typ0@pidgin.im>
parents:
20471
diff
changeset
|
315 { |
25396
06a802d32d71
I incorrectly assumed that the FindMembership and ABFindAll SOAP requests
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
25395
diff
changeset
|
316 MsnCallbackState *state = data; |
23453
bca58b00afab
References #4382, replaces usage of msn_soap_xml_get with xmlnode_get_child
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23447
diff
changeset
|
317 if (resp && xmlnode_get_child(resp->xml, "Body/Fault") == NULL) { |
23519
7bceac816e19
The great MSN debug message cleanup! Threw in a few whitespace fixes,
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23507
diff
changeset
|
318 purple_debug_info("msn", "Address Book successfully created!\n"); |
25396
06a802d32d71
I incorrectly assumed that the FindMembership and ABFindAll SOAP requests
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
25395
diff
changeset
|
319 msn_get_address_book(state->session, MSN_PS_INITIAL, NULL, NULL); |
20538
90fd0826c6ce
finish converting the rest of stuff to the new soap api, signing on, getting
Ka-Hing Cheung <khc@hxbc.us>
parents:
20501
diff
changeset
|
320 } else { |
23519
7bceac816e19
The great MSN debug message cleanup! Threw in a few whitespace fixes,
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23507
diff
changeset
|
321 purple_debug_info("msn", "Address Book creation failed!\n"); |
20538
90fd0826c6ce
finish converting the rest of stuff to the new soap api, signing on, getting
Ka-Hing Cheung <khc@hxbc.us>
parents:
20501
diff
changeset
|
322 } |
20477
9a2a4a0c0003
Add the possibility to create an Address Book, useful for newly registered MSN users.
Carlos Silva <typ0@pidgin.im>
parents:
20471
diff
changeset
|
323 } |
9a2a4a0c0003
Add the possibility to create an Address Book, useful for newly registered MSN users.
Carlos Silva <typ0@pidgin.im>
parents:
20471
diff
changeset
|
324 |
9a2a4a0c0003
Add the possibility to create an Address Book, useful for newly registered MSN users.
Carlos Silva <typ0@pidgin.im>
parents:
20471
diff
changeset
|
325 static void |
23459
69af5301e1a7
killing MsnContact which just wraps MsnSession
Ka-Hing Cheung <khc@hxbc.us>
parents:
23453
diff
changeset
|
326 msn_create_address_book(MsnSession *session) |
20477
9a2a4a0c0003
Add the possibility to create an Address Book, useful for newly registered MSN users.
Carlos Silva <typ0@pidgin.im>
parents:
20471
diff
changeset
|
327 { |
9a2a4a0c0003
Add the possibility to create an Address Book, useful for newly registered MSN users.
Carlos Silva <typ0@pidgin.im>
parents:
20471
diff
changeset
|
328 gchar *body; |
25396
06a802d32d71
I incorrectly assumed that the FindMembership and ABFindAll SOAP requests
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
25395
diff
changeset
|
329 MsnCallbackState *state; |
20477
9a2a4a0c0003
Add the possibility to create an Address Book, useful for newly registered MSN users.
Carlos Silva <typ0@pidgin.im>
parents:
20471
diff
changeset
|
330 |
23459
69af5301e1a7
killing MsnContact which just wraps MsnSession
Ka-Hing Cheung <khc@hxbc.us>
parents:
23453
diff
changeset
|
331 g_return_if_fail(session != NULL); |
69af5301e1a7
killing MsnContact which just wraps MsnSession
Ka-Hing Cheung <khc@hxbc.us>
parents:
23453
diff
changeset
|
332 g_return_if_fail(session->user != NULL); |
69af5301e1a7
killing MsnContact which just wraps MsnSession
Ka-Hing Cheung <khc@hxbc.us>
parents:
23453
diff
changeset
|
333 g_return_if_fail(session->user->passport != NULL); |
20481
eb93710aec4d
Make buddy and group management actually work, add some SOAP templates, redesign some parts of code and separate some bigger functions into its smaller tasks which are completely unrelated to each other
Carlos Silva <typ0@pidgin.im>
parents:
20479
diff
changeset
|
334 |
23519
7bceac816e19
The great MSN debug message cleanup! Threw in a few whitespace fixes,
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23507
diff
changeset
|
335 purple_debug_info("msn", "Creating an Address Book.\n"); |
20477
9a2a4a0c0003
Add the possibility to create an Address Book, useful for newly registered MSN users.
Carlos Silva <typ0@pidgin.im>
parents:
20471
diff
changeset
|
336 |
23735
35f7b7c62995
Remove calls to g_markup_escape_text. Not only does this help with old
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23734
diff
changeset
|
337 body = g_strdup_printf(MSN_ADD_ADDRESSBOOK_TEMPLATE, |
25396
06a802d32d71
I incorrectly assumed that the FindMembership and ABFindAll SOAP requests
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
25395
diff
changeset
|
338 session->user->passport); |
20477
9a2a4a0c0003
Add the possibility to create an Address Book, useful for newly registered MSN users.
Carlos Silva <typ0@pidgin.im>
parents:
20471
diff
changeset
|
339 |
25396
06a802d32d71
I incorrectly assumed that the FindMembership and ABFindAll SOAP requests
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
25395
diff
changeset
|
340 state = msn_callback_state_new(session); |
06a802d32d71
I incorrectly assumed that the FindMembership and ABFindAll SOAP requests
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
25395
diff
changeset
|
341 state->body = xmlnode_from_str(body, -1); |
06a802d32d71
I incorrectly assumed that the FindMembership and ABFindAll SOAP requests
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
25395
diff
changeset
|
342 state->post_action = MSN_ADD_ADDRESSBOOK_SOAP_ACTION; |
06a802d32d71
I incorrectly assumed that the FindMembership and ABFindAll SOAP requests
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
25395
diff
changeset
|
343 state->post_url = MSN_ADDRESS_BOOK_POST_URL; |
06a802d32d71
I incorrectly assumed that the FindMembership and ABFindAll SOAP requests
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
25395
diff
changeset
|
344 state->cb = msn_create_address_cb; |
06a802d32d71
I incorrectly assumed that the FindMembership and ABFindAll SOAP requests
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
25395
diff
changeset
|
345 msn_contact_request(state); |
20477
9a2a4a0c0003
Add the possibility to create an Address Book, useful for newly registered MSN users.
Carlos Silva <typ0@pidgin.im>
parents:
20471
diff
changeset
|
346 |
9a2a4a0c0003
Add the possibility to create an Address Book, useful for newly registered MSN users.
Carlos Silva <typ0@pidgin.im>
parents:
20471
diff
changeset
|
347 g_free(body); |
20538
90fd0826c6ce
finish converting the rest of stuff to the new soap api, signing on, getting
Ka-Hing Cheung <khc@hxbc.us>
parents:
20501
diff
changeset
|
348 } |
90fd0826c6ce
finish converting the rest of stuff to the new soap api, signing on, getting
Ka-Hing Cheung <khc@hxbc.us>
parents:
20501
diff
changeset
|
349 |
90fd0826c6ce
finish converting the rest of stuff to the new soap api, signing on, getting
Ka-Hing Cheung <khc@hxbc.us>
parents:
20501
diff
changeset
|
350 static void |
90fd0826c6ce
finish converting the rest of stuff to the new soap api, signing on, getting
Ka-Hing Cheung <khc@hxbc.us>
parents:
20501
diff
changeset
|
351 msn_parse_each_member(MsnSession *session, xmlnode *member, const char *node, |
90fd0826c6ce
finish converting the rest of stuff to the new soap api, signing on, getting
Ka-Hing Cheung <khc@hxbc.us>
parents:
20501
diff
changeset
|
352 MsnListId list) |
90fd0826c6ce
finish converting the rest of stuff to the new soap api, signing on, getting
Ka-Hing Cheung <khc@hxbc.us>
parents:
20501
diff
changeset
|
353 { |
27845
975fc5f64438
Ignore buddies with invalid emails in the membership list or address book,
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
27488
diff
changeset
|
354 char *passport; |
975fc5f64438
Ignore buddies with invalid emails in the membership list or address book,
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
27488
diff
changeset
|
355 char *type; |
975fc5f64438
Ignore buddies with invalid emails in the membership list or address book,
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
27488
diff
changeset
|
356 char *member_id; |
975fc5f64438
Ignore buddies with invalid emails in the membership list or address book,
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
27488
diff
changeset
|
357 MsnUser *user; |
24515
f1936abe1616
Get the MSN buddy's network ID from the FindMembership response.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
24514
diff
changeset
|
358 xmlnode *annotation; |
24722
daabf16bd511
When getting the privacy lists, set the default network to unknown. If the
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
24525
diff
changeset
|
359 guint nid = MSN_NETWORK_UNKNOWN; |
26909
2a95e8bd9b80
Parse the invite message out of the pending membership list so that it can
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
26906
diff
changeset
|
360 char *invite = NULL; |
20538
90fd0826c6ce
finish converting the rest of stuff to the new soap api, signing on, getting
Ka-Hing Cheung <khc@hxbc.us>
parents:
20501
diff
changeset
|
361 |
27845
975fc5f64438
Ignore buddies with invalid emails in the membership list or address book,
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
27488
diff
changeset
|
362 passport = xmlnode_get_data(xmlnode_get_child(member, node)); |
975fc5f64438
Ignore buddies with invalid emails in the membership list or address book,
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
27488
diff
changeset
|
363 if (!purple_email_is_valid(passport)) { |
975fc5f64438
Ignore buddies with invalid emails in the membership list or address book,
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
27488
diff
changeset
|
364 g_free(passport); |
975fc5f64438
Ignore buddies with invalid emails in the membership list or address book,
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
27488
diff
changeset
|
365 return; |
975fc5f64438
Ignore buddies with invalid emails in the membership list or address book,
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
27488
diff
changeset
|
366 } |
975fc5f64438
Ignore buddies with invalid emails in the membership list or address book,
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
27488
diff
changeset
|
367 |
975fc5f64438
Ignore buddies with invalid emails in the membership list or address book,
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
27488
diff
changeset
|
368 type = xmlnode_get_data(xmlnode_get_child(member, "Type")); |
975fc5f64438
Ignore buddies with invalid emails in the membership list or address book,
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
27488
diff
changeset
|
369 member_id = xmlnode_get_data(xmlnode_get_child(member, "MembershipId")); |
975fc5f64438
Ignore buddies with invalid emails in the membership list or address book,
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
27488
diff
changeset
|
370 user = msn_userlist_find_add_user(session->userlist, passport, NULL); |
975fc5f64438
Ignore buddies with invalid emails in the membership list or address book,
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
27488
diff
changeset
|
371 |
26909
2a95e8bd9b80
Parse the invite message out of the pending membership list so that it can
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
26906
diff
changeset
|
372 for (annotation = xmlnode_get_child(member, "Annotations/Annotation"); |
2a95e8bd9b80
Parse the invite message out of the pending membership list so that it can
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
26906
diff
changeset
|
373 annotation; |
2a95e8bd9b80
Parse the invite message out of the pending membership list so that it can
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
26906
diff
changeset
|
374 annotation = xmlnode_get_next_twin(annotation)) { |
2a95e8bd9b80
Parse the invite message out of the pending membership list so that it can
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
26906
diff
changeset
|
375 char *name = xmlnode_get_data(xmlnode_get_child(annotation, "Name")); |
2a95e8bd9b80
Parse the invite message out of the pending membership list so that it can
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
26906
diff
changeset
|
376 char *value = xmlnode_get_data(xmlnode_get_child(annotation, "Value")); |
2a95e8bd9b80
Parse the invite message out of the pending membership list so that it can
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
26906
diff
changeset
|
377 if (name && value) { |
2a95e8bd9b80
Parse the invite message out of the pending membership list so that it can
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
26906
diff
changeset
|
378 if (!strcmp(name, "MSN.IM.BuddyType")) { |
2a95e8bd9b80
Parse the invite message out of the pending membership list so that it can
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
26906
diff
changeset
|
379 nid = strtoul(value, NULL, 10); |
2a95e8bd9b80
Parse the invite message out of the pending membership list so that it can
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
26906
diff
changeset
|
380 } |
2a95e8bd9b80
Parse the invite message out of the pending membership list so that it can
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
26906
diff
changeset
|
381 else if (!strcmp(name, "MSN.IM.InviteMessage")) { |
2a95e8bd9b80
Parse the invite message out of the pending membership list so that it can
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
26906
diff
changeset
|
382 invite = value; |
2a95e8bd9b80
Parse the invite message out of the pending membership list so that it can
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
26906
diff
changeset
|
383 value = NULL; |
2a95e8bd9b80
Parse the invite message out of the pending membership list so that it can
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
26906
diff
changeset
|
384 } |
2a95e8bd9b80
Parse the invite message out of the pending membership list so that it can
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
26906
diff
changeset
|
385 } |
2a95e8bd9b80
Parse the invite message out of the pending membership list so that it can
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
26906
diff
changeset
|
386 g_free(name); |
2a95e8bd9b80
Parse the invite message out of the pending membership list so that it can
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
26906
diff
changeset
|
387 g_free(value); |
2a95e8bd9b80
Parse the invite message out of the pending membership list so that it can
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
26906
diff
changeset
|
388 } |
2a95e8bd9b80
Parse the invite message out of the pending membership list so that it can
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
26906
diff
changeset
|
389 |
2a95e8bd9b80
Parse the invite message out of the pending membership list so that it can
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
26906
diff
changeset
|
390 /* For EmailMembers, the network must be found in the annotations, above. |
2a95e8bd9b80
Parse the invite message out of the pending membership list so that it can
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
26906
diff
changeset
|
391 Otherwise, PassportMembers are on the Passport network. */ |
2a95e8bd9b80
Parse the invite message out of the pending membership list so that it can
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
26906
diff
changeset
|
392 if (!strcmp(node, "PassportName")) |
24722
daabf16bd511
When getting the privacy lists, set the default network to unknown. If the
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
24525
diff
changeset
|
393 nid = MSN_NETWORK_PASSPORT; |
25395
89670ae028bd
The MSN AddressBook can contain contacts with global isMessengerUser=false,
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
25387
diff
changeset
|
394 |
24515
f1936abe1616
Get the MSN buddy's network ID from the FindMembership response.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
24514
diff
changeset
|
395 purple_debug_info("msn", "CL: %s name: %s, Type: %s, MembershipID: %s, NetworkID: %u\n", |
f1936abe1616
Get the MSN buddy's network ID from the FindMembership response.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
24514
diff
changeset
|
396 node, passport, type, member_id == NULL ? "(null)" : member_id, nid); |
f1936abe1616
Get the MSN buddy's network ID from the FindMembership response.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
24514
diff
changeset
|
397 |
f1936abe1616
Get the MSN buddy's network ID from the FindMembership response.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
24514
diff
changeset
|
398 msn_user_set_network(user, nid); |
26909
2a95e8bd9b80
Parse the invite message out of the pending membership list so that it can
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
26906
diff
changeset
|
399 msn_user_set_invite_message(user, invite); |
20538
90fd0826c6ce
finish converting the rest of stuff to the new soap api, signing on, getting
Ka-Hing Cheung <khc@hxbc.us>
parents:
20501
diff
changeset
|
400 |
90fd0826c6ce
finish converting the rest of stuff to the new soap api, signing on, getting
Ka-Hing Cheung <khc@hxbc.us>
parents:
20501
diff
changeset
|
401 if (member_id) { |
90fd0826c6ce
finish converting the rest of stuff to the new soap api, signing on, getting
Ka-Hing Cheung <khc@hxbc.us>
parents:
20501
diff
changeset
|
402 user->membership_id[list] = atoi(member_id); |
90fd0826c6ce
finish converting the rest of stuff to the new soap api, signing on, getting
Ka-Hing Cheung <khc@hxbc.us>
parents:
20501
diff
changeset
|
403 } |
90fd0826c6ce
finish converting the rest of stuff to the new soap api, signing on, getting
Ka-Hing Cheung <khc@hxbc.us>
parents:
20501
diff
changeset
|
404 |
23298
5cdd93dac7a2
Delete trailing whitespace
Mark Doliner <mark@kingant.net>
parents:
22832
diff
changeset
|
405 msn_got_lst_user(session, user, 1 << list, NULL); |
20538
90fd0826c6ce
finish converting the rest of stuff to the new soap api, signing on, getting
Ka-Hing Cheung <khc@hxbc.us>
parents:
20501
diff
changeset
|
406 |
90fd0826c6ce
finish converting the rest of stuff to the new soap api, signing on, getting
Ka-Hing Cheung <khc@hxbc.us>
parents:
20501
diff
changeset
|
407 g_free(passport); |
90fd0826c6ce
finish converting the rest of stuff to the new soap api, signing on, getting
Ka-Hing Cheung <khc@hxbc.us>
parents:
20501
diff
changeset
|
408 g_free(type); |
90fd0826c6ce
finish converting the rest of stuff to the new soap api, signing on, getting
Ka-Hing Cheung <khc@hxbc.us>
parents:
20501
diff
changeset
|
409 g_free(member_id); |
26909
2a95e8bd9b80
Parse the invite message out of the pending membership list so that it can
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
26906
diff
changeset
|
410 g_free(invite); |
20538
90fd0826c6ce
finish converting the rest of stuff to the new soap api, signing on, getting
Ka-Hing Cheung <khc@hxbc.us>
parents:
20501
diff
changeset
|
411 } |
90fd0826c6ce
finish converting the rest of stuff to the new soap api, signing on, getting
Ka-Hing Cheung <khc@hxbc.us>
parents:
20501
diff
changeset
|
412 |
90fd0826c6ce
finish converting the rest of stuff to the new soap api, signing on, getting
Ka-Hing Cheung <khc@hxbc.us>
parents:
20501
diff
changeset
|
413 static void |
90fd0826c6ce
finish converting the rest of stuff to the new soap api, signing on, getting
Ka-Hing Cheung <khc@hxbc.us>
parents:
20501
diff
changeset
|
414 msn_parse_each_service(MsnSession *session, xmlnode *service) |
90fd0826c6ce
finish converting the rest of stuff to the new soap api, signing on, getting
Ka-Hing Cheung <khc@hxbc.us>
parents:
20501
diff
changeset
|
415 { |
90fd0826c6ce
finish converting the rest of stuff to the new soap api, signing on, getting
Ka-Hing Cheung <khc@hxbc.us>
parents:
20501
diff
changeset
|
416 xmlnode *type; |
90fd0826c6ce
finish converting the rest of stuff to the new soap api, signing on, getting
Ka-Hing Cheung <khc@hxbc.us>
parents:
20501
diff
changeset
|
417 |
23453
bca58b00afab
References #4382, replaces usage of msn_soap_xml_get with xmlnode_get_child
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23447
diff
changeset
|
418 if ((type = xmlnode_get_child(service, "Info/Handle/Type"))) { |
20538
90fd0826c6ce
finish converting the rest of stuff to the new soap api, signing on, getting
Ka-Hing Cheung <khc@hxbc.us>
parents:
20501
diff
changeset
|
419 char *type_str = xmlnode_get_data(type); |
90fd0826c6ce
finish converting the rest of stuff to the new soap api, signing on, getting
Ka-Hing Cheung <khc@hxbc.us>
parents:
20501
diff
changeset
|
420 |
90fd0826c6ce
finish converting the rest of stuff to the new soap api, signing on, getting
Ka-Hing Cheung <khc@hxbc.us>
parents:
20501
diff
changeset
|
421 if (g_str_equal(type_str, "Profile")) { |
90fd0826c6ce
finish converting the rest of stuff to the new soap api, signing on, getting
Ka-Hing Cheung <khc@hxbc.us>
parents:
20501
diff
changeset
|
422 /* Process Windows Live 'Messenger Roaming Identity' */ |
90fd0826c6ce
finish converting the rest of stuff to the new soap api, signing on, getting
Ka-Hing Cheung <khc@hxbc.us>
parents:
20501
diff
changeset
|
423 } else if (g_str_equal(type_str, "Messenger")) { |
90fd0826c6ce
finish converting the rest of stuff to the new soap api, signing on, getting
Ka-Hing Cheung <khc@hxbc.us>
parents:
20501
diff
changeset
|
424 xmlnode *lastchange = xmlnode_get_child(service, "LastChange"); |
90fd0826c6ce
finish converting the rest of stuff to the new soap api, signing on, getting
Ka-Hing Cheung <khc@hxbc.us>
parents:
20501
diff
changeset
|
425 char *lastchange_str = xmlnode_get_data(lastchange); |
90fd0826c6ce
finish converting the rest of stuff to the new soap api, signing on, getting
Ka-Hing Cheung <khc@hxbc.us>
parents:
20501
diff
changeset
|
426 xmlnode *membership; |
90fd0826c6ce
finish converting the rest of stuff to the new soap api, signing on, getting
Ka-Hing Cheung <khc@hxbc.us>
parents:
20501
diff
changeset
|
427 |
23519
7bceac816e19
The great MSN debug message cleanup! Threw in a few whitespace fixes,
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23507
diff
changeset
|
428 purple_debug_info("msn", "CL last change: %s\n", lastchange_str); |
20538
90fd0826c6ce
finish converting the rest of stuff to the new soap api, signing on, getting
Ka-Hing Cheung <khc@hxbc.us>
parents:
20501
diff
changeset
|
429 purple_account_set_string(session->account, "CLLastChange", |
90fd0826c6ce
finish converting the rest of stuff to the new soap api, signing on, getting
Ka-Hing Cheung <khc@hxbc.us>
parents:
20501
diff
changeset
|
430 lastchange_str); |
90fd0826c6ce
finish converting the rest of stuff to the new soap api, signing on, getting
Ka-Hing Cheung <khc@hxbc.us>
parents:
20501
diff
changeset
|
431 |
23453
bca58b00afab
References #4382, replaces usage of msn_soap_xml_get with xmlnode_get_child
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23447
diff
changeset
|
432 for (membership = xmlnode_get_child(service, |
20538
90fd0826c6ce
finish converting the rest of stuff to the new soap api, signing on, getting
Ka-Hing Cheung <khc@hxbc.us>
parents:
20501
diff
changeset
|
433 "Memberships/Membership"); |
90fd0826c6ce
finish converting the rest of stuff to the new soap api, signing on, getting
Ka-Hing Cheung <khc@hxbc.us>
parents:
20501
diff
changeset
|
434 membership; membership = xmlnode_get_next_twin(membership)) { |
90fd0826c6ce
finish converting the rest of stuff to the new soap api, signing on, getting
Ka-Hing Cheung <khc@hxbc.us>
parents:
20501
diff
changeset
|
435 |
90fd0826c6ce
finish converting the rest of stuff to the new soap api, signing on, getting
Ka-Hing Cheung <khc@hxbc.us>
parents:
20501
diff
changeset
|
436 xmlnode *role = xmlnode_get_child(membership, "MemberRole"); |
90fd0826c6ce
finish converting the rest of stuff to the new soap api, signing on, getting
Ka-Hing Cheung <khc@hxbc.us>
parents:
20501
diff
changeset
|
437 char *role_str = xmlnode_get_data(role); |
90fd0826c6ce
finish converting the rest of stuff to the new soap api, signing on, getting
Ka-Hing Cheung <khc@hxbc.us>
parents:
20501
diff
changeset
|
438 MsnListId list = msn_get_memberrole(role_str); |
90fd0826c6ce
finish converting the rest of stuff to the new soap api, signing on, getting
Ka-Hing Cheung <khc@hxbc.us>
parents:
20501
diff
changeset
|
439 xmlnode *member; |
90fd0826c6ce
finish converting the rest of stuff to the new soap api, signing on, getting
Ka-Hing Cheung <khc@hxbc.us>
parents:
20501
diff
changeset
|
440 |
23519
7bceac816e19
The great MSN debug message cleanup! Threw in a few whitespace fixes,
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23507
diff
changeset
|
441 purple_debug_info("msn", "CL MemberRole role: %s, list: %d\n", |
23767 | 442 role_str, list); |
20538
90fd0826c6ce
finish converting the rest of stuff to the new soap api, signing on, getting
Ka-Hing Cheung <khc@hxbc.us>
parents:
20501
diff
changeset
|
443 |
23453
bca58b00afab
References #4382, replaces usage of msn_soap_xml_get with xmlnode_get_child
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23447
diff
changeset
|
444 for (member = xmlnode_get_child(membership, "Members/Member"); |
20538
90fd0826c6ce
finish converting the rest of stuff to the new soap api, signing on, getting
Ka-Hing Cheung <khc@hxbc.us>
parents:
20501
diff
changeset
|
445 member; member = xmlnode_get_next_twin(member)) { |
90fd0826c6ce
finish converting the rest of stuff to the new soap api, signing on, getting
Ka-Hing Cheung <khc@hxbc.us>
parents:
20501
diff
changeset
|
446 const char *member_type = xmlnode_get_attrib(member, "type"); |
90fd0826c6ce
finish converting the rest of stuff to the new soap api, signing on, getting
Ka-Hing Cheung <khc@hxbc.us>
parents:
20501
diff
changeset
|
447 if (g_str_equal(member_type, "PassportMember")) { |
90fd0826c6ce
finish converting the rest of stuff to the new soap api, signing on, getting
Ka-Hing Cheung <khc@hxbc.us>
parents:
20501
diff
changeset
|
448 msn_parse_each_member(session, member, "PassportName", |
90fd0826c6ce
finish converting the rest of stuff to the new soap api, signing on, getting
Ka-Hing Cheung <khc@hxbc.us>
parents:
20501
diff
changeset
|
449 list); |
90fd0826c6ce
finish converting the rest of stuff to the new soap api, signing on, getting
Ka-Hing Cheung <khc@hxbc.us>
parents:
20501
diff
changeset
|
450 } else if (g_str_equal(member_type, "PhoneMember")) { |
90fd0826c6ce
finish converting the rest of stuff to the new soap api, signing on, getting
Ka-Hing Cheung <khc@hxbc.us>
parents:
20501
diff
changeset
|
451 |
90fd0826c6ce
finish converting the rest of stuff to the new soap api, signing on, getting
Ka-Hing Cheung <khc@hxbc.us>
parents:
20501
diff
changeset
|
452 } else if (g_str_equal(member_type, "EmailMember")) { |
90fd0826c6ce
finish converting the rest of stuff to the new soap api, signing on, getting
Ka-Hing Cheung <khc@hxbc.us>
parents:
20501
diff
changeset
|
453 msn_parse_each_member(session, member, "Email", list); |
90fd0826c6ce
finish converting the rest of stuff to the new soap api, signing on, getting
Ka-Hing Cheung <khc@hxbc.us>
parents:
20501
diff
changeset
|
454 } |
90fd0826c6ce
finish converting the rest of stuff to the new soap api, signing on, getting
Ka-Hing Cheung <khc@hxbc.us>
parents:
20501
diff
changeset
|
455 } |
90fd0826c6ce
finish converting the rest of stuff to the new soap api, signing on, getting
Ka-Hing Cheung <khc@hxbc.us>
parents:
20501
diff
changeset
|
456 |
90fd0826c6ce
finish converting the rest of stuff to the new soap api, signing on, getting
Ka-Hing Cheung <khc@hxbc.us>
parents:
20501
diff
changeset
|
457 g_free(role_str); |
90fd0826c6ce
finish converting the rest of stuff to the new soap api, signing on, getting
Ka-Hing Cheung <khc@hxbc.us>
parents:
20501
diff
changeset
|
458 } |
90fd0826c6ce
finish converting the rest of stuff to the new soap api, signing on, getting
Ka-Hing Cheung <khc@hxbc.us>
parents:
20501
diff
changeset
|
459 |
90fd0826c6ce
finish converting the rest of stuff to the new soap api, signing on, getting
Ka-Hing Cheung <khc@hxbc.us>
parents:
20501
diff
changeset
|
460 g_free(lastchange_str); |
90fd0826c6ce
finish converting the rest of stuff to the new soap api, signing on, getting
Ka-Hing Cheung <khc@hxbc.us>
parents:
20501
diff
changeset
|
461 } |
90fd0826c6ce
finish converting the rest of stuff to the new soap api, signing on, getting
Ka-Hing Cheung <khc@hxbc.us>
parents:
20501
diff
changeset
|
462 |
90fd0826c6ce
finish converting the rest of stuff to the new soap api, signing on, getting
Ka-Hing Cheung <khc@hxbc.us>
parents:
20501
diff
changeset
|
463 g_free(type_str); |
90fd0826c6ce
finish converting the rest of stuff to the new soap api, signing on, getting
Ka-Hing Cheung <khc@hxbc.us>
parents:
20501
diff
changeset
|
464 } |
20477
9a2a4a0c0003
Add the possibility to create an Address Book, useful for newly registered MSN users.
Carlos Silva <typ0@pidgin.im>
parents:
20471
diff
changeset
|
465 } |
9a2a4a0c0003
Add the possibility to create an Address Book, useful for newly registered MSN users.
Carlos Silva <typ0@pidgin.im>
parents:
20471
diff
changeset
|
466 |
20394
4a099e4d0d09
propagate from branch 'im.pidgin.pidgin' (head 98b6b547b29ea1192b73cc4e1de1e674edef4328)
Richard Laager <rlaager@wiktel.com>
parents:
diff
changeset
|
467 /*parse contact list*/ |
4a099e4d0d09
propagate from branch 'im.pidgin.pidgin' (head 98b6b547b29ea1192b73cc4e1de1e674edef4328)
Richard Laager <rlaager@wiktel.com>
parents:
diff
changeset
|
468 static void |
23459
69af5301e1a7
killing MsnContact which just wraps MsnSession
Ka-Hing Cheung <khc@hxbc.us>
parents:
23453
diff
changeset
|
469 msn_parse_contact_list(MsnSession *session, xmlnode *node) |
20394
4a099e4d0d09
propagate from branch 'im.pidgin.pidgin' (head 98b6b547b29ea1192b73cc4e1de1e674edef4328)
Richard Laager <rlaager@wiktel.com>
parents:
diff
changeset
|
470 { |
20538
90fd0826c6ce
finish converting the rest of stuff to the new soap api, signing on, getting
Ka-Hing Cheung <khc@hxbc.us>
parents:
20501
diff
changeset
|
471 xmlnode *fault, *faultnode; |
20467
86da6ab1f612
Correctly process an additional <Service> with type Profile and name 'Messenger Roaming Identity' sent with the contact list using a recently registered WLM account, that was causing the initial ADL command to be sent malformed, and our presence status not being forwarded to our buddies
Carlos Silva <typ0@pidgin.im>
parents:
20466
diff
changeset
|
472 |
20538
90fd0826c6ce
finish converting the rest of stuff to the new soap api, signing on, getting
Ka-Hing Cheung <khc@hxbc.us>
parents:
20501
diff
changeset
|
473 /* we may get a response if our cache data is too old: |
90fd0826c6ce
finish converting the rest of stuff to the new soap api, signing on, getting
Ka-Hing Cheung <khc@hxbc.us>
parents:
20501
diff
changeset
|
474 * |
90fd0826c6ce
finish converting the rest of stuff to the new soap api, signing on, getting
Ka-Hing Cheung <khc@hxbc.us>
parents:
20501
diff
changeset
|
475 * <faultstring>Need to do full sync. Can't sync deltas Client |
90fd0826c6ce
finish converting the rest of stuff to the new soap api, signing on, getting
Ka-Hing Cheung <khc@hxbc.us>
parents:
20501
diff
changeset
|
476 * has too old a copy for us to do a delta sync</faultstring> |
90fd0826c6ce
finish converting the rest of stuff to the new soap api, signing on, getting
Ka-Hing Cheung <khc@hxbc.us>
parents:
20501
diff
changeset
|
477 * |
90fd0826c6ce
finish converting the rest of stuff to the new soap api, signing on, getting
Ka-Hing Cheung <khc@hxbc.us>
parents:
20501
diff
changeset
|
478 * this is not handled yet |
90fd0826c6ce
finish converting the rest of stuff to the new soap api, signing on, getting
Ka-Hing Cheung <khc@hxbc.us>
parents:
20501
diff
changeset
|
479 */ |
23453
bca58b00afab
References #4382, replaces usage of msn_soap_xml_get with xmlnode_get_child
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23447
diff
changeset
|
480 if ((fault = xmlnode_get_child(node, "Body/Fault"))) { |
20538
90fd0826c6ce
finish converting the rest of stuff to the new soap api, signing on, getting
Ka-Hing Cheung <khc@hxbc.us>
parents:
20501
diff
changeset
|
481 if ((faultnode = xmlnode_get_child(fault, "faultstring"))) { |
90fd0826c6ce
finish converting the rest of stuff to the new soap api, signing on, getting
Ka-Hing Cheung <khc@hxbc.us>
parents:
20501
diff
changeset
|
482 char *faultstring = xmlnode_get_data(faultnode); |
23519
7bceac816e19
The great MSN debug message cleanup! Threw in a few whitespace fixes,
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23507
diff
changeset
|
483 purple_debug_info("msn", "Retrieving contact list failed: %s\n", |
20538
90fd0826c6ce
finish converting the rest of stuff to the new soap api, signing on, getting
Ka-Hing Cheung <khc@hxbc.us>
parents:
20501
diff
changeset
|
484 faultstring); |
20477
9a2a4a0c0003
Add the possibility to create an Address Book, useful for newly registered MSN users.
Carlos Silva <typ0@pidgin.im>
parents:
20471
diff
changeset
|
485 g_free(faultstring); |
9a2a4a0c0003
Add the possibility to create an Address Book, useful for newly registered MSN users.
Carlos Silva <typ0@pidgin.im>
parents:
20471
diff
changeset
|
486 } |
23453
bca58b00afab
References #4382, replaces usage of msn_soap_xml_get with xmlnode_get_child
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23447
diff
changeset
|
487 if ((faultnode = xmlnode_get_child(fault, "detail/errorcode"))) { |
20538
90fd0826c6ce
finish converting the rest of stuff to the new soap api, signing on, getting
Ka-Hing Cheung <khc@hxbc.us>
parents:
20501
diff
changeset
|
488 char *errorcode = xmlnode_get_data(faultnode); |
20394
4a099e4d0d09
propagate from branch 'im.pidgin.pidgin' (head 98b6b547b29ea1192b73cc4e1de1e674edef4328)
Richard Laager <rlaager@wiktel.com>
parents:
diff
changeset
|
489 |
20538
90fd0826c6ce
finish converting the rest of stuff to the new soap api, signing on, getting
Ka-Hing Cheung <khc@hxbc.us>
parents:
20501
diff
changeset
|
490 if (g_str_equal(errorcode, "ABDoesNotExist")) { |
23459
69af5301e1a7
killing MsnContact which just wraps MsnSession
Ka-Hing Cheung <khc@hxbc.us>
parents:
23453
diff
changeset
|
491 msn_create_address_book(session); |
20538
90fd0826c6ce
finish converting the rest of stuff to the new soap api, signing on, getting
Ka-Hing Cheung <khc@hxbc.us>
parents:
20501
diff
changeset
|
492 g_free(errorcode); |
90fd0826c6ce
finish converting the rest of stuff to the new soap api, signing on, getting
Ka-Hing Cheung <khc@hxbc.us>
parents:
20501
diff
changeset
|
493 return; |
90fd0826c6ce
finish converting the rest of stuff to the new soap api, signing on, getting
Ka-Hing Cheung <khc@hxbc.us>
parents:
20501
diff
changeset
|
494 } |
20477
9a2a4a0c0003
Add the possibility to create an Address Book, useful for newly registered MSN users.
Carlos Silva <typ0@pidgin.im>
parents:
20471
diff
changeset
|
495 |
20538
90fd0826c6ce
finish converting the rest of stuff to the new soap api, signing on, getting
Ka-Hing Cheung <khc@hxbc.us>
parents:
20501
diff
changeset
|
496 g_free(errorcode); |
20467
86da6ab1f612
Correctly process an additional <Service> with type Profile and name 'Messenger Roaming Identity' sent with the contact list using a recently registered WLM account, that was causing the initial ADL command to be sent malformed, and our presence status not being forwarded to our buddies
Carlos Silva <typ0@pidgin.im>
parents:
20466
diff
changeset
|
497 } |
86da6ab1f612
Correctly process an additional <Service> with type Profile and name 'Messenger Roaming Identity' sent with the contact list using a recently registered WLM account, that was causing the initial ADL command to be sent malformed, and our presence status not being forwarded to our buddies
Carlos Silva <typ0@pidgin.im>
parents:
20466
diff
changeset
|
498 |
23459
69af5301e1a7
killing MsnContact which just wraps MsnSession
Ka-Hing Cheung <khc@hxbc.us>
parents:
23453
diff
changeset
|
499 msn_get_contact_list(session, MSN_PS_INITIAL, NULL); |
20538
90fd0826c6ce
finish converting the rest of stuff to the new soap api, signing on, getting
Ka-Hing Cheung <khc@hxbc.us>
parents:
20501
diff
changeset
|
500 } else { |
90fd0826c6ce
finish converting the rest of stuff to the new soap api, signing on, getting
Ka-Hing Cheung <khc@hxbc.us>
parents:
20501
diff
changeset
|
501 xmlnode *service; |
20486
ff4ae9dde291
Make block/unblock work right, as well as being add by a buddy. Finally fixes #723
Carlos Silva <typ0@pidgin.im>
parents:
20484
diff
changeset
|
502 |
23453
bca58b00afab
References #4382, replaces usage of msn_soap_xml_get with xmlnode_get_child
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23447
diff
changeset
|
503 for (service = xmlnode_get_child(node, "Body/FindMembershipResponse/" |
20538
90fd0826c6ce
finish converting the rest of stuff to the new soap api, signing on, getting
Ka-Hing Cheung <khc@hxbc.us>
parents:
20501
diff
changeset
|
504 "FindMembershipResult/Services/Service"); |
90fd0826c6ce
finish converting the rest of stuff to the new soap api, signing on, getting
Ka-Hing Cheung <khc@hxbc.us>
parents:
20501
diff
changeset
|
505 service; service = xmlnode_get_next_twin(service)) { |
23459
69af5301e1a7
killing MsnContact which just wraps MsnSession
Ka-Hing Cheung <khc@hxbc.us>
parents:
23453
diff
changeset
|
506 msn_parse_each_service(session, service); |
20394
4a099e4d0d09
propagate from branch 'im.pidgin.pidgin' (head 98b6b547b29ea1192b73cc4e1de1e674edef4328)
Richard Laager <rlaager@wiktel.com>
parents:
diff
changeset
|
507 } |
4a099e4d0d09
propagate from branch 'im.pidgin.pidgin' (head 98b6b547b29ea1192b73cc4e1de1e674edef4328)
Richard Laager <rlaager@wiktel.com>
parents:
diff
changeset
|
508 } |
4a099e4d0d09
propagate from branch 'im.pidgin.pidgin' (head 98b6b547b29ea1192b73cc4e1de1e674edef4328)
Richard Laager <rlaager@wiktel.com>
parents:
diff
changeset
|
509 } |
4a099e4d0d09
propagate from branch 'im.pidgin.pidgin' (head 98b6b547b29ea1192b73cc4e1de1e674edef4328)
Richard Laager <rlaager@wiktel.com>
parents:
diff
changeset
|
510 |
4a099e4d0d09
propagate from branch 'im.pidgin.pidgin' (head 98b6b547b29ea1192b73cc4e1de1e674edef4328)
Richard Laager <rlaager@wiktel.com>
parents:
diff
changeset
|
511 static void |
20538
90fd0826c6ce
finish converting the rest of stuff to the new soap api, signing on, getting
Ka-Hing Cheung <khc@hxbc.us>
parents:
20501
diff
changeset
|
512 msn_get_contact_list_cb(MsnSoapMessage *req, MsnSoapMessage *resp, |
90fd0826c6ce
finish converting the rest of stuff to the new soap api, signing on, getting
Ka-Hing Cheung <khc@hxbc.us>
parents:
20501
diff
changeset
|
513 gpointer data) |
20394
4a099e4d0d09
propagate from branch 'im.pidgin.pidgin' (head 98b6b547b29ea1192b73cc4e1de1e674edef4328)
Richard Laager <rlaager@wiktel.com>
parents:
diff
changeset
|
514 { |
25396
06a802d32d71
I incorrectly assumed that the FindMembership and ABFindAll SOAP requests
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
25395
diff
changeset
|
515 MsnCallbackState *state = data; |
06a802d32d71
I incorrectly assumed that the FindMembership and ABFindAll SOAP requests
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
25395
diff
changeset
|
516 MsnSession *session = state->session; |
20538
90fd0826c6ce
finish converting the rest of stuff to the new soap api, signing on, getting
Ka-Hing Cheung <khc@hxbc.us>
parents:
20501
diff
changeset
|
517 |
90fd0826c6ce
finish converting the rest of stuff to the new soap api, signing on, getting
Ka-Hing Cheung <khc@hxbc.us>
parents:
20501
diff
changeset
|
518 g_return_if_fail(session != NULL); |
90fd0826c6ce
finish converting the rest of stuff to the new soap api, signing on, getting
Ka-Hing Cheung <khc@hxbc.us>
parents:
20501
diff
changeset
|
519 |
90fd0826c6ce
finish converting the rest of stuff to the new soap api, signing on, getting
Ka-Hing Cheung <khc@hxbc.us>
parents:
20501
diff
changeset
|
520 if (resp != NULL) { |
90fd0826c6ce
finish converting the rest of stuff to the new soap api, signing on, getting
Ka-Hing Cheung <khc@hxbc.us>
parents:
20501
diff
changeset
|
521 const char *abLastChange; |
90fd0826c6ce
finish converting the rest of stuff to the new soap api, signing on, getting
Ka-Hing Cheung <khc@hxbc.us>
parents:
20501
diff
changeset
|
522 const char *dynamicItemLastChange; |
90fd0826c6ce
finish converting the rest of stuff to the new soap api, signing on, getting
Ka-Hing Cheung <khc@hxbc.us>
parents:
20501
diff
changeset
|
523 |
23519
7bceac816e19
The great MSN debug message cleanup! Threw in a few whitespace fixes,
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23507
diff
changeset
|
524 purple_debug_misc("msn", "Got the contact list!\n"); |
20394
4a099e4d0d09
propagate from branch 'im.pidgin.pidgin' (head 98b6b547b29ea1192b73cc4e1de1e674edef4328)
Richard Laager <rlaager@wiktel.com>
parents:
diff
changeset
|
525 |
23459
69af5301e1a7
killing MsnContact which just wraps MsnSession
Ka-Hing Cheung <khc@hxbc.us>
parents:
23453
diff
changeset
|
526 msn_parse_contact_list(session, resp->xml); |
20538
90fd0826c6ce
finish converting the rest of stuff to the new soap api, signing on, getting
Ka-Hing Cheung <khc@hxbc.us>
parents:
20501
diff
changeset
|
527 abLastChange = purple_account_get_string(session->account, |
90fd0826c6ce
finish converting the rest of stuff to the new soap api, signing on, getting
Ka-Hing Cheung <khc@hxbc.us>
parents:
20501
diff
changeset
|
528 "ablastChange", NULL); |
90fd0826c6ce
finish converting the rest of stuff to the new soap api, signing on, getting
Ka-Hing Cheung <khc@hxbc.us>
parents:
20501
diff
changeset
|
529 dynamicItemLastChange = purple_account_get_string(session->account, |
90fd0826c6ce
finish converting the rest of stuff to the new soap api, signing on, getting
Ka-Hing Cheung <khc@hxbc.us>
parents:
20501
diff
changeset
|
530 "dynamicItemLastChange", NULL); |
90fd0826c6ce
finish converting the rest of stuff to the new soap api, signing on, getting
Ka-Hing Cheung <khc@hxbc.us>
parents:
20501
diff
changeset
|
531 |
25396
06a802d32d71
I incorrectly assumed that the FindMembership and ABFindAll SOAP requests
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
25395
diff
changeset
|
532 if (state->partner_scenario == MSN_PS_INITIAL) { |
20538
90fd0826c6ce
finish converting the rest of stuff to the new soap api, signing on, getting
Ka-Hing Cheung <khc@hxbc.us>
parents:
20501
diff
changeset
|
533 #ifdef MSN_PARTIAL_LISTS |
90fd0826c6ce
finish converting the rest of stuff to the new soap api, signing on, getting
Ka-Hing Cheung <khc@hxbc.us>
parents:
20501
diff
changeset
|
534 /* XXX: this should be enabled when we can correctly do partial |
90fd0826c6ce
finish converting the rest of stuff to the new soap api, signing on, getting
Ka-Hing Cheung <khc@hxbc.us>
parents:
20501
diff
changeset
|
535 syncs with the server. Currently we need to retrieve the whole |
90fd0826c6ce
finish converting the rest of stuff to the new soap api, signing on, getting
Ka-Hing Cheung <khc@hxbc.us>
parents:
20501
diff
changeset
|
536 list to detect sync issues */ |
23459
69af5301e1a7
killing MsnContact which just wraps MsnSession
Ka-Hing Cheung <khc@hxbc.us>
parents:
23453
diff
changeset
|
537 msn_get_address_book(session, MSN_PS_INITIAL, abLastChange, dynamicItemLastChange); |
20538
90fd0826c6ce
finish converting the rest of stuff to the new soap api, signing on, getting
Ka-Hing Cheung <khc@hxbc.us>
parents:
20501
diff
changeset
|
538 #else |
23459
69af5301e1a7
killing MsnContact which just wraps MsnSession
Ka-Hing Cheung <khc@hxbc.us>
parents:
23453
diff
changeset
|
539 msn_get_address_book(session, MSN_PS_INITIAL, NULL, NULL); |
20538
90fd0826c6ce
finish converting the rest of stuff to the new soap api, signing on, getting
Ka-Hing Cheung <khc@hxbc.us>
parents:
20501
diff
changeset
|
540 #endif |
90fd0826c6ce
finish converting the rest of stuff to the new soap api, signing on, getting
Ka-Hing Cheung <khc@hxbc.us>
parents:
20501
diff
changeset
|
541 } |
90fd0826c6ce
finish converting the rest of stuff to the new soap api, signing on, getting
Ka-Hing Cheung <khc@hxbc.us>
parents:
20501
diff
changeset
|
542 } |
20394
4a099e4d0d09
propagate from branch 'im.pidgin.pidgin' (head 98b6b547b29ea1192b73cc4e1de1e674edef4328)
Richard Laager <rlaager@wiktel.com>
parents:
diff
changeset
|
543 } |
4a099e4d0d09
propagate from branch 'im.pidgin.pidgin' (head 98b6b547b29ea1192b73cc4e1de1e674edef4328)
Richard Laager <rlaager@wiktel.com>
parents:
diff
changeset
|
544 |
4a099e4d0d09
propagate from branch 'im.pidgin.pidgin' (head 98b6b547b29ea1192b73cc4e1de1e674edef4328)
Richard Laager <rlaager@wiktel.com>
parents:
diff
changeset
|
545 /*SOAP get contact list*/ |
4a099e4d0d09
propagate from branch 'im.pidgin.pidgin' (head 98b6b547b29ea1192b73cc4e1de1e674edef4328)
Richard Laager <rlaager@wiktel.com>
parents:
diff
changeset
|
546 void |
23459
69af5301e1a7
killing MsnContact which just wraps MsnSession
Ka-Hing Cheung <khc@hxbc.us>
parents:
23453
diff
changeset
|
547 msn_get_contact_list(MsnSession *session, |
20538
90fd0826c6ce
finish converting the rest of stuff to the new soap api, signing on, getting
Ka-Hing Cheung <khc@hxbc.us>
parents:
20501
diff
changeset
|
548 const MsnSoapPartnerScenario partner_scenario, const char *update_time) |
20394
4a099e4d0d09
propagate from branch 'im.pidgin.pidgin' (head 98b6b547b29ea1192b73cc4e1de1e674edef4328)
Richard Laager <rlaager@wiktel.com>
parents:
diff
changeset
|
549 { |
20486
ff4ae9dde291
Make block/unblock work right, as well as being add by a buddy. Finally fixes #723
Carlos Silva <typ0@pidgin.im>
parents:
20484
diff
changeset
|
550 gchar *body = NULL; |
20671
4dd60add6a7c
Further cleanup of the msn prpl including preventing the authorization request callback from crashing if triggered after the account is disconnected. Also removal of some extraneous debuggery, there is more that needs to be removed.
Daniel Atallah <daniel.atallah@gmail.com>
parents:
20666
diff
changeset
|
551 gchar *update_str = NULL; |
25396
06a802d32d71
I incorrectly assumed that the FindMembership and ABFindAll SOAP requests
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
25395
diff
changeset
|
552 MsnCallbackState *state; |
20486
ff4ae9dde291
Make block/unblock work right, as well as being add by a buddy. Finally fixes #723
Carlos Silva <typ0@pidgin.im>
parents:
20484
diff
changeset
|
553 const gchar *partner_scenario_str = MsnSoapPartnerScenarioText[partner_scenario]; |
20467
86da6ab1f612
Correctly process an additional <Service> with type Profile and name 'Messenger Roaming Identity' sent with the contact list using a recently registered WLM account, that was causing the initial ADL command to be sent malformed, and our presence status not being forwarded to our buddies
Carlos Silva <typ0@pidgin.im>
parents:
20466
diff
changeset
|
554 |
23519
7bceac816e19
The great MSN debug message cleanup! Threw in a few whitespace fixes,
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23507
diff
changeset
|
555 purple_debug_misc("msn", "Getting Contact List.\n"); |
20486
ff4ae9dde291
Make block/unblock work right, as well as being add by a buddy. Finally fixes #723
Carlos Silva <typ0@pidgin.im>
parents:
20484
diff
changeset
|
556 |
23519
7bceac816e19
The great MSN debug message cleanup! Threw in a few whitespace fixes,
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23507
diff
changeset
|
557 if (update_time != NULL) { |
7bceac816e19
The great MSN debug message cleanup! Threw in a few whitespace fixes,
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23507
diff
changeset
|
558 purple_debug_info("msn", "CL Last update time: %s\n", update_time); |
23735
35f7b7c62995
Remove calls to g_markup_escape_text. Not only does this help with old
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23734
diff
changeset
|
559 update_str = g_strdup_printf(MSN_GET_CONTACT_UPDATE_XML, update_time); |
20394
4a099e4d0d09
propagate from branch 'im.pidgin.pidgin' (head 98b6b547b29ea1192b73cc4e1de1e674edef4328)
Richard Laager <rlaager@wiktel.com>
parents:
diff
changeset
|
560 } |
20486
ff4ae9dde291
Make block/unblock work right, as well as being add by a buddy. Finally fixes #723
Carlos Silva <typ0@pidgin.im>
parents:
20484
diff
changeset
|
561 |
23735
35f7b7c62995
Remove calls to g_markup_escape_text. Not only does this help with old
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23734
diff
changeset
|
562 body = g_strdup_printf(MSN_GET_CONTACT_TEMPLATE, partner_scenario_str, |
25396
06a802d32d71
I incorrectly assumed that the FindMembership and ABFindAll SOAP requests
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
25395
diff
changeset
|
563 update_str ? update_str : ""); |
20477
9a2a4a0c0003
Add the possibility to create an Address Book, useful for newly registered MSN users.
Carlos Silva <typ0@pidgin.im>
parents:
20471
diff
changeset
|
564 |
25396
06a802d32d71
I incorrectly assumed that the FindMembership and ABFindAll SOAP requests
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
25395
diff
changeset
|
565 state = msn_callback_state_new(session); |
06a802d32d71
I incorrectly assumed that the FindMembership and ABFindAll SOAP requests
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
25395
diff
changeset
|
566 state->partner_scenario = partner_scenario; |
06a802d32d71
I incorrectly assumed that the FindMembership and ABFindAll SOAP requests
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
25395
diff
changeset
|
567 state->body = xmlnode_from_str(body, -1); |
06a802d32d71
I incorrectly assumed that the FindMembership and ABFindAll SOAP requests
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
25395
diff
changeset
|
568 state->post_action = MSN_GET_CONTACT_SOAP_ACTION; |
06a802d32d71
I incorrectly assumed that the FindMembership and ABFindAll SOAP requests
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
25395
diff
changeset
|
569 state->post_url = MSN_GET_CONTACT_POST_URL; |
06a802d32d71
I incorrectly assumed that the FindMembership and ABFindAll SOAP requests
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
25395
diff
changeset
|
570 state->cb = msn_get_contact_list_cb; |
06a802d32d71
I incorrectly assumed that the FindMembership and ABFindAll SOAP requests
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
25395
diff
changeset
|
571 msn_contact_request(state); |
20538
90fd0826c6ce
finish converting the rest of stuff to the new soap api, signing on, getting
Ka-Hing Cheung <khc@hxbc.us>
parents:
20501
diff
changeset
|
572 |
90fd0826c6ce
finish converting the rest of stuff to the new soap api, signing on, getting
Ka-Hing Cheung <khc@hxbc.us>
parents:
20501
diff
changeset
|
573 g_free(update_str); |
20394
4a099e4d0d09
propagate from branch 'im.pidgin.pidgin' (head 98b6b547b29ea1192b73cc4e1de1e674edef4328)
Richard Laager <rlaager@wiktel.com>
parents:
diff
changeset
|
574 g_free(body); |
4a099e4d0d09
propagate from branch 'im.pidgin.pidgin' (head 98b6b547b29ea1192b73cc4e1de1e674edef4328)
Richard Laager <rlaager@wiktel.com>
parents:
diff
changeset
|
575 } |
4a099e4d0d09
propagate from branch 'im.pidgin.pidgin' (head 98b6b547b29ea1192b73cc4e1de1e674edef4328)
Richard Laager <rlaager@wiktel.com>
parents:
diff
changeset
|
576 |
20439
bee467c81570
A bunch of MSNP14 stuff:
Stu Tomlinson <stu@nosnilmot.com>
parents:
20432
diff
changeset
|
577 static void |
23459
69af5301e1a7
killing MsnContact which just wraps MsnSession
Ka-Hing Cheung <khc@hxbc.us>
parents:
23453
diff
changeset
|
578 msn_parse_addressbook_groups(MsnSession *session, xmlnode *node) |
20394
4a099e4d0d09
propagate from branch 'im.pidgin.pidgin' (head 98b6b547b29ea1192b73cc4e1de1e674edef4328)
Richard Laager <rlaager@wiktel.com>
parents:
diff
changeset
|
579 { |
20439
bee467c81570
A bunch of MSNP14 stuff:
Stu Tomlinson <stu@nosnilmot.com>
parents:
20432
diff
changeset
|
580 xmlnode *group; |
20394
4a099e4d0d09
propagate from branch 'im.pidgin.pidgin' (head 98b6b547b29ea1192b73cc4e1de1e674edef4328)
Richard Laager <rlaager@wiktel.com>
parents:
diff
changeset
|
581 |
23519
7bceac816e19
The great MSN debug message cleanup! Threw in a few whitespace fixes,
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23507
diff
changeset
|
582 purple_debug_info("msn", "msn_parse_addressbook_groups()\n"); |
20467
86da6ab1f612
Correctly process an additional <Service> with type Profile and name 'Messenger Roaming Identity' sent with the contact list using a recently registered WLM account, that was causing the initial ADL command to be sent malformed, and our presence status not being forwarded to our buddies
Carlos Silva <typ0@pidgin.im>
parents:
20466
diff
changeset
|
583 |
20439
bee467c81570
A bunch of MSNP14 stuff:
Stu Tomlinson <stu@nosnilmot.com>
parents:
20432
diff
changeset
|
584 for(group = xmlnode_get_child(node, "Group"); group; |
bee467c81570
A bunch of MSNP14 stuff:
Stu Tomlinson <stu@nosnilmot.com>
parents:
20432
diff
changeset
|
585 group = xmlnode_get_next_twin(group)){ |
bee467c81570
A bunch of MSNP14 stuff:
Stu Tomlinson <stu@nosnilmot.com>
parents:
20432
diff
changeset
|
586 xmlnode *groupId, *groupInfo, *groupname; |
20671
4dd60add6a7c
Further cleanup of the msn prpl including preventing the authorization request callback from crashing if triggered after the account is disconnected. Also removal of some extraneous debuggery, there is more that needs to be removed.
Daniel Atallah <daniel.atallah@gmail.com>
parents:
20666
diff
changeset
|
587 char *group_id = NULL, *group_name = NULL; |
20394
4a099e4d0d09
propagate from branch 'im.pidgin.pidgin' (head 98b6b547b29ea1192b73cc4e1de1e674edef4328)
Richard Laager <rlaager@wiktel.com>
parents:
diff
changeset
|
588 |
20671
4dd60add6a7c
Further cleanup of the msn prpl including preventing the authorization request callback from crashing if triggered after the account is disconnected. Also removal of some extraneous debuggery, there is more that needs to be removed.
Daniel Atallah <daniel.atallah@gmail.com>
parents:
20666
diff
changeset
|
589 if ((groupId = xmlnode_get_child(group, "groupId"))) |
4dd60add6a7c
Further cleanup of the msn prpl including preventing the authorization request callback from crashing if triggered after the account is disconnected. Also removal of some extraneous debuggery, there is more that needs to be removed.
Daniel Atallah <daniel.atallah@gmail.com>
parents:
20666
diff
changeset
|
590 group_id = xmlnode_get_data(groupId); |
4dd60add6a7c
Further cleanup of the msn prpl including preventing the authorization request callback from crashing if triggered after the account is disconnected. Also removal of some extraneous debuggery, there is more that needs to be removed.
Daniel Atallah <daniel.atallah@gmail.com>
parents:
20666
diff
changeset
|
591 if ((groupInfo = xmlnode_get_child(group, "groupInfo")) && (groupname = xmlnode_get_child(groupInfo, "name"))) |
4dd60add6a7c
Further cleanup of the msn prpl including preventing the authorization request callback from crashing if triggered after the account is disconnected. Also removal of some extraneous debuggery, there is more that needs to be removed.
Daniel Atallah <daniel.atallah@gmail.com>
parents:
20666
diff
changeset
|
592 group_name = xmlnode_get_data(groupname); |
20394
4a099e4d0d09
propagate from branch 'im.pidgin.pidgin' (head 98b6b547b29ea1192b73cc4e1de1e674edef4328)
Richard Laager <rlaager@wiktel.com>
parents:
diff
changeset
|
593 |
24512
9a3ed3b7ac4b
Check for NULL group_id before calling msn_group_new since that function will
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
24451
diff
changeset
|
594 if (group_id == NULL) { |
20394
4a099e4d0d09
propagate from branch 'im.pidgin.pidgin' (head 98b6b547b29ea1192b73cc4e1de1e674edef4328)
Richard Laager <rlaager@wiktel.com>
parents:
diff
changeset
|
595 /* Group of ungroupped buddies */ |
20477
9a2a4a0c0003
Add the possibility to create an Address Book, useful for newly registered MSN users.
Carlos Silva <typ0@pidgin.im>
parents:
20471
diff
changeset
|
596 g_free(group_name); |
20394
4a099e4d0d09
propagate from branch 'im.pidgin.pidgin' (head 98b6b547b29ea1192b73cc4e1de1e674edef4328)
Richard Laager <rlaager@wiktel.com>
parents:
diff
changeset
|
597 continue; |
4a099e4d0d09
propagate from branch 'im.pidgin.pidgin' (head 98b6b547b29ea1192b73cc4e1de1e674edef4328)
Richard Laager <rlaager@wiktel.com>
parents:
diff
changeset
|
598 } |
4a099e4d0d09
propagate from branch 'im.pidgin.pidgin' (head 98b6b547b29ea1192b73cc4e1de1e674edef4328)
Richard Laager <rlaager@wiktel.com>
parents:
diff
changeset
|
599 |
24512
9a3ed3b7ac4b
Check for NULL group_id before calling msn_group_new since that function will
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
24451
diff
changeset
|
600 msn_group_new(session->userlist, group_id, group_name); |
9a3ed3b7ac4b
Check for NULL group_id before calling msn_group_new since that function will
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
24451
diff
changeset
|
601 |
23519
7bceac816e19
The great MSN debug message cleanup! Threw in a few whitespace fixes,
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23507
diff
changeset
|
602 purple_debug_info("msn", "AB group_id: %s, name: %s\n", group_id, group_name ? group_name : "(null)"); |
24512
9a3ed3b7ac4b
Check for NULL group_id before calling msn_group_new since that function will
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
24451
diff
changeset
|
603 if ((purple_find_group(group_name)) == NULL) { |
20401
4ddc27c18781
Fix up some gaim -> purple issues.
Richard Laager <rlaager@wiktel.com>
parents:
20394
diff
changeset
|
604 PurpleGroup *g = purple_group_new(group_name); |
4ddc27c18781
Fix up some gaim -> purple issues.
Richard Laager <rlaager@wiktel.com>
parents:
20394
diff
changeset
|
605 purple_blist_add_group(g, NULL); |
20394
4a099e4d0d09
propagate from branch 'im.pidgin.pidgin' (head 98b6b547b29ea1192b73cc4e1de1e674edef4328)
Richard Laager <rlaager@wiktel.com>
parents:
diff
changeset
|
606 } |
4a099e4d0d09
propagate from branch 'im.pidgin.pidgin' (head 98b6b547b29ea1192b73cc4e1de1e674edef4328)
Richard Laager <rlaager@wiktel.com>
parents:
diff
changeset
|
607 g_free(group_id); |
4a099e4d0d09
propagate from branch 'im.pidgin.pidgin' (head 98b6b547b29ea1192b73cc4e1de1e674edef4328)
Richard Laager <rlaager@wiktel.com>
parents:
diff
changeset
|
608 g_free(group_name); |
4a099e4d0d09
propagate from branch 'im.pidgin.pidgin' (head 98b6b547b29ea1192b73cc4e1de1e674edef4328)
Richard Laager <rlaager@wiktel.com>
parents:
diff
changeset
|
609 } |
20439
bee467c81570
A bunch of MSNP14 stuff:
Stu Tomlinson <stu@nosnilmot.com>
parents:
20432
diff
changeset
|
610 } |
20394
4a099e4d0d09
propagate from branch 'im.pidgin.pidgin' (head 98b6b547b29ea1192b73cc4e1de1e674edef4328)
Richard Laager <rlaager@wiktel.com>
parents:
diff
changeset
|
611 |
22569
207f51e16b50
another patch from Maiku that "Properly identifies users you have the mobile
Ka-Hing Cheung <khc@hxbc.us>
parents:
21833
diff
changeset
|
612 static gboolean |
207f51e16b50
another patch from Maiku that "Properly identifies users you have the mobile
Ka-Hing Cheung <khc@hxbc.us>
parents:
21833
diff
changeset
|
613 msn_parse_addressbook_mobile(xmlnode *contactInfo, char **inout_mobile_number) |
20439
bee467c81570
A bunch of MSNP14 stuff:
Stu Tomlinson <stu@nosnilmot.com>
parents:
20432
diff
changeset
|
614 { |
22569
207f51e16b50
another patch from Maiku that "Properly identifies users you have the mobile
Ka-Hing Cheung <khc@hxbc.us>
parents:
21833
diff
changeset
|
615 xmlnode *phones; |
207f51e16b50
another patch from Maiku that "Properly identifies users you have the mobile
Ka-Hing Cheung <khc@hxbc.us>
parents:
21833
diff
changeset
|
616 char *mobile_number = NULL; |
207f51e16b50
another patch from Maiku that "Properly identifies users you have the mobile
Ka-Hing Cheung <khc@hxbc.us>
parents:
21833
diff
changeset
|
617 gboolean mobile = FALSE; |
207f51e16b50
another patch from Maiku that "Properly identifies users you have the mobile
Ka-Hing Cheung <khc@hxbc.us>
parents:
21833
diff
changeset
|
618 |
207f51e16b50
another patch from Maiku that "Properly identifies users you have the mobile
Ka-Hing Cheung <khc@hxbc.us>
parents:
21833
diff
changeset
|
619 *inout_mobile_number = NULL; |
207f51e16b50
another patch from Maiku that "Properly identifies users you have the mobile
Ka-Hing Cheung <khc@hxbc.us>
parents:
21833
diff
changeset
|
620 |
207f51e16b50
another patch from Maiku that "Properly identifies users you have the mobile
Ka-Hing Cheung <khc@hxbc.us>
parents:
21833
diff
changeset
|
621 if ((phones = xmlnode_get_child(contactInfo, "phones"))) { |
207f51e16b50
another patch from Maiku that "Properly identifies users you have the mobile
Ka-Hing Cheung <khc@hxbc.us>
parents:
21833
diff
changeset
|
622 xmlnode *contact_phone; |
207f51e16b50
another patch from Maiku that "Properly identifies users you have the mobile
Ka-Hing Cheung <khc@hxbc.us>
parents:
21833
diff
changeset
|
623 char *phone_type = NULL; |
207f51e16b50
another patch from Maiku that "Properly identifies users you have the mobile
Ka-Hing Cheung <khc@hxbc.us>
parents:
21833
diff
changeset
|
624 |
207f51e16b50
another patch from Maiku that "Properly identifies users you have the mobile
Ka-Hing Cheung <khc@hxbc.us>
parents:
21833
diff
changeset
|
625 for (contact_phone = xmlnode_get_child(phones, "ContactPhone"); |
207f51e16b50
another patch from Maiku that "Properly identifies users you have the mobile
Ka-Hing Cheung <khc@hxbc.us>
parents:
21833
diff
changeset
|
626 contact_phone; |
207f51e16b50
another patch from Maiku that "Properly identifies users you have the mobile
Ka-Hing Cheung <khc@hxbc.us>
parents:
21833
diff
changeset
|
627 contact_phone = xmlnode_get_next_twin(contact_phone)) { |
207f51e16b50
another patch from Maiku that "Properly identifies users you have the mobile
Ka-Hing Cheung <khc@hxbc.us>
parents:
21833
diff
changeset
|
628 xmlnode *contact_phone_type; |
207f51e16b50
another patch from Maiku that "Properly identifies users you have the mobile
Ka-Hing Cheung <khc@hxbc.us>
parents:
21833
diff
changeset
|
629 |
207f51e16b50
another patch from Maiku that "Properly identifies users you have the mobile
Ka-Hing Cheung <khc@hxbc.us>
parents:
21833
diff
changeset
|
630 if (!(contact_phone_type = |
207f51e16b50
another patch from Maiku that "Properly identifies users you have the mobile
Ka-Hing Cheung <khc@hxbc.us>
parents:
21833
diff
changeset
|
631 xmlnode_get_child(contact_phone, "contactPhoneType"))) |
207f51e16b50
another patch from Maiku that "Properly identifies users you have the mobile
Ka-Hing Cheung <khc@hxbc.us>
parents:
21833
diff
changeset
|
632 continue; |
207f51e16b50
another patch from Maiku that "Properly identifies users you have the mobile
Ka-Hing Cheung <khc@hxbc.us>
parents:
21833
diff
changeset
|
633 |
207f51e16b50
another patch from Maiku that "Properly identifies users you have the mobile
Ka-Hing Cheung <khc@hxbc.us>
parents:
21833
diff
changeset
|
634 phone_type = xmlnode_get_data(contact_phone_type); |
207f51e16b50
another patch from Maiku that "Properly identifies users you have the mobile
Ka-Hing Cheung <khc@hxbc.us>
parents:
21833
diff
changeset
|
635 |
207f51e16b50
another patch from Maiku that "Properly identifies users you have the mobile
Ka-Hing Cheung <khc@hxbc.us>
parents:
21833
diff
changeset
|
636 if (phone_type && !strcmp(phone_type, "ContactPhoneMobile")) { |
207f51e16b50
another patch from Maiku that "Properly identifies users you have the mobile
Ka-Hing Cheung <khc@hxbc.us>
parents:
21833
diff
changeset
|
637 xmlnode *number; |
23298
5cdd93dac7a2
Delete trailing whitespace
Mark Doliner <mark@kingant.net>
parents:
22832
diff
changeset
|
638 |
22569
207f51e16b50
another patch from Maiku that "Properly identifies users you have the mobile
Ka-Hing Cheung <khc@hxbc.us>
parents:
21833
diff
changeset
|
639 if ((number = xmlnode_get_child(contact_phone, "number"))) { |
207f51e16b50
another patch from Maiku that "Properly identifies users you have the mobile
Ka-Hing Cheung <khc@hxbc.us>
parents:
21833
diff
changeset
|
640 xmlnode *messenger_enabled; |
207f51e16b50
another patch from Maiku that "Properly identifies users you have the mobile
Ka-Hing Cheung <khc@hxbc.us>
parents:
21833
diff
changeset
|
641 char *is_messenger_enabled = NULL; |
207f51e16b50
another patch from Maiku that "Properly identifies users you have the mobile
Ka-Hing Cheung <khc@hxbc.us>
parents:
21833
diff
changeset
|
642 |
22829
3c98c25b076b
Fix incorrect freeing in my previous commit.
Daniel Atallah <daniel.atallah@gmail.com>
parents:
22828
diff
changeset
|
643 g_free(mobile_number); |
22569
207f51e16b50
another patch from Maiku that "Properly identifies users you have the mobile
Ka-Hing Cheung <khc@hxbc.us>
parents:
21833
diff
changeset
|
644 mobile_number = xmlnode_get_data(number); |
207f51e16b50
another patch from Maiku that "Properly identifies users you have the mobile
Ka-Hing Cheung <khc@hxbc.us>
parents:
21833
diff
changeset
|
645 |
207f51e16b50
another patch from Maiku that "Properly identifies users you have the mobile
Ka-Hing Cheung <khc@hxbc.us>
parents:
21833
diff
changeset
|
646 if (mobile_number && |
23298
5cdd93dac7a2
Delete trailing whitespace
Mark Doliner <mark@kingant.net>
parents:
22832
diff
changeset
|
647 (messenger_enabled = xmlnode_get_child(contact_phone, "isMessengerEnabled")) |
5cdd93dac7a2
Delete trailing whitespace
Mark Doliner <mark@kingant.net>
parents:
22832
diff
changeset
|
648 && (is_messenger_enabled = xmlnode_get_data(messenger_enabled)) |
22828
7d3b2c023ad8
This is the way we plug the leaks, plug the leaks, plug the leaks...
Daniel Atallah <daniel.atallah@gmail.com>
parents:
22571
diff
changeset
|
649 && !strcmp(is_messenger_enabled, "true")) |
22569
207f51e16b50
another patch from Maiku that "Properly identifies users you have the mobile
Ka-Hing Cheung <khc@hxbc.us>
parents:
21833
diff
changeset
|
650 mobile = TRUE; |
207f51e16b50
another patch from Maiku that "Properly identifies users you have the mobile
Ka-Hing Cheung <khc@hxbc.us>
parents:
21833
diff
changeset
|
651 |
207f51e16b50
another patch from Maiku that "Properly identifies users you have the mobile
Ka-Hing Cheung <khc@hxbc.us>
parents:
21833
diff
changeset
|
652 g_free(is_messenger_enabled); |
207f51e16b50
another patch from Maiku that "Properly identifies users you have the mobile
Ka-Hing Cheung <khc@hxbc.us>
parents:
21833
diff
changeset
|
653 } |
207f51e16b50
another patch from Maiku that "Properly identifies users you have the mobile
Ka-Hing Cheung <khc@hxbc.us>
parents:
21833
diff
changeset
|
654 } |
207f51e16b50
another patch from Maiku that "Properly identifies users you have the mobile
Ka-Hing Cheung <khc@hxbc.us>
parents:
21833
diff
changeset
|
655 |
207f51e16b50
another patch from Maiku that "Properly identifies users you have the mobile
Ka-Hing Cheung <khc@hxbc.us>
parents:
21833
diff
changeset
|
656 g_free(phone_type); |
207f51e16b50
another patch from Maiku that "Properly identifies users you have the mobile
Ka-Hing Cheung <khc@hxbc.us>
parents:
21833
diff
changeset
|
657 } |
207f51e16b50
another patch from Maiku that "Properly identifies users you have the mobile
Ka-Hing Cheung <khc@hxbc.us>
parents:
21833
diff
changeset
|
658 } |
207f51e16b50
another patch from Maiku that "Properly identifies users you have the mobile
Ka-Hing Cheung <khc@hxbc.us>
parents:
21833
diff
changeset
|
659 |
207f51e16b50
another patch from Maiku that "Properly identifies users you have the mobile
Ka-Hing Cheung <khc@hxbc.us>
parents:
21833
diff
changeset
|
660 *inout_mobile_number = mobile_number; |
207f51e16b50
another patch from Maiku that "Properly identifies users you have the mobile
Ka-Hing Cheung <khc@hxbc.us>
parents:
21833
diff
changeset
|
661 return mobile; |
207f51e16b50
another patch from Maiku that "Properly identifies users you have the mobile
Ka-Hing Cheung <khc@hxbc.us>
parents:
21833
diff
changeset
|
662 } |
207f51e16b50
another patch from Maiku that "Properly identifies users you have the mobile
Ka-Hing Cheung <khc@hxbc.us>
parents:
21833
diff
changeset
|
663 |
20439
bee467c81570
A bunch of MSNP14 stuff:
Stu Tomlinson <stu@nosnilmot.com>
parents:
20432
diff
changeset
|
664 static void |
23459
69af5301e1a7
killing MsnContact which just wraps MsnSession
Ka-Hing Cheung <khc@hxbc.us>
parents:
23453
diff
changeset
|
665 msn_parse_addressbook_contacts(MsnSession *session, xmlnode *node) |
20439
bee467c81570
A bunch of MSNP14 stuff:
Stu Tomlinson <stu@nosnilmot.com>
parents:
20432
diff
changeset
|
666 { |
bee467c81570
A bunch of MSNP14 stuff:
Stu Tomlinson <stu@nosnilmot.com>
parents:
20432
diff
changeset
|
667 xmlnode *contactNode; |
23472
70de4e2246ec
Add real server-side aliasing to MSN.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23470
diff
changeset
|
668 char *passport = NULL, *Name = NULL, *uid = NULL, *type = NULL, *mobile_number = NULL, *alias = NULL; |
22569
207f51e16b50
another patch from Maiku that "Properly identifies users you have the mobile
Ka-Hing Cheung <khc@hxbc.us>
parents:
21833
diff
changeset
|
669 gboolean mobile = FALSE; |
23472
70de4e2246ec
Add real server-side aliasing to MSN.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23470
diff
changeset
|
670 PurpleConnection *pc = purple_account_get_connection(session->account); |
20394
4a099e4d0d09
propagate from branch 'im.pidgin.pidgin' (head 98b6b547b29ea1192b73cc4e1de1e674edef4328)
Richard Laager <rlaager@wiktel.com>
parents:
diff
changeset
|
671 |
20439
bee467c81570
A bunch of MSNP14 stuff:
Stu Tomlinson <stu@nosnilmot.com>
parents:
20432
diff
changeset
|
672 for(contactNode = xmlnode_get_child(node, "Contact"); contactNode; |
20666
0e1bc5c51030
A few leak plugs, some unnecessary allocation prevention, null pointer deref fixes and general robustness fixes. I'm sure there is more to do here, I got tired... Fixes #3308
Daniel Atallah <daniel.atallah@gmail.com>
parents:
20539
diff
changeset
|
673 contactNode = xmlnode_get_next_twin(contactNode)) { |
25395
89670ae028bd
The MSN AddressBook can contain contacts with global isMessengerUser=false,
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
25387
diff
changeset
|
674 xmlnode *contactId, *contactInfo, *contactType, *passportName, *displayName, *guid, *groupIds; |
23472
70de4e2246ec
Add real server-side aliasing to MSN.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23470
diff
changeset
|
675 xmlnode *annotation; |
20394
4a099e4d0d09
propagate from branch 'im.pidgin.pidgin' (head 98b6b547b29ea1192b73cc4e1de1e674edef4328)
Richard Laager <rlaager@wiktel.com>
parents:
diff
changeset
|
676 MsnUser *user; |
20666
0e1bc5c51030
A few leak plugs, some unnecessary allocation prevention, null pointer deref fixes and general robustness fixes. I'm sure there is more to do here, I got tired... Fixes #3308
Daniel Atallah <daniel.atallah@gmail.com>
parents:
20539
diff
changeset
|
677 |
0e1bc5c51030
A few leak plugs, some unnecessary allocation prevention, null pointer deref fixes and general robustness fixes. I'm sure there is more to do here, I got tired... Fixes #3308
Daniel Atallah <daniel.atallah@gmail.com>
parents:
20539
diff
changeset
|
678 if (!(contactId = xmlnode_get_child(contactNode,"contactId")) |
0e1bc5c51030
A few leak plugs, some unnecessary allocation prevention, null pointer deref fixes and general robustness fixes. I'm sure there is more to do here, I got tired... Fixes #3308
Daniel Atallah <daniel.atallah@gmail.com>
parents:
20539
diff
changeset
|
679 || !(contactInfo = xmlnode_get_child(contactNode, "contactInfo")) |
0e1bc5c51030
A few leak plugs, some unnecessary allocation prevention, null pointer deref fixes and general robustness fixes. I'm sure there is more to do here, I got tired... Fixes #3308
Daniel Atallah <daniel.atallah@gmail.com>
parents:
20539
diff
changeset
|
680 || !(contactType = xmlnode_get_child(contactInfo, "contactType"))) |
0e1bc5c51030
A few leak plugs, some unnecessary allocation prevention, null pointer deref fixes and general robustness fixes. I'm sure there is more to do here, I got tired... Fixes #3308
Daniel Atallah <daniel.atallah@gmail.com>
parents:
20539
diff
changeset
|
681 continue; |
20394
4a099e4d0d09
propagate from branch 'im.pidgin.pidgin' (head 98b6b547b29ea1192b73cc4e1de1e674edef4328)
Richard Laager <rlaager@wiktel.com>
parents:
diff
changeset
|
682 |
20666
0e1bc5c51030
A few leak plugs, some unnecessary allocation prevention, null pointer deref fixes and general robustness fixes. I'm sure there is more to do here, I got tired... Fixes #3308
Daniel Atallah <daniel.atallah@gmail.com>
parents:
20539
diff
changeset
|
683 g_free(passport); |
0e1bc5c51030
A few leak plugs, some unnecessary allocation prevention, null pointer deref fixes and general robustness fixes. I'm sure there is more to do here, I got tired... Fixes #3308
Daniel Atallah <daniel.atallah@gmail.com>
parents:
20539
diff
changeset
|
684 g_free(Name); |
23472
70de4e2246ec
Add real server-side aliasing to MSN.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23470
diff
changeset
|
685 g_free(alias); |
20666
0e1bc5c51030
A few leak plugs, some unnecessary allocation prevention, null pointer deref fixes and general robustness fixes. I'm sure there is more to do here, I got tired... Fixes #3308
Daniel Atallah <daniel.atallah@gmail.com>
parents:
20539
diff
changeset
|
686 g_free(uid); |
0e1bc5c51030
A few leak plugs, some unnecessary allocation prevention, null pointer deref fixes and general robustness fixes. I'm sure there is more to do here, I got tired... Fixes #3308
Daniel Atallah <daniel.atallah@gmail.com>
parents:
20539
diff
changeset
|
687 g_free(type); |
22832
f62a4a7fe365
Fix a number of leaks. As far as I can tell, MSNP14 now logs in without
Daniel Atallah <daniel.atallah@gmail.com>
parents:
22829
diff
changeset
|
688 g_free(mobile_number); |
23472
70de4e2246ec
Add real server-side aliasing to MSN.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23470
diff
changeset
|
689 passport = Name = uid = type = mobile_number = alias = NULL; |
22569
207f51e16b50
another patch from Maiku that "Properly identifies users you have the mobile
Ka-Hing Cheung <khc@hxbc.us>
parents:
21833
diff
changeset
|
690 mobile = FALSE; |
20666
0e1bc5c51030
A few leak plugs, some unnecessary allocation prevention, null pointer deref fixes and general robustness fixes. I'm sure there is more to do here, I got tired... Fixes #3308
Daniel Atallah <daniel.atallah@gmail.com>
parents:
20539
diff
changeset
|
691 |
20394
4a099e4d0d09
propagate from branch 'im.pidgin.pidgin' (head 98b6b547b29ea1192b73cc4e1de1e674edef4328)
Richard Laager <rlaager@wiktel.com>
parents:
diff
changeset
|
692 uid = xmlnode_get_data(contactId); |
4a099e4d0d09
propagate from branch 'im.pidgin.pidgin' (head 98b6b547b29ea1192b73cc4e1de1e674edef4328)
Richard Laager <rlaager@wiktel.com>
parents:
diff
changeset
|
693 type = xmlnode_get_data(contactType); |
4a099e4d0d09
propagate from branch 'im.pidgin.pidgin' (head 98b6b547b29ea1192b73cc4e1de1e674edef4328)
Richard Laager <rlaager@wiktel.com>
parents:
diff
changeset
|
694 |
4a099e4d0d09
propagate from branch 'im.pidgin.pidgin' (head 98b6b547b29ea1192b73cc4e1de1e674edef4328)
Richard Laager <rlaager@wiktel.com>
parents:
diff
changeset
|
695 /*setup the Display Name*/ |
20666
0e1bc5c51030
A few leak plugs, some unnecessary allocation prevention, null pointer deref fixes and general robustness fixes. I'm sure there is more to do here, I got tired... Fixes #3308
Daniel Atallah <daniel.atallah@gmail.com>
parents:
20539
diff
changeset
|
696 if (type && !strcmp(type, "Me")){ |
0e1bc5c51030
A few leak plugs, some unnecessary allocation prevention, null pointer deref fixes and general robustness fixes. I'm sure there is more to do here, I got tired... Fixes #3308
Daniel Atallah <daniel.atallah@gmail.com>
parents:
20539
diff
changeset
|
697 char *friendly = NULL; |
0e1bc5c51030
A few leak plugs, some unnecessary allocation prevention, null pointer deref fixes and general robustness fixes. I'm sure there is more to do here, I got tired... Fixes #3308
Daniel Atallah <daniel.atallah@gmail.com>
parents:
20539
diff
changeset
|
698 if ((displayName = xmlnode_get_child(contactInfo, "displayName"))) |
0e1bc5c51030
A few leak plugs, some unnecessary allocation prevention, null pointer deref fixes and general robustness fixes. I'm sure there is more to do here, I got tired... Fixes #3308
Daniel Atallah <daniel.atallah@gmail.com>
parents:
20539
diff
changeset
|
699 friendly = xmlnode_get_data(displayName); |
0e1bc5c51030
A few leak plugs, some unnecessary allocation prevention, null pointer deref fixes and general robustness fixes. I'm sure there is more to do here, I got tired... Fixes #3308
Daniel Atallah <daniel.atallah@gmail.com>
parents:
20539
diff
changeset
|
700 purple_connection_set_display_name(session->account->gc, friendly ? purple_url_decode(friendly) : NULL); |
20394
4a099e4d0d09
propagate from branch 'im.pidgin.pidgin' (head 98b6b547b29ea1192b73cc4e1de1e674edef4328)
Richard Laager <rlaager@wiktel.com>
parents:
diff
changeset
|
701 g_free(friendly); |
20403
599b5a4aebab
The last of the merge fix-ups.
Richard Laager <rlaager@wiktel.com>
parents:
20401
diff
changeset
|
702 continue; /* Not adding own account as buddy to buddylist */ |
20394
4a099e4d0d09
propagate from branch 'im.pidgin.pidgin' (head 98b6b547b29ea1192b73cc4e1de1e674edef4328)
Richard Laager <rlaager@wiktel.com>
parents:
diff
changeset
|
703 } |
20666
0e1bc5c51030
A few leak plugs, some unnecessary allocation prevention, null pointer deref fixes and general robustness fixes. I'm sure there is more to do here, I got tired... Fixes #3308
Daniel Atallah <daniel.atallah@gmail.com>
parents:
20539
diff
changeset
|
704 |
0e1bc5c51030
A few leak plugs, some unnecessary allocation prevention, null pointer deref fixes and general robustness fixes. I'm sure there is more to do here, I got tired... Fixes #3308
Daniel Atallah <daniel.atallah@gmail.com>
parents:
20539
diff
changeset
|
705 passportName = xmlnode_get_child(contactInfo, "passportName"); |
20477
9a2a4a0c0003
Add the possibility to create an Address Book, useful for newly registered MSN users.
Carlos Silva <typ0@pidgin.im>
parents:
20471
diff
changeset
|
706 if (passportName == NULL) { |
20394
4a099e4d0d09
propagate from branch 'im.pidgin.pidgin' (head 98b6b547b29ea1192b73cc4e1de1e674edef4328)
Richard Laager <rlaager@wiktel.com>
parents:
diff
changeset
|
707 xmlnode *emailsNode, *contactEmailNode, *emailNode; |
4a099e4d0d09
propagate from branch 'im.pidgin.pidgin' (head 98b6b547b29ea1192b73cc4e1de1e674edef4328)
Richard Laager <rlaager@wiktel.com>
parents:
diff
changeset
|
708 xmlnode *messengerEnabledNode; |
4a099e4d0d09
propagate from branch 'im.pidgin.pidgin' (head 98b6b547b29ea1192b73cc4e1de1e674edef4328)
Richard Laager <rlaager@wiktel.com>
parents:
diff
changeset
|
709 char *msnEnabled; |
4a099e4d0d09
propagate from branch 'im.pidgin.pidgin' (head 98b6b547b29ea1192b73cc4e1de1e674edef4328)
Richard Laager <rlaager@wiktel.com>
parents:
diff
changeset
|
710 |
25395
89670ae028bd
The MSN AddressBook can contain contacts with global isMessengerUser=false,
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
25387
diff
changeset
|
711 /*TODO: add it to the non-instant Messenger group and recognize as email Membership*/ |
89670ae028bd
The MSN AddressBook can contain contacts with global isMessengerUser=false,
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
25387
diff
changeset
|
712 /* Yahoo/Federated User? */ |
20666
0e1bc5c51030
A few leak plugs, some unnecessary allocation prevention, null pointer deref fixes and general robustness fixes. I'm sure there is more to do here, I got tired... Fixes #3308
Daniel Atallah <daniel.atallah@gmail.com>
parents:
20539
diff
changeset
|
713 emailsNode = xmlnode_get_child(contactInfo, "emails"); |
20477
9a2a4a0c0003
Add the possibility to create an Address Book, useful for newly registered MSN users.
Carlos Silva <typ0@pidgin.im>
parents:
20471
diff
changeset
|
714 if (emailsNode == NULL) { |
20394
4a099e4d0d09
propagate from branch 'im.pidgin.pidgin' (head 98b6b547b29ea1192b73cc4e1de1e674edef4328)
Richard Laager <rlaager@wiktel.com>
parents:
diff
changeset
|
715 /*TODO: need to support the Mobile type*/ |
4a099e4d0d09
propagate from branch 'im.pidgin.pidgin' (head 98b6b547b29ea1192b73cc4e1de1e674edef4328)
Richard Laager <rlaager@wiktel.com>
parents:
diff
changeset
|
716 continue; |
4a099e4d0d09
propagate from branch 'im.pidgin.pidgin' (head 98b6b547b29ea1192b73cc4e1de1e674edef4328)
Richard Laager <rlaager@wiktel.com>
parents:
diff
changeset
|
717 } |
25582
7ea04b53f553
Pluck the MSN bug fixes.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents:
25491
diff
changeset
|
718 for (contactEmailNode = xmlnode_get_child(emailsNode, "ContactEmail"); |
7ea04b53f553
Pluck the MSN bug fixes.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents:
25491
diff
changeset
|
719 contactEmailNode; |
7ea04b53f553
Pluck the MSN bug fixes.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents:
25491
diff
changeset
|
720 contactEmailNode = xmlnode_get_next_twin(contactEmailNode)) { |
7ea04b53f553
Pluck the MSN bug fixes.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents:
25491
diff
changeset
|
721 if ((messengerEnabledNode = xmlnode_get_child(contactEmailNode, "isMessengerEnabled"))) { |
20666
0e1bc5c51030
A few leak plugs, some unnecessary allocation prevention, null pointer deref fixes and general robustness fixes. I'm sure there is more to do here, I got tired... Fixes #3308
Daniel Atallah <daniel.atallah@gmail.com>
parents:
20539
diff
changeset
|
722 |
25582
7ea04b53f553
Pluck the MSN bug fixes.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents:
25491
diff
changeset
|
723 msnEnabled = xmlnode_get_data(messengerEnabledNode); |
7ea04b53f553
Pluck the MSN bug fixes.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents:
25491
diff
changeset
|
724 |
7ea04b53f553
Pluck the MSN bug fixes.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents:
25491
diff
changeset
|
725 if (msnEnabled && !strcmp(msnEnabled, "true")) { |
7ea04b53f553
Pluck the MSN bug fixes.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents:
25491
diff
changeset
|
726 if ((emailNode = xmlnode_get_child(contactEmailNode, "email"))) |
7ea04b53f553
Pluck the MSN bug fixes.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents:
25491
diff
changeset
|
727 passport = xmlnode_get_data(emailNode); |
20666
0e1bc5c51030
A few leak plugs, some unnecessary allocation prevention, null pointer deref fixes and general robustness fixes. I'm sure there is more to do here, I got tired... Fixes #3308
Daniel Atallah <daniel.atallah@gmail.com>
parents:
20539
diff
changeset
|
728 |
25582
7ea04b53f553
Pluck the MSN bug fixes.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents:
25491
diff
changeset
|
729 /* Messenger enabled, Get the Passport*/ |
7ea04b53f553
Pluck the MSN bug fixes.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents:
25491
diff
changeset
|
730 purple_debug_info("msn", "AB Yahoo/Federated User %s\n", passport ? passport : "(null)"); |
7ea04b53f553
Pluck the MSN bug fixes.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents:
25491
diff
changeset
|
731 g_free(msnEnabled); |
7ea04b53f553
Pluck the MSN bug fixes.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents:
25491
diff
changeset
|
732 break; |
7ea04b53f553
Pluck the MSN bug fixes.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents:
25491
diff
changeset
|
733 } |
20666
0e1bc5c51030
A few leak plugs, some unnecessary allocation prevention, null pointer deref fixes and general robustness fixes. I'm sure there is more to do here, I got tired... Fixes #3308
Daniel Atallah <daniel.atallah@gmail.com>
parents:
20539
diff
changeset
|
734 |
20495
7f5564ebde7f
Fix some memory leaks. Free xmlnodes properly using xmlnode_free instead of
Sadrul Habib Chowdhury <imadil@gmail.com>
parents:
20494
diff
changeset
|
735 g_free(msnEnabled); |
20394
4a099e4d0d09
propagate from branch 'im.pidgin.pidgin' (head 98b6b547b29ea1192b73cc4e1de1e674edef4328)
Richard Laager <rlaager@wiktel.com>
parents:
diff
changeset
|
736 } |
4a099e4d0d09
propagate from branch 'im.pidgin.pidgin' (head 98b6b547b29ea1192b73cc4e1de1e674edef4328)
Richard Laager <rlaager@wiktel.com>
parents:
diff
changeset
|
737 } |
20477
9a2a4a0c0003
Add the possibility to create an Address Book, useful for newly registered MSN users.
Carlos Silva <typ0@pidgin.im>
parents:
20471
diff
changeset
|
738 } else { |
25395
89670ae028bd
The MSN AddressBook can contain contacts with global isMessengerUser=false,
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
25387
diff
changeset
|
739 xmlnode *messenger_user; |
89670ae028bd
The MSN AddressBook can contain contacts with global isMessengerUser=false,
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
25387
diff
changeset
|
740 /* ignore non-messenger contacts */ |
89670ae028bd
The MSN AddressBook can contain contacts with global isMessengerUser=false,
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
25387
diff
changeset
|
741 if ((messenger_user = xmlnode_get_child(contactInfo, "isMessengerUser"))) { |
89670ae028bd
The MSN AddressBook can contain contacts with global isMessengerUser=false,
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
25387
diff
changeset
|
742 char *is_messenger_user = xmlnode_get_data(messenger_user); |
89670ae028bd
The MSN AddressBook can contain contacts with global isMessengerUser=false,
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
25387
diff
changeset
|
743 |
89670ae028bd
The MSN AddressBook can contain contacts with global isMessengerUser=false,
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
25387
diff
changeset
|
744 if (is_messenger_user && !strcmp(is_messenger_user, "false")) { |
89670ae028bd
The MSN AddressBook can contain contacts with global isMessengerUser=false,
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
25387
diff
changeset
|
745 g_free(is_messenger_user); |
89670ae028bd
The MSN AddressBook can contain contacts with global isMessengerUser=false,
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
25387
diff
changeset
|
746 continue; |
89670ae028bd
The MSN AddressBook can contain contacts with global isMessengerUser=false,
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
25387
diff
changeset
|
747 } |
89670ae028bd
The MSN AddressBook can contain contacts with global isMessengerUser=false,
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
25387
diff
changeset
|
748 |
89670ae028bd
The MSN AddressBook can contain contacts with global isMessengerUser=false,
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
25387
diff
changeset
|
749 g_free(is_messenger_user); |
89670ae028bd
The MSN AddressBook can contain contacts with global isMessengerUser=false,
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
25387
diff
changeset
|
750 } |
89670ae028bd
The MSN AddressBook can contain contacts with global isMessengerUser=false,
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
25387
diff
changeset
|
751 |
20394
4a099e4d0d09
propagate from branch 'im.pidgin.pidgin' (head 98b6b547b29ea1192b73cc4e1de1e674edef4328)
Richard Laager <rlaager@wiktel.com>
parents:
diff
changeset
|
752 passport = xmlnode_get_data(passportName); |
4a099e4d0d09
propagate from branch 'im.pidgin.pidgin' (head 98b6b547b29ea1192b73cc4e1de1e674edef4328)
Richard Laager <rlaager@wiktel.com>
parents:
diff
changeset
|
753 } |
4a099e4d0d09
propagate from branch 'im.pidgin.pidgin' (head 98b6b547b29ea1192b73cc4e1de1e674edef4328)
Richard Laager <rlaager@wiktel.com>
parents:
diff
changeset
|
754 |
26906
6db0d455813b
This line is redundant.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
26265
diff
changeset
|
755 /* Couldn't find anything */ |
20666
0e1bc5c51030
A few leak plugs, some unnecessary allocation prevention, null pointer deref fixes and general robustness fixes. I'm sure there is more to do here, I got tired... Fixes #3308
Daniel Atallah <daniel.atallah@gmail.com>
parents:
20539
diff
changeset
|
756 if (passport == NULL) |
20394
4a099e4d0d09
propagate from branch 'im.pidgin.pidgin' (head 98b6b547b29ea1192b73cc4e1de1e674edef4328)
Richard Laager <rlaager@wiktel.com>
parents:
diff
changeset
|
757 continue; |
4a099e4d0d09
propagate from branch 'im.pidgin.pidgin' (head 98b6b547b29ea1192b73cc4e1de1e674edef4328)
Richard Laager <rlaager@wiktel.com>
parents:
diff
changeset
|
758 |
27845
975fc5f64438
Ignore buddies with invalid emails in the membership list or address book,
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
27488
diff
changeset
|
759 if (!purple_email_is_valid(passport)) |
975fc5f64438
Ignore buddies with invalid emails in the membership list or address book,
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
27488
diff
changeset
|
760 continue; |
975fc5f64438
Ignore buddies with invalid emails in the membership list or address book,
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
27488
diff
changeset
|
761 |
20666
0e1bc5c51030
A few leak plugs, some unnecessary allocation prevention, null pointer deref fixes and general robustness fixes. I'm sure there is more to do here, I got tired... Fixes #3308
Daniel Atallah <daniel.atallah@gmail.com>
parents:
20539
diff
changeset
|
762 if ((displayName = xmlnode_get_child(contactInfo, "displayName"))) |
0e1bc5c51030
A few leak plugs, some unnecessary allocation prevention, null pointer deref fixes and general robustness fixes. I'm sure there is more to do here, I got tired... Fixes #3308
Daniel Atallah <daniel.atallah@gmail.com>
parents:
20539
diff
changeset
|
763 Name = xmlnode_get_data(displayName); |
0e1bc5c51030
A few leak plugs, some unnecessary allocation prevention, null pointer deref fixes and general robustness fixes. I'm sure there is more to do here, I got tired... Fixes #3308
Daniel Atallah <daniel.atallah@gmail.com>
parents:
20539
diff
changeset
|
764 else |
20394
4a099e4d0d09
propagate from branch 'im.pidgin.pidgin' (head 98b6b547b29ea1192b73cc4e1de1e674edef4328)
Richard Laager <rlaager@wiktel.com>
parents:
diff
changeset
|
765 Name = g_strdup(passport); |
4a099e4d0d09
propagate from branch 'im.pidgin.pidgin' (head 98b6b547b29ea1192b73cc4e1de1e674edef4328)
Richard Laager <rlaager@wiktel.com>
parents:
diff
changeset
|
766 |
23472
70de4e2246ec
Add real server-side aliasing to MSN.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23470
diff
changeset
|
767 for (annotation = xmlnode_get_child(contactInfo, "annotations/Annotation"); |
70de4e2246ec
Add real server-side aliasing to MSN.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23470
diff
changeset
|
768 annotation; annotation = xmlnode_get_next_twin(annotation)) { |
70de4e2246ec
Add real server-side aliasing to MSN.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23470
diff
changeset
|
769 char *name; |
70de4e2246ec
Add real server-side aliasing to MSN.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23470
diff
changeset
|
770 name = xmlnode_get_data(xmlnode_get_child(annotation, "Name")); |
70de4e2246ec
Add real server-side aliasing to MSN.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23470
diff
changeset
|
771 if (!strcmp(name, "AB.NickName")) |
70de4e2246ec
Add real server-side aliasing to MSN.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23470
diff
changeset
|
772 alias = xmlnode_get_data(xmlnode_get_child(annotation, "Value")); |
24514
e88f30b437ad
Add tests for some known contact annotations. These don't do anything yet, but
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
24513
diff
changeset
|
773 else if (!strcmp(name, "MSN.IM.HasSharedFolder")) |
e88f30b437ad
Add tests for some known contact annotations. These don't do anything yet, but
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
24513
diff
changeset
|
774 ; /* Do nothing yet... */ |
e88f30b437ad
Add tests for some known contact annotations. These don't do anything yet, but
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
24513
diff
changeset
|
775 else if (!strcmp(name, "AB.Spouse")) |
e88f30b437ad
Add tests for some known contact annotations. These don't do anything yet, but
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
24513
diff
changeset
|
776 ; /* Do nothing yet... */ |
e88f30b437ad
Add tests for some known contact annotations. These don't do anything yet, but
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
24513
diff
changeset
|
777 else if (!strcmp(name, "MSN.Mobile.ContactId")) |
e88f30b437ad
Add tests for some known contact annotations. These don't do anything yet, but
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
24513
diff
changeset
|
778 ; /* Do nothing yet... */ |
e88f30b437ad
Add tests for some known contact annotations. These don't do anything yet, but
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
24513
diff
changeset
|
779 else |
e88f30b437ad
Add tests for some known contact annotations. These don't do anything yet, but
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
24513
diff
changeset
|
780 purple_debug_info("msn", |
e88f30b437ad
Add tests for some known contact annotations. These don't do anything yet, but
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
24513
diff
changeset
|
781 "Unknown AB contact annotation: %s\n", name); |
23472
70de4e2246ec
Add real server-side aliasing to MSN.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23470
diff
changeset
|
782 g_free(name); |
70de4e2246ec
Add real server-side aliasing to MSN.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23470
diff
changeset
|
783 } |
70de4e2246ec
Add real server-side aliasing to MSN.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23470
diff
changeset
|
784 |
22569
207f51e16b50
another patch from Maiku that "Properly identifies users you have the mobile
Ka-Hing Cheung <khc@hxbc.us>
parents:
21833
diff
changeset
|
785 mobile = msn_parse_addressbook_mobile(contactInfo, &mobile_number); |
207f51e16b50
another patch from Maiku that "Properly identifies users you have the mobile
Ka-Hing Cheung <khc@hxbc.us>
parents:
21833
diff
changeset
|
786 |
23519
7bceac816e19
The great MSN debug message cleanup! Threw in a few whitespace fixes,
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23507
diff
changeset
|
787 purple_debug_misc("msn", "AB passport:{%s} uid:{%s} display:{%s} alias: {%s} mobile:{%s} mobile number:{%s}\n", |
23472
70de4e2246ec
Add real server-side aliasing to MSN.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23470
diff
changeset
|
788 passport, uid ? uid : "(null)", Name ? Name : "(null)", alias ? alias : "(null)", |
22569
207f51e16b50
another patch from Maiku that "Properly identifies users you have the mobile
Ka-Hing Cheung <khc@hxbc.us>
parents:
21833
diff
changeset
|
789 mobile ? "true" : "false", mobile_number ? mobile_number : "(null)"); |
20394
4a099e4d0d09
propagate from branch 'im.pidgin.pidgin' (head 98b6b547b29ea1192b73cc4e1de1e674edef4328)
Richard Laager <rlaager@wiktel.com>
parents:
diff
changeset
|
790 |
20666
0e1bc5c51030
A few leak plugs, some unnecessary allocation prevention, null pointer deref fixes and general robustness fixes. I'm sure there is more to do here, I got tired... Fixes #3308
Daniel Atallah <daniel.atallah@gmail.com>
parents:
20539
diff
changeset
|
791 user = msn_userlist_find_add_user(session->userlist, passport, Name); |
0e1bc5c51030
A few leak plugs, some unnecessary allocation prevention, null pointer deref fixes and general robustness fixes. I'm sure there is more to do here, I got tired... Fixes #3308
Daniel Atallah <daniel.atallah@gmail.com>
parents:
20539
diff
changeset
|
792 msn_user_set_uid(user, uid); |
22569
207f51e16b50
another patch from Maiku that "Properly identifies users you have the mobile
Ka-Hing Cheung <khc@hxbc.us>
parents:
21833
diff
changeset
|
793 msn_user_set_mobile_phone(user, mobile_number); |
20394
4a099e4d0d09
propagate from branch 'im.pidgin.pidgin' (head 98b6b547b29ea1192b73cc4e1de1e674edef4328)
Richard Laager <rlaager@wiktel.com>
parents:
diff
changeset
|
794 |
20666
0e1bc5c51030
A few leak plugs, some unnecessary allocation prevention, null pointer deref fixes and general robustness fixes. I'm sure there is more to do here, I got tired... Fixes #3308
Daniel Atallah <daniel.atallah@gmail.com>
parents:
20539
diff
changeset
|
795 groupIds = xmlnode_get_child(contactInfo, "groupIds"); |
20477
9a2a4a0c0003
Add the possibility to create an Address Book, useful for newly registered MSN users.
Carlos Silva <typ0@pidgin.im>
parents:
20471
diff
changeset
|
796 if (groupIds) { |
20666
0e1bc5c51030
A few leak plugs, some unnecessary allocation prevention, null pointer deref fixes and general robustness fixes. I'm sure there is more to do here, I got tired... Fixes #3308
Daniel Atallah <daniel.atallah@gmail.com>
parents:
20539
diff
changeset
|
797 for (guid = xmlnode_get_child(groupIds, "guid"); guid; |
23519
7bceac816e19
The great MSN debug message cleanup! Threw in a few whitespace fixes,
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23507
diff
changeset
|
798 guid = xmlnode_get_next_twin(guid)) { |
20666
0e1bc5c51030
A few leak plugs, some unnecessary allocation prevention, null pointer deref fixes and general robustness fixes. I'm sure there is more to do here, I got tired... Fixes #3308
Daniel Atallah <daniel.atallah@gmail.com>
parents:
20539
diff
changeset
|
799 char *group_id = xmlnode_get_data(guid); |
0e1bc5c51030
A few leak plugs, some unnecessary allocation prevention, null pointer deref fixes and general robustness fixes. I'm sure there is more to do here, I got tired... Fixes #3308
Daniel Atallah <daniel.atallah@gmail.com>
parents:
20539
diff
changeset
|
800 msn_user_add_group_id(user, group_id); |
23519
7bceac816e19
The great MSN debug message cleanup! Threw in a few whitespace fixes,
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23507
diff
changeset
|
801 purple_debug_misc("msn", "AB guid:%s\n", group_id ? group_id : "(null)"); |
20394
4a099e4d0d09
propagate from branch 'im.pidgin.pidgin' (head 98b6b547b29ea1192b73cc4e1de1e674edef4328)
Richard Laager <rlaager@wiktel.com>
parents:
diff
changeset
|
802 g_free(group_id); |
4a099e4d0d09
propagate from branch 'im.pidgin.pidgin' (head 98b6b547b29ea1192b73cc4e1de1e674edef4328)
Richard Laager <rlaager@wiktel.com>
parents:
diff
changeset
|
803 } |
20477
9a2a4a0c0003
Add the possibility to create an Address Book, useful for newly registered MSN users.
Carlos Silva <typ0@pidgin.im>
parents:
20471
diff
changeset
|
804 } else { |
20671
4dd60add6a7c
Further cleanup of the msn prpl including preventing the authorization request callback from crashing if triggered after the account is disconnected. Also removal of some extraneous debuggery, there is more that needs to be removed.
Daniel Atallah <daniel.atallah@gmail.com>
parents:
20666
diff
changeset
|
805 purple_debug_info("msn", "User not in any groups, adding to default group.\n"); |
20394
4a099e4d0d09
propagate from branch 'im.pidgin.pidgin' (head 98b6b547b29ea1192b73cc4e1de1e674edef4328)
Richard Laager <rlaager@wiktel.com>
parents:
diff
changeset
|
806 /*not in any group,Then set default group*/ |
20439
bee467c81570
A bunch of MSNP14 stuff:
Stu Tomlinson <stu@nosnilmot.com>
parents:
20432
diff
changeset
|
807 msn_user_add_group_id(user, MSN_INDIVIDUALS_GROUP_ID); |
20394
4a099e4d0d09
propagate from branch 'im.pidgin.pidgin' (head 98b6b547b29ea1192b73cc4e1de1e674edef4328)
Richard Laager <rlaager@wiktel.com>
parents:
diff
changeset
|
808 } |
20439
bee467c81570
A bunch of MSNP14 stuff:
Stu Tomlinson <stu@nosnilmot.com>
parents:
20432
diff
changeset
|
809 |
bee467c81570
A bunch of MSNP14 stuff:
Stu Tomlinson <stu@nosnilmot.com>
parents:
20432
diff
changeset
|
810 msn_got_lst_user(session, user, MSN_LIST_FL_OP, NULL); |
22569
207f51e16b50
another patch from Maiku that "Properly identifies users you have the mobile
Ka-Hing Cheung <khc@hxbc.us>
parents:
21833
diff
changeset
|
811 |
23519
7bceac816e19
The great MSN debug message cleanup! Threw in a few whitespace fixes,
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23507
diff
changeset
|
812 if (mobile && user) |
22569
207f51e16b50
another patch from Maiku that "Properly identifies users you have the mobile
Ka-Hing Cheung <khc@hxbc.us>
parents:
21833
diff
changeset
|
813 { |
207f51e16b50
another patch from Maiku that "Properly identifies users you have the mobile
Ka-Hing Cheung <khc@hxbc.us>
parents:
21833
diff
changeset
|
814 user->mobile = TRUE; |
207f51e16b50
another patch from Maiku that "Properly identifies users you have the mobile
Ka-Hing Cheung <khc@hxbc.us>
parents:
21833
diff
changeset
|
815 purple_prpl_got_user_status(session->account, user->passport, "mobile", NULL); |
207f51e16b50
another patch from Maiku that "Properly identifies users you have the mobile
Ka-Hing Cheung <khc@hxbc.us>
parents:
21833
diff
changeset
|
816 purple_prpl_got_user_status(session->account, user->passport, "available", NULL); |
207f51e16b50
another patch from Maiku that "Properly identifies users you have the mobile
Ka-Hing Cheung <khc@hxbc.us>
parents:
21833
diff
changeset
|
817 } |
23472
70de4e2246ec
Add real server-side aliasing to MSN.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23470
diff
changeset
|
818 if (alias) |
70de4e2246ec
Add real server-side aliasing to MSN.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23470
diff
changeset
|
819 purple_serv_got_private_alias(pc, passport, alias); |
20439
bee467c81570
A bunch of MSNP14 stuff:
Stu Tomlinson <stu@nosnilmot.com>
parents:
20432
diff
changeset
|
820 } |
20666
0e1bc5c51030
A few leak plugs, some unnecessary allocation prevention, null pointer deref fixes and general robustness fixes. I'm sure there is more to do here, I got tired... Fixes #3308
Daniel Atallah <daniel.atallah@gmail.com>
parents:
20539
diff
changeset
|
821 |
0e1bc5c51030
A few leak plugs, some unnecessary allocation prevention, null pointer deref fixes and general robustness fixes. I'm sure there is more to do here, I got tired... Fixes #3308
Daniel Atallah <daniel.atallah@gmail.com>
parents:
20539
diff
changeset
|
822 g_free(passport); |
0e1bc5c51030
A few leak plugs, some unnecessary allocation prevention, null pointer deref fixes and general robustness fixes. I'm sure there is more to do here, I got tired... Fixes #3308
Daniel Atallah <daniel.atallah@gmail.com>
parents:
20539
diff
changeset
|
823 g_free(Name); |
0e1bc5c51030
A few leak plugs, some unnecessary allocation prevention, null pointer deref fixes and general robustness fixes. I'm sure there is more to do here, I got tired... Fixes #3308
Daniel Atallah <daniel.atallah@gmail.com>
parents:
20539
diff
changeset
|
824 g_free(uid); |
0e1bc5c51030
A few leak plugs, some unnecessary allocation prevention, null pointer deref fixes and general robustness fixes. I'm sure there is more to do here, I got tired... Fixes #3308
Daniel Atallah <daniel.atallah@gmail.com>
parents:
20539
diff
changeset
|
825 g_free(type); |
22832
f62a4a7fe365
Fix a number of leaks. As far as I can tell, MSNP14 now logs in without
Daniel Atallah <daniel.atallah@gmail.com>
parents:
22829
diff
changeset
|
826 g_free(mobile_number); |
20439
bee467c81570
A bunch of MSNP14 stuff:
Stu Tomlinson <stu@nosnilmot.com>
parents:
20432
diff
changeset
|
827 } |
bee467c81570
A bunch of MSNP14 stuff:
Stu Tomlinson <stu@nosnilmot.com>
parents:
20432
diff
changeset
|
828 |
bee467c81570
A bunch of MSNP14 stuff:
Stu Tomlinson <stu@nosnilmot.com>
parents:
20432
diff
changeset
|
829 static gboolean |
23459
69af5301e1a7
killing MsnContact which just wraps MsnSession
Ka-Hing Cheung <khc@hxbc.us>
parents:
23453
diff
changeset
|
830 msn_parse_addressbook(MsnSession *session, xmlnode *node) |
20439
bee467c81570
A bunch of MSNP14 stuff:
Stu Tomlinson <stu@nosnilmot.com>
parents:
20432
diff
changeset
|
831 { |
20538
90fd0826c6ce
finish converting the rest of stuff to the new soap api, signing on, getting
Ka-Hing Cheung <khc@hxbc.us>
parents:
20501
diff
changeset
|
832 xmlnode *result; |
20439
bee467c81570
A bunch of MSNP14 stuff:
Stu Tomlinson <stu@nosnilmot.com>
parents:
20432
diff
changeset
|
833 xmlnode *groups; |
20671
4dd60add6a7c
Further cleanup of the msn prpl including preventing the authorization request callback from crashing if triggered after the account is disconnected. Also removal of some extraneous debuggery, there is more that needs to be removed.
Daniel Atallah <daniel.atallah@gmail.com>
parents:
20666
diff
changeset
|
834 xmlnode *contacts; |
20439
bee467c81570
A bunch of MSNP14 stuff:
Stu Tomlinson <stu@nosnilmot.com>
parents:
20432
diff
changeset
|
835 xmlnode *abNode; |
20538
90fd0826c6ce
finish converting the rest of stuff to the new soap api, signing on, getting
Ka-Hing Cheung <khc@hxbc.us>
parents:
20501
diff
changeset
|
836 xmlnode *fault; |
20439
bee467c81570
A bunch of MSNP14 stuff:
Stu Tomlinson <stu@nosnilmot.com>
parents:
20432
diff
changeset
|
837 |
23453
bca58b00afab
References #4382, replaces usage of msn_soap_xml_get with xmlnode_get_child
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23447
diff
changeset
|
838 if ((fault = xmlnode_get_child(node, "Body/Fault"))) { |
20538
90fd0826c6ce
finish converting the rest of stuff to the new soap api, signing on, getting
Ka-Hing Cheung <khc@hxbc.us>
parents:
20501
diff
changeset
|
839 xmlnode *faultnode; |
90fd0826c6ce
finish converting the rest of stuff to the new soap api, signing on, getting
Ka-Hing Cheung <khc@hxbc.us>
parents:
20501
diff
changeset
|
840 |
90fd0826c6ce
finish converting the rest of stuff to the new soap api, signing on, getting
Ka-Hing Cheung <khc@hxbc.us>
parents:
20501
diff
changeset
|
841 if ((faultnode = xmlnode_get_child(fault, "faultstring"))) { |
90fd0826c6ce
finish converting the rest of stuff to the new soap api, signing on, getting
Ka-Hing Cheung <khc@hxbc.us>
parents:
20501
diff
changeset
|
842 gchar *faultstring = xmlnode_get_data(faultnode); |
23519
7bceac816e19
The great MSN debug message cleanup! Threw in a few whitespace fixes,
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23507
diff
changeset
|
843 purple_debug_info("msn", "AB Faultstring: %s\n", faultstring); |
20538
90fd0826c6ce
finish converting the rest of stuff to the new soap api, signing on, getting
Ka-Hing Cheung <khc@hxbc.us>
parents:
20501
diff
changeset
|
844 g_free(faultstring); |
90fd0826c6ce
finish converting the rest of stuff to the new soap api, signing on, getting
Ka-Hing Cheung <khc@hxbc.us>
parents:
20501
diff
changeset
|
845 } |
20477
9a2a4a0c0003
Add the possibility to create an Address Book, useful for newly registered MSN users.
Carlos Silva <typ0@pidgin.im>
parents:
20471
diff
changeset
|
846 |
23453
bca58b00afab
References #4382, replaces usage of msn_soap_xml_get with xmlnode_get_child
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23447
diff
changeset
|
847 if ((faultnode = xmlnode_get_child(fault, "detail/errorcode"))) { |
20538
90fd0826c6ce
finish converting the rest of stuff to the new soap api, signing on, getting
Ka-Hing Cheung <khc@hxbc.us>
parents:
20501
diff
changeset
|
848 gchar *errorcode = xmlnode_get_data(faultnode); |
90fd0826c6ce
finish converting the rest of stuff to the new soap api, signing on, getting
Ka-Hing Cheung <khc@hxbc.us>
parents:
20501
diff
changeset
|
849 |
23519
7bceac816e19
The great MSN debug message cleanup! Threw in a few whitespace fixes,
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23507
diff
changeset
|
850 purple_debug_info("msn", "AB Error Code: %s\n", errorcode); |
23298
5cdd93dac7a2
Delete trailing whitespace
Mark Doliner <mark@kingant.net>
parents:
22832
diff
changeset
|
851 |
20538
90fd0826c6ce
finish converting the rest of stuff to the new soap api, signing on, getting
Ka-Hing Cheung <khc@hxbc.us>
parents:
20501
diff
changeset
|
852 if (g_str_equal(errorcode, "ABDoesNotExist")) { |
90fd0826c6ce
finish converting the rest of stuff to the new soap api, signing on, getting
Ka-Hing Cheung <khc@hxbc.us>
parents:
20501
diff
changeset
|
853 g_free(errorcode); |
90fd0826c6ce
finish converting the rest of stuff to the new soap api, signing on, getting
Ka-Hing Cheung <khc@hxbc.us>
parents:
20501
diff
changeset
|
854 return TRUE; |
90fd0826c6ce
finish converting the rest of stuff to the new soap api, signing on, getting
Ka-Hing Cheung <khc@hxbc.us>
parents:
20501
diff
changeset
|
855 } |
22828
7d3b2c023ad8
This is the way we plug the leaks, plug the leaks, plug the leaks...
Daniel Atallah <daniel.atallah@gmail.com>
parents:
22571
diff
changeset
|
856 g_free(errorcode); |
20538
90fd0826c6ce
finish converting the rest of stuff to the new soap api, signing on, getting
Ka-Hing Cheung <khc@hxbc.us>
parents:
20501
diff
changeset
|
857 } |
90fd0826c6ce
finish converting the rest of stuff to the new soap api, signing on, getting
Ka-Hing Cheung <khc@hxbc.us>
parents:
20501
diff
changeset
|
858 |
20439
bee467c81570
A bunch of MSNP14 stuff:
Stu Tomlinson <stu@nosnilmot.com>
parents:
20432
diff
changeset
|
859 return FALSE; |
bee467c81570
A bunch of MSNP14 stuff:
Stu Tomlinson <stu@nosnilmot.com>
parents:
20432
diff
changeset
|
860 } |
20471
530a92d50c5e
Misc cleanups, better error handling, and print the Address Book received from the server in a human readable way.
Carlos Silva <typ0@pidgin.im>
parents:
20467
diff
changeset
|
861 |
23453
bca58b00afab
References #4382, replaces usage of msn_soap_xml_get with xmlnode_get_child
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23447
diff
changeset
|
862 result = xmlnode_get_child(node, "Body/ABFindAllResponse/ABFindAllResult"); |
23519
7bceac816e19
The great MSN debug message cleanup! Threw in a few whitespace fixes,
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23507
diff
changeset
|
863 if (result == NULL) { |
7bceac816e19
The great MSN debug message cleanup! Threw in a few whitespace fixes,
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23507
diff
changeset
|
864 purple_debug_misc("msn", "Received no address book update\n"); |
20538
90fd0826c6ce
finish converting the rest of stuff to the new soap api, signing on, getting
Ka-Hing Cheung <khc@hxbc.us>
parents:
20501
diff
changeset
|
865 return TRUE; |
20477
9a2a4a0c0003
Add the possibility to create an Address Book, useful for newly registered MSN users.
Carlos Silva <typ0@pidgin.im>
parents:
20471
diff
changeset
|
866 } |
9a2a4a0c0003
Add the possibility to create an Address Book, useful for newly registered MSN users.
Carlos Silva <typ0@pidgin.im>
parents:
20471
diff
changeset
|
867 |
20538
90fd0826c6ce
finish converting the rest of stuff to the new soap api, signing on, getting
Ka-Hing Cheung <khc@hxbc.us>
parents:
20501
diff
changeset
|
868 /* I don't see this "groups" tag documented on msnpiki, need to find out |
90fd0826c6ce
finish converting the rest of stuff to the new soap api, signing on, getting
Ka-Hing Cheung <khc@hxbc.us>
parents:
20501
diff
changeset
|
869 if they are really there, and update msnpiki */ |
20439
bee467c81570
A bunch of MSNP14 stuff:
Stu Tomlinson <stu@nosnilmot.com>
parents:
20432
diff
changeset
|
870 /*Process Group List*/ |
23519
7bceac816e19
The great MSN debug message cleanup! Threw in a few whitespace fixes,
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23507
diff
changeset
|
871 groups = xmlnode_get_child(result, "groups"); |
20439
bee467c81570
A bunch of MSNP14 stuff:
Stu Tomlinson <stu@nosnilmot.com>
parents:
20432
diff
changeset
|
872 if (groups != NULL) { |
23459
69af5301e1a7
killing MsnContact which just wraps MsnSession
Ka-Hing Cheung <khc@hxbc.us>
parents:
23453
diff
changeset
|
873 msn_parse_addressbook_groups(session, groups); |
20439
bee467c81570
A bunch of MSNP14 stuff:
Stu Tomlinson <stu@nosnilmot.com>
parents:
20432
diff
changeset
|
874 } |
bee467c81570
A bunch of MSNP14 stuff:
Stu Tomlinson <stu@nosnilmot.com>
parents:
20432
diff
changeset
|
875 |
bee467c81570
A bunch of MSNP14 stuff:
Stu Tomlinson <stu@nosnilmot.com>
parents:
20432
diff
changeset
|
876 /*add a default No group to set up the no group Membership*/ |
bee467c81570
A bunch of MSNP14 stuff:
Stu Tomlinson <stu@nosnilmot.com>
parents:
20432
diff
changeset
|
877 msn_group_new(session->userlist, MSN_INDIVIDUALS_GROUP_ID, |
bee467c81570
A bunch of MSNP14 stuff:
Stu Tomlinson <stu@nosnilmot.com>
parents:
20432
diff
changeset
|
878 MSN_INDIVIDUALS_GROUP_NAME); |
23519
7bceac816e19
The great MSN debug message cleanup! Threw in a few whitespace fixes,
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23507
diff
changeset
|
879 purple_debug_misc("msn", "AB group_id:%s name:%s\n", |
20439
bee467c81570
A bunch of MSNP14 stuff:
Stu Tomlinson <stu@nosnilmot.com>
parents:
20432
diff
changeset
|
880 MSN_INDIVIDUALS_GROUP_ID, MSN_INDIVIDUALS_GROUP_NAME); |
bee467c81570
A bunch of MSNP14 stuff:
Stu Tomlinson <stu@nosnilmot.com>
parents:
20432
diff
changeset
|
881 if ((purple_find_group(MSN_INDIVIDUALS_GROUP_NAME)) == NULL){ |
bee467c81570
A bunch of MSNP14 stuff:
Stu Tomlinson <stu@nosnilmot.com>
parents:
20432
diff
changeset
|
882 PurpleGroup *g = purple_group_new(MSN_INDIVIDUALS_GROUP_NAME); |
bee467c81570
A bunch of MSNP14 stuff:
Stu Tomlinson <stu@nosnilmot.com>
parents:
20432
diff
changeset
|
883 purple_blist_add_group(g, NULL); |
bee467c81570
A bunch of MSNP14 stuff:
Stu Tomlinson <stu@nosnilmot.com>
parents:
20432
diff
changeset
|
884 } |
bee467c81570
A bunch of MSNP14 stuff:
Stu Tomlinson <stu@nosnilmot.com>
parents:
20432
diff
changeset
|
885 |
bee467c81570
A bunch of MSNP14 stuff:
Stu Tomlinson <stu@nosnilmot.com>
parents:
20432
diff
changeset
|
886 /*add a default No group to set up the no group Membership*/ |
bee467c81570
A bunch of MSNP14 stuff:
Stu Tomlinson <stu@nosnilmot.com>
parents:
20432
diff
changeset
|
887 msn_group_new(session->userlist, MSN_NON_IM_GROUP_ID, MSN_NON_IM_GROUP_NAME); |
23519
7bceac816e19
The great MSN debug message cleanup! Threw in a few whitespace fixes,
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23507
diff
changeset
|
888 purple_debug_misc("msn", "AB group_id:%s name:%s\n", MSN_NON_IM_GROUP_ID, MSN_NON_IM_GROUP_NAME); |
7bceac816e19
The great MSN debug message cleanup! Threw in a few whitespace fixes,
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23507
diff
changeset
|
889 if ((purple_find_group(MSN_NON_IM_GROUP_NAME)) == NULL) { |
20439
bee467c81570
A bunch of MSNP14 stuff:
Stu Tomlinson <stu@nosnilmot.com>
parents:
20432
diff
changeset
|
890 PurpleGroup *g = purple_group_new(MSN_NON_IM_GROUP_NAME); |
bee467c81570
A bunch of MSNP14 stuff:
Stu Tomlinson <stu@nosnilmot.com>
parents:
20432
diff
changeset
|
891 purple_blist_add_group(g, NULL); |
bee467c81570
A bunch of MSNP14 stuff:
Stu Tomlinson <stu@nosnilmot.com>
parents:
20432
diff
changeset
|
892 } |
bee467c81570
A bunch of MSNP14 stuff:
Stu Tomlinson <stu@nosnilmot.com>
parents:
20432
diff
changeset
|
893 |
bee467c81570
A bunch of MSNP14 stuff:
Stu Tomlinson <stu@nosnilmot.com>
parents:
20432
diff
changeset
|
894 /*Process contact List*/ |
23519
7bceac816e19
The great MSN debug message cleanup! Threw in a few whitespace fixes,
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23507
diff
changeset
|
895 purple_debug_info("msn", "Process contact list...\n"); |
7bceac816e19
The great MSN debug message cleanup! Threw in a few whitespace fixes,
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23507
diff
changeset
|
896 contacts = xmlnode_get_child(result, "contacts"); |
20439
bee467c81570
A bunch of MSNP14 stuff:
Stu Tomlinson <stu@nosnilmot.com>
parents:
20432
diff
changeset
|
897 if (contacts != NULL) { |
23459
69af5301e1a7
killing MsnContact which just wraps MsnSession
Ka-Hing Cheung <khc@hxbc.us>
parents:
23453
diff
changeset
|
898 msn_parse_addressbook_contacts(session, contacts); |
20394
4a099e4d0d09
propagate from branch 'im.pidgin.pidgin' (head 98b6b547b29ea1192b73cc4e1de1e674edef4328)
Richard Laager <rlaager@wiktel.com>
parents:
diff
changeset
|
899 } |
4a099e4d0d09
propagate from branch 'im.pidgin.pidgin' (head 98b6b547b29ea1192b73cc4e1de1e674edef4328)
Richard Laager <rlaager@wiktel.com>
parents:
diff
changeset
|
900 |
23519
7bceac816e19
The great MSN debug message cleanup! Threw in a few whitespace fixes,
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23507
diff
changeset
|
901 abNode = xmlnode_get_child(result, "ab"); |
7bceac816e19
The great MSN debug message cleanup! Threw in a few whitespace fixes,
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23507
diff
changeset
|
902 if (abNode != NULL) { |
20666
0e1bc5c51030
A few leak plugs, some unnecessary allocation prevention, null pointer deref fixes and general robustness fixes. I'm sure there is more to do here, I got tired... Fixes #3308
Daniel Atallah <daniel.atallah@gmail.com>
parents:
20539
diff
changeset
|
903 xmlnode *node2; |
0e1bc5c51030
A few leak plugs, some unnecessary allocation prevention, null pointer deref fixes and general robustness fixes. I'm sure there is more to do here, I got tired... Fixes #3308
Daniel Atallah <daniel.atallah@gmail.com>
parents:
20539
diff
changeset
|
904 char *tmp = NULL; |
20394
4a099e4d0d09
propagate from branch 'im.pidgin.pidgin' (head 98b6b547b29ea1192b73cc4e1de1e674edef4328)
Richard Laager <rlaager@wiktel.com>
parents:
diff
changeset
|
905 |
20666
0e1bc5c51030
A few leak plugs, some unnecessary allocation prevention, null pointer deref fixes and general robustness fixes. I'm sure there is more to do here, I got tired... Fixes #3308
Daniel Atallah <daniel.atallah@gmail.com>
parents:
20539
diff
changeset
|
906 if ((node2 = xmlnode_get_child(abNode, "lastChange"))) |
0e1bc5c51030
A few leak plugs, some unnecessary allocation prevention, null pointer deref fixes and general robustness fixes. I'm sure there is more to do here, I got tired... Fixes #3308
Daniel Atallah <daniel.atallah@gmail.com>
parents:
20539
diff
changeset
|
907 tmp = xmlnode_get_data(node2); |
23519
7bceac816e19
The great MSN debug message cleanup! Threw in a few whitespace fixes,
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23507
diff
changeset
|
908 purple_debug_info("msn", "AB lastchanged Time:{%s}\n", tmp ? tmp : "(null)"); |
20666
0e1bc5c51030
A few leak plugs, some unnecessary allocation prevention, null pointer deref fixes and general robustness fixes. I'm sure there is more to do here, I got tired... Fixes #3308
Daniel Atallah <daniel.atallah@gmail.com>
parents:
20539
diff
changeset
|
909 purple_account_set_string(session->account, "ablastChange", tmp); |
20432
703fc3437ab5
Store account specific settings in the account, not in some random blist
Stu Tomlinson <stu@nosnilmot.com>
parents:
20427
diff
changeset
|
910 |
20666
0e1bc5c51030
A few leak plugs, some unnecessary allocation prevention, null pointer deref fixes and general robustness fixes. I'm sure there is more to do here, I got tired... Fixes #3308
Daniel Atallah <daniel.atallah@gmail.com>
parents:
20539
diff
changeset
|
911 g_free(tmp); tmp = NULL; |
0e1bc5c51030
A few leak plugs, some unnecessary allocation prevention, null pointer deref fixes and general robustness fixes. I'm sure there is more to do here, I got tired... Fixes #3308
Daniel Atallah <daniel.atallah@gmail.com>
parents:
20539
diff
changeset
|
912 if ((node2 = xmlnode_get_child(abNode, "DynamicItemLastChanged"))) |
0e1bc5c51030
A few leak plugs, some unnecessary allocation prevention, null pointer deref fixes and general robustness fixes. I'm sure there is more to do here, I got tired... Fixes #3308
Daniel Atallah <daniel.atallah@gmail.com>
parents:
20539
diff
changeset
|
913 tmp = xmlnode_get_data(node2); |
23519
7bceac816e19
The great MSN debug message cleanup! Threw in a few whitespace fixes,
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23507
diff
changeset
|
914 purple_debug_info("msn", "AB DynamicItemLastChanged :{%s}\n", tmp ? tmp : "(null)"); |
20666
0e1bc5c51030
A few leak plugs, some unnecessary allocation prevention, null pointer deref fixes and general robustness fixes. I'm sure there is more to do here, I got tired... Fixes #3308
Daniel Atallah <daniel.atallah@gmail.com>
parents:
20539
diff
changeset
|
915 purple_account_set_string(session->account, "DynamicItemLastChanged", tmp); |
0e1bc5c51030
A few leak plugs, some unnecessary allocation prevention, null pointer deref fixes and general robustness fixes. I'm sure there is more to do here, I got tired... Fixes #3308
Daniel Atallah <daniel.atallah@gmail.com>
parents:
20539
diff
changeset
|
916 g_free(tmp); |
20394
4a099e4d0d09
propagate from branch 'im.pidgin.pidgin' (head 98b6b547b29ea1192b73cc4e1de1e674edef4328)
Richard Laager <rlaager@wiktel.com>
parents:
diff
changeset
|
917 } |
4a099e4d0d09
propagate from branch 'im.pidgin.pidgin' (head 98b6b547b29ea1192b73cc4e1de1e674edef4328)
Richard Laager <rlaager@wiktel.com>
parents:
diff
changeset
|
918 |
4a099e4d0d09
propagate from branch 'im.pidgin.pidgin' (head 98b6b547b29ea1192b73cc4e1de1e674edef4328)
Richard Laager <rlaager@wiktel.com>
parents:
diff
changeset
|
919 return TRUE; |
4a099e4d0d09
propagate from branch 'im.pidgin.pidgin' (head 98b6b547b29ea1192b73cc4e1de1e674edef4328)
Richard Laager <rlaager@wiktel.com>
parents:
diff
changeset
|
920 } |
4a099e4d0d09
propagate from branch 'im.pidgin.pidgin' (head 98b6b547b29ea1192b73cc4e1de1e674edef4328)
Richard Laager <rlaager@wiktel.com>
parents:
diff
changeset
|
921 |
4a099e4d0d09
propagate from branch 'im.pidgin.pidgin' (head 98b6b547b29ea1192b73cc4e1de1e674edef4328)
Richard Laager <rlaager@wiktel.com>
parents:
diff
changeset
|
922 static void |
20538
90fd0826c6ce
finish converting the rest of stuff to the new soap api, signing on, getting
Ka-Hing Cheung <khc@hxbc.us>
parents:
20501
diff
changeset
|
923 msn_get_address_cb(MsnSoapMessage *req, MsnSoapMessage *resp, gpointer data) |
20394
4a099e4d0d09
propagate from branch 'im.pidgin.pidgin' (head 98b6b547b29ea1192b73cc4e1de1e674edef4328)
Richard Laager <rlaager@wiktel.com>
parents:
diff
changeset
|
924 { |
25396
06a802d32d71
I incorrectly assumed that the FindMembership and ABFindAll SOAP requests
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
25395
diff
changeset
|
925 MsnCallbackState *state = data; |
06a802d32d71
I incorrectly assumed that the FindMembership and ABFindAll SOAP requests
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
25395
diff
changeset
|
926 MsnSession *session = state->session; |
20501
f6dff814d95f
cleans up ownership of soap callback data, this soap stuff is perfect
Ka-Hing Cheung <khc@hxbc.us>
parents:
20495
diff
changeset
|
927 |
20394
4a099e4d0d09
propagate from branch 'im.pidgin.pidgin' (head 98b6b547b29ea1192b73cc4e1de1e674edef4328)
Richard Laager <rlaager@wiktel.com>
parents:
diff
changeset
|
928 g_return_if_fail(session != NULL); |
4a099e4d0d09
propagate from branch 'im.pidgin.pidgin' (head 98b6b547b29ea1192b73cc4e1de1e674edef4328)
Richard Laager <rlaager@wiktel.com>
parents:
diff
changeset
|
929 |
23519
7bceac816e19
The great MSN debug message cleanup! Threw in a few whitespace fixes,
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23507
diff
changeset
|
930 purple_debug_misc("msn", "Got the Address Book!\n"); |
20479
6a8463be5b23
Improve MSN_SOAP_DEBUG and workaround a Win32 bug which would case Pidgin to consume insane amounts of memory when printing a large string to the Debug Window.
Carlos Silva <typ0@pidgin.im>
parents:
20477
diff
changeset
|
931 |
23459
69af5301e1a7
killing MsnContact which just wraps MsnSession
Ka-Hing Cheung <khc@hxbc.us>
parents:
23453
diff
changeset
|
932 if (msn_parse_addressbook(session, resp->xml)) { |
23529
4162ac08c775
On MSN, always send the privacy settings and contact list after parsing
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23521
diff
changeset
|
933 msn_send_privacy(session->account->gc); |
4162ac08c775
On MSN, always send the privacy settings and contact list after parsing
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23521
diff
changeset
|
934 msn_notification_dump_contact(session); |
20394
4a099e4d0d09
propagate from branch 'im.pidgin.pidgin' (head 98b6b547b29ea1192b73cc4e1de1e674edef4328)
Richard Laager <rlaager@wiktel.com>
parents:
diff
changeset
|
935 } else { |
20538
90fd0826c6ce
finish converting the rest of stuff to the new soap api, signing on, getting
Ka-Hing Cheung <khc@hxbc.us>
parents:
20501
diff
changeset
|
936 /* This is making us loop infinitely when we fail to parse the |
90fd0826c6ce
finish converting the rest of stuff to the new soap api, signing on, getting
Ka-Hing Cheung <khc@hxbc.us>
parents:
20501
diff
changeset
|
937 address book, disable for now (we should re-enable when we |
90fd0826c6ce
finish converting the rest of stuff to the new soap api, signing on, getting
Ka-Hing Cheung <khc@hxbc.us>
parents:
20501
diff
changeset
|
938 send timestamps) |
20477
9a2a4a0c0003
Add the possibility to create an Address Book, useful for newly registered MSN users.
Carlos Silva <typ0@pidgin.im>
parents:
20471
diff
changeset
|
939 */ |
9a2a4a0c0003
Add the possibility to create an Address Book, useful for newly registered MSN users.
Carlos Silva <typ0@pidgin.im>
parents:
20471
diff
changeset
|
940 /* |
23459
69af5301e1a7
killing MsnContact which just wraps MsnSession
Ka-Hing Cheung <khc@hxbc.us>
parents:
23453
diff
changeset
|
941 msn_get_address_book(session, NULL, NULL); |
20477
9a2a4a0c0003
Add the possibility to create an Address Book, useful for newly registered MSN users.
Carlos Silva <typ0@pidgin.im>
parents:
20471
diff
changeset
|
942 */ |
25491
c729cdeb88c8
Set an error if you're unable to connect to the contact server, or are not
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
25458
diff
changeset
|
943 msn_session_set_error(session, MSN_ERROR_BAD_BLIST, NULL); |
20394
4a099e4d0d09
propagate from branch 'im.pidgin.pidgin' (head 98b6b547b29ea1192b73cc4e1de1e674edef4328)
Richard Laager <rlaager@wiktel.com>
parents:
diff
changeset
|
944 } |
4a099e4d0d09
propagate from branch 'im.pidgin.pidgin' (head 98b6b547b29ea1192b73cc4e1de1e674edef4328)
Richard Laager <rlaager@wiktel.com>
parents:
diff
changeset
|
945 } |
4a099e4d0d09
propagate from branch 'im.pidgin.pidgin' (head 98b6b547b29ea1192b73cc4e1de1e674edef4328)
Richard Laager <rlaager@wiktel.com>
parents:
diff
changeset
|
946 |
4a099e4d0d09
propagate from branch 'im.pidgin.pidgin' (head 98b6b547b29ea1192b73cc4e1de1e674edef4328)
Richard Laager <rlaager@wiktel.com>
parents:
diff
changeset
|
947 /*get the address book*/ |
4a099e4d0d09
propagate from branch 'im.pidgin.pidgin' (head 98b6b547b29ea1192b73cc4e1de1e674edef4328)
Richard Laager <rlaager@wiktel.com>
parents:
diff
changeset
|
948 void |
23459
69af5301e1a7
killing MsnContact which just wraps MsnSession
Ka-Hing Cheung <khc@hxbc.us>
parents:
23453
diff
changeset
|
949 msn_get_address_book(MsnSession *session, |
20538
90fd0826c6ce
finish converting the rest of stuff to the new soap api, signing on, getting
Ka-Hing Cheung <khc@hxbc.us>
parents:
20501
diff
changeset
|
950 MsnSoapPartnerScenario partner_scenario, const char *LastChanged, |
90fd0826c6ce
finish converting the rest of stuff to the new soap api, signing on, getting
Ka-Hing Cheung <khc@hxbc.us>
parents:
20501
diff
changeset
|
951 const char *dynamicItemLastChange) |
20394
4a099e4d0d09
propagate from branch 'im.pidgin.pidgin' (head 98b6b547b29ea1192b73cc4e1de1e674edef4328)
Richard Laager <rlaager@wiktel.com>
parents:
diff
changeset
|
952 { |
21109
e64e6fbd1351
merge_into_workspace of c0e79d15a4fe4c5b0129fcae5060754b25f72a56 and
Ka-Hing Cheung <khc@hxbc.us>
diff
changeset
|
953 char *body, *update_str = NULL; |
25396
06a802d32d71
I incorrectly assumed that the FindMembership and ABFindAll SOAP requests
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
25395
diff
changeset
|
954 MsnCallbackState *state; |
20394
4a099e4d0d09
propagate from branch 'im.pidgin.pidgin' (head 98b6b547b29ea1192b73cc4e1de1e674edef4328)
Richard Laager <rlaager@wiktel.com>
parents:
diff
changeset
|
955 |
23519
7bceac816e19
The great MSN debug message cleanup! Threw in a few whitespace fixes,
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23507
diff
changeset
|
956 purple_debug_misc("msn", "Getting Address Book\n"); |
20477
9a2a4a0c0003
Add the possibility to create an Address Book, useful for newly registered MSN users.
Carlos Silva <typ0@pidgin.im>
parents:
20471
diff
changeset
|
957 |
20394
4a099e4d0d09
propagate from branch 'im.pidgin.pidgin' (head 98b6b547b29ea1192b73cc4e1de1e674edef4328)
Richard Laager <rlaager@wiktel.com>
parents:
diff
changeset
|
958 /*build SOAP and POST it*/ |
20666
0e1bc5c51030
A few leak plugs, some unnecessary allocation prevention, null pointer deref fixes and general robustness fixes. I'm sure there is more to do here, I got tired... Fixes #3308
Daniel Atallah <daniel.atallah@gmail.com>
parents:
20539
diff
changeset
|
959 if (dynamicItemLastChange != NULL) |
0e1bc5c51030
A few leak plugs, some unnecessary allocation prevention, null pointer deref fixes and general robustness fixes. I'm sure there is more to do here, I got tired... Fixes #3308
Daniel Atallah <daniel.atallah@gmail.com>
parents:
20539
diff
changeset
|
960 update_str = g_strdup_printf(MSN_GET_ADDRESS_UPDATE_XML, dynamicItemLastChange); |
0e1bc5c51030
A few leak plugs, some unnecessary allocation prevention, null pointer deref fixes and general robustness fixes. I'm sure there is more to do here, I got tired... Fixes #3308
Daniel Atallah <daniel.atallah@gmail.com>
parents:
20539
diff
changeset
|
961 else if (LastChanged != NULL) |
0e1bc5c51030
A few leak plugs, some unnecessary allocation prevention, null pointer deref fixes and general robustness fixes. I'm sure there is more to do here, I got tired... Fixes #3308
Daniel Atallah <daniel.atallah@gmail.com>
parents:
20539
diff
changeset
|
962 update_str = g_strdup_printf(MSN_GET_ADDRESS_UPDATE_XML, LastChanged); |
20481
eb93710aec4d
Make buddy and group management actually work, add some SOAP templates, redesign some parts of code and separate some bigger functions into its smaller tasks which are completely unrelated to each other
Carlos Silva <typ0@pidgin.im>
parents:
20479
diff
changeset
|
963 |
23735
35f7b7c62995
Remove calls to g_markup_escape_text. Not only does this help with old
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23734
diff
changeset
|
964 body = g_strdup_printf(MSN_GET_ADDRESS_TEMPLATE, |
23447
72aa2ccad28d
fix sending offline message in p15 by sending the correct token. In msnp14,
Ka-Hing Cheung <khc@hxbc.us>
parents:
23446
diff
changeset
|
965 MsnSoapPartnerScenarioText[partner_scenario], |
72aa2ccad28d
fix sending offline message in p15 by sending the correct token. In msnp14,
Ka-Hing Cheung <khc@hxbc.us>
parents:
23446
diff
changeset
|
966 update_str ? update_str : ""); |
20477
9a2a4a0c0003
Add the possibility to create an Address Book, useful for newly registered MSN users.
Carlos Silva <typ0@pidgin.im>
parents:
20471
diff
changeset
|
967 |
25396
06a802d32d71
I incorrectly assumed that the FindMembership and ABFindAll SOAP requests
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
25395
diff
changeset
|
968 state = msn_callback_state_new(session); |
06a802d32d71
I incorrectly assumed that the FindMembership and ABFindAll SOAP requests
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
25395
diff
changeset
|
969 state->body = xmlnode_from_str(body, -1); |
06a802d32d71
I incorrectly assumed that the FindMembership and ABFindAll SOAP requests
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
25395
diff
changeset
|
970 state->post_action = MSN_GET_ADDRESS_SOAP_ACTION; |
06a802d32d71
I incorrectly assumed that the FindMembership and ABFindAll SOAP requests
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
25395
diff
changeset
|
971 state->post_url = MSN_ADDRESS_BOOK_POST_URL; |
06a802d32d71
I incorrectly assumed that the FindMembership and ABFindAll SOAP requests
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
25395
diff
changeset
|
972 state->cb = msn_get_address_cb; |
06a802d32d71
I incorrectly assumed that the FindMembership and ABFindAll SOAP requests
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
25395
diff
changeset
|
973 msn_contact_request(state); |
20538
90fd0826c6ce
finish converting the rest of stuff to the new soap api, signing on, getting
Ka-Hing Cheung <khc@hxbc.us>
parents:
20501
diff
changeset
|
974 |
21109
e64e6fbd1351
merge_into_workspace of c0e79d15a4fe4c5b0129fcae5060754b25f72a56 and
Ka-Hing Cheung <khc@hxbc.us>
diff
changeset
|
975 g_free(update_str); |
20394
4a099e4d0d09
propagate from branch 'im.pidgin.pidgin' (head 98b6b547b29ea1192b73cc4e1de1e674edef4328)
Richard Laager <rlaager@wiktel.com>
parents:
diff
changeset
|
976 g_free(body); |
4a099e4d0d09
propagate from branch 'im.pidgin.pidgin' (head 98b6b547b29ea1192b73cc4e1de1e674edef4328)
Richard Laager <rlaager@wiktel.com>
parents:
diff
changeset
|
977 } |
4a099e4d0d09
propagate from branch 'im.pidgin.pidgin' (head 98b6b547b29ea1192b73cc4e1de1e674edef4328)
Richard Laager <rlaager@wiktel.com>
parents:
diff
changeset
|
978 |
23470
eb8bd060b987
Update MSN Contact tokens when an invalid token error is returned.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
979 /*************************************************************** |
eb8bd060b987
Update MSN Contact tokens when an invalid token error is returned.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
980 * Contact Operations |
eb8bd060b987
Update MSN Contact tokens when an invalid token error is returned.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
981 ***************************************************************/ |
eb8bd060b987
Update MSN Contact tokens when an invalid token error is returned.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
982 |
20394
4a099e4d0d09
propagate from branch 'im.pidgin.pidgin' (head 98b6b547b29ea1192b73cc4e1de1e674edef4328)
Richard Laager <rlaager@wiktel.com>
parents:
diff
changeset
|
983 static void |
20538
90fd0826c6ce
finish converting the rest of stuff to the new soap api, signing on, getting
Ka-Hing Cheung <khc@hxbc.us>
parents:
20501
diff
changeset
|
984 msn_add_contact_read_cb(MsnSoapMessage *req, MsnSoapMessage *resp, |
90fd0826c6ce
finish converting the rest of stuff to the new soap api, signing on, getting
Ka-Hing Cheung <khc@hxbc.us>
parents:
20501
diff
changeset
|
985 gpointer data) |
20394
4a099e4d0d09
propagate from branch 'im.pidgin.pidgin' (head 98b6b547b29ea1192b73cc4e1de1e674edef4328)
Richard Laager <rlaager@wiktel.com>
parents:
diff
changeset
|
986 { |
20538
90fd0826c6ce
finish converting the rest of stuff to the new soap api, signing on, getting
Ka-Hing Cheung <khc@hxbc.us>
parents:
20501
diff
changeset
|
987 MsnCallbackState *state = data; |
90fd0826c6ce
finish converting the rest of stuff to the new soap api, signing on, getting
Ka-Hing Cheung <khc@hxbc.us>
parents:
20501
diff
changeset
|
988 MsnSession *session = state->session; |
20501
f6dff814d95f
cleans up ownership of soap callback data, this soap stuff is perfect
Ka-Hing Cheung <khc@hxbc.us>
parents:
20495
diff
changeset
|
989 |
23470
eb8bd060b987
Update MSN Contact tokens when an invalid token error is returned.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
990 MsnUserList *userlist; |
eb8bd060b987
Update MSN Contact tokens when an invalid token error is returned.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
991 MsnUser *user; |
24222
7ec9a1ae93d7
Save the MSN ContactID after adding a buddy so it can be used for
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
24206
diff
changeset
|
992 xmlnode *guid; |
23470
eb8bd060b987
Update MSN Contact tokens when an invalid token error is returned.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
993 |
24517
2b4c909b40c4
Print a specific error to debug log about EmailDomainIsFederated error.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
24516
diff
changeset
|
994 xmlnode *fault; |
24516
ff275531cbf2
Send the SOAP faultcode to the callbacks for each Contact operation. They all
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
24515
diff
changeset
|
995 |
24522
692c34bf98d8
Handle the InvalidPassportUser response when adding buddies and report it to
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
24521
diff
changeset
|
996 g_return_if_fail(session != NULL); |
692c34bf98d8
Handle the InvalidPassportUser response when adding buddies and report it to
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
24521
diff
changeset
|
997 userlist = session->userlist; |
692c34bf98d8
Handle the InvalidPassportUser response when adding buddies and report it to
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
24521
diff
changeset
|
998 |
24517
2b4c909b40c4
Print a specific error to debug log about EmailDomainIsFederated error.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
24516
diff
changeset
|
999 fault = xmlnode_get_child(resp->xml, "Body/Fault"); |
2b4c909b40c4
Print a specific error to debug log about EmailDomainIsFederated error.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
24516
diff
changeset
|
1000 if (fault != NULL) { |
2b4c909b40c4
Print a specific error to debug log about EmailDomainIsFederated error.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
24516
diff
changeset
|
1001 char *errorcode = xmlnode_get_data(xmlnode_get_child(fault, "detail/errorcode")); |
2b4c909b40c4
Print a specific error to debug log about EmailDomainIsFederated error.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
24516
diff
changeset
|
1002 if (errorcode && !strcmp(errorcode, "EmailDomainIsFederated")) { |
2b4c909b40c4
Print a specific error to debug log about EmailDomainIsFederated error.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
24516
diff
changeset
|
1003 /* Do something special! */ |
2b4c909b40c4
Print a specific error to debug log about EmailDomainIsFederated error.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
24516
diff
changeset
|
1004 purple_debug_error("msn", "Contact is from a federated domain, but don't know what to do yet!\n"); |
24522
692c34bf98d8
Handle the InvalidPassportUser response when adding buddies and report it to
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
24521
diff
changeset
|
1005 |
692c34bf98d8
Handle the InvalidPassportUser response when adding buddies and report it to
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
24521
diff
changeset
|
1006 } else if (errorcode && !strcmp(errorcode, "InvalidPassportUser")) { |
692c34bf98d8
Handle the InvalidPassportUser response when adding buddies and report it to
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
24521
diff
changeset
|
1007 PurpleBuddy *buddy = purple_find_buddy(session->account, state->who); |
692c34bf98d8
Handle the InvalidPassportUser response when adding buddies and report it to
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
24521
diff
changeset
|
1008 char *str = g_strdup_printf(_("Unable to add \"%s\"."), state->who); |
692c34bf98d8
Handle the InvalidPassportUser response when adding buddies and report it to
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
24521
diff
changeset
|
1009 purple_notify_error(state->session, _("Buddy Add error"), str, |
692c34bf98d8
Handle the InvalidPassportUser response when adding buddies and report it to
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
24521
diff
changeset
|
1010 _("The username specified does not exist.")); |
692c34bf98d8
Handle the InvalidPassportUser response when adding buddies and report it to
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
24521
diff
changeset
|
1011 g_free(str); |
692c34bf98d8
Handle the InvalidPassportUser response when adding buddies and report it to
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
24521
diff
changeset
|
1012 msn_userlist_rem_buddy(userlist, state->who); |
692c34bf98d8
Handle the InvalidPassportUser response when adding buddies and report it to
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
24521
diff
changeset
|
1013 if (buddy != NULL) |
692c34bf98d8
Handle the InvalidPassportUser response when adding buddies and report it to
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
24521
diff
changeset
|
1014 purple_blist_remove_buddy(buddy); |
24517
2b4c909b40c4
Print a specific error to debug log about EmailDomainIsFederated error.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
24516
diff
changeset
|
1015 |
24522
692c34bf98d8
Handle the InvalidPassportUser response when adding buddies and report it to
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
24521
diff
changeset
|
1016 } else { |
692c34bf98d8
Handle the InvalidPassportUser response when adding buddies and report it to
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
24521
diff
changeset
|
1017 /* We don't know how to respond to this faultcode, so log it */ |
692c34bf98d8
Handle the InvalidPassportUser response when adding buddies and report it to
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
24521
diff
changeset
|
1018 char *fault_str = xmlnode_to_str(fault, NULL); |
692c34bf98d8
Handle the InvalidPassportUser response when adding buddies and report it to
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
24521
diff
changeset
|
1019 if (fault_str != NULL) { |
692c34bf98d8
Handle the InvalidPassportUser response when adding buddies and report it to
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
24521
diff
changeset
|
1020 purple_debug_error("msn", "Operation {%s} Failed, SOAP Fault was: %s\n", |
692c34bf98d8
Handle the InvalidPassportUser response when adding buddies and report it to
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
24521
diff
changeset
|
1021 msn_contact_operation_str(state->action), fault_str); |
692c34bf98d8
Handle the InvalidPassportUser response when adding buddies and report it to
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
24521
diff
changeset
|
1022 g_free(fault_str); |
692c34bf98d8
Handle the InvalidPassportUser response when adding buddies and report it to
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
24521
diff
changeset
|
1023 } |
24517
2b4c909b40c4
Print a specific error to debug log about EmailDomainIsFederated error.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
24516
diff
changeset
|
1024 } |
24522
692c34bf98d8
Handle the InvalidPassportUser response when adding buddies and report it to
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
24521
diff
changeset
|
1025 return; |
24516
ff275531cbf2
Send the SOAP faultcode to the callbacks for each Contact operation. They all
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
24515
diff
changeset
|
1026 } |
ff275531cbf2
Send the SOAP faultcode to the callbacks for each Contact operation. They all
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
24515
diff
changeset
|
1027 |
23519
7bceac816e19
The great MSN debug message cleanup! Threw in a few whitespace fixes,
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23507
diff
changeset
|
1028 purple_debug_info("msn", "Contact added successfully\n"); |
20481
eb93710aec4d
Make buddy and group management actually work, add some SOAP templates, redesign some parts of code and separate some bigger functions into its smaller tasks which are completely unrelated to each other
Carlos Silva <typ0@pidgin.im>
parents:
20479
diff
changeset
|
1029 |
24525
98afd76647bd
Updates for federated/Yahoo buddies:
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
24524
diff
changeset
|
1030 msn_userlist_add_buddy_to_list(userlist, state->who, MSN_LIST_AL); |
98afd76647bd
Updates for federated/Yahoo buddies:
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
24524
diff
changeset
|
1031 msn_userlist_add_buddy_to_list(userlist, state->who, MSN_LIST_FL); |
20481
eb93710aec4d
Make buddy and group management actually work, add some SOAP templates, redesign some parts of code and separate some bigger functions into its smaller tasks which are completely unrelated to each other
Carlos Silva <typ0@pidgin.im>
parents:
20479
diff
changeset
|
1032 |
23470
eb8bd060b987
Update MSN Contact tokens when an invalid token error is returned.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
1033 user = msn_userlist_find_add_user(userlist, state->who, state->who); |
eb8bd060b987
Update MSN Contact tokens when an invalid token error is returned.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
1034 msn_user_add_group_id(user, state->guid); |
24222
7ec9a1ae93d7
Save the MSN ContactID after adding a buddy so it can be used for
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
24206
diff
changeset
|
1035 |
7ec9a1ae93d7
Save the MSN ContactID after adding a buddy so it can be used for
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
24206
diff
changeset
|
1036 guid = xmlnode_get_child(resp->xml, |
7ec9a1ae93d7
Save the MSN ContactID after adding a buddy so it can be used for
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
24206
diff
changeset
|
1037 "Body/ABContactAddResponse/ABContactAddResult/guid"); |
7ec9a1ae93d7
Save the MSN ContactID after adding a buddy so it can be used for
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
24206
diff
changeset
|
1038 if (guid != NULL) { |
7ec9a1ae93d7
Save the MSN ContactID after adding a buddy so it can be used for
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
24206
diff
changeset
|
1039 char *uid = xmlnode_get_data(guid); |
7ec9a1ae93d7
Save the MSN ContactID after adding a buddy so it can be used for
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
24206
diff
changeset
|
1040 msn_user_set_uid(user, uid); |
7ec9a1ae93d7
Save the MSN ContactID after adding a buddy so it can be used for
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
24206
diff
changeset
|
1041 purple_debug_info("msn", "Set %s guid to %s.\n", state->who, uid); |
7ec9a1ae93d7
Save the MSN ContactID after adding a buddy so it can be used for
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
24206
diff
changeset
|
1042 g_free(uid); |
7ec9a1ae93d7
Save the MSN ContactID after adding a buddy so it can be used for
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
24206
diff
changeset
|
1043 } |
20394
4a099e4d0d09
propagate from branch 'im.pidgin.pidgin' (head 98b6b547b29ea1192b73cc4e1de1e674edef4328)
Richard Laager <rlaager@wiktel.com>
parents:
diff
changeset
|
1044 } |
4a099e4d0d09
propagate from branch 'im.pidgin.pidgin' (head 98b6b547b29ea1192b73cc4e1de1e674edef4328)
Richard Laager <rlaager@wiktel.com>
parents:
diff
changeset
|
1045 |
20484
98613886411a
Handle special cases in buddy/group management (wrt MSN_INDIVIDUALS_GROUP and MSN_NON_IM_GROUP).
Carlos Silva <typ0@pidgin.im>
parents:
20481
diff
changeset
|
1046 /* add a Contact in MSN_INDIVIDUALS_GROUP */ |
20394
4a099e4d0d09
propagate from branch 'im.pidgin.pidgin' (head 98b6b547b29ea1192b73cc4e1de1e674edef4328)
Richard Laager <rlaager@wiktel.com>
parents:
diff
changeset
|
1047 void |
23459
69af5301e1a7
killing MsnContact which just wraps MsnSession
Ka-Hing Cheung <khc@hxbc.us>
parents:
23453
diff
changeset
|
1048 msn_add_contact(MsnSession *session, MsnCallbackState *state, const char *passport) |
20394
4a099e4d0d09
propagate from branch 'im.pidgin.pidgin' (head 98b6b547b29ea1192b73cc4e1de1e674edef4328)
Richard Laager <rlaager@wiktel.com>
parents:
diff
changeset
|
1049 { |
24524
2b6847646817
Use ContactEmail to add federated buddies to the AddressBook. Those on Yahoo
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
24522
diff
changeset
|
1050 MsnUser *user; |
20481
eb93710aec4d
Make buddy and group management actually work, add some SOAP templates, redesign some parts of code and separate some bigger functions into its smaller tasks which are completely unrelated to each other
Carlos Silva <typ0@pidgin.im>
parents:
20479
diff
changeset
|
1051 gchar *body = NULL; |
eb93710aec4d
Make buddy and group management actually work, add some SOAP templates, redesign some parts of code and separate some bigger functions into its smaller tasks which are completely unrelated to each other
Carlos Silva <typ0@pidgin.im>
parents:
20479
diff
changeset
|
1052 gchar *contact_xml = NULL; |
20538
90fd0826c6ce
finish converting the rest of stuff to the new soap api, signing on, getting
Ka-Hing Cheung <khc@hxbc.us>
parents:
20501
diff
changeset
|
1053 |
90fd0826c6ce
finish converting the rest of stuff to the new soap api, signing on, getting
Ka-Hing Cheung <khc@hxbc.us>
parents:
20501
diff
changeset
|
1054 #if 0 |
90fd0826c6ce
finish converting the rest of stuff to the new soap api, signing on, getting
Ka-Hing Cheung <khc@hxbc.us>
parents:
20501
diff
changeset
|
1055 gchar *escaped_displayname; |
20484
98613886411a
Handle special cases in buddy/group management (wrt MSN_INDIVIDUALS_GROUP and MSN_NON_IM_GROUP).
Carlos Silva <typ0@pidgin.im>
parents:
20481
diff
changeset
|
1056 |
20481
eb93710aec4d
Make buddy and group management actually work, add some SOAP templates, redesign some parts of code and separate some bigger functions into its smaller tasks which are completely unrelated to each other
Carlos Silva <typ0@pidgin.im>
parents:
20479
diff
changeset
|
1057 |
20484
98613886411a
Handle special cases in buddy/group management (wrt MSN_INDIVIDUALS_GROUP and MSN_NON_IM_GROUP).
Carlos Silva <typ0@pidgin.im>
parents:
20481
diff
changeset
|
1058 if (displayname != NULL) { |
98613886411a
Handle special cases in buddy/group management (wrt MSN_INDIVIDUALS_GROUP and MSN_NON_IM_GROUP).
Carlos Silva <typ0@pidgin.im>
parents:
20481
diff
changeset
|
1059 escaped_displayname = g_markup_decode_text(displayname, -1); |
98613886411a
Handle special cases in buddy/group management (wrt MSN_INDIVIDUALS_GROUP and MSN_NON_IM_GROUP).
Carlos Silva <typ0@pidgin.im>
parents:
20481
diff
changeset
|
1060 } else { |
98613886411a
Handle special cases in buddy/group management (wrt MSN_INDIVIDUALS_GROUP and MSN_NON_IM_GROUP).
Carlos Silva <typ0@pidgin.im>
parents:
20481
diff
changeset
|
1061 escaped_displayname = passport; |
98613886411a
Handle special cases in buddy/group management (wrt MSN_INDIVIDUALS_GROUP and MSN_NON_IM_GROUP).
Carlos Silva <typ0@pidgin.im>
parents:
20481
diff
changeset
|
1062 } |
98613886411a
Handle special cases in buddy/group management (wrt MSN_INDIVIDUALS_GROUP and MSN_NON_IM_GROUP).
Carlos Silva <typ0@pidgin.im>
parents:
20481
diff
changeset
|
1063 contact_xml = g_strdup_printf(MSN_XML_ADD_CONTACT, escaped_displayname, passport); |
20538
90fd0826c6ce
finish converting the rest of stuff to the new soap api, signing on, getting
Ka-Hing Cheung <khc@hxbc.us>
parents:
20501
diff
changeset
|
1064 #endif |
90fd0826c6ce
finish converting the rest of stuff to the new soap api, signing on, getting
Ka-Hing Cheung <khc@hxbc.us>
parents:
20501
diff
changeset
|
1065 |
23519
7bceac816e19
The great MSN debug message cleanup! Threw in a few whitespace fixes,
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23507
diff
changeset
|
1066 purple_debug_info("msn", "Adding contact %s to contact list\n", passport); |
20394
4a099e4d0d09
propagate from branch 'im.pidgin.pidgin' (head 98b6b547b29ea1192b73cc4e1de1e674edef4328)
Richard Laager <rlaager@wiktel.com>
parents:
diff
changeset
|
1067 |
24524
2b6847646817
Use ContactEmail to add federated buddies to the AddressBook. Those on Yahoo
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
24522
diff
changeset
|
1068 user = msn_userlist_find_user(session->userlist, passport); |
2b6847646817
Use ContactEmail to add federated buddies to the AddressBook. Those on Yahoo
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
24522
diff
changeset
|
1069 if (user == NULL) { |
2b6847646817
Use ContactEmail to add federated buddies to the AddressBook. Those on Yahoo
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
24522
diff
changeset
|
1070 purple_debug_warning("msn", "Unable to retrieve user %s from the userlist!\n", passport); |
2b6847646817
Use ContactEmail to add federated buddies to the AddressBook. Those on Yahoo
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
24522
diff
changeset
|
1071 return; /* guess this never happened! */ |
2b6847646817
Use ContactEmail to add federated buddies to the AddressBook. Those on Yahoo
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
24522
diff
changeset
|
1072 } |
2b6847646817
Use ContactEmail to add federated buddies to the AddressBook. Those on Yahoo
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
24522
diff
changeset
|
1073 |
2b6847646817
Use ContactEmail to add federated buddies to the AddressBook. Those on Yahoo
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
24522
diff
changeset
|
1074 if (user->networkid != MSN_NETWORK_PASSPORT) { |
2b6847646817
Use ContactEmail to add federated buddies to the AddressBook. Those on Yahoo
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
24522
diff
changeset
|
1075 contact_xml = g_strdup_printf(MSN_CONTACT_EMAIL_XML, |
2b6847646817
Use ContactEmail to add federated buddies to the AddressBook. Those on Yahoo
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
24522
diff
changeset
|
1076 user->networkid == MSN_NETWORK_YAHOO ? |
2b6847646817
Use ContactEmail to add federated buddies to the AddressBook. Those on Yahoo
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
24522
diff
changeset
|
1077 "Messenger2" : |
2b6847646817
Use ContactEmail to add federated buddies to the AddressBook. Those on Yahoo
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
24522
diff
changeset
|
1078 "Messenger3", |
2b6847646817
Use ContactEmail to add federated buddies to the AddressBook. Those on Yahoo
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
24522
diff
changeset
|
1079 passport, 0); |
2b6847646817
Use ContactEmail to add federated buddies to the AddressBook. Those on Yahoo
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
24522
diff
changeset
|
1080 } else { |
2b6847646817
Use ContactEmail to add federated buddies to the AddressBook. Those on Yahoo
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
24522
diff
changeset
|
1081 contact_xml = g_strdup_printf(MSN_CONTACT_XML, passport); |
2b6847646817
Use ContactEmail to add federated buddies to the AddressBook. Those on Yahoo
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
24522
diff
changeset
|
1082 } |
20481
eb93710aec4d
Make buddy and group management actually work, add some SOAP templates, redesign some parts of code and separate some bigger functions into its smaller tasks which are completely unrelated to each other
Carlos Silva <typ0@pidgin.im>
parents:
20479
diff
changeset
|
1083 body = g_strdup_printf(MSN_ADD_CONTACT_TEMPLATE, contact_xml); |
eb93710aec4d
Make buddy and group management actually work, add some SOAP templates, redesign some parts of code and separate some bigger functions into its smaller tasks which are completely unrelated to each other
Carlos Silva <typ0@pidgin.im>
parents:
20479
diff
changeset
|
1084 |
23470
eb8bd060b987
Update MSN Contact tokens when an invalid token error is returned.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
1085 state->body = xmlnode_from_str(body, -1); |
eb8bd060b987
Update MSN Contact tokens when an invalid token error is returned.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
1086 state->post_action = MSN_CONTACT_ADD_SOAP_ACTION; |
eb8bd060b987
Update MSN Contact tokens when an invalid token error is returned.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
1087 state->post_url = MSN_ADDRESS_BOOK_POST_URL; |
eb8bd060b987
Update MSN Contact tokens when an invalid token error is returned.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
1088 state->cb = msn_add_contact_read_cb; |
eb8bd060b987
Update MSN Contact tokens when an invalid token error is returned.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
1089 msn_contact_request(state); |
20538
90fd0826c6ce
finish converting the rest of stuff to the new soap api, signing on, getting
Ka-Hing Cheung <khc@hxbc.us>
parents:
20501
diff
changeset
|
1090 |
20481
eb93710aec4d
Make buddy and group management actually work, add some SOAP templates, redesign some parts of code and separate some bigger functions into its smaller tasks which are completely unrelated to each other
Carlos Silva <typ0@pidgin.im>
parents:
20479
diff
changeset
|
1091 g_free(contact_xml); |
20394
4a099e4d0d09
propagate from branch 'im.pidgin.pidgin' (head 98b6b547b29ea1192b73cc4e1de1e674edef4328)
Richard Laager <rlaager@wiktel.com>
parents:
diff
changeset
|
1092 g_free(body); |
4a099e4d0d09
propagate from branch 'im.pidgin.pidgin' (head 98b6b547b29ea1192b73cc4e1de1e674edef4328)
Richard Laager <rlaager@wiktel.com>
parents:
diff
changeset
|
1093 } |
20481
eb93710aec4d
Make buddy and group management actually work, add some SOAP templates, redesign some parts of code and separate some bigger functions into its smaller tasks which are completely unrelated to each other
Carlos Silva <typ0@pidgin.im>
parents:
20479
diff
changeset
|
1094 |
eb93710aec4d
Make buddy and group management actually work, add some SOAP templates, redesign some parts of code and separate some bigger functions into its smaller tasks which are completely unrelated to each other
Carlos Silva <typ0@pidgin.im>
parents:
20479
diff
changeset
|
1095 static void |
20538
90fd0826c6ce
finish converting the rest of stuff to the new soap api, signing on, getting
Ka-Hing Cheung <khc@hxbc.us>
parents:
20501
diff
changeset
|
1096 msn_add_contact_to_group_read_cb(MsnSoapMessage *req, MsnSoapMessage *resp, |
90fd0826c6ce
finish converting the rest of stuff to the new soap api, signing on, getting
Ka-Hing Cheung <khc@hxbc.us>
parents:
20501
diff
changeset
|
1097 gpointer data) |
20481
eb93710aec4d
Make buddy and group management actually work, add some SOAP templates, redesign some parts of code and separate some bigger functions into its smaller tasks which are completely unrelated to each other
Carlos Silva <typ0@pidgin.im>
parents:
20479
diff
changeset
|
1098 { |
20538
90fd0826c6ce
finish converting the rest of stuff to the new soap api, signing on, getting
Ka-Hing Cheung <khc@hxbc.us>
parents:
20501
diff
changeset
|
1099 MsnCallbackState *state = data; |
24522
692c34bf98d8
Handle the InvalidPassportUser response when adding buddies and report it to
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
24521
diff
changeset
|
1100 MsnSession *session = state->session; |
20481
eb93710aec4d
Make buddy and group management actually work, add some SOAP templates, redesign some parts of code and separate some bigger functions into its smaller tasks which are completely unrelated to each other
Carlos Silva <typ0@pidgin.im>
parents:
20479
diff
changeset
|
1101 MsnUserList *userlist; |
24520
d39ed4032dc9
Split up that faultcode stuff I just changed. Stops it from printing an annoying
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
24519
diff
changeset
|
1102 xmlnode *fault; |
20481
eb93710aec4d
Make buddy and group management actually work, add some SOAP templates, redesign some parts of code and separate some bigger functions into its smaller tasks which are completely unrelated to each other
Carlos Silva <typ0@pidgin.im>
parents:
20479
diff
changeset
|
1103 |
24522
692c34bf98d8
Handle the InvalidPassportUser response when adding buddies and report it to
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
24521
diff
changeset
|
1104 g_return_if_fail(session != NULL); |
692c34bf98d8
Handle the InvalidPassportUser response when adding buddies and report it to
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
24521
diff
changeset
|
1105 userlist = session->userlist; |
692c34bf98d8
Handle the InvalidPassportUser response when adding buddies and report it to
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
24521
diff
changeset
|
1106 |
24520
d39ed4032dc9
Split up that faultcode stuff I just changed. Stops it from printing an annoying
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
24519
diff
changeset
|
1107 fault = xmlnode_get_child(resp->xml, "Body/Fault"); |
d39ed4032dc9
Split up that faultcode stuff I just changed. Stops it from printing an annoying
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
24519
diff
changeset
|
1108 if (fault != NULL) { |
24522
692c34bf98d8
Handle the InvalidPassportUser response when adding buddies and report it to
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
24521
diff
changeset
|
1109 char *errorcode = xmlnode_get_data(xmlnode_get_child(fault, "detail/errorcode")); |
692c34bf98d8
Handle the InvalidPassportUser response when adding buddies and report it to
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
24521
diff
changeset
|
1110 if (errorcode && !strcmp(errorcode, "EmailDomainIsFederated")) { |
692c34bf98d8
Handle the InvalidPassportUser response when adding buddies and report it to
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
24521
diff
changeset
|
1111 /* Do something special! */ |
692c34bf98d8
Handle the InvalidPassportUser response when adding buddies and report it to
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
24521
diff
changeset
|
1112 purple_debug_error("msn", "Contact is from a federated domain, but don't know what to do yet!\n"); |
692c34bf98d8
Handle the InvalidPassportUser response when adding buddies and report it to
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
24521
diff
changeset
|
1113 |
692c34bf98d8
Handle the InvalidPassportUser response when adding buddies and report it to
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
24521
diff
changeset
|
1114 } else if (errorcode && !strcmp(errorcode, "InvalidPassportUser")) { |
692c34bf98d8
Handle the InvalidPassportUser response when adding buddies and report it to
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
24521
diff
changeset
|
1115 PurpleBuddy *buddy = purple_find_buddy(session->account, state->who); |
692c34bf98d8
Handle the InvalidPassportUser response when adding buddies and report it to
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
24521
diff
changeset
|
1116 char *str = g_strdup_printf(_("Unable to add \"%s\"."), state->who); |
692c34bf98d8
Handle the InvalidPassportUser response when adding buddies and report it to
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
24521
diff
changeset
|
1117 purple_notify_error(session, _("Buddy Add error"), str, |
692c34bf98d8
Handle the InvalidPassportUser response when adding buddies and report it to
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
24521
diff
changeset
|
1118 _("The username specified does not exist.")); |
692c34bf98d8
Handle the InvalidPassportUser response when adding buddies and report it to
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
24521
diff
changeset
|
1119 g_free(str); |
692c34bf98d8
Handle the InvalidPassportUser response when adding buddies and report it to
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
24521
diff
changeset
|
1120 msn_userlist_rem_buddy(userlist, state->who); |
692c34bf98d8
Handle the InvalidPassportUser response when adding buddies and report it to
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
24521
diff
changeset
|
1121 if (buddy != NULL) |
692c34bf98d8
Handle the InvalidPassportUser response when adding buddies and report it to
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
24521
diff
changeset
|
1122 purple_blist_remove_buddy(buddy); |
692c34bf98d8
Handle the InvalidPassportUser response when adding buddies and report it to
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
24521
diff
changeset
|
1123 |
692c34bf98d8
Handle the InvalidPassportUser response when adding buddies and report it to
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
24521
diff
changeset
|
1124 } else { |
692c34bf98d8
Handle the InvalidPassportUser response when adding buddies and report it to
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
24521
diff
changeset
|
1125 /* We don't know how to respond to this faultcode, so log it */ |
692c34bf98d8
Handle the InvalidPassportUser response when adding buddies and report it to
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
24521
diff
changeset
|
1126 char *fault_str = xmlnode_to_str(fault, NULL); |
692c34bf98d8
Handle the InvalidPassportUser response when adding buddies and report it to
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
24521
diff
changeset
|
1127 if (fault_str != NULL) { |
692c34bf98d8
Handle the InvalidPassportUser response when adding buddies and report it to
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
24521
diff
changeset
|
1128 purple_debug_error("msn", "Operation {%s} Failed, SOAP Fault was: %s\n", |
692c34bf98d8
Handle the InvalidPassportUser response when adding buddies and report it to
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
24521
diff
changeset
|
1129 msn_contact_operation_str(state->action), fault_str); |
692c34bf98d8
Handle the InvalidPassportUser response when adding buddies and report it to
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
24521
diff
changeset
|
1130 g_free(fault_str); |
692c34bf98d8
Handle the InvalidPassportUser response when adding buddies and report it to
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
24521
diff
changeset
|
1131 } |
692c34bf98d8
Handle the InvalidPassportUser response when adding buddies and report it to
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
24521
diff
changeset
|
1132 } |
24516
ff275531cbf2
Send the SOAP faultcode to the callbacks for each Contact operation. They all
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
24515
diff
changeset
|
1133 return; |
ff275531cbf2
Send the SOAP faultcode to the callbacks for each Contact operation. They all
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
24515
diff
changeset
|
1134 } |
20538
90fd0826c6ce
finish converting the rest of stuff to the new soap api, signing on, getting
Ka-Hing Cheung <khc@hxbc.us>
parents:
20501
diff
changeset
|
1135 |
23470
eb8bd060b987
Update MSN Contact tokens when an invalid token error is returned.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
1136 if (msn_userlist_add_buddy_to_group(userlist, state->who, |
eb8bd060b987
Update MSN Contact tokens when an invalid token error is returned.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
1137 state->new_group_name)) { |
23519
7bceac816e19
The great MSN debug message cleanup! Threw in a few whitespace fixes,
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23507
diff
changeset
|
1138 purple_debug_info("msn", "Contact %s added to group %s successfully!\n", state->who, state->new_group_name); |
23470
eb8bd060b987
Update MSN Contact tokens when an invalid token error is returned.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
1139 } else { |
23519
7bceac816e19
The great MSN debug message cleanup! Threw in a few whitespace fixes,
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23507
diff
changeset
|
1140 purple_debug_info("msn", "Contact %s added to group %s successfully on server, but failed in the local list\n", state->who, state->new_group_name); |
23470
eb8bd060b987
Update MSN Contact tokens when an invalid token error is returned.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
1141 } |
20481
eb93710aec4d
Make buddy and group management actually work, add some SOAP templates, redesign some parts of code and separate some bigger functions into its smaller tasks which are completely unrelated to each other
Carlos Silva <typ0@pidgin.im>
parents:
20479
diff
changeset
|
1142 |
23470
eb8bd060b987
Update MSN Contact tokens when an invalid token error is returned.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
1143 if (state->action & MSN_ADD_BUDDY) { |
eb8bd060b987
Update MSN Contact tokens when an invalid token error is returned.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
1144 MsnUser *user = msn_userlist_find_user(userlist, state->who); |
24222
7ec9a1ae93d7
Save the MSN ContactID after adding a buddy so it can be used for
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
24206
diff
changeset
|
1145 xmlnode *guid = xmlnode_get_child(resp->xml, |
7ec9a1ae93d7
Save the MSN ContactID after adding a buddy so it can be used for
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
24206
diff
changeset
|
1146 "Body/ABGroupContactAddResponse/ABGroupContactAddResult/guid"); |
7ec9a1ae93d7
Save the MSN ContactID after adding a buddy so it can be used for
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
24206
diff
changeset
|
1147 |
7ec9a1ae93d7
Save the MSN ContactID after adding a buddy so it can be used for
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
24206
diff
changeset
|
1148 if (guid != NULL) { |
7ec9a1ae93d7
Save the MSN ContactID after adding a buddy so it can be used for
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
24206
diff
changeset
|
1149 char *uid = xmlnode_get_data(guid); |
7ec9a1ae93d7
Save the MSN ContactID after adding a buddy so it can be used for
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
24206
diff
changeset
|
1150 msn_user_set_uid(user, uid); |
7ec9a1ae93d7
Save the MSN ContactID after adding a buddy so it can be used for
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
24206
diff
changeset
|
1151 purple_debug_info("msn", "Set %s guid to %s.\n", state->who, uid); |
7ec9a1ae93d7
Save the MSN ContactID after adding a buddy so it can be used for
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
24206
diff
changeset
|
1152 g_free(uid); |
20538
90fd0826c6ce
finish converting the rest of stuff to the new soap api, signing on, getting
Ka-Hing Cheung <khc@hxbc.us>
parents:
20501
diff
changeset
|
1153 } |
20481
eb93710aec4d
Make buddy and group management actually work, add some SOAP templates, redesign some parts of code and separate some bigger functions into its smaller tasks which are completely unrelated to each other
Carlos Silva <typ0@pidgin.im>
parents:
20479
diff
changeset
|
1154 |
24525
98afd76647bd
Updates for federated/Yahoo buddies:
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
24524
diff
changeset
|
1155 msn_userlist_add_buddy_to_list(userlist, state->who, MSN_LIST_AL); |
98afd76647bd
Updates for federated/Yahoo buddies:
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
24524
diff
changeset
|
1156 msn_userlist_add_buddy_to_list(userlist, state->who, MSN_LIST_FL); |
20481
eb93710aec4d
Make buddy and group management actually work, add some SOAP templates, redesign some parts of code and separate some bigger functions into its smaller tasks which are completely unrelated to each other
Carlos Silva <typ0@pidgin.im>
parents:
20479
diff
changeset
|
1157 |
23470
eb8bd060b987
Update MSN Contact tokens when an invalid token error is returned.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
1158 if (msn_userlist_user_is_in_list(user, MSN_LIST_PL)) { |
eb8bd060b987
Update MSN Contact tokens when an invalid token error is returned.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
1159 msn_del_contact_from_list(state->session, NULL, state->who, MSN_LIST_PL); |
eb8bd060b987
Update MSN Contact tokens when an invalid token error is returned.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
1160 return; |
20486
ff4ae9dde291
Make block/unblock work right, as well as being add by a buddy. Finally fixes #723
Carlos Silva <typ0@pidgin.im>
parents:
20484
diff
changeset
|
1161 } |
20481
eb93710aec4d
Make buddy and group management actually work, add some SOAP templates, redesign some parts of code and separate some bigger functions into its smaller tasks which are completely unrelated to each other
Carlos Silva <typ0@pidgin.im>
parents:
20479
diff
changeset
|
1162 } |
eb93710aec4d
Make buddy and group management actually work, add some SOAP templates, redesign some parts of code and separate some bigger functions into its smaller tasks which are completely unrelated to each other
Carlos Silva <typ0@pidgin.im>
parents:
20479
diff
changeset
|
1163 |
23470
eb8bd060b987
Update MSN Contact tokens when an invalid token error is returned.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
1164 if (state->action & MSN_MOVE_BUDDY) { |
eb8bd060b987
Update MSN Contact tokens when an invalid token error is returned.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
1165 msn_del_contact_from_group(state->session, state->who, state->old_group_name); |
eb8bd060b987
Update MSN Contact tokens when an invalid token error is returned.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
1166 } |
20481
eb93710aec4d
Make buddy and group management actually work, add some SOAP templates, redesign some parts of code and separate some bigger functions into its smaller tasks which are completely unrelated to each other
Carlos Silva <typ0@pidgin.im>
parents:
20479
diff
changeset
|
1167 } |
eb93710aec4d
Make buddy and group management actually work, add some SOAP templates, redesign some parts of code and separate some bigger functions into its smaller tasks which are completely unrelated to each other
Carlos Silva <typ0@pidgin.im>
parents:
20479
diff
changeset
|
1168 |
eb93710aec4d
Make buddy and group management actually work, add some SOAP templates, redesign some parts of code and separate some bigger functions into its smaller tasks which are completely unrelated to each other
Carlos Silva <typ0@pidgin.im>
parents:
20479
diff
changeset
|
1169 void |
23464
1ac5faa72c8d
explicit merge of '9d90ebdb7e38fdd77bb504bc3302a083616360d9'
Elliott Sales de Andrade <qulogic@pidgin.im>
diff
changeset
|
1170 msn_add_contact_to_group(MsnSession *session, MsnCallbackState *state, |
20481
eb93710aec4d
Make buddy and group management actually work, add some SOAP templates, redesign some parts of code and separate some bigger functions into its smaller tasks which are completely unrelated to each other
Carlos Silva <typ0@pidgin.im>
parents:
20479
diff
changeset
|
1171 const char *passport, const char *groupId) |
eb93710aec4d
Make buddy and group management actually work, add some SOAP templates, redesign some parts of code and separate some bigger functions into its smaller tasks which are completely unrelated to each other
Carlos Silva <typ0@pidgin.im>
parents:
20479
diff
changeset
|
1172 { |
eb93710aec4d
Make buddy and group management actually work, add some SOAP templates, redesign some parts of code and separate some bigger functions into its smaller tasks which are completely unrelated to each other
Carlos Silva <typ0@pidgin.im>
parents:
20479
diff
changeset
|
1173 MsnUserList *userlist; |
eb93710aec4d
Make buddy and group management actually work, add some SOAP templates, redesign some parts of code and separate some bigger functions into its smaller tasks which are completely unrelated to each other
Carlos Silva <typ0@pidgin.im>
parents:
20479
diff
changeset
|
1174 MsnUser *user; |
27488
3698c7f4d803
On MSN, pop up an "invite message" request similar to oscar, and send that
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
27137
diff
changeset
|
1175 gchar *body = NULL, *contact_xml, *invite; |
20481
eb93710aec4d
Make buddy and group management actually work, add some SOAP templates, redesign some parts of code and separate some bigger functions into its smaller tasks which are completely unrelated to each other
Carlos Silva <typ0@pidgin.im>
parents:
20479
diff
changeset
|
1176 |
eb93710aec4d
Make buddy and group management actually work, add some SOAP templates, redesign some parts of code and separate some bigger functions into its smaller tasks which are completely unrelated to each other
Carlos Silva <typ0@pidgin.im>
parents:
20479
diff
changeset
|
1177 g_return_if_fail(passport != NULL); |
eb93710aec4d
Make buddy and group management actually work, add some SOAP templates, redesign some parts of code and separate some bigger functions into its smaller tasks which are completely unrelated to each other
Carlos Silva <typ0@pidgin.im>
parents:
20479
diff
changeset
|
1178 g_return_if_fail(groupId != NULL); |
eb93710aec4d
Make buddy and group management actually work, add some SOAP templates, redesign some parts of code and separate some bigger functions into its smaller tasks which are completely unrelated to each other
Carlos Silva <typ0@pidgin.im>
parents:
20479
diff
changeset
|
1179 |
23459
69af5301e1a7
killing MsnContact which just wraps MsnSession
Ka-Hing Cheung <khc@hxbc.us>
parents:
23453
diff
changeset
|
1180 g_return_if_fail(session != NULL); |
23298
5cdd93dac7a2
Delete trailing whitespace
Mark Doliner <mark@kingant.net>
parents:
22832
diff
changeset
|
1181 |
23459
69af5301e1a7
killing MsnContact which just wraps MsnSession
Ka-Hing Cheung <khc@hxbc.us>
parents:
23453
diff
changeset
|
1182 userlist = session->userlist; |
20484
98613886411a
Handle special cases in buddy/group management (wrt MSN_INDIVIDUALS_GROUP and MSN_NON_IM_GROUP).
Carlos Silva <typ0@pidgin.im>
parents:
20481
diff
changeset
|
1183 |
98613886411a
Handle special cases in buddy/group management (wrt MSN_INDIVIDUALS_GROUP and MSN_NON_IM_GROUP).
Carlos Silva <typ0@pidgin.im>
parents:
20481
diff
changeset
|
1184 if (!strcmp(groupId, MSN_INDIVIDUALS_GROUP_ID) || !strcmp(groupId, MSN_NON_IM_GROUP_ID)) { |
23298
5cdd93dac7a2
Delete trailing whitespace
Mark Doliner <mark@kingant.net>
parents:
22832
diff
changeset
|
1185 |
20484
98613886411a
Handle special cases in buddy/group management (wrt MSN_INDIVIDUALS_GROUP and MSN_NON_IM_GROUP).
Carlos Silva <typ0@pidgin.im>
parents:
20481
diff
changeset
|
1186 user = msn_userlist_find_add_user(userlist, passport, passport); |
98613886411a
Handle special cases in buddy/group management (wrt MSN_INDIVIDUALS_GROUP and MSN_NON_IM_GROUP).
Carlos Silva <typ0@pidgin.im>
parents:
20481
diff
changeset
|
1187 |
98613886411a
Handle special cases in buddy/group management (wrt MSN_INDIVIDUALS_GROUP and MSN_NON_IM_GROUP).
Carlos Silva <typ0@pidgin.im>
parents:
20481
diff
changeset
|
1188 if (state->action & MSN_ADD_BUDDY) { |
23459
69af5301e1a7
killing MsnContact which just wraps MsnSession
Ka-Hing Cheung <khc@hxbc.us>
parents:
23453
diff
changeset
|
1189 msn_add_contact(session, state, passport); |
20484
98613886411a
Handle special cases in buddy/group management (wrt MSN_INDIVIDUALS_GROUP and MSN_NON_IM_GROUP).
Carlos Silva <typ0@pidgin.im>
parents:
20481
diff
changeset
|
1190 return; |
98613886411a
Handle special cases in buddy/group management (wrt MSN_INDIVIDUALS_GROUP and MSN_NON_IM_GROUP).
Carlos Silva <typ0@pidgin.im>
parents:
20481
diff
changeset
|
1191 } |
98613886411a
Handle special cases in buddy/group management (wrt MSN_INDIVIDUALS_GROUP and MSN_NON_IM_GROUP).
Carlos Silva <typ0@pidgin.im>
parents:
20481
diff
changeset
|
1192 |
98613886411a
Handle special cases in buddy/group management (wrt MSN_INDIVIDUALS_GROUP and MSN_NON_IM_GROUP).
Carlos Silva <typ0@pidgin.im>
parents:
20481
diff
changeset
|
1193 if (state->action & MSN_MOVE_BUDDY) { |
98613886411a
Handle special cases in buddy/group management (wrt MSN_INDIVIDUALS_GROUP and MSN_NON_IM_GROUP).
Carlos Silva <typ0@pidgin.im>
parents:
20481
diff
changeset
|
1194 msn_user_add_group_id(user, groupId); |
23459
69af5301e1a7
killing MsnContact which just wraps MsnSession
Ka-Hing Cheung <khc@hxbc.us>
parents:
23453
diff
changeset
|
1195 msn_del_contact_from_group(session, passport, state->old_group_name); |
20484
98613886411a
Handle special cases in buddy/group management (wrt MSN_INDIVIDUALS_GROUP and MSN_NON_IM_GROUP).
Carlos Silva <typ0@pidgin.im>
parents:
20481
diff
changeset
|
1196 } |
98613886411a
Handle special cases in buddy/group management (wrt MSN_INDIVIDUALS_GROUP and MSN_NON_IM_GROUP).
Carlos Silva <typ0@pidgin.im>
parents:
20481
diff
changeset
|
1197 |
98613886411a
Handle special cases in buddy/group management (wrt MSN_INDIVIDUALS_GROUP and MSN_NON_IM_GROUP).
Carlos Silva <typ0@pidgin.im>
parents:
20481
diff
changeset
|
1198 return; |
98613886411a
Handle special cases in buddy/group management (wrt MSN_INDIVIDUALS_GROUP and MSN_NON_IM_GROUP).
Carlos Silva <typ0@pidgin.im>
parents:
20481
diff
changeset
|
1199 } |
98613886411a
Handle special cases in buddy/group management (wrt MSN_INDIVIDUALS_GROUP and MSN_NON_IM_GROUP).
Carlos Silva <typ0@pidgin.im>
parents:
20481
diff
changeset
|
1200 |
23519
7bceac816e19
The great MSN debug message cleanup! Threw in a few whitespace fixes,
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23507
diff
changeset
|
1201 purple_debug_info("msn", "Adding user %s to group %s\n", passport, |
20481
eb93710aec4d
Make buddy and group management actually work, add some SOAP templates, redesign some parts of code and separate some bigger functions into its smaller tasks which are completely unrelated to each other
Carlos Silva <typ0@pidgin.im>
parents:
20479
diff
changeset
|
1202 msn_userlist_find_group_name(userlist, groupId)); |
eb93710aec4d
Make buddy and group management actually work, add some SOAP templates, redesign some parts of code and separate some bigger functions into its smaller tasks which are completely unrelated to each other
Carlos Silva <typ0@pidgin.im>
parents:
20479
diff
changeset
|
1203 |
eb93710aec4d
Make buddy and group management actually work, add some SOAP templates, redesign some parts of code and separate some bigger functions into its smaller tasks which are completely unrelated to each other
Carlos Silva <typ0@pidgin.im>
parents:
20479
diff
changeset
|
1204 user = msn_userlist_find_user(userlist, passport); |
eb93710aec4d
Make buddy and group management actually work, add some SOAP templates, redesign some parts of code and separate some bigger functions into its smaller tasks which are completely unrelated to each other
Carlos Silva <typ0@pidgin.im>
parents:
20479
diff
changeset
|
1205 if (user == NULL) { |
23519
7bceac816e19
The great MSN debug message cleanup! Threw in a few whitespace fixes,
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23507
diff
changeset
|
1206 purple_debug_warning("msn", "Unable to retrieve user %s from the userlist!\n", passport); |
23298
5cdd93dac7a2
Delete trailing whitespace
Mark Doliner <mark@kingant.net>
parents:
22832
diff
changeset
|
1207 msn_callback_state_free(state); |
20538
90fd0826c6ce
finish converting the rest of stuff to the new soap api, signing on, getting
Ka-Hing Cheung <khc@hxbc.us>
parents:
20501
diff
changeset
|
1208 return; /* guess this never happened! */ |
20481
eb93710aec4d
Make buddy and group management actually work, add some SOAP templates, redesign some parts of code and separate some bigger functions into its smaller tasks which are completely unrelated to each other
Carlos Silva <typ0@pidgin.im>
parents:
20479
diff
changeset
|
1209 } |
eb93710aec4d
Make buddy and group management actually work, add some SOAP templates, redesign some parts of code and separate some bigger functions into its smaller tasks which are completely unrelated to each other
Carlos Silva <typ0@pidgin.im>
parents:
20479
diff
changeset
|
1210 |
24524
2b6847646817
Use ContactEmail to add federated buddies to the AddressBook. Those on Yahoo
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
24522
diff
changeset
|
1211 if (user->uid != NULL) { |
20481
eb93710aec4d
Make buddy and group management actually work, add some SOAP templates, redesign some parts of code and separate some bigger functions into its smaller tasks which are completely unrelated to each other
Carlos Silva <typ0@pidgin.im>
parents:
20479
diff
changeset
|
1212 contact_xml = g_strdup_printf(MSN_CONTACT_ID_XML, user->uid); |
24524
2b6847646817
Use ContactEmail to add federated buddies to the AddressBook. Those on Yahoo
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
24522
diff
changeset
|
1213 } else if (user->networkid != MSN_NETWORK_PASSPORT) { |
2b6847646817
Use ContactEmail to add federated buddies to the AddressBook. Those on Yahoo
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
24522
diff
changeset
|
1214 contact_xml = g_strdup_printf(MSN_CONTACT_EMAIL_XML, |
2b6847646817
Use ContactEmail to add federated buddies to the AddressBook. Those on Yahoo
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
24522
diff
changeset
|
1215 user->networkid == MSN_NETWORK_YAHOO ? |
2b6847646817
Use ContactEmail to add federated buddies to the AddressBook. Those on Yahoo
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
24522
diff
changeset
|
1216 "Messenger2" : |
2b6847646817
Use ContactEmail to add federated buddies to the AddressBook. Those on Yahoo
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
24522
diff
changeset
|
1217 "Messenger3", |
2b6847646817
Use ContactEmail to add federated buddies to the AddressBook. Those on Yahoo
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
24522
diff
changeset
|
1218 passport, 0); |
20481
eb93710aec4d
Make buddy and group management actually work, add some SOAP templates, redesign some parts of code and separate some bigger functions into its smaller tasks which are completely unrelated to each other
Carlos Silva <typ0@pidgin.im>
parents:
20479
diff
changeset
|
1219 } else { |
eb93710aec4d
Make buddy and group management actually work, add some SOAP templates, redesign some parts of code and separate some bigger functions into its smaller tasks which are completely unrelated to each other
Carlos Silva <typ0@pidgin.im>
parents:
20479
diff
changeset
|
1220 contact_xml = g_strdup_printf(MSN_CONTACT_XML, passport); |
eb93710aec4d
Make buddy and group management actually work, add some SOAP templates, redesign some parts of code and separate some bigger functions into its smaller tasks which are completely unrelated to each other
Carlos Silva <typ0@pidgin.im>
parents:
20479
diff
changeset
|
1221 } |
eb93710aec4d
Make buddy and group management actually work, add some SOAP templates, redesign some parts of code and separate some bigger functions into its smaller tasks which are completely unrelated to each other
Carlos Silva <typ0@pidgin.im>
parents:
20479
diff
changeset
|
1222 |
27488
3698c7f4d803
On MSN, pop up an "invite message" request similar to oscar, and send that
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
27137
diff
changeset
|
1223 if (user->invite_message) { |
3698c7f4d803
On MSN, pop up an "invite message" request similar to oscar, and send that
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
27137
diff
changeset
|
1224 char *tmp; |
3698c7f4d803
On MSN, pop up an "invite message" request similar to oscar, and send that
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
27137
diff
changeset
|
1225 body = g_markup_escape_text(user->invite_message, -1); |
3698c7f4d803
On MSN, pop up an "invite message" request similar to oscar, and send that
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
27137
diff
changeset
|
1226 tmp = g_markup_escape_text(purple_connection_get_display_name(session->account->gc), -1); |
3698c7f4d803
On MSN, pop up an "invite message" request similar to oscar, and send that
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
27137
diff
changeset
|
1227 invite = g_strdup_printf(MSN_CONTACT_INVITE_MESSAGE_XML, body, tmp); |
3698c7f4d803
On MSN, pop up an "invite message" request similar to oscar, and send that
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
27137
diff
changeset
|
1228 g_free(body); |
3698c7f4d803
On MSN, pop up an "invite message" request similar to oscar, and send that
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
27137
diff
changeset
|
1229 g_free(tmp); |
3698c7f4d803
On MSN, pop up an "invite message" request similar to oscar, and send that
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
27137
diff
changeset
|
1230 |
3698c7f4d803
On MSN, pop up an "invite message" request similar to oscar, and send that
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
27137
diff
changeset
|
1231 /* We can free this now */ |
3698c7f4d803
On MSN, pop up an "invite message" request similar to oscar, and send that
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
27137
diff
changeset
|
1232 g_free(user->invite_message); |
3698c7f4d803
On MSN, pop up an "invite message" request similar to oscar, and send that
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
27137
diff
changeset
|
1233 user->invite_message = NULL; |
3698c7f4d803
On MSN, pop up an "invite message" request similar to oscar, and send that
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
27137
diff
changeset
|
1234 |
3698c7f4d803
On MSN, pop up an "invite message" request similar to oscar, and send that
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
27137
diff
changeset
|
1235 } else { |
3698c7f4d803
On MSN, pop up an "invite message" request similar to oscar, and send that
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
27137
diff
changeset
|
1236 invite = g_strdup(""); |
3698c7f4d803
On MSN, pop up an "invite message" request similar to oscar, and send that
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
27137
diff
changeset
|
1237 } |
3698c7f4d803
On MSN, pop up an "invite message" request similar to oscar, and send that
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
27137
diff
changeset
|
1238 |
3698c7f4d803
On MSN, pop up an "invite message" request similar to oscar, and send that
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
27137
diff
changeset
|
1239 body = g_strdup_printf(MSN_ADD_CONTACT_GROUP_TEMPLATE, groupId, contact_xml, invite); |
20481
eb93710aec4d
Make buddy and group management actually work, add some SOAP templates, redesign some parts of code and separate some bigger functions into its smaller tasks which are completely unrelated to each other
Carlos Silva <typ0@pidgin.im>
parents:
20479
diff
changeset
|
1240 |
23470
eb8bd060b987
Update MSN Contact tokens when an invalid token error is returned.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
1241 state->body = xmlnode_from_str(body, -1); |
eb8bd060b987
Update MSN Contact tokens when an invalid token error is returned.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
1242 state->post_action = MSN_ADD_CONTACT_GROUP_SOAP_ACTION; |
eb8bd060b987
Update MSN Contact tokens when an invalid token error is returned.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
1243 state->post_url = MSN_ADDRESS_BOOK_POST_URL; |
eb8bd060b987
Update MSN Contact tokens when an invalid token error is returned.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
1244 state->cb = msn_add_contact_to_group_read_cb; |
eb8bd060b987
Update MSN Contact tokens when an invalid token error is returned.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
1245 msn_contact_request(state); |
20481
eb93710aec4d
Make buddy and group management actually work, add some SOAP templates, redesign some parts of code and separate some bigger functions into its smaller tasks which are completely unrelated to each other
Carlos Silva <typ0@pidgin.im>
parents:
20479
diff
changeset
|
1246 |
27488
3698c7f4d803
On MSN, pop up an "invite message" request similar to oscar, and send that
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
27137
diff
changeset
|
1247 g_free(invite); |
20538
90fd0826c6ce
finish converting the rest of stuff to the new soap api, signing on, getting
Ka-Hing Cheung <khc@hxbc.us>
parents:
20501
diff
changeset
|
1248 g_free(contact_xml); |
20481
eb93710aec4d
Make buddy and group management actually work, add some SOAP templates, redesign some parts of code and separate some bigger functions into its smaller tasks which are completely unrelated to each other
Carlos Silva <typ0@pidgin.im>
parents:
20479
diff
changeset
|
1249 g_free(body); |
eb93710aec4d
Make buddy and group management actually work, add some SOAP templates, redesign some parts of code and separate some bigger functions into its smaller tasks which are completely unrelated to each other
Carlos Silva <typ0@pidgin.im>
parents:
20479
diff
changeset
|
1250 } |
eb93710aec4d
Make buddy and group management actually work, add some SOAP templates, redesign some parts of code and separate some bigger functions into its smaller tasks which are completely unrelated to each other
Carlos Silva <typ0@pidgin.im>
parents:
20479
diff
changeset
|
1251 |
20394
4a099e4d0d09
propagate from branch 'im.pidgin.pidgin' (head 98b6b547b29ea1192b73cc4e1de1e674edef4328)
Richard Laager <rlaager@wiktel.com>
parents:
diff
changeset
|
1252 static void |
20538
90fd0826c6ce
finish converting the rest of stuff to the new soap api, signing on, getting
Ka-Hing Cheung <khc@hxbc.us>
parents:
20501
diff
changeset
|
1253 msn_delete_contact_read_cb(MsnSoapMessage *req, MsnSoapMessage *resp, |
90fd0826c6ce
finish converting the rest of stuff to the new soap api, signing on, getting
Ka-Hing Cheung <khc@hxbc.us>
parents:
20501
diff
changeset
|
1254 gpointer data) |
20394
4a099e4d0d09
propagate from branch 'im.pidgin.pidgin' (head 98b6b547b29ea1192b73cc4e1de1e674edef4328)
Richard Laager <rlaager@wiktel.com>
parents:
diff
changeset
|
1255 { |
21109
e64e6fbd1351
merge_into_workspace of c0e79d15a4fe4c5b0129fcae5060754b25f72a56 and
Ka-Hing Cheung <khc@hxbc.us>
diff
changeset
|
1256 MsnCallbackState *state = data; |
23470
eb8bd060b987
Update MSN Contact tokens when an invalid token error is returned.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
1257 MsnUserList *userlist = state->session->userlist; |
eb8bd060b987
Update MSN Contact tokens when an invalid token error is returned.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
1258 MsnUser *user = msn_userlist_find_user_with_id(userlist, state->uid); |
24520
d39ed4032dc9
Split up that faultcode stuff I just changed. Stops it from printing an annoying
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
24519
diff
changeset
|
1259 xmlnode *fault; |
24516
ff275531cbf2
Send the SOAP faultcode to the callbacks for each Contact operation. They all
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
24515
diff
changeset
|
1260 |
ff275531cbf2
Send the SOAP faultcode to the callbacks for each Contact operation. They all
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
24515
diff
changeset
|
1261 /* We don't know how to respond to this faultcode, so log it */ |
24520
d39ed4032dc9
Split up that faultcode stuff I just changed. Stops it from printing an annoying
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
24519
diff
changeset
|
1262 fault = xmlnode_get_child(resp->xml, "Body/Fault"); |
d39ed4032dc9
Split up that faultcode stuff I just changed. Stops it from printing an annoying
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
24519
diff
changeset
|
1263 if (fault != NULL) { |
d39ed4032dc9
Split up that faultcode stuff I just changed. Stops it from printing an annoying
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
24519
diff
changeset
|
1264 char *fault_str = xmlnode_to_str(fault, NULL); |
24516
ff275531cbf2
Send the SOAP faultcode to the callbacks for each Contact operation. They all
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
24515
diff
changeset
|
1265 purple_debug_error("msn", "Operation {%s} Failed, SOAP Fault was: %s\n", |
ff275531cbf2
Send the SOAP faultcode to the callbacks for each Contact operation. They all
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
24515
diff
changeset
|
1266 msn_contact_operation_str(state->action), fault_str); |
ff275531cbf2
Send the SOAP faultcode to the callbacks for each Contact operation. They all
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
24515
diff
changeset
|
1267 g_free(fault_str); |
ff275531cbf2
Send the SOAP faultcode to the callbacks for each Contact operation. They all
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
24515
diff
changeset
|
1268 return; |
ff275531cbf2
Send the SOAP faultcode to the callbacks for each Contact operation. They all
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
24515
diff
changeset
|
1269 } |
20539
2c8c6d77f12c
Make use of the GQueue in MsnSoapConn to manage the SOAP requests, allowing them to work perfectly even when dispatching multiple requests at once.
Carlos Silva <typ0@pidgin.im>
parents:
20501
diff
changeset
|
1270 |
23519
7bceac816e19
The great MSN debug message cleanup! Threw in a few whitespace fixes,
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23507
diff
changeset
|
1271 purple_debug_info("msn", "Delete contact successful\n"); |
23470
eb8bd060b987
Update MSN Contact tokens when an invalid token error is returned.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
1272 |
eb8bd060b987
Update MSN Contact tokens when an invalid token error is returned.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
1273 if (user != NULL) { |
eb8bd060b987
Update MSN Contact tokens when an invalid token error is returned.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
1274 msn_userlist_remove_user(userlist, user); |
20539
2c8c6d77f12c
Make use of the GQueue in MsnSoapConn to manage the SOAP requests, allowing them to work perfectly even when dispatching multiple requests at once.
Carlos Silva <typ0@pidgin.im>
parents:
20501
diff
changeset
|
1275 } |
20394
4a099e4d0d09
propagate from branch 'im.pidgin.pidgin' (head 98b6b547b29ea1192b73cc4e1de1e674edef4328)
Richard Laager <rlaager@wiktel.com>
parents:
diff
changeset
|
1276 } |
4a099e4d0d09
propagate from branch 'im.pidgin.pidgin' (head 98b6b547b29ea1192b73cc4e1de1e674edef4328)
Richard Laager <rlaager@wiktel.com>
parents:
diff
changeset
|
1277 |
4a099e4d0d09
propagate from branch 'im.pidgin.pidgin' (head 98b6b547b29ea1192b73cc4e1de1e674edef4328)
Richard Laager <rlaager@wiktel.com>
parents:
diff
changeset
|
1278 /*delete a Contact*/ |
4a099e4d0d09
propagate from branch 'im.pidgin.pidgin' (head 98b6b547b29ea1192b73cc4e1de1e674edef4328)
Richard Laager <rlaager@wiktel.com>
parents:
diff
changeset
|
1279 void |
24206
f54e7398f733
Use the MSN passport in more places instead of the Contact ID if it's
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23735
diff
changeset
|
1280 msn_delete_contact(MsnSession *session, MsnUser *user) |
23298
5cdd93dac7a2
Delete trailing whitespace
Mark Doliner <mark@kingant.net>
parents:
22832
diff
changeset
|
1281 { |
20481
eb93710aec4d
Make buddy and group management actually work, add some SOAP templates, redesign some parts of code and separate some bigger functions into its smaller tasks which are completely unrelated to each other
Carlos Silva <typ0@pidgin.im>
parents:
20479
diff
changeset
|
1282 gchar *body = NULL; |
eb93710aec4d
Make buddy and group management actually work, add some SOAP templates, redesign some parts of code and separate some bigger functions into its smaller tasks which are completely unrelated to each other
Carlos Silva <typ0@pidgin.im>
parents:
20479
diff
changeset
|
1283 gchar *contact_id_xml = NULL ; |
20539
2c8c6d77f12c
Make use of the GQueue in MsnSoapConn to manage the SOAP requests, allowing them to work perfectly even when dispatching multiple requests at once.
Carlos Silva <typ0@pidgin.im>
parents:
20501
diff
changeset
|
1284 MsnCallbackState *state; |
20394
4a099e4d0d09
propagate from branch 'im.pidgin.pidgin' (head 98b6b547b29ea1192b73cc4e1de1e674edef4328)
Richard Laager <rlaager@wiktel.com>
parents:
diff
changeset
|
1285 |
24206
f54e7398f733
Use the MSN passport in more places instead of the Contact ID if it's
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23735
diff
changeset
|
1286 if (user->uid != NULL) { |
f54e7398f733
Use the MSN passport in more places instead of the Contact ID if it's
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23735
diff
changeset
|
1287 contact_id_xml = g_strdup_printf(MSN_CONTACT_ID_XML, user->uid); |
f54e7398f733
Use the MSN passport in more places instead of the Contact ID if it's
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23735
diff
changeset
|
1288 purple_debug_info("msn", "Deleting contact with contactId: %s\n", user->uid); |
f54e7398f733
Use the MSN passport in more places instead of the Contact ID if it's
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23735
diff
changeset
|
1289 } else { |
24519
3915331092b2
Deleting a contact without a ContactId doesn't work, so don't bother the server
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
24518
diff
changeset
|
1290 purple_debug_info("msn", "Unable to delete contact %s without a ContactId\n", user->passport); |
3915331092b2
Deleting a contact without a ContactId doesn't work, so don't bother the server
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
24518
diff
changeset
|
1291 return; |
24206
f54e7398f733
Use the MSN passport in more places instead of the Contact ID if it's
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23735
diff
changeset
|
1292 } |
20481
eb93710aec4d
Make buddy and group management actually work, add some SOAP templates, redesign some parts of code and separate some bigger functions into its smaller tasks which are completely unrelated to each other
Carlos Silva <typ0@pidgin.im>
parents:
20479
diff
changeset
|
1293 |
23459
69af5301e1a7
killing MsnContact which just wraps MsnSession
Ka-Hing Cheung <khc@hxbc.us>
parents:
23453
diff
changeset
|
1294 state = msn_callback_state_new(session); |
24206
f54e7398f733
Use the MSN passport in more places instead of the Contact ID if it's
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23735
diff
changeset
|
1295 msn_callback_state_set_uid(state, user->uid); |
20539
2c8c6d77f12c
Make use of the GQueue in MsnSoapConn to manage the SOAP requests, allowing them to work perfectly even when dispatching multiple requests at once.
Carlos Silva <typ0@pidgin.im>
parents:
20501
diff
changeset
|
1296 |
20481
eb93710aec4d
Make buddy and group management actually work, add some SOAP templates, redesign some parts of code and separate some bigger functions into its smaller tasks which are completely unrelated to each other
Carlos Silva <typ0@pidgin.im>
parents:
20479
diff
changeset
|
1297 /* build SOAP request */ |
eb93710aec4d
Make buddy and group management actually work, add some SOAP templates, redesign some parts of code and separate some bigger functions into its smaller tasks which are completely unrelated to each other
Carlos Silva <typ0@pidgin.im>
parents:
20479
diff
changeset
|
1298 body = g_strdup_printf(MSN_DEL_CONTACT_TEMPLATE, contact_id_xml); |
23447
72aa2ccad28d
fix sending offline message in p15 by sending the correct token. In msnp14,
Ka-Hing Cheung <khc@hxbc.us>
parents:
23446
diff
changeset
|
1299 |
23470
eb8bd060b987
Update MSN Contact tokens when an invalid token error is returned.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
1300 state->body = xmlnode_from_str(body, -1); |
eb8bd060b987
Update MSN Contact tokens when an invalid token error is returned.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
1301 state->post_action = MSN_CONTACT_DEL_SOAP_ACTION; |
eb8bd060b987
Update MSN Contact tokens when an invalid token error is returned.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
1302 state->post_url = MSN_ADDRESS_BOOK_POST_URL; |
eb8bd060b987
Update MSN Contact tokens when an invalid token error is returned.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
1303 state->cb = msn_delete_contact_read_cb; |
eb8bd060b987
Update MSN Contact tokens when an invalid token error is returned.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
1304 msn_contact_request(state); |
20481
eb93710aec4d
Make buddy and group management actually work, add some SOAP templates, redesign some parts of code and separate some bigger functions into its smaller tasks which are completely unrelated to each other
Carlos Silva <typ0@pidgin.im>
parents:
20479
diff
changeset
|
1305 |
eb93710aec4d
Make buddy and group management actually work, add some SOAP templates, redesign some parts of code and separate some bigger functions into its smaller tasks which are completely unrelated to each other
Carlos Silva <typ0@pidgin.im>
parents:
20479
diff
changeset
|
1306 g_free(contact_id_xml); |
20394
4a099e4d0d09
propagate from branch 'im.pidgin.pidgin' (head 98b6b547b29ea1192b73cc4e1de1e674edef4328)
Richard Laager <rlaager@wiktel.com>
parents:
diff
changeset
|
1307 g_free(body); |
4a099e4d0d09
propagate from branch 'im.pidgin.pidgin' (head 98b6b547b29ea1192b73cc4e1de1e674edef4328)
Richard Laager <rlaager@wiktel.com>
parents:
diff
changeset
|
1308 } |
4a099e4d0d09
propagate from branch 'im.pidgin.pidgin' (head 98b6b547b29ea1192b73cc4e1de1e674edef4328)
Richard Laager <rlaager@wiktel.com>
parents:
diff
changeset
|
1309 |
20481
eb93710aec4d
Make buddy and group management actually work, add some SOAP templates, redesign some parts of code and separate some bigger functions into its smaller tasks which are completely unrelated to each other
Carlos Silva <typ0@pidgin.im>
parents:
20479
diff
changeset
|
1310 static void |
20538
90fd0826c6ce
finish converting the rest of stuff to the new soap api, signing on, getting
Ka-Hing Cheung <khc@hxbc.us>
parents:
20501
diff
changeset
|
1311 msn_del_contact_from_group_read_cb(MsnSoapMessage *req, MsnSoapMessage *resp, |
90fd0826c6ce
finish converting the rest of stuff to the new soap api, signing on, getting
Ka-Hing Cheung <khc@hxbc.us>
parents:
20501
diff
changeset
|
1312 gpointer data) |
20481
eb93710aec4d
Make buddy and group management actually work, add some SOAP templates, redesign some parts of code and separate some bigger functions into its smaller tasks which are completely unrelated to each other
Carlos Silva <typ0@pidgin.im>
parents:
20479
diff
changeset
|
1313 { |
20538
90fd0826c6ce
finish converting the rest of stuff to the new soap api, signing on, getting
Ka-Hing Cheung <khc@hxbc.us>
parents:
20501
diff
changeset
|
1314 MsnCallbackState *state = data; |
24520
d39ed4032dc9
Split up that faultcode stuff I just changed. Stops it from printing an annoying
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
24519
diff
changeset
|
1315 xmlnode *fault; |
24516
ff275531cbf2
Send the SOAP faultcode to the callbacks for each Contact operation. They all
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
24515
diff
changeset
|
1316 |
ff275531cbf2
Send the SOAP faultcode to the callbacks for each Contact operation. They all
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
24515
diff
changeset
|
1317 /* We don't know how to respond to this faultcode, so log it */ |
24520
d39ed4032dc9
Split up that faultcode stuff I just changed. Stops it from printing an annoying
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
24519
diff
changeset
|
1318 fault = xmlnode_get_child(resp->xml, "Body/Fault"); |
d39ed4032dc9
Split up that faultcode stuff I just changed. Stops it from printing an annoying
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
24519
diff
changeset
|
1319 if (fault != NULL) { |
d39ed4032dc9
Split up that faultcode stuff I just changed. Stops it from printing an annoying
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
24519
diff
changeset
|
1320 char *fault_str = xmlnode_to_str(fault, NULL); |
24516
ff275531cbf2
Send the SOAP faultcode to the callbacks for each Contact operation. They all
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
24515
diff
changeset
|
1321 purple_debug_error("msn", "Operation {%s} Failed, SOAP Fault was: %s\n", |
ff275531cbf2
Send the SOAP faultcode to the callbacks for each Contact operation. They all
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
24515
diff
changeset
|
1322 msn_contact_operation_str(state->action), fault_str); |
ff275531cbf2
Send the SOAP faultcode to the callbacks for each Contact operation. They all
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
24515
diff
changeset
|
1323 g_free(fault_str); |
ff275531cbf2
Send the SOAP faultcode to the callbacks for each Contact operation. They all
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
24515
diff
changeset
|
1324 return; |
ff275531cbf2
Send the SOAP faultcode to the callbacks for each Contact operation. They all
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
24515
diff
changeset
|
1325 } |
20501
f6dff814d95f
cleans up ownership of soap callback data, this soap stuff is perfect
Ka-Hing Cheung <khc@hxbc.us>
parents:
20495
diff
changeset
|
1326 |
23470
eb8bd060b987
Update MSN Contact tokens when an invalid token error is returned.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
1327 if (msn_userlist_rem_buddy_from_group(state->session->userlist, |
eb8bd060b987
Update MSN Contact tokens when an invalid token error is returned.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
1328 state->who, state->old_group_name)) { |
23519
7bceac816e19
The great MSN debug message cleanup! Threw in a few whitespace fixes,
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23507
diff
changeset
|
1329 purple_debug_info("msn", "Contact %s deleted successfully from group %s\n", state->who, state->old_group_name); |
23470
eb8bd060b987
Update MSN Contact tokens when an invalid token error is returned.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
1330 } else { |
23519
7bceac816e19
The great MSN debug message cleanup! Threw in a few whitespace fixes,
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23507
diff
changeset
|
1331 purple_debug_info("msn", "Contact %s deleted successfully from group %s in the server, but failed in the local list\n", state->who, state->old_group_name); |
20481
eb93710aec4d
Make buddy and group management actually work, add some SOAP templates, redesign some parts of code and separate some bigger functions into its smaller tasks which are completely unrelated to each other
Carlos Silva <typ0@pidgin.im>
parents:
20479
diff
changeset
|
1332 } |
eb93710aec4d
Make buddy and group management actually work, add some SOAP templates, redesign some parts of code and separate some bigger functions into its smaller tasks which are completely unrelated to each other
Carlos Silva <typ0@pidgin.im>
parents:
20479
diff
changeset
|
1333 } |
eb93710aec4d
Make buddy and group management actually work, add some SOAP templates, redesign some parts of code and separate some bigger functions into its smaller tasks which are completely unrelated to each other
Carlos Silva <typ0@pidgin.im>
parents:
20479
diff
changeset
|
1334 |
eb93710aec4d
Make buddy and group management actually work, add some SOAP templates, redesign some parts of code and separate some bigger functions into its smaller tasks which are completely unrelated to each other
Carlos Silva <typ0@pidgin.im>
parents:
20479
diff
changeset
|
1335 void |
23459
69af5301e1a7
killing MsnContact which just wraps MsnSession
Ka-Hing Cheung <khc@hxbc.us>
parents:
23453
diff
changeset
|
1336 msn_del_contact_from_group(MsnSession *session, const char *passport, const char *group_name) |
20481
eb93710aec4d
Make buddy and group management actually work, add some SOAP templates, redesign some parts of code and separate some bigger functions into its smaller tasks which are completely unrelated to each other
Carlos Silva <typ0@pidgin.im>
parents:
20479
diff
changeset
|
1337 { |
eb93710aec4d
Make buddy and group management actually work, add some SOAP templates, redesign some parts of code and separate some bigger functions into its smaller tasks which are completely unrelated to each other
Carlos Silva <typ0@pidgin.im>
parents:
20479
diff
changeset
|
1338 MsnUserList * userlist; |
eb93710aec4d
Make buddy and group management actually work, add some SOAP templates, redesign some parts of code and separate some bigger functions into its smaller tasks which are completely unrelated to each other
Carlos Silva <typ0@pidgin.im>
parents:
20479
diff
changeset
|
1339 MsnUser *user; |
eb93710aec4d
Make buddy and group management actually work, add some SOAP templates, redesign some parts of code and separate some bigger functions into its smaller tasks which are completely unrelated to each other
Carlos Silva <typ0@pidgin.im>
parents:
20479
diff
changeset
|
1340 MsnCallbackState *state; |
20538
90fd0826c6ce
finish converting the rest of stuff to the new soap api, signing on, getting
Ka-Hing Cheung <khc@hxbc.us>
parents:
20501
diff
changeset
|
1341 gchar *body, *contact_id_xml; |
20481
eb93710aec4d
Make buddy and group management actually work, add some SOAP templates, redesign some parts of code and separate some bigger functions into its smaller tasks which are completely unrelated to each other
Carlos Silva <typ0@pidgin.im>
parents:
20479
diff
changeset
|
1342 const gchar *groupId; |
23298
5cdd93dac7a2
Delete trailing whitespace
Mark Doliner <mark@kingant.net>
parents:
22832
diff
changeset
|
1343 |
20481
eb93710aec4d
Make buddy and group management actually work, add some SOAP templates, redesign some parts of code and separate some bigger functions into its smaller tasks which are completely unrelated to each other
Carlos Silva <typ0@pidgin.im>
parents:
20479
diff
changeset
|
1344 g_return_if_fail(passport != NULL); |
eb93710aec4d
Make buddy and group management actually work, add some SOAP templates, redesign some parts of code and separate some bigger functions into its smaller tasks which are completely unrelated to each other
Carlos Silva <typ0@pidgin.im>
parents:
20479
diff
changeset
|
1345 g_return_if_fail(group_name != NULL); |
23459
69af5301e1a7
killing MsnContact which just wraps MsnSession
Ka-Hing Cheung <khc@hxbc.us>
parents:
23453
diff
changeset
|
1346 g_return_if_fail(session != NULL); |
23298
5cdd93dac7a2
Delete trailing whitespace
Mark Doliner <mark@kingant.net>
parents:
22832
diff
changeset
|
1347 |
23459
69af5301e1a7
killing MsnContact which just wraps MsnSession
Ka-Hing Cheung <khc@hxbc.us>
parents:
23453
diff
changeset
|
1348 userlist = session->userlist; |
23298
5cdd93dac7a2
Delete trailing whitespace
Mark Doliner <mark@kingant.net>
parents:
22832
diff
changeset
|
1349 |
20481
eb93710aec4d
Make buddy and group management actually work, add some SOAP templates, redesign some parts of code and separate some bigger functions into its smaller tasks which are completely unrelated to each other
Carlos Silva <typ0@pidgin.im>
parents:
20479
diff
changeset
|
1350 groupId = msn_userlist_find_group_id(userlist, group_name); |
eb93710aec4d
Make buddy and group management actually work, add some SOAP templates, redesign some parts of code and separate some bigger functions into its smaller tasks which are completely unrelated to each other
Carlos Silva <typ0@pidgin.im>
parents:
20479
diff
changeset
|
1351 if (groupId != NULL) { |
23519
7bceac816e19
The great MSN debug message cleanup! Threw in a few whitespace fixes,
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23507
diff
changeset
|
1352 purple_debug_info("msn", "Deleting user %s from group %s\n", passport, group_name); |
20481
eb93710aec4d
Make buddy and group management actually work, add some SOAP templates, redesign some parts of code and separate some bigger functions into its smaller tasks which are completely unrelated to each other
Carlos Silva <typ0@pidgin.im>
parents:
20479
diff
changeset
|
1353 } else { |
23519
7bceac816e19
The great MSN debug message cleanup! Threw in a few whitespace fixes,
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23507
diff
changeset
|
1354 purple_debug_warning("msn", "Unable to retrieve group id from group %s !\n", group_name); |
20481
eb93710aec4d
Make buddy and group management actually work, add some SOAP templates, redesign some parts of code and separate some bigger functions into its smaller tasks which are completely unrelated to each other
Carlos Silva <typ0@pidgin.im>
parents:
20479
diff
changeset
|
1355 return; |
eb93710aec4d
Make buddy and group management actually work, add some SOAP templates, redesign some parts of code and separate some bigger functions into its smaller tasks which are completely unrelated to each other
Carlos Silva <typ0@pidgin.im>
parents:
20479
diff
changeset
|
1356 } |
23298
5cdd93dac7a2
Delete trailing whitespace
Mark Doliner <mark@kingant.net>
parents:
22832
diff
changeset
|
1357 |
20481
eb93710aec4d
Make buddy and group management actually work, add some SOAP templates, redesign some parts of code and separate some bigger functions into its smaller tasks which are completely unrelated to each other
Carlos Silva <typ0@pidgin.im>
parents:
20479
diff
changeset
|
1358 user = msn_userlist_find_user(userlist, passport); |
23298
5cdd93dac7a2
Delete trailing whitespace
Mark Doliner <mark@kingant.net>
parents:
22832
diff
changeset
|
1359 |
20481
eb93710aec4d
Make buddy and group management actually work, add some SOAP templates, redesign some parts of code and separate some bigger functions into its smaller tasks which are completely unrelated to each other
Carlos Silva <typ0@pidgin.im>
parents:
20479
diff
changeset
|
1360 if (user == NULL) { |
23519
7bceac816e19
The great MSN debug message cleanup! Threw in a few whitespace fixes,
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23507
diff
changeset
|
1361 purple_debug_warning("msn", "Unable to retrieve user from passport %s!\n", passport); |
20481
eb93710aec4d
Make buddy and group management actually work, add some SOAP templates, redesign some parts of code and separate some bigger functions into its smaller tasks which are completely unrelated to each other
Carlos Silva <typ0@pidgin.im>
parents:
20479
diff
changeset
|
1362 return; |
eb93710aec4d
Make buddy and group management actually work, add some SOAP templates, redesign some parts of code and separate some bigger functions into its smaller tasks which are completely unrelated to each other
Carlos Silva <typ0@pidgin.im>
parents:
20479
diff
changeset
|
1363 } |
20484
98613886411a
Handle special cases in buddy/group management (wrt MSN_INDIVIDUALS_GROUP and MSN_NON_IM_GROUP).
Carlos Silva <typ0@pidgin.im>
parents:
20481
diff
changeset
|
1364 |
98613886411a
Handle special cases in buddy/group management (wrt MSN_INDIVIDUALS_GROUP and MSN_NON_IM_GROUP).
Carlos Silva <typ0@pidgin.im>
parents:
20481
diff
changeset
|
1365 if ( !strcmp(groupId, MSN_INDIVIDUALS_GROUP_ID) || !strcmp(groupId, MSN_NON_IM_GROUP_ID)) { |
98613886411a
Handle special cases in buddy/group management (wrt MSN_INDIVIDUALS_GROUP and MSN_NON_IM_GROUP).
Carlos Silva <typ0@pidgin.im>
parents:
20481
diff
changeset
|
1366 msn_user_remove_group_id(user, groupId); |
98613886411a
Handle special cases in buddy/group management (wrt MSN_INDIVIDUALS_GROUP and MSN_NON_IM_GROUP).
Carlos Silva <typ0@pidgin.im>
parents:
20481
diff
changeset
|
1367 return; |
98613886411a
Handle special cases in buddy/group management (wrt MSN_INDIVIDUALS_GROUP and MSN_NON_IM_GROUP).
Carlos Silva <typ0@pidgin.im>
parents:
20481
diff
changeset
|
1368 } |
98613886411a
Handle special cases in buddy/group management (wrt MSN_INDIVIDUALS_GROUP and MSN_NON_IM_GROUP).
Carlos Silva <typ0@pidgin.im>
parents:
20481
diff
changeset
|
1369 |
23459
69af5301e1a7
killing MsnContact which just wraps MsnSession
Ka-Hing Cheung <khc@hxbc.us>
parents:
23453
diff
changeset
|
1370 state = msn_callback_state_new(session); |
20481
eb93710aec4d
Make buddy and group management actually work, add some SOAP templates, redesign some parts of code and separate some bigger functions into its smaller tasks which are completely unrelated to each other
Carlos Silva <typ0@pidgin.im>
parents:
20479
diff
changeset
|
1371 msn_callback_state_set_who(state, passport); |
eb93710aec4d
Make buddy and group management actually work, add some SOAP templates, redesign some parts of code and separate some bigger functions into its smaller tasks which are completely unrelated to each other
Carlos Silva <typ0@pidgin.im>
parents:
20479
diff
changeset
|
1372 msn_callback_state_set_guid(state, groupId); |
eb93710aec4d
Make buddy and group management actually work, add some SOAP templates, redesign some parts of code and separate some bigger functions into its smaller tasks which are completely unrelated to each other
Carlos Silva <typ0@pidgin.im>
parents:
20479
diff
changeset
|
1373 msn_callback_state_set_old_group_name(state, group_name); |
20666
0e1bc5c51030
A few leak plugs, some unnecessary allocation prevention, null pointer deref fixes and general robustness fixes. I'm sure there is more to do here, I got tired... Fixes #3308
Daniel Atallah <daniel.atallah@gmail.com>
parents:
20539
diff
changeset
|
1374 |
24206
f54e7398f733
Use the MSN passport in more places instead of the Contact ID if it's
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23735
diff
changeset
|
1375 if (user->uid != NULL) |
f54e7398f733
Use the MSN passport in more places instead of the Contact ID if it's
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23735
diff
changeset
|
1376 contact_id_xml = g_strdup_printf(MSN_CONTACT_ID_XML, user->uid); |
f54e7398f733
Use the MSN passport in more places instead of the Contact ID if it's
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23735
diff
changeset
|
1377 else |
f54e7398f733
Use the MSN passport in more places instead of the Contact ID if it's
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23735
diff
changeset
|
1378 contact_id_xml = g_strdup_printf(MSN_CONTACT_XML, passport); |
20481
eb93710aec4d
Make buddy and group management actually work, add some SOAP templates, redesign some parts of code and separate some bigger functions into its smaller tasks which are completely unrelated to each other
Carlos Silva <typ0@pidgin.im>
parents:
20479
diff
changeset
|
1379 body = g_strdup_printf(MSN_CONTACT_DEL_GROUP_TEMPLATE, contact_id_xml, groupId); |
20538
90fd0826c6ce
finish converting the rest of stuff to the new soap api, signing on, getting
Ka-Hing Cheung <khc@hxbc.us>
parents:
20501
diff
changeset
|
1380 |
23470
eb8bd060b987
Update MSN Contact tokens when an invalid token error is returned.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
1381 state->body = xmlnode_from_str(body, -1); |
eb8bd060b987
Update MSN Contact tokens when an invalid token error is returned.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
1382 state->post_action = MSN_CONTACT_DEL_GROUP_SOAP_ACTION; |
eb8bd060b987
Update MSN Contact tokens when an invalid token error is returned.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
1383 state->post_url = MSN_ADDRESS_BOOK_POST_URL; |
eb8bd060b987
Update MSN Contact tokens when an invalid token error is returned.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
1384 state->cb = msn_del_contact_from_group_read_cb; |
eb8bd060b987
Update MSN Contact tokens when an invalid token error is returned.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
1385 msn_contact_request(state); |
23298
5cdd93dac7a2
Delete trailing whitespace
Mark Doliner <mark@kingant.net>
parents:
22832
diff
changeset
|
1386 |
20538
90fd0826c6ce
finish converting the rest of stuff to the new soap api, signing on, getting
Ka-Hing Cheung <khc@hxbc.us>
parents:
20501
diff
changeset
|
1387 g_free(contact_id_xml); |
20481
eb93710aec4d
Make buddy and group management actually work, add some SOAP templates, redesign some parts of code and separate some bigger functions into its smaller tasks which are completely unrelated to each other
Carlos Silva <typ0@pidgin.im>
parents:
20479
diff
changeset
|
1388 g_free(body); |
eb93710aec4d
Make buddy and group management actually work, add some SOAP templates, redesign some parts of code and separate some bigger functions into its smaller tasks which are completely unrelated to each other
Carlos Silva <typ0@pidgin.im>
parents:
20479
diff
changeset
|
1389 } |
eb93710aec4d
Make buddy and group management actually work, add some SOAP templates, redesign some parts of code and separate some bigger functions into its smaller tasks which are completely unrelated to each other
Carlos Silva <typ0@pidgin.im>
parents:
20479
diff
changeset
|
1390 |
eb93710aec4d
Make buddy and group management actually work, add some SOAP templates, redesign some parts of code and separate some bigger functions into its smaller tasks which are completely unrelated to each other
Carlos Silva <typ0@pidgin.im>
parents:
20479
diff
changeset
|
1391 |
20394
4a099e4d0d09
propagate from branch 'im.pidgin.pidgin' (head 98b6b547b29ea1192b73cc4e1de1e674edef4328)
Richard Laager <rlaager@wiktel.com>
parents:
diff
changeset
|
1392 static void |
20538
90fd0826c6ce
finish converting the rest of stuff to the new soap api, signing on, getting
Ka-Hing Cheung <khc@hxbc.us>
parents:
20501
diff
changeset
|
1393 msn_update_contact_read_cb(MsnSoapMessage *req, MsnSoapMessage *resp, |
90fd0826c6ce
finish converting the rest of stuff to the new soap api, signing on, getting
Ka-Hing Cheung <khc@hxbc.us>
parents:
20501
diff
changeset
|
1394 gpointer data) |
20394
4a099e4d0d09
propagate from branch 'im.pidgin.pidgin' (head 98b6b547b29ea1192b73cc4e1de1e674edef4328)
Richard Laager <rlaager@wiktel.com>
parents:
diff
changeset
|
1395 { |
24516
ff275531cbf2
Send the SOAP faultcode to the callbacks for each Contact operation. They all
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
24515
diff
changeset
|
1396 MsnCallbackState *state = (MsnCallbackState *)data; |
24520
d39ed4032dc9
Split up that faultcode stuff I just changed. Stops it from printing an annoying
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
24519
diff
changeset
|
1397 xmlnode *fault; |
24516
ff275531cbf2
Send the SOAP faultcode to the callbacks for each Contact operation. They all
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
24515
diff
changeset
|
1398 |
ff275531cbf2
Send the SOAP faultcode to the callbacks for each Contact operation. They all
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
24515
diff
changeset
|
1399 /* We don't know how to respond to this faultcode, so log it */ |
24520
d39ed4032dc9
Split up that faultcode stuff I just changed. Stops it from printing an annoying
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
24519
diff
changeset
|
1400 fault = xmlnode_get_child(resp->xml, "Body/Fault"); |
d39ed4032dc9
Split up that faultcode stuff I just changed. Stops it from printing an annoying
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
24519
diff
changeset
|
1401 if (fault != NULL) { |
d39ed4032dc9
Split up that faultcode stuff I just changed. Stops it from printing an annoying
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
24519
diff
changeset
|
1402 char *fault_str = xmlnode_to_str(fault, NULL); |
24516
ff275531cbf2
Send the SOAP faultcode to the callbacks for each Contact operation. They all
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
24515
diff
changeset
|
1403 purple_debug_error("msn", "Operation {%s} Failed, SOAP Fault was: %s\n", |
ff275531cbf2
Send the SOAP faultcode to the callbacks for each Contact operation. They all
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
24515
diff
changeset
|
1404 msn_contact_operation_str(state->action), fault_str); |
ff275531cbf2
Send the SOAP faultcode to the callbacks for each Contact operation. They all
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
24515
diff
changeset
|
1405 g_free(fault_str); |
ff275531cbf2
Send the SOAP faultcode to the callbacks for each Contact operation. They all
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
24515
diff
changeset
|
1406 return; |
ff275531cbf2
Send the SOAP faultcode to the callbacks for each Contact operation. They all
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
24515
diff
changeset
|
1407 } |
ff275531cbf2
Send the SOAP faultcode to the callbacks for each Contact operation. They all
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
24515
diff
changeset
|
1408 |
23519
7bceac816e19
The great MSN debug message cleanup! Threw in a few whitespace fixes,
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23507
diff
changeset
|
1409 purple_debug_info("msn", "Contact updated successfully\n"); |
20394
4a099e4d0d09
propagate from branch 'im.pidgin.pidgin' (head 98b6b547b29ea1192b73cc4e1de1e674edef4328)
Richard Laager <rlaager@wiktel.com>
parents:
diff
changeset
|
1410 } |
4a099e4d0d09
propagate from branch 'im.pidgin.pidgin' (head 98b6b547b29ea1192b73cc4e1de1e674edef4328)
Richard Laager <rlaager@wiktel.com>
parents:
diff
changeset
|
1411 |
23472
70de4e2246ec
Add real server-side aliasing to MSN.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23470
diff
changeset
|
1412 /* Update a contact's info */ |
20394
4a099e4d0d09
propagate from branch 'im.pidgin.pidgin' (head 98b6b547b29ea1192b73cc4e1de1e674edef4328)
Richard Laager <rlaager@wiktel.com>
parents:
diff
changeset
|
1413 void |
23472
70de4e2246ec
Add real server-side aliasing to MSN.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23470
diff
changeset
|
1414 msn_update_contact(MsnSession *session, const char *passport, MsnContactUpdateType type, const char* value) |
20394
4a099e4d0d09
propagate from branch 'im.pidgin.pidgin' (head 98b6b547b29ea1192b73cc4e1de1e674edef4328)
Richard Laager <rlaager@wiktel.com>
parents:
diff
changeset
|
1415 { |
23470
eb8bd060b987
Update MSN Contact tokens when an invalid token error is returned.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
1416 MsnCallbackState *state; |
23472
70de4e2246ec
Add real server-side aliasing to MSN.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23470
diff
changeset
|
1417 xmlnode *contact; |
70de4e2246ec
Add real server-side aliasing to MSN.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23470
diff
changeset
|
1418 xmlnode *contact_info; |
70de4e2246ec
Add real server-side aliasing to MSN.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23470
diff
changeset
|
1419 xmlnode *changes; |
20394
4a099e4d0d09
propagate from branch 'im.pidgin.pidgin' (head 98b6b547b29ea1192b73cc4e1de1e674edef4328)
Richard Laager <rlaager@wiktel.com>
parents:
diff
changeset
|
1420 |
23519
7bceac816e19
The great MSN debug message cleanup! Threw in a few whitespace fixes,
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23507
diff
changeset
|
1421 purple_debug_info("msn", "Update contact information with new %s: %s\n", |
25387
b4b76f6a2b27
Don't crash on Windows when removing an alias for an MSN buddy.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
24722
diff
changeset
|
1422 type == MSN_UPDATE_DISPLAY ? "display name" : "alias", |
b4b76f6a2b27
Don't crash on Windows when removing an alias for an MSN buddy.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
24722
diff
changeset
|
1423 value ? value : "(null)"); |
23519
7bceac816e19
The great MSN debug message cleanup! Threw in a few whitespace fixes,
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23507
diff
changeset
|
1424 purple_debug_info("msn", "passport=%s\n", passport); |
23472
70de4e2246ec
Add real server-side aliasing to MSN.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23470
diff
changeset
|
1425 g_return_if_fail(passport != NULL); |
70de4e2246ec
Add real server-side aliasing to MSN.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23470
diff
changeset
|
1426 contact_info = xmlnode_new("contactInfo"); |
70de4e2246ec
Add real server-side aliasing to MSN.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23470
diff
changeset
|
1427 changes = xmlnode_new("propertiesChanged"); |
20394
4a099e4d0d09
propagate from branch 'im.pidgin.pidgin' (head 98b6b547b29ea1192b73cc4e1de1e674edef4328)
Richard Laager <rlaager@wiktel.com>
parents:
diff
changeset
|
1428 |
23472
70de4e2246ec
Add real server-side aliasing to MSN.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23470
diff
changeset
|
1429 switch (type) { |
70de4e2246ec
Add real server-side aliasing to MSN.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23470
diff
changeset
|
1430 xmlnode *annotations; |
70de4e2246ec
Add real server-side aliasing to MSN.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23470
diff
changeset
|
1431 xmlnode *display; |
70de4e2246ec
Add real server-side aliasing to MSN.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23470
diff
changeset
|
1432 xmlnode *a, *n, *v; |
70de4e2246ec
Add real server-side aliasing to MSN.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23470
diff
changeset
|
1433 case MSN_UPDATE_DISPLAY: |
70de4e2246ec
Add real server-side aliasing to MSN.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23470
diff
changeset
|
1434 display = xmlnode_new_child(contact_info, "displayName"); |
70de4e2246ec
Add real server-side aliasing to MSN.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23470
diff
changeset
|
1435 xmlnode_insert_data(display, value, -1); |
70de4e2246ec
Add real server-side aliasing to MSN.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23470
diff
changeset
|
1436 xmlnode_insert_data(changes, "DisplayName", -1); |
70de4e2246ec
Add real server-side aliasing to MSN.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23470
diff
changeset
|
1437 break; |
20671
4dd60add6a7c
Further cleanup of the msn prpl including preventing the authorization request callback from crashing if triggered after the account is disconnected. Also removal of some extraneous debuggery, there is more that needs to be removed.
Daniel Atallah <daniel.atallah@gmail.com>
parents:
20666
diff
changeset
|
1438 |
23472
70de4e2246ec
Add real server-side aliasing to MSN.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23470
diff
changeset
|
1439 case MSN_UPDATE_ALIAS: |
70de4e2246ec
Add real server-side aliasing to MSN.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23470
diff
changeset
|
1440 annotations = xmlnode_new_child(contact_info, "annotations"); |
70de4e2246ec
Add real server-side aliasing to MSN.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23470
diff
changeset
|
1441 xmlnode_insert_data(changes, "Annotation ", -1); |
20394
4a099e4d0d09
propagate from branch 'im.pidgin.pidgin' (head 98b6b547b29ea1192b73cc4e1de1e674edef4328)
Richard Laager <rlaager@wiktel.com>
parents:
diff
changeset
|
1442 |
23472
70de4e2246ec
Add real server-side aliasing to MSN.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23470
diff
changeset
|
1443 a = xmlnode_new_child(annotations, "Annotation"); |
70de4e2246ec
Add real server-side aliasing to MSN.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23470
diff
changeset
|
1444 n = xmlnode_new_child(a, "Name"); |
70de4e2246ec
Add real server-side aliasing to MSN.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23470
diff
changeset
|
1445 xmlnode_insert_data(n, "AB.NickName", -1); |
70de4e2246ec
Add real server-side aliasing to MSN.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23470
diff
changeset
|
1446 v = xmlnode_new_child(a, "Value"); |
70de4e2246ec
Add real server-side aliasing to MSN.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23470
diff
changeset
|
1447 xmlnode_insert_data(v, value, -1); |
70de4e2246ec
Add real server-side aliasing to MSN.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23470
diff
changeset
|
1448 break; |
70de4e2246ec
Add real server-side aliasing to MSN.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23470
diff
changeset
|
1449 |
70de4e2246ec
Add real server-side aliasing to MSN.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23470
diff
changeset
|
1450 default: |
70de4e2246ec
Add real server-side aliasing to MSN.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23470
diff
changeset
|
1451 g_return_if_reached(); |
70de4e2246ec
Add real server-side aliasing to MSN.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23470
diff
changeset
|
1452 } |
70de4e2246ec
Add real server-side aliasing to MSN.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23470
diff
changeset
|
1453 |
70de4e2246ec
Add real server-side aliasing to MSN.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23470
diff
changeset
|
1454 |
20538
90fd0826c6ce
finish converting the rest of stuff to the new soap api, signing on, getting
Ka-Hing Cheung <khc@hxbc.us>
parents:
20501
diff
changeset
|
1455 |
23470
eb8bd060b987
Update MSN Contact tokens when an invalid token error is returned.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
1456 state = msn_callback_state_new(session); |
20538
90fd0826c6ce
finish converting the rest of stuff to the new soap api, signing on, getting
Ka-Hing Cheung <khc@hxbc.us>
parents:
20501
diff
changeset
|
1457 |
23472
70de4e2246ec
Add real server-side aliasing to MSN.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23470
diff
changeset
|
1458 state->body = xmlnode_from_str(MSN_CONTACT_UPDATE_TEMPLATE, -1); |
23470
eb8bd060b987
Update MSN Contact tokens when an invalid token error is returned.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
1459 state->action = MSN_UPDATE_INFO; |
eb8bd060b987
Update MSN Contact tokens when an invalid token error is returned.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
1460 state->post_action = MSN_CONTACT_UPDATE_SOAP_ACTION; |
eb8bd060b987
Update MSN Contact tokens when an invalid token error is returned.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
1461 state->post_url = MSN_ADDRESS_BOOK_POST_URL; |
eb8bd060b987
Update MSN Contact tokens when an invalid token error is returned.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
1462 state->cb = msn_update_contact_read_cb; |
20538
90fd0826c6ce
finish converting the rest of stuff to the new soap api, signing on, getting
Ka-Hing Cheung <khc@hxbc.us>
parents:
20501
diff
changeset
|
1463 |
23472
70de4e2246ec
Add real server-side aliasing to MSN.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23470
diff
changeset
|
1464 contact = xmlnode_get_child(state->body, "Body/ABContactUpdate/contacts/Contact"); |
70de4e2246ec
Add real server-side aliasing to MSN.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23470
diff
changeset
|
1465 xmlnode_insert_child(contact, contact_info); |
70de4e2246ec
Add real server-side aliasing to MSN.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23470
diff
changeset
|
1466 xmlnode_insert_child(contact, changes); |
20538
90fd0826c6ce
finish converting the rest of stuff to the new soap api, signing on, getting
Ka-Hing Cheung <khc@hxbc.us>
parents:
20501
diff
changeset
|
1467 |
23472
70de4e2246ec
Add real server-side aliasing to MSN.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23470
diff
changeset
|
1468 if (!strcmp(passport, "Me")) { |
70de4e2246ec
Add real server-side aliasing to MSN.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23470
diff
changeset
|
1469 xmlnode *contactType = xmlnode_new_child(contact_info, "contactType"); |
70de4e2246ec
Add real server-side aliasing to MSN.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23470
diff
changeset
|
1470 xmlnode_insert_data(contactType, "Me", -1); |
70de4e2246ec
Add real server-side aliasing to MSN.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23470
diff
changeset
|
1471 } else { |
70de4e2246ec
Add real server-side aliasing to MSN.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23470
diff
changeset
|
1472 MsnUser *user = msn_userlist_find_user(session->userlist, passport); |
70de4e2246ec
Add real server-side aliasing to MSN.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23470
diff
changeset
|
1473 xmlnode *contactId = xmlnode_new_child(contact, "contactId"); |
70de4e2246ec
Add real server-side aliasing to MSN.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23470
diff
changeset
|
1474 msn_callback_state_set_uid(state, user->uid); |
70de4e2246ec
Add real server-side aliasing to MSN.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23470
diff
changeset
|
1475 xmlnode_insert_data(contactId, state->uid, -1); |
70de4e2246ec
Add real server-side aliasing to MSN.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23470
diff
changeset
|
1476 } |
70de4e2246ec
Add real server-side aliasing to MSN.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23470
diff
changeset
|
1477 |
70de4e2246ec
Add real server-side aliasing to MSN.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23470
diff
changeset
|
1478 msn_contact_request(state); |
20394
4a099e4d0d09
propagate from branch 'im.pidgin.pidgin' (head 98b6b547b29ea1192b73cc4e1de1e674edef4328)
Richard Laager <rlaager@wiktel.com>
parents:
diff
changeset
|
1479 } |
4a099e4d0d09
propagate from branch 'im.pidgin.pidgin' (head 98b6b547b29ea1192b73cc4e1de1e674edef4328)
Richard Laager <rlaager@wiktel.com>
parents:
diff
changeset
|
1480 |
4a099e4d0d09
propagate from branch 'im.pidgin.pidgin' (head 98b6b547b29ea1192b73cc4e1de1e674edef4328)
Richard Laager <rlaager@wiktel.com>
parents:
diff
changeset
|
1481 static void |
20538
90fd0826c6ce
finish converting the rest of stuff to the new soap api, signing on, getting
Ka-Hing Cheung <khc@hxbc.us>
parents:
20501
diff
changeset
|
1482 msn_del_contact_from_list_read_cb(MsnSoapMessage *req, MsnSoapMessage *resp, |
90fd0826c6ce
finish converting the rest of stuff to the new soap api, signing on, getting
Ka-Hing Cheung <khc@hxbc.us>
parents:
20501
diff
changeset
|
1483 gpointer data) |
20394
4a099e4d0d09
propagate from branch 'im.pidgin.pidgin' (head 98b6b547b29ea1192b73cc4e1de1e674edef4328)
Richard Laager <rlaager@wiktel.com>
parents:
diff
changeset
|
1484 { |
20538
90fd0826c6ce
finish converting the rest of stuff to the new soap api, signing on, getting
Ka-Hing Cheung <khc@hxbc.us>
parents:
20501
diff
changeset
|
1485 MsnCallbackState *state = data; |
90fd0826c6ce
finish converting the rest of stuff to the new soap api, signing on, getting
Ka-Hing Cheung <khc@hxbc.us>
parents:
20501
diff
changeset
|
1486 MsnSession *session = state->session; |
24520
d39ed4032dc9
Split up that faultcode stuff I just changed. Stops it from printing an annoying
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
24519
diff
changeset
|
1487 xmlnode *fault; |
24516
ff275531cbf2
Send the SOAP faultcode to the callbacks for each Contact operation. They all
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
24515
diff
changeset
|
1488 |
ff275531cbf2
Send the SOAP faultcode to the callbacks for each Contact operation. They all
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
24515
diff
changeset
|
1489 /* We don't know how to respond to this faultcode, so log it */ |
24520
d39ed4032dc9
Split up that faultcode stuff I just changed. Stops it from printing an annoying
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
24519
diff
changeset
|
1490 fault = xmlnode_get_child(resp->xml, "Body/Fault"); |
d39ed4032dc9
Split up that faultcode stuff I just changed. Stops it from printing an annoying
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
24519
diff
changeset
|
1491 if (fault != NULL) { |
d39ed4032dc9
Split up that faultcode stuff I just changed. Stops it from printing an annoying
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
24519
diff
changeset
|
1492 char *fault_str = xmlnode_to_str(fault, NULL); |
24516
ff275531cbf2
Send the SOAP faultcode to the callbacks for each Contact operation. They all
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
24515
diff
changeset
|
1493 purple_debug_error("msn", "Operation {%s} Failed, SOAP Fault was: %s\n", |
ff275531cbf2
Send the SOAP faultcode to the callbacks for each Contact operation. They all
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
24515
diff
changeset
|
1494 msn_contact_operation_str(state->action), fault_str); |
ff275531cbf2
Send the SOAP faultcode to the callbacks for each Contact operation. They all
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
24515
diff
changeset
|
1495 g_free(fault_str); |
ff275531cbf2
Send the SOAP faultcode to the callbacks for each Contact operation. They all
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
24515
diff
changeset
|
1496 return; |
ff275531cbf2
Send the SOAP faultcode to the callbacks for each Contact operation. They all
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
24515
diff
changeset
|
1497 } |
20486
ff4ae9dde291
Make block/unblock work right, as well as being add by a buddy. Finally fixes #723
Carlos Silva <typ0@pidgin.im>
parents:
20484
diff
changeset
|
1498 |
23519
7bceac816e19
The great MSN debug message cleanup! Threw in a few whitespace fixes,
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23507
diff
changeset
|
1499 purple_debug_info("msn", "Contact %s deleted successfully from %s list on server!\n", state->who, MsnMemberRole[state->list_id]); |
20486
ff4ae9dde291
Make block/unblock work right, as well as being add by a buddy. Finally fixes #723
Carlos Silva <typ0@pidgin.im>
parents:
20484
diff
changeset
|
1500 |
23470
eb8bd060b987
Update MSN Contact tokens when an invalid token error is returned.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
1501 if (state->list_id == MSN_LIST_PL) { |
eb8bd060b987
Update MSN Contact tokens when an invalid token error is returned.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
1502 MsnUser *user = msn_userlist_find_user(session->userlist, state->who); |
eb8bd060b987
Update MSN Contact tokens when an invalid token error is returned.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
1503 MsnCallbackState *new_state = msn_callback_state_dup(state); |
20773
dcb28d9939ee
Keep MsnUser->list_op in sync.
Carlos Silva <typ0@pidgin.im>
parents:
20772
diff
changeset
|
1504 |
23470
eb8bd060b987
Update MSN Contact tokens when an invalid token error is returned.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
1505 if (user != NULL) |
eb8bd060b987
Update MSN Contact tokens when an invalid token error is returned.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
1506 msn_user_unset_op(user, MSN_LIST_PL_OP); |
20486
ff4ae9dde291
Make block/unblock work right, as well as being add by a buddy. Finally fixes #723
Carlos Silva <typ0@pidgin.im>
parents:
20484
diff
changeset
|
1507 |
23470
eb8bd060b987
Update MSN Contact tokens when an invalid token error is returned.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
1508 msn_add_contact_to_list(session, new_state, state->who, MSN_LIST_RL); |
eb8bd060b987
Update MSN Contact tokens when an invalid token error is returned.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
1509 return; |
eb8bd060b987
Update MSN Contact tokens when an invalid token error is returned.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
1510 } else if (state->list_id == MSN_LIST_AL) { |
eb8bd060b987
Update MSN Contact tokens when an invalid token error is returned.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
1511 purple_privacy_permit_remove(session->account, state->who, TRUE); |
eb8bd060b987
Update MSN Contact tokens when an invalid token error is returned.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
1512 msn_add_contact_to_list(session, NULL, state->who, MSN_LIST_BL); |
eb8bd060b987
Update MSN Contact tokens when an invalid token error is returned.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
1513 } else if (state->list_id == MSN_LIST_BL) { |
eb8bd060b987
Update MSN Contact tokens when an invalid token error is returned.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
1514 purple_privacy_deny_remove(session->account, state->who, TRUE); |
eb8bd060b987
Update MSN Contact tokens when an invalid token error is returned.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
1515 msn_add_contact_to_list(session, NULL, state->who, MSN_LIST_AL); |
20486
ff4ae9dde291
Make block/unblock work right, as well as being add by a buddy. Finally fixes #723
Carlos Silva <typ0@pidgin.im>
parents:
20484
diff
changeset
|
1516 } |
ff4ae9dde291
Make block/unblock work right, as well as being add by a buddy. Finally fixes #723
Carlos Silva <typ0@pidgin.im>
parents:
20484
diff
changeset
|
1517 |
20394
4a099e4d0d09
propagate from branch 'im.pidgin.pidgin' (head 98b6b547b29ea1192b73cc4e1de1e674edef4328)
Richard Laager <rlaager@wiktel.com>
parents:
diff
changeset
|
1518 } |
4a099e4d0d09
propagate from branch 'im.pidgin.pidgin' (head 98b6b547b29ea1192b73cc4e1de1e674edef4328)
Richard Laager <rlaager@wiktel.com>
parents:
diff
changeset
|
1519 |
4a099e4d0d09
propagate from branch 'im.pidgin.pidgin' (head 98b6b547b29ea1192b73cc4e1de1e674edef4328)
Richard Laager <rlaager@wiktel.com>
parents:
diff
changeset
|
1520 void |
23459
69af5301e1a7
killing MsnContact which just wraps MsnSession
Ka-Hing Cheung <khc@hxbc.us>
parents:
23453
diff
changeset
|
1521 msn_del_contact_from_list(MsnSession *session, MsnCallbackState *state, |
20486
ff4ae9dde291
Make block/unblock work right, as well as being add by a buddy. Finally fixes #723
Carlos Silva <typ0@pidgin.im>
parents:
20484
diff
changeset
|
1522 const gchar *passport, const MsnListId list) |
20394
4a099e4d0d09
propagate from branch 'im.pidgin.pidgin' (head 98b6b547b29ea1192b73cc4e1de1e674edef4328)
Richard Laager <rlaager@wiktel.com>
parents:
diff
changeset
|
1523 { |
20486
ff4ae9dde291
Make block/unblock work right, as well as being add by a buddy. Finally fixes #723
Carlos Silva <typ0@pidgin.im>
parents:
20484
diff
changeset
|
1524 gchar *body = NULL, *member = NULL; |
ff4ae9dde291
Make block/unblock work right, as well as being add by a buddy. Finally fixes #723
Carlos Silva <typ0@pidgin.im>
parents:
20484
diff
changeset
|
1525 MsnSoapPartnerScenario partner_scenario; |
ff4ae9dde291
Make block/unblock work right, as well as being add by a buddy. Finally fixes #723
Carlos Silva <typ0@pidgin.im>
parents:
20484
diff
changeset
|
1526 MsnUser *user; |
ff4ae9dde291
Make block/unblock work right, as well as being add by a buddy. Finally fixes #723
Carlos Silva <typ0@pidgin.im>
parents:
20484
diff
changeset
|
1527 |
23459
69af5301e1a7
killing MsnContact which just wraps MsnSession
Ka-Hing Cheung <khc@hxbc.us>
parents:
23453
diff
changeset
|
1528 g_return_if_fail(session != NULL); |
24525
98afd76647bd
Updates for federated/Yahoo buddies:
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
24524
diff
changeset
|
1529 g_return_if_fail(session->userlist != NULL); |
20486
ff4ae9dde291
Make block/unblock work right, as well as being add by a buddy. Finally fixes #723
Carlos Silva <typ0@pidgin.im>
parents:
20484
diff
changeset
|
1530 g_return_if_fail(passport != NULL); |
ff4ae9dde291
Make block/unblock work right, as well as being add by a buddy. Finally fixes #723
Carlos Silva <typ0@pidgin.im>
parents:
20484
diff
changeset
|
1531 g_return_if_fail(list < 5); |
ff4ae9dde291
Make block/unblock work right, as well as being add by a buddy. Finally fixes #723
Carlos Silva <typ0@pidgin.im>
parents:
20484
diff
changeset
|
1532 |
23519
7bceac816e19
The great MSN debug message cleanup! Threw in a few whitespace fixes,
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23507
diff
changeset
|
1533 purple_debug_info("msn", "Deleting contact %s from %s list\n", passport, MsnMemberRole[list]); |
20486
ff4ae9dde291
Make block/unblock work right, as well as being add by a buddy. Finally fixes #723
Carlos Silva <typ0@pidgin.im>
parents:
20484
diff
changeset
|
1534 |
ff4ae9dde291
Make block/unblock work right, as well as being add by a buddy. Finally fixes #723
Carlos Silva <typ0@pidgin.im>
parents:
20484
diff
changeset
|
1535 if (state == NULL) { |
23459
69af5301e1a7
killing MsnContact which just wraps MsnSession
Ka-Hing Cheung <khc@hxbc.us>
parents:
23453
diff
changeset
|
1536 state = msn_callback_state_new(session); |
20486
ff4ae9dde291
Make block/unblock work right, as well as being add by a buddy. Finally fixes #723
Carlos Silva <typ0@pidgin.im>
parents:
20484
diff
changeset
|
1537 } |
ff4ae9dde291
Make block/unblock work right, as well as being add by a buddy. Finally fixes #723
Carlos Silva <typ0@pidgin.im>
parents:
20484
diff
changeset
|
1538 msn_callback_state_set_list_id(state, list); |
ff4ae9dde291
Make block/unblock work right, as well as being add by a buddy. Finally fixes #723
Carlos Silva <typ0@pidgin.im>
parents:
20484
diff
changeset
|
1539 msn_callback_state_set_who(state, passport); |
ff4ae9dde291
Make block/unblock work right, as well as being add by a buddy. Finally fixes #723
Carlos Silva <typ0@pidgin.im>
parents:
20484
diff
changeset
|
1540 |
24525
98afd76647bd
Updates for federated/Yahoo buddies:
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
24524
diff
changeset
|
1541 user = msn_userlist_find_user(session->userlist, passport); |
98afd76647bd
Updates for federated/Yahoo buddies:
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
24524
diff
changeset
|
1542 |
20486
ff4ae9dde291
Make block/unblock work right, as well as being add by a buddy. Finally fixes #723
Carlos Silva <typ0@pidgin.im>
parents:
20484
diff
changeset
|
1543 if (list == MSN_LIST_PL) { |
ff4ae9dde291
Make block/unblock work right, as well as being add by a buddy. Finally fixes #723
Carlos Silva <typ0@pidgin.im>
parents:
20484
diff
changeset
|
1544 partner_scenario = MSN_PS_CONTACT_API; |
25582
7ea04b53f553
Pluck the MSN bug fixes.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents:
25491
diff
changeset
|
1545 if (user && user->networkid != MSN_NETWORK_PASSPORT) |
7ea04b53f553
Pluck the MSN bug fixes.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents:
25491
diff
changeset
|
1546 member = g_strdup_printf(MSN_MEMBER_MEMBERSHIPID_XML, |
7ea04b53f553
Pluck the MSN bug fixes.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents:
25491
diff
changeset
|
1547 "EmailMember", "Email", |
7ea04b53f553
Pluck the MSN bug fixes.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents:
25491
diff
changeset
|
1548 user->membership_id[MSN_LIST_PL]); |
7ea04b53f553
Pluck the MSN bug fixes.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents:
25491
diff
changeset
|
1549 else |
7ea04b53f553
Pluck the MSN bug fixes.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents:
25491
diff
changeset
|
1550 member = g_strdup_printf(MSN_MEMBER_MEMBERSHIPID_XML, |
7ea04b53f553
Pluck the MSN bug fixes.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents:
25491
diff
changeset
|
1551 "PassportMember", "Passport", |
7ea04b53f553
Pluck the MSN bug fixes.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents:
25491
diff
changeset
|
1552 user->membership_id[MSN_LIST_PL]); |
20486
ff4ae9dde291
Make block/unblock work right, as well as being add by a buddy. Finally fixes #723
Carlos Silva <typ0@pidgin.im>
parents:
20484
diff
changeset
|
1553 } else { |
ff4ae9dde291
Make block/unblock work right, as well as being add by a buddy. Finally fixes #723
Carlos Silva <typ0@pidgin.im>
parents:
20484
diff
changeset
|
1554 /* list == MSN_LIST_AL || list == MSN_LIST_BL */ |
ff4ae9dde291
Make block/unblock work right, as well as being add by a buddy. Finally fixes #723
Carlos Silva <typ0@pidgin.im>
parents:
20484
diff
changeset
|
1555 partner_scenario = MSN_PS_BLOCK_UNBLOCK; |
25582
7ea04b53f553
Pluck the MSN bug fixes.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents:
25491
diff
changeset
|
1556 if (user && user->networkid != MSN_NETWORK_PASSPORT) |
7ea04b53f553
Pluck the MSN bug fixes.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents:
25491
diff
changeset
|
1557 member = g_strdup_printf(MSN_MEMBER_PASSPORT_XML, |
7ea04b53f553
Pluck the MSN bug fixes.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents:
25491
diff
changeset
|
1558 "EmailMember", "Email", |
7ea04b53f553
Pluck the MSN bug fixes.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents:
25491
diff
changeset
|
1559 "Email", passport, "Email"); |
7ea04b53f553
Pluck the MSN bug fixes.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents:
25491
diff
changeset
|
1560 else |
7ea04b53f553
Pluck the MSN bug fixes.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents:
25491
diff
changeset
|
1561 member = g_strdup_printf(MSN_MEMBER_PASSPORT_XML, |
7ea04b53f553
Pluck the MSN bug fixes.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents:
25491
diff
changeset
|
1562 "PassportMember", "Passport", |
7ea04b53f553
Pluck the MSN bug fixes.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents:
25491
diff
changeset
|
1563 "PassportName", passport, "PassportName"); |
20486
ff4ae9dde291
Make block/unblock work right, as well as being add by a buddy. Finally fixes #723
Carlos Silva <typ0@pidgin.im>
parents:
20484
diff
changeset
|
1564 } |
ff4ae9dde291
Make block/unblock work right, as well as being add by a buddy. Finally fixes #723
Carlos Silva <typ0@pidgin.im>
parents:
20484
diff
changeset
|
1565 |
24521
e63483708bd7
Fix a typo in a name.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
24520
diff
changeset
|
1566 body = g_strdup_printf(MSN_CONTACT_DELETE_FROM_LIST_TEMPLATE, |
23447
72aa2ccad28d
fix sending offline message in p15 by sending the correct token. In msnp14,
Ka-Hing Cheung <khc@hxbc.us>
parents:
23446
diff
changeset
|
1567 MsnSoapPartnerScenarioText[partner_scenario], |
72aa2ccad28d
fix sending offline message in p15 by sending the correct token. In msnp14,
Ka-Hing Cheung <khc@hxbc.us>
parents:
23446
diff
changeset
|
1568 MsnMemberRole[list], member); |
20486
ff4ae9dde291
Make block/unblock work right, as well as being add by a buddy. Finally fixes #723
Carlos Silva <typ0@pidgin.im>
parents:
20484
diff
changeset
|
1569 |
23470
eb8bd060b987
Update MSN Contact tokens when an invalid token error is returned.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
1570 state->body = xmlnode_from_str(body, -1); |
eb8bd060b987
Update MSN Contact tokens when an invalid token error is returned.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
1571 state->post_action = MSN_DELETE_MEMBER_FROM_LIST_SOAP_ACTION; |
eb8bd060b987
Update MSN Contact tokens when an invalid token error is returned.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
1572 state->post_url = MSN_SHARE_POST_URL; |
eb8bd060b987
Update MSN Contact tokens when an invalid token error is returned.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
1573 state->cb = msn_del_contact_from_list_read_cb; |
eb8bd060b987
Update MSN Contact tokens when an invalid token error is returned.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
1574 msn_contact_request(state); |
20486
ff4ae9dde291
Make block/unblock work right, as well as being add by a buddy. Finally fixes #723
Carlos Silva <typ0@pidgin.im>
parents:
20484
diff
changeset
|
1575 |
20538
90fd0826c6ce
finish converting the rest of stuff to the new soap api, signing on, getting
Ka-Hing Cheung <khc@hxbc.us>
parents:
20501
diff
changeset
|
1576 g_free(member); |
20486
ff4ae9dde291
Make block/unblock work right, as well as being add by a buddy. Finally fixes #723
Carlos Silva <typ0@pidgin.im>
parents:
20484
diff
changeset
|
1577 g_free(body); |
ff4ae9dde291
Make block/unblock work right, as well as being add by a buddy. Finally fixes #723
Carlos Silva <typ0@pidgin.im>
parents:
20484
diff
changeset
|
1578 } |
ff4ae9dde291
Make block/unblock work right, as well as being add by a buddy. Finally fixes #723
Carlos Silva <typ0@pidgin.im>
parents:
20484
diff
changeset
|
1579 |
ff4ae9dde291
Make block/unblock work right, as well as being add by a buddy. Finally fixes #723
Carlos Silva <typ0@pidgin.im>
parents:
20484
diff
changeset
|
1580 static void |
20538
90fd0826c6ce
finish converting the rest of stuff to the new soap api, signing on, getting
Ka-Hing Cheung <khc@hxbc.us>
parents:
20501
diff
changeset
|
1581 msn_add_contact_to_list_read_cb(MsnSoapMessage *req, MsnSoapMessage *resp, |
90fd0826c6ce
finish converting the rest of stuff to the new soap api, signing on, getting
Ka-Hing Cheung <khc@hxbc.us>
parents:
20501
diff
changeset
|
1582 gpointer data) |
20486
ff4ae9dde291
Make block/unblock work right, as well as being add by a buddy. Finally fixes #723
Carlos Silva <typ0@pidgin.im>
parents:
20484
diff
changeset
|
1583 { |
20538
90fd0826c6ce
finish converting the rest of stuff to the new soap api, signing on, getting
Ka-Hing Cheung <khc@hxbc.us>
parents:
20501
diff
changeset
|
1584 MsnCallbackState *state = data; |
24520
d39ed4032dc9
Split up that faultcode stuff I just changed. Stops it from printing an annoying
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
24519
diff
changeset
|
1585 xmlnode *fault; |
20486
ff4ae9dde291
Make block/unblock work right, as well as being add by a buddy. Finally fixes #723
Carlos Silva <typ0@pidgin.im>
parents:
20484
diff
changeset
|
1586 |
24516
ff275531cbf2
Send the SOAP faultcode to the callbacks for each Contact operation. They all
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
24515
diff
changeset
|
1587 /* We don't know how to respond to this faultcode, so log it */ |
24520
d39ed4032dc9
Split up that faultcode stuff I just changed. Stops it from printing an annoying
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
24519
diff
changeset
|
1588 fault = xmlnode_get_child(resp->xml, "Body/Fault"); |
d39ed4032dc9
Split up that faultcode stuff I just changed. Stops it from printing an annoying
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
24519
diff
changeset
|
1589 if (fault != NULL) { |
d39ed4032dc9
Split up that faultcode stuff I just changed. Stops it from printing an annoying
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
24519
diff
changeset
|
1590 char *fault_str = xmlnode_to_str(fault, NULL); |
24516
ff275531cbf2
Send the SOAP faultcode to the callbacks for each Contact operation. They all
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
24515
diff
changeset
|
1591 purple_debug_error("msn", "Operation {%s} Failed, SOAP Fault was: %s\n", |
ff275531cbf2
Send the SOAP faultcode to the callbacks for each Contact operation. They all
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
24515
diff
changeset
|
1592 msn_contact_operation_str(state->action), fault_str); |
ff275531cbf2
Send the SOAP faultcode to the callbacks for each Contact operation. They all
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
24515
diff
changeset
|
1593 g_free(fault_str); |
ff275531cbf2
Send the SOAP faultcode to the callbacks for each Contact operation. They all
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
24515
diff
changeset
|
1594 return; |
ff275531cbf2
Send the SOAP faultcode to the callbacks for each Contact operation. They all
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
24515
diff
changeset
|
1595 } |
ff275531cbf2
Send the SOAP faultcode to the callbacks for each Contact operation. They all
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
24515
diff
changeset
|
1596 |
20538
90fd0826c6ce
finish converting the rest of stuff to the new soap api, signing on, getting
Ka-Hing Cheung <khc@hxbc.us>
parents:
20501
diff
changeset
|
1597 g_return_if_fail(state->session != NULL); |
23298
5cdd93dac7a2
Delete trailing whitespace
Mark Doliner <mark@kingant.net>
parents:
22832
diff
changeset
|
1598 |
23519
7bceac816e19
The great MSN debug message cleanup! Threw in a few whitespace fixes,
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23507
diff
changeset
|
1599 purple_debug_info("msn", "Contact %s added successfully to %s list on server!\n", state->who, MsnMemberRole[state->list_id]); |
20394
4a099e4d0d09
propagate from branch 'im.pidgin.pidgin' (head 98b6b547b29ea1192b73cc4e1de1e674edef4328)
Richard Laager <rlaager@wiktel.com>
parents:
diff
changeset
|
1600 |
23470
eb8bd060b987
Update MSN Contact tokens when an invalid token error is returned.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
1601 if (state->list_id == MSN_LIST_RL) { |
eb8bd060b987
Update MSN Contact tokens when an invalid token error is returned.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
1602 MsnUser *user = msn_userlist_find_user(state->session->userlist, state->who); |
20394
4a099e4d0d09
propagate from branch 'im.pidgin.pidgin' (head 98b6b547b29ea1192b73cc4e1de1e674edef4328)
Richard Laager <rlaager@wiktel.com>
parents:
diff
changeset
|
1603 |
23470
eb8bd060b987
Update MSN Contact tokens when an invalid token error is returned.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
1604 if (user != NULL) { |
eb8bd060b987
Update MSN Contact tokens when an invalid token error is returned.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
1605 msn_user_set_op(user, MSN_LIST_RL_OP); |
eb8bd060b987
Update MSN Contact tokens when an invalid token error is returned.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
1606 } |
20486
ff4ae9dde291
Make block/unblock work right, as well as being add by a buddy. Finally fixes #723
Carlos Silva <typ0@pidgin.im>
parents:
20484
diff
changeset
|
1607 |
23470
eb8bd060b987
Update MSN Contact tokens when an invalid token error is returned.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
1608 if (state->action & MSN_DENIED_BUDDY) { |
eb8bd060b987
Update MSN Contact tokens when an invalid token error is returned.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
1609 msn_add_contact_to_list(state->session, NULL, state->who, MSN_LIST_BL); |
eb8bd060b987
Update MSN Contact tokens when an invalid token error is returned.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
1610 } else if (state->list_id == MSN_LIST_AL) { |
eb8bd060b987
Update MSN Contact tokens when an invalid token error is returned.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
1611 purple_privacy_permit_add(state->session->account, state->who, TRUE); |
eb8bd060b987
Update MSN Contact tokens when an invalid token error is returned.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
1612 } else if (state->list_id == MSN_LIST_BL) { |
eb8bd060b987
Update MSN Contact tokens when an invalid token error is returned.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
1613 purple_privacy_deny_add(state->session->account, state->who, TRUE); |
20538
90fd0826c6ce
finish converting the rest of stuff to the new soap api, signing on, getting
Ka-Hing Cheung <khc@hxbc.us>
parents:
20501
diff
changeset
|
1614 } |
20486
ff4ae9dde291
Make block/unblock work right, as well as being add by a buddy. Finally fixes #723
Carlos Silva <typ0@pidgin.im>
parents:
20484
diff
changeset
|
1615 } |
ff4ae9dde291
Make block/unblock work right, as well as being add by a buddy. Finally fixes #723
Carlos Silva <typ0@pidgin.im>
parents:
20484
diff
changeset
|
1616 } |
ff4ae9dde291
Make block/unblock work right, as well as being add by a buddy. Finally fixes #723
Carlos Silva <typ0@pidgin.im>
parents:
20484
diff
changeset
|
1617 |
ff4ae9dde291
Make block/unblock work right, as well as being add by a buddy. Finally fixes #723
Carlos Silva <typ0@pidgin.im>
parents:
20484
diff
changeset
|
1618 void |
23459
69af5301e1a7
killing MsnContact which just wraps MsnSession
Ka-Hing Cheung <khc@hxbc.us>
parents:
23453
diff
changeset
|
1619 msn_add_contact_to_list(MsnSession *session, MsnCallbackState *state, |
20486
ff4ae9dde291
Make block/unblock work right, as well as being add by a buddy. Finally fixes #723
Carlos Silva <typ0@pidgin.im>
parents:
20484
diff
changeset
|
1620 const gchar *passport, const MsnListId list) |
ff4ae9dde291
Make block/unblock work right, as well as being add by a buddy. Finally fixes #723
Carlos Silva <typ0@pidgin.im>
parents:
20484
diff
changeset
|
1621 { |
ff4ae9dde291
Make block/unblock work right, as well as being add by a buddy. Finally fixes #723
Carlos Silva <typ0@pidgin.im>
parents:
20484
diff
changeset
|
1622 gchar *body = NULL, *member = NULL; |
ff4ae9dde291
Make block/unblock work right, as well as being add by a buddy. Finally fixes #723
Carlos Silva <typ0@pidgin.im>
parents:
20484
diff
changeset
|
1623 MsnSoapPartnerScenario partner_scenario; |
24525
98afd76647bd
Updates for federated/Yahoo buddies:
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
24524
diff
changeset
|
1624 MsnUser *user; |
20486
ff4ae9dde291
Make block/unblock work right, as well as being add by a buddy. Finally fixes #723
Carlos Silva <typ0@pidgin.im>
parents:
20484
diff
changeset
|
1625 |
23459
69af5301e1a7
killing MsnContact which just wraps MsnSession
Ka-Hing Cheung <khc@hxbc.us>
parents:
23453
diff
changeset
|
1626 g_return_if_fail(session != NULL); |
20486
ff4ae9dde291
Make block/unblock work right, as well as being add by a buddy. Finally fixes #723
Carlos Silva <typ0@pidgin.im>
parents:
20484
diff
changeset
|
1627 g_return_if_fail(passport != NULL); |
ff4ae9dde291
Make block/unblock work right, as well as being add by a buddy. Finally fixes #723
Carlos Silva <typ0@pidgin.im>
parents:
20484
diff
changeset
|
1628 g_return_if_fail(list < 5); |
ff4ae9dde291
Make block/unblock work right, as well as being add by a buddy. Finally fixes #723
Carlos Silva <typ0@pidgin.im>
parents:
20484
diff
changeset
|
1629 |
23519
7bceac816e19
The great MSN debug message cleanup! Threw in a few whitespace fixes,
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23507
diff
changeset
|
1630 purple_debug_info("msn", "Adding contact %s to %s list\n", passport, MsnMemberRole[list]); |
20486
ff4ae9dde291
Make block/unblock work right, as well as being add by a buddy. Finally fixes #723
Carlos Silva <typ0@pidgin.im>
parents:
20484
diff
changeset
|
1631 |
ff4ae9dde291
Make block/unblock work right, as well as being add by a buddy. Finally fixes #723
Carlos Silva <typ0@pidgin.im>
parents:
20484
diff
changeset
|
1632 if (state == NULL) { |
23459
69af5301e1a7
killing MsnContact which just wraps MsnSession
Ka-Hing Cheung <khc@hxbc.us>
parents:
23453
diff
changeset
|
1633 state = msn_callback_state_new(session); |
20486
ff4ae9dde291
Make block/unblock work right, as well as being add by a buddy. Finally fixes #723
Carlos Silva <typ0@pidgin.im>
parents:
20484
diff
changeset
|
1634 } |
ff4ae9dde291
Make block/unblock work right, as well as being add by a buddy. Finally fixes #723
Carlos Silva <typ0@pidgin.im>
parents:
20484
diff
changeset
|
1635 msn_callback_state_set_list_id(state, list); |
ff4ae9dde291
Make block/unblock work right, as well as being add by a buddy. Finally fixes #723
Carlos Silva <typ0@pidgin.im>
parents:
20484
diff
changeset
|
1636 msn_callback_state_set_who(state, passport); |
ff4ae9dde291
Make block/unblock work right, as well as being add by a buddy. Finally fixes #723
Carlos Silva <typ0@pidgin.im>
parents:
20484
diff
changeset
|
1637 |
24525
98afd76647bd
Updates for federated/Yahoo buddies:
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
24524
diff
changeset
|
1638 user = msn_userlist_find_user(session->userlist, passport); |
20486
ff4ae9dde291
Make block/unblock work right, as well as being add by a buddy. Finally fixes #723
Carlos Silva <typ0@pidgin.im>
parents:
20484
diff
changeset
|
1639 |
24525
98afd76647bd
Updates for federated/Yahoo buddies:
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
24524
diff
changeset
|
1640 partner_scenario = (list == MSN_LIST_RL) ? MSN_PS_CONTACT_API : MSN_PS_BLOCK_UNBLOCK; |
25582
7ea04b53f553
Pluck the MSN bug fixes.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents:
25491
diff
changeset
|
1641 if (user && user->networkid != MSN_NETWORK_PASSPORT) |
7ea04b53f553
Pluck the MSN bug fixes.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents:
25491
diff
changeset
|
1642 member = g_strdup_printf(MSN_MEMBER_PASSPORT_XML, |
7ea04b53f553
Pluck the MSN bug fixes.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents:
25491
diff
changeset
|
1643 "EmailMember", "Email", |
7ea04b53f553
Pluck the MSN bug fixes.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents:
25491
diff
changeset
|
1644 "Email", state->who, "Email"); |
7ea04b53f553
Pluck the MSN bug fixes.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents:
25491
diff
changeset
|
1645 else |
7ea04b53f553
Pluck the MSN bug fixes.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents:
25491
diff
changeset
|
1646 member = g_strdup_printf(MSN_MEMBER_PASSPORT_XML, |
7ea04b53f553
Pluck the MSN bug fixes.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents:
25491
diff
changeset
|
1647 "PassportMember", "Passport", |
7ea04b53f553
Pluck the MSN bug fixes.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents:
25491
diff
changeset
|
1648 "PassportName", state->who, "PassportName"); |
20486
ff4ae9dde291
Make block/unblock work right, as well as being add by a buddy. Finally fixes #723
Carlos Silva <typ0@pidgin.im>
parents:
20484
diff
changeset
|
1649 |
23298
5cdd93dac7a2
Delete trailing whitespace
Mark Doliner <mark@kingant.net>
parents:
22832
diff
changeset
|
1650 body = g_strdup_printf(MSN_CONTACT_ADD_TO_LIST_TEMPLATE, |
23447
72aa2ccad28d
fix sending offline message in p15 by sending the correct token. In msnp14,
Ka-Hing Cheung <khc@hxbc.us>
parents:
23446
diff
changeset
|
1651 MsnSoapPartnerScenarioText[partner_scenario], |
72aa2ccad28d
fix sending offline message in p15 by sending the correct token. In msnp14,
Ka-Hing Cheung <khc@hxbc.us>
parents:
23446
diff
changeset
|
1652 MsnMemberRole[list], member); |
20486
ff4ae9dde291
Make block/unblock work right, as well as being add by a buddy. Finally fixes #723
Carlos Silva <typ0@pidgin.im>
parents:
20484
diff
changeset
|
1653 |
23470
eb8bd060b987
Update MSN Contact tokens when an invalid token error is returned.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
1654 state->body = xmlnode_from_str(body, -1); |
eb8bd060b987
Update MSN Contact tokens when an invalid token error is returned.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
1655 state->post_action = MSN_ADD_MEMBER_TO_LIST_SOAP_ACTION; |
eb8bd060b987
Update MSN Contact tokens when an invalid token error is returned.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
1656 state->post_url = MSN_SHARE_POST_URL; |
eb8bd060b987
Update MSN Contact tokens when an invalid token error is returned.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
1657 state->cb = msn_add_contact_to_list_read_cb; |
eb8bd060b987
Update MSN Contact tokens when an invalid token error is returned.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
1658 msn_contact_request(state); |
20486
ff4ae9dde291
Make block/unblock work right, as well as being add by a buddy. Finally fixes #723
Carlos Silva <typ0@pidgin.im>
parents:
20484
diff
changeset
|
1659 |
20538
90fd0826c6ce
finish converting the rest of stuff to the new soap api, signing on, getting
Ka-Hing Cheung <khc@hxbc.us>
parents:
20501
diff
changeset
|
1660 g_free(member); |
20394
4a099e4d0d09
propagate from branch 'im.pidgin.pidgin' (head 98b6b547b29ea1192b73cc4e1de1e674edef4328)
Richard Laager <rlaager@wiktel.com>
parents:
diff
changeset
|
1661 g_free(body); |
4a099e4d0d09
propagate from branch 'im.pidgin.pidgin' (head 98b6b547b29ea1192b73cc4e1de1e674edef4328)
Richard Laager <rlaager@wiktel.com>
parents:
diff
changeset
|
1662 } |
4a099e4d0d09
propagate from branch 'im.pidgin.pidgin' (head 98b6b547b29ea1192b73cc4e1de1e674edef4328)
Richard Laager <rlaager@wiktel.com>
parents:
diff
changeset
|
1663 |
20427
059cc0bf6c91
Fix a compile warning by #if 0'ing out some unused code
Stu Tomlinson <stu@nosnilmot.com>
parents:
20403
diff
changeset
|
1664 #if 0 |
20394
4a099e4d0d09
propagate from branch 'im.pidgin.pidgin' (head 98b6b547b29ea1192b73cc4e1de1e674edef4328)
Richard Laager <rlaager@wiktel.com>
parents:
diff
changeset
|
1665 static void |
20538
90fd0826c6ce
finish converting the rest of stuff to the new soap api, signing on, getting
Ka-Hing Cheung <khc@hxbc.us>
parents:
20501
diff
changeset
|
1666 msn_gleams_read_cb(MsnSoapMessage *req, MsnSoapMessage *resp, gpointer data) |
20394
4a099e4d0d09
propagate from branch 'im.pidgin.pidgin' (head 98b6b547b29ea1192b73cc4e1de1e674edef4328)
Richard Laager <rlaager@wiktel.com>
parents:
diff
changeset
|
1667 { |
23519
7bceac816e19
The great MSN debug message cleanup! Threw in a few whitespace fixes,
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23507
diff
changeset
|
1668 purple_debug_info("msn", "Gleams read done\n"); |
20394
4a099e4d0d09
propagate from branch 'im.pidgin.pidgin' (head 98b6b547b29ea1192b73cc4e1de1e674edef4328)
Richard Laager <rlaager@wiktel.com>
parents:
diff
changeset
|
1669 } |
4a099e4d0d09
propagate from branch 'im.pidgin.pidgin' (head 98b6b547b29ea1192b73cc4e1de1e674edef4328)
Richard Laager <rlaager@wiktel.com>
parents:
diff
changeset
|
1670 |
4a099e4d0d09
propagate from branch 'im.pidgin.pidgin' (head 98b6b547b29ea1192b73cc4e1de1e674edef4328)
Richard Laager <rlaager@wiktel.com>
parents:
diff
changeset
|
1671 /*get the gleams info*/ |
4a099e4d0d09
propagate from branch 'im.pidgin.pidgin' (head 98b6b547b29ea1192b73cc4e1de1e674edef4328)
Richard Laager <rlaager@wiktel.com>
parents:
diff
changeset
|
1672 void |
23459
69af5301e1a7
killing MsnContact which just wraps MsnSession
Ka-Hing Cheung <khc@hxbc.us>
parents:
23453
diff
changeset
|
1673 msn_get_gleams(MsnSession *session) |
20394
4a099e4d0d09
propagate from branch 'im.pidgin.pidgin' (head 98b6b547b29ea1192b73cc4e1de1e674edef4328)
Richard Laager <rlaager@wiktel.com>
parents:
diff
changeset
|
1674 { |
4a099e4d0d09
propagate from branch 'im.pidgin.pidgin' (head 98b6b547b29ea1192b73cc4e1de1e674edef4328)
Richard Laager <rlaager@wiktel.com>
parents:
diff
changeset
|
1675 MsnSoapReq *soap_request; |
4a099e4d0d09
propagate from branch 'im.pidgin.pidgin' (head 98b6b547b29ea1192b73cc4e1de1e674edef4328)
Richard Laager <rlaager@wiktel.com>
parents:
diff
changeset
|
1676 |
23519
7bceac816e19
The great MSN debug message cleanup! Threw in a few whitespace fixes,
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23507
diff
changeset
|
1677 purple_debug_info("msn", "msn get gleams info...\n"); |
23464
1ac5faa72c8d
explicit merge of '9d90ebdb7e38fdd77bb504bc3302a083616360d9'
Elliott Sales de Andrade <qulogic@pidgin.im>
diff
changeset
|
1678 |
23470
eb8bd060b987
Update MSN Contact tokens when an invalid token error is returned.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
1679 state = msn_callback_state_new(session); |
eb8bd060b987
Update MSN Contact tokens when an invalid token error is returned.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
1680 state->body = xmlnode_from_str(MSN_GLEAMS_TEMPLATE, -1); |
eb8bd060b987
Update MSN Contact tokens when an invalid token error is returned.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
1681 state->post_action = MSN_GET_GLEAMS_SOAP_ACTION; |
eb8bd060b987
Update MSN Contact tokens when an invalid token error is returned.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
1682 state->post_url = MSN_ADDRESS_BOOK_POST_URL; |
eb8bd060b987
Update MSN Contact tokens when an invalid token error is returned.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
1683 state->cb = msn_gleams_read_cb; |
eb8bd060b987
Update MSN Contact tokens when an invalid token error is returned.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
1684 msn_contact_request(state); |
20394
4a099e4d0d09
propagate from branch 'im.pidgin.pidgin' (head 98b6b547b29ea1192b73cc4e1de1e674edef4328)
Richard Laager <rlaager@wiktel.com>
parents:
diff
changeset
|
1685 } |
4a099e4d0d09
propagate from branch 'im.pidgin.pidgin' (head 98b6b547b29ea1192b73cc4e1de1e674edef4328)
Richard Laager <rlaager@wiktel.com>
parents:
diff
changeset
|
1686 #endif |
4a099e4d0d09
propagate from branch 'im.pidgin.pidgin' (head 98b6b547b29ea1192b73cc4e1de1e674edef4328)
Richard Laager <rlaager@wiktel.com>
parents:
diff
changeset
|
1687 |
20481
eb93710aec4d
Make buddy and group management actually work, add some SOAP templates, redesign some parts of code and separate some bigger functions into its smaller tasks which are completely unrelated to each other
Carlos Silva <typ0@pidgin.im>
parents:
20479
diff
changeset
|
1688 |
20394
4a099e4d0d09
propagate from branch 'im.pidgin.pidgin' (head 98b6b547b29ea1192b73cc4e1de1e674edef4328)
Richard Laager <rlaager@wiktel.com>
parents:
diff
changeset
|
1689 /*************************************************************** |
20481
eb93710aec4d
Make buddy and group management actually work, add some SOAP templates, redesign some parts of code and separate some bigger functions into its smaller tasks which are completely unrelated to each other
Carlos Silva <typ0@pidgin.im>
parents:
20479
diff
changeset
|
1690 * Group Operations |
20394
4a099e4d0d09
propagate from branch 'im.pidgin.pidgin' (head 98b6b547b29ea1192b73cc4e1de1e674edef4328)
Richard Laager <rlaager@wiktel.com>
parents:
diff
changeset
|
1691 ***************************************************************/ |
20481
eb93710aec4d
Make buddy and group management actually work, add some SOAP templates, redesign some parts of code and separate some bigger functions into its smaller tasks which are completely unrelated to each other
Carlos Silva <typ0@pidgin.im>
parents:
20479
diff
changeset
|
1692 |
20394
4a099e4d0d09
propagate from branch 'im.pidgin.pidgin' (head 98b6b547b29ea1192b73cc4e1de1e674edef4328)
Richard Laager <rlaager@wiktel.com>
parents:
diff
changeset
|
1693 static void |
20538
90fd0826c6ce
finish converting the rest of stuff to the new soap api, signing on, getting
Ka-Hing Cheung <khc@hxbc.us>
parents:
20501
diff
changeset
|
1694 msn_group_read_cb(MsnSoapMessage *req, MsnSoapMessage *resp, gpointer data) |
20394
4a099e4d0d09
propagate from branch 'im.pidgin.pidgin' (head 98b6b547b29ea1192b73cc4e1de1e674edef4328)
Richard Laager <rlaager@wiktel.com>
parents:
diff
changeset
|
1695 { |
20538
90fd0826c6ce
finish converting the rest of stuff to the new soap api, signing on, getting
Ka-Hing Cheung <khc@hxbc.us>
parents:
20501
diff
changeset
|
1696 MsnCallbackState *state = data; |
23470
eb8bd060b987
Update MSN Contact tokens when an invalid token error is returned.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
1697 MsnSession *session; |
eb8bd060b987
Update MSN Contact tokens when an invalid token error is returned.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
1698 MsnUserList *userlist; |
24520
d39ed4032dc9
Split up that faultcode stuff I just changed. Stops it from printing an annoying
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
24519
diff
changeset
|
1699 xmlnode *fault; |
24516
ff275531cbf2
Send the SOAP faultcode to the callbacks for each Contact operation. They all
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
24515
diff
changeset
|
1700 |
ff275531cbf2
Send the SOAP faultcode to the callbacks for each Contact operation. They all
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
24515
diff
changeset
|
1701 /* We don't know how to respond to this faultcode, so log it */ |
24520
d39ed4032dc9
Split up that faultcode stuff I just changed. Stops it from printing an annoying
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
24519
diff
changeset
|
1702 fault = xmlnode_get_child(resp->xml, "Body/Fault"); |
d39ed4032dc9
Split up that faultcode stuff I just changed. Stops it from printing an annoying
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
24519
diff
changeset
|
1703 if (fault != NULL) { |
d39ed4032dc9
Split up that faultcode stuff I just changed. Stops it from printing an annoying
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
24519
diff
changeset
|
1704 char *fault_str = xmlnode_to_str(fault, NULL); |
24516
ff275531cbf2
Send the SOAP faultcode to the callbacks for each Contact operation. They all
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
24515
diff
changeset
|
1705 purple_debug_error("msn", "Operation {%s} Failed, SOAP Fault was: %s\n", |
ff275531cbf2
Send the SOAP faultcode to the callbacks for each Contact operation. They all
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
24515
diff
changeset
|
1706 msn_contact_operation_str(state->action), fault_str); |
ff275531cbf2
Send the SOAP faultcode to the callbacks for each Contact operation. They all
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
24515
diff
changeset
|
1707 g_free(fault_str); |
ff275531cbf2
Send the SOAP faultcode to the callbacks for each Contact operation. They all
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
24515
diff
changeset
|
1708 return; |
ff275531cbf2
Send the SOAP faultcode to the callbacks for each Contact operation. They all
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
24515
diff
changeset
|
1709 } |
23298
5cdd93dac7a2
Delete trailing whitespace
Mark Doliner <mark@kingant.net>
parents:
22832
diff
changeset
|
1710 |
23519
7bceac816e19
The great MSN debug message cleanup! Threw in a few whitespace fixes,
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23507
diff
changeset
|
1711 purple_debug_info("msn", "Group request successful.\n"); |
23298
5cdd93dac7a2
Delete trailing whitespace
Mark Doliner <mark@kingant.net>
parents:
22832
diff
changeset
|
1712 |
20538
90fd0826c6ce
finish converting the rest of stuff to the new soap api, signing on, getting
Ka-Hing Cheung <khc@hxbc.us>
parents:
20501
diff
changeset
|
1713 g_return_if_fail(state->session != NULL); |
90fd0826c6ce
finish converting the rest of stuff to the new soap api, signing on, getting
Ka-Hing Cheung <khc@hxbc.us>
parents:
20501
diff
changeset
|
1714 g_return_if_fail(state->session->userlist != NULL); |
20501
f6dff814d95f
cleans up ownership of soap callback data, this soap stuff is perfect
Ka-Hing Cheung <khc@hxbc.us>
parents:
20495
diff
changeset
|
1715 |
23470
eb8bd060b987
Update MSN Contact tokens when an invalid token error is returned.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
1716 session = state->session; |
eb8bd060b987
Update MSN Contact tokens when an invalid token error is returned.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
1717 userlist = session->userlist; |
20501
f6dff814d95f
cleans up ownership of soap callback data, this soap stuff is perfect
Ka-Hing Cheung <khc@hxbc.us>
parents:
20495
diff
changeset
|
1718 |
23470
eb8bd060b987
Update MSN Contact tokens when an invalid token error is returned.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
1719 if (state->action & MSN_RENAME_GROUP) { |
eb8bd060b987
Update MSN Contact tokens when an invalid token error is returned.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
1720 msn_userlist_rename_group_id(session->userlist, |
eb8bd060b987
Update MSN Contact tokens when an invalid token error is returned.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
1721 state->guid, |
eb8bd060b987
Update MSN Contact tokens when an invalid token error is returned.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
1722 state->new_group_name); |
20501
f6dff814d95f
cleans up ownership of soap callback data, this soap stuff is perfect
Ka-Hing Cheung <khc@hxbc.us>
parents:
20495
diff
changeset
|
1723 } |
20538
90fd0826c6ce
finish converting the rest of stuff to the new soap api, signing on, getting
Ka-Hing Cheung <khc@hxbc.us>
parents:
20501
diff
changeset
|
1724 |
23470
eb8bd060b987
Update MSN Contact tokens when an invalid token error is returned.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
1725 if (state->action & MSN_ADD_GROUP) { |
eb8bd060b987
Update MSN Contact tokens when an invalid token error is returned.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
1726 /* the response is taken from |
eb8bd060b987
Update MSN Contact tokens when an invalid token error is returned.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
1727 http://telepathy.freedesktop.org/wiki/Pymsn/MSNP/ContactListActions |
eb8bd060b987
Update MSN Contact tokens when an invalid token error is returned.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
1728 should copy it to msnpiki some day */ |
eb8bd060b987
Update MSN Contact tokens when an invalid token error is returned.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
1729 xmlnode *guid_node = xmlnode_get_child(resp->xml, |
eb8bd060b987
Update MSN Contact tokens when an invalid token error is returned.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
1730 "Body/ABGroupAddResponse/ABGroupAddResult/guid"); |
20538
90fd0826c6ce
finish converting the rest of stuff to the new soap api, signing on, getting
Ka-Hing Cheung <khc@hxbc.us>
parents:
20501
diff
changeset
|
1731 |
23470
eb8bd060b987
Update MSN Contact tokens when an invalid token error is returned.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
1732 if (guid_node) { |
eb8bd060b987
Update MSN Contact tokens when an invalid token error is returned.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
1733 char *guid = xmlnode_get_data(guid_node); |
20538
90fd0826c6ce
finish converting the rest of stuff to the new soap api, signing on, getting
Ka-Hing Cheung <khc@hxbc.us>
parents:
20501
diff
changeset
|
1734 |
23470
eb8bd060b987
Update MSN Contact tokens when an invalid token error is returned.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
1735 /* create and add the new group to the userlist */ |
23519
7bceac816e19
The great MSN debug message cleanup! Threw in a few whitespace fixes,
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23507
diff
changeset
|
1736 purple_debug_info("msn", "Adding group %s with guid = %s to the userlist\n", state->new_group_name, guid); |
23470
eb8bd060b987
Update MSN Contact tokens when an invalid token error is returned.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
1737 msn_group_new(session->userlist, guid, state->new_group_name); |
20477
9a2a4a0c0003
Add the possibility to create an Address Book, useful for newly registered MSN users.
Carlos Silva <typ0@pidgin.im>
parents:
20471
diff
changeset
|
1738 |
23470
eb8bd060b987
Update MSN Contact tokens when an invalid token error is returned.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
1739 if (state->action & MSN_ADD_BUDDY) { |
eb8bd060b987
Update MSN Contact tokens when an invalid token error is returned.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
1740 msn_userlist_add_buddy(session->userlist, |
eb8bd060b987
Update MSN Contact tokens when an invalid token error is returned.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
1741 state->who, |
20538
90fd0826c6ce
finish converting the rest of stuff to the new soap api, signing on, getting
Ka-Hing Cheung <khc@hxbc.us>
parents:
20501
diff
changeset
|
1742 state->new_group_name); |
23470
eb8bd060b987
Update MSN Contact tokens when an invalid token error is returned.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
1743 } else if (state->action & MSN_MOVE_BUDDY) { |
eb8bd060b987
Update MSN Contact tokens when an invalid token error is returned.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
1744 /* This will be freed when the add contact callback fires */ |
eb8bd060b987
Update MSN Contact tokens when an invalid token error is returned.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
1745 MsnCallbackState *new_state = msn_callback_state_dup(state); |
eb8bd060b987
Update MSN Contact tokens when an invalid token error is returned.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
1746 msn_add_contact_to_group(session, new_state, state->who, guid); |
eb8bd060b987
Update MSN Contact tokens when an invalid token error is returned.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
1747 g_free(guid); |
eb8bd060b987
Update MSN Contact tokens when an invalid token error is returned.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
1748 return; |
20481
eb93710aec4d
Make buddy and group management actually work, add some SOAP templates, redesign some parts of code and separate some bigger functions into its smaller tasks which are completely unrelated to each other
Carlos Silva <typ0@pidgin.im>
parents:
20479
diff
changeset
|
1749 } |
23470
eb8bd060b987
Update MSN Contact tokens when an invalid token error is returned.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
1750 g_free(guid); |
eb8bd060b987
Update MSN Contact tokens when an invalid token error is returned.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
1751 } else { |
23519
7bceac816e19
The great MSN debug message cleanup! Threw in a few whitespace fixes,
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23507
diff
changeset
|
1752 purple_debug_info("msn", "Adding group %s failed\n", |
23470
eb8bd060b987
Update MSN Contact tokens when an invalid token error is returned.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
1753 state->new_group_name); |
20481
eb93710aec4d
Make buddy and group management actually work, add some SOAP templates, redesign some parts of code and separate some bigger functions into its smaller tasks which are completely unrelated to each other
Carlos Silva <typ0@pidgin.im>
parents:
20479
diff
changeset
|
1754 } |
23470
eb8bd060b987
Update MSN Contact tokens when an invalid token error is returned.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
1755 } |
23298
5cdd93dac7a2
Delete trailing whitespace
Mark Doliner <mark@kingant.net>
parents:
22832
diff
changeset
|
1756 |
23470
eb8bd060b987
Update MSN Contact tokens when an invalid token error is returned.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
1757 if (state->action & MSN_DEL_GROUP) { |
eb8bd060b987
Update MSN Contact tokens when an invalid token error is returned.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
1758 GList *l; |
eb8bd060b987
Update MSN Contact tokens when an invalid token error is returned.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
1759 |
eb8bd060b987
Update MSN Contact tokens when an invalid token error is returned.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
1760 msn_userlist_remove_group_id(session->userlist, state->guid); |
eb8bd060b987
Update MSN Contact tokens when an invalid token error is returned.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
1761 for (l = userlist->users; l != NULL; l = l->next) { |
eb8bd060b987
Update MSN Contact tokens when an invalid token error is returned.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
1762 msn_user_remove_group_id( (MsnUser *)l->data, state->guid); |
20481
eb93710aec4d
Make buddy and group management actually work, add some SOAP templates, redesign some parts of code and separate some bigger functions into its smaller tasks which are completely unrelated to each other
Carlos Silva <typ0@pidgin.im>
parents:
20479
diff
changeset
|
1763 } |
eb93710aec4d
Make buddy and group management actually work, add some SOAP templates, redesign some parts of code and separate some bigger functions into its smaller tasks which are completely unrelated to each other
Carlos Silva <typ0@pidgin.im>
parents:
20479
diff
changeset
|
1764 } |
20394
4a099e4d0d09
propagate from branch 'im.pidgin.pidgin' (head 98b6b547b29ea1192b73cc4e1de1e674edef4328)
Richard Laager <rlaager@wiktel.com>
parents:
diff
changeset
|
1765 } |
4a099e4d0d09
propagate from branch 'im.pidgin.pidgin' (head 98b6b547b29ea1192b73cc4e1de1e674edef4328)
Richard Laager <rlaager@wiktel.com>
parents:
diff
changeset
|
1766 |
20481
eb93710aec4d
Make buddy and group management actually work, add some SOAP templates, redesign some parts of code and separate some bigger functions into its smaller tasks which are completely unrelated to each other
Carlos Silva <typ0@pidgin.im>
parents:
20479
diff
changeset
|
1767 /* add group */ |
eb93710aec4d
Make buddy and group management actually work, add some SOAP templates, redesign some parts of code and separate some bigger functions into its smaller tasks which are completely unrelated to each other
Carlos Silva <typ0@pidgin.im>
parents:
20479
diff
changeset
|
1768 void |
eb93710aec4d
Make buddy and group management actually work, add some SOAP templates, redesign some parts of code and separate some bigger functions into its smaller tasks which are completely unrelated to each other
Carlos Silva <typ0@pidgin.im>
parents:
20479
diff
changeset
|
1769 msn_add_group(MsnSession *session, MsnCallbackState *state, const char* group_name) |
20394
4a099e4d0d09
propagate from branch 'im.pidgin.pidgin' (head 98b6b547b29ea1192b73cc4e1de1e674edef4328)
Richard Laager <rlaager@wiktel.com>
parents:
diff
changeset
|
1770 { |
4a099e4d0d09
propagate from branch 'im.pidgin.pidgin' (head 98b6b547b29ea1192b73cc4e1de1e674edef4328)
Richard Laager <rlaager@wiktel.com>
parents:
diff
changeset
|
1771 char *body = NULL; |
23446
f1f5efd679a4
Patch 4 from Qulogic, this one fixes a group name escape bug introduced by
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23445
diff
changeset
|
1772 char *escaped_group_name = NULL; |
20394
4a099e4d0d09
propagate from branch 'im.pidgin.pidgin' (head 98b6b547b29ea1192b73cc4e1de1e674edef4328)
Richard Laager <rlaager@wiktel.com>
parents:
diff
changeset
|
1773 |
4a099e4d0d09
propagate from branch 'im.pidgin.pidgin' (head 98b6b547b29ea1192b73cc4e1de1e674edef4328)
Richard Laager <rlaager@wiktel.com>
parents:
diff
changeset
|
1774 g_return_if_fail(session != NULL); |
20481
eb93710aec4d
Make buddy and group management actually work, add some SOAP templates, redesign some parts of code and separate some bigger functions into its smaller tasks which are completely unrelated to each other
Carlos Silva <typ0@pidgin.im>
parents:
20479
diff
changeset
|
1775 g_return_if_fail(group_name != NULL); |
23298
5cdd93dac7a2
Delete trailing whitespace
Mark Doliner <mark@kingant.net>
parents:
22832
diff
changeset
|
1776 |
23519
7bceac816e19
The great MSN debug message cleanup! Threw in a few whitespace fixes,
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23507
diff
changeset
|
1777 purple_debug_info("msn", "Adding group %s to contact list.\n", group_name); |
20481
eb93710aec4d
Make buddy and group management actually work, add some SOAP templates, redesign some parts of code and separate some bigger functions into its smaller tasks which are completely unrelated to each other
Carlos Silva <typ0@pidgin.im>
parents:
20479
diff
changeset
|
1778 |
eb93710aec4d
Make buddy and group management actually work, add some SOAP templates, redesign some parts of code and separate some bigger functions into its smaller tasks which are completely unrelated to each other
Carlos Silva <typ0@pidgin.im>
parents:
20479
diff
changeset
|
1779 if (state == NULL) { |
20538
90fd0826c6ce
finish converting the rest of stuff to the new soap api, signing on, getting
Ka-Hing Cheung <khc@hxbc.us>
parents:
20501
diff
changeset
|
1780 state = msn_callback_state_new(session); |
20481
eb93710aec4d
Make buddy and group management actually work, add some SOAP templates, redesign some parts of code and separate some bigger functions into its smaller tasks which are completely unrelated to each other
Carlos Silva <typ0@pidgin.im>
parents:
20479
diff
changeset
|
1781 } |
20394
4a099e4d0d09
propagate from branch 'im.pidgin.pidgin' (head 98b6b547b29ea1192b73cc4e1de1e674edef4328)
Richard Laager <rlaager@wiktel.com>
parents:
diff
changeset
|
1782 |
20481
eb93710aec4d
Make buddy and group management actually work, add some SOAP templates, redesign some parts of code and separate some bigger functions into its smaller tasks which are completely unrelated to each other
Carlos Silva <typ0@pidgin.im>
parents:
20479
diff
changeset
|
1783 msn_callback_state_set_action(state, MSN_ADD_GROUP); |
eb93710aec4d
Make buddy and group management actually work, add some SOAP templates, redesign some parts of code and separate some bigger functions into its smaller tasks which are completely unrelated to each other
Carlos Silva <typ0@pidgin.im>
parents:
20479
diff
changeset
|
1784 msn_callback_state_set_new_group_name(state, group_name); |
eb93710aec4d
Make buddy and group management actually work, add some SOAP templates, redesign some parts of code and separate some bigger functions into its smaller tasks which are completely unrelated to each other
Carlos Silva <typ0@pidgin.im>
parents:
20479
diff
changeset
|
1785 |
eb93710aec4d
Make buddy and group management actually work, add some SOAP templates, redesign some parts of code and separate some bigger functions into its smaller tasks which are completely unrelated to each other
Carlos Silva <typ0@pidgin.im>
parents:
20479
diff
changeset
|
1786 /* escape group name's html special chars so it can safely be sent |
eb93710aec4d
Make buddy and group management actually work, add some SOAP templates, redesign some parts of code and separate some bigger functions into its smaller tasks which are completely unrelated to each other
Carlos Silva <typ0@pidgin.im>
parents:
20479
diff
changeset
|
1787 * in a XML SOAP request |
eb93710aec4d
Make buddy and group management actually work, add some SOAP templates, redesign some parts of code and separate some bigger functions into its smaller tasks which are completely unrelated to each other
Carlos Silva <typ0@pidgin.im>
parents:
20479
diff
changeset
|
1788 */ |
23446
f1f5efd679a4
Patch 4 from Qulogic, this one fixes a group name escape bug introduced by
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23445
diff
changeset
|
1789 escaped_group_name = g_markup_escape_text(group_name, -1); |
23470
eb8bd060b987
Update MSN Contact tokens when an invalid token error is returned.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
1790 body = g_strdup_printf(MSN_GROUP_ADD_TEMPLATE, escaped_group_name); |
20481
eb93710aec4d
Make buddy and group management actually work, add some SOAP templates, redesign some parts of code and separate some bigger functions into its smaller tasks which are completely unrelated to each other
Carlos Silva <typ0@pidgin.im>
parents:
20479
diff
changeset
|
1791 |
23470
eb8bd060b987
Update MSN Contact tokens when an invalid token error is returned.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
1792 state->body = xmlnode_from_str(body, -1); |
eb8bd060b987
Update MSN Contact tokens when an invalid token error is returned.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
1793 state->post_action = MSN_GROUP_ADD_SOAP_ACTION; |
eb8bd060b987
Update MSN Contact tokens when an invalid token error is returned.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
1794 state->post_url = MSN_ADDRESS_BOOK_POST_URL; |
eb8bd060b987
Update MSN Contact tokens when an invalid token error is returned.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
1795 state->cb = msn_group_read_cb; |
eb8bd060b987
Update MSN Contact tokens when an invalid token error is returned.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
1796 msn_contact_request(state); |
20538
90fd0826c6ce
finish converting the rest of stuff to the new soap api, signing on, getting
Ka-Hing Cheung <khc@hxbc.us>
parents:
20501
diff
changeset
|
1797 |
23447
72aa2ccad28d
fix sending offline message in p15 by sending the correct token. In msnp14,
Ka-Hing Cheung <khc@hxbc.us>
parents:
23446
diff
changeset
|
1798 g_free(escaped_group_name); |
20481
eb93710aec4d
Make buddy and group management actually work, add some SOAP templates, redesign some parts of code and separate some bigger functions into its smaller tasks which are completely unrelated to each other
Carlos Silva <typ0@pidgin.im>
parents:
20479
diff
changeset
|
1799 g_free(body); |
eb93710aec4d
Make buddy and group management actually work, add some SOAP templates, redesign some parts of code and separate some bigger functions into its smaller tasks which are completely unrelated to each other
Carlos Silva <typ0@pidgin.im>
parents:
20479
diff
changeset
|
1800 } |
20394
4a099e4d0d09
propagate from branch 'im.pidgin.pidgin' (head 98b6b547b29ea1192b73cc4e1de1e674edef4328)
Richard Laager <rlaager@wiktel.com>
parents:
diff
changeset
|
1801 |
20481
eb93710aec4d
Make buddy and group management actually work, add some SOAP templates, redesign some parts of code and separate some bigger functions into its smaller tasks which are completely unrelated to each other
Carlos Silva <typ0@pidgin.im>
parents:
20479
diff
changeset
|
1802 /* delete group */ |
eb93710aec4d
Make buddy and group management actually work, add some SOAP templates, redesign some parts of code and separate some bigger functions into its smaller tasks which are completely unrelated to each other
Carlos Silva <typ0@pidgin.im>
parents:
20479
diff
changeset
|
1803 void |
eb93710aec4d
Make buddy and group management actually work, add some SOAP templates, redesign some parts of code and separate some bigger functions into its smaller tasks which are completely unrelated to each other
Carlos Silva <typ0@pidgin.im>
parents:
20479
diff
changeset
|
1804 msn_del_group(MsnSession *session, const gchar *group_name) |
eb93710aec4d
Make buddy and group management actually work, add some SOAP templates, redesign some parts of code and separate some bigger functions into its smaller tasks which are completely unrelated to each other
Carlos Silva <typ0@pidgin.im>
parents:
20479
diff
changeset
|
1805 { |
eb93710aec4d
Make buddy and group management actually work, add some SOAP templates, redesign some parts of code and separate some bigger functions into its smaller tasks which are completely unrelated to each other
Carlos Silva <typ0@pidgin.im>
parents:
20479
diff
changeset
|
1806 MsnCallbackState *state; |
eb93710aec4d
Make buddy and group management actually work, add some SOAP templates, redesign some parts of code and separate some bigger functions into its smaller tasks which are completely unrelated to each other
Carlos Silva <typ0@pidgin.im>
parents:
20479
diff
changeset
|
1807 char *body = NULL; |
eb93710aec4d
Make buddy and group management actually work, add some SOAP templates, redesign some parts of code and separate some bigger functions into its smaller tasks which are completely unrelated to each other
Carlos Silva <typ0@pidgin.im>
parents:
20479
diff
changeset
|
1808 const gchar *guid; |
eb93710aec4d
Make buddy and group management actually work, add some SOAP templates, redesign some parts of code and separate some bigger functions into its smaller tasks which are completely unrelated to each other
Carlos Silva <typ0@pidgin.im>
parents:
20479
diff
changeset
|
1809 |
eb93710aec4d
Make buddy and group management actually work, add some SOAP templates, redesign some parts of code and separate some bigger functions into its smaller tasks which are completely unrelated to each other
Carlos Silva <typ0@pidgin.im>
parents:
20479
diff
changeset
|
1810 g_return_if_fail(session != NULL); |
23298
5cdd93dac7a2
Delete trailing whitespace
Mark Doliner <mark@kingant.net>
parents:
22832
diff
changeset
|
1811 |
20481
eb93710aec4d
Make buddy and group management actually work, add some SOAP templates, redesign some parts of code and separate some bigger functions into its smaller tasks which are completely unrelated to each other
Carlos Silva <typ0@pidgin.im>
parents:
20479
diff
changeset
|
1812 g_return_if_fail(group_name != NULL); |
23519
7bceac816e19
The great MSN debug message cleanup! Threw in a few whitespace fixes,
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23507
diff
changeset
|
1813 purple_debug_info("msn", "Deleting group %s from contact list\n", group_name); |
23298
5cdd93dac7a2
Delete trailing whitespace
Mark Doliner <mark@kingant.net>
parents:
22832
diff
changeset
|
1814 |
20481
eb93710aec4d
Make buddy and group management actually work, add some SOAP templates, redesign some parts of code and separate some bigger functions into its smaller tasks which are completely unrelated to each other
Carlos Silva <typ0@pidgin.im>
parents:
20479
diff
changeset
|
1815 guid = msn_userlist_find_group_id(session->userlist, group_name); |
23298
5cdd93dac7a2
Delete trailing whitespace
Mark Doliner <mark@kingant.net>
parents:
22832
diff
changeset
|
1816 |
5cdd93dac7a2
Delete trailing whitespace
Mark Doliner <mark@kingant.net>
parents:
22832
diff
changeset
|
1817 /* if group uid we need to del is NULL, |
20481
eb93710aec4d
Make buddy and group management actually work, add some SOAP templates, redesign some parts of code and separate some bigger functions into its smaller tasks which are completely unrelated to each other
Carlos Silva <typ0@pidgin.im>
parents:
20479
diff
changeset
|
1818 * we need to delete nothing |
eb93710aec4d
Make buddy and group management actually work, add some SOAP templates, redesign some parts of code and separate some bigger functions into its smaller tasks which are completely unrelated to each other
Carlos Silva <typ0@pidgin.im>
parents:
20479
diff
changeset
|
1819 */ |
eb93710aec4d
Make buddy and group management actually work, add some SOAP templates, redesign some parts of code and separate some bigger functions into its smaller tasks which are completely unrelated to each other
Carlos Silva <typ0@pidgin.im>
parents:
20479
diff
changeset
|
1820 if (guid == NULL) { |
23519
7bceac816e19
The great MSN debug message cleanup! Threw in a few whitespace fixes,
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23507
diff
changeset
|
1821 purple_debug_info("msn", "Group %s guid not found, returning.\n", group_name); |
20481
eb93710aec4d
Make buddy and group management actually work, add some SOAP templates, redesign some parts of code and separate some bigger functions into its smaller tasks which are completely unrelated to each other
Carlos Silva <typ0@pidgin.im>
parents:
20479
diff
changeset
|
1822 return; |
eb93710aec4d
Make buddy and group management actually work, add some SOAP templates, redesign some parts of code and separate some bigger functions into its smaller tasks which are completely unrelated to each other
Carlos Silva <typ0@pidgin.im>
parents:
20479
diff
changeset
|
1823 } |
20484
98613886411a
Handle special cases in buddy/group management (wrt MSN_INDIVIDUALS_GROUP and MSN_NON_IM_GROUP).
Carlos Silva <typ0@pidgin.im>
parents:
20481
diff
changeset
|
1824 |
98613886411a
Handle special cases in buddy/group management (wrt MSN_INDIVIDUALS_GROUP and MSN_NON_IM_GROUP).
Carlos Silva <typ0@pidgin.im>
parents:
20481
diff
changeset
|
1825 if ( !strcmp(guid, MSN_INDIVIDUALS_GROUP_ID) || !strcmp(guid, MSN_NON_IM_GROUP_ID) ) { |
23521
a0e957b7b923
Take care of more cleanup in the MSN code.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23519
diff
changeset
|
1826 /* XXX add back PurpleGroup since it isn't really removed in the server? */ |
20484
98613886411a
Handle special cases in buddy/group management (wrt MSN_INDIVIDUALS_GROUP and MSN_NON_IM_GROUP).
Carlos Silva <typ0@pidgin.im>
parents:
20481
diff
changeset
|
1827 return; |
98613886411a
Handle special cases in buddy/group management (wrt MSN_INDIVIDUALS_GROUP and MSN_NON_IM_GROUP).
Carlos Silva <typ0@pidgin.im>
parents:
20481
diff
changeset
|
1828 } |
98613886411a
Handle special cases in buddy/group management (wrt MSN_INDIVIDUALS_GROUP and MSN_NON_IM_GROUP).
Carlos Silva <typ0@pidgin.im>
parents:
20481
diff
changeset
|
1829 |
20538
90fd0826c6ce
finish converting the rest of stuff to the new soap api, signing on, getting
Ka-Hing Cheung <khc@hxbc.us>
parents:
20501
diff
changeset
|
1830 state = msn_callback_state_new(session); |
20481
eb93710aec4d
Make buddy and group management actually work, add some SOAP templates, redesign some parts of code and separate some bigger functions into its smaller tasks which are completely unrelated to each other
Carlos Silva <typ0@pidgin.im>
parents:
20479
diff
changeset
|
1831 msn_callback_state_set_action(state, MSN_DEL_GROUP); |
eb93710aec4d
Make buddy and group management actually work, add some SOAP templates, redesign some parts of code and separate some bigger functions into its smaller tasks which are completely unrelated to each other
Carlos Silva <typ0@pidgin.im>
parents:
20479
diff
changeset
|
1832 msn_callback_state_set_guid(state, guid); |
23298
5cdd93dac7a2
Delete trailing whitespace
Mark Doliner <mark@kingant.net>
parents:
22832
diff
changeset
|
1833 |
20481
eb93710aec4d
Make buddy and group management actually work, add some SOAP templates, redesign some parts of code and separate some bigger functions into its smaller tasks which are completely unrelated to each other
Carlos Silva <typ0@pidgin.im>
parents:
20479
diff
changeset
|
1834 body = g_strdup_printf(MSN_GROUP_DEL_TEMPLATE, guid); |
20538
90fd0826c6ce
finish converting the rest of stuff to the new soap api, signing on, getting
Ka-Hing Cheung <khc@hxbc.us>
parents:
20501
diff
changeset
|
1835 |
23470
eb8bd060b987
Update MSN Contact tokens when an invalid token error is returned.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
1836 state->body = xmlnode_from_str(body, -1); |
eb8bd060b987
Update MSN Contact tokens when an invalid token error is returned.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
1837 state->post_action = MSN_GROUP_DEL_SOAP_ACTION; |
eb8bd060b987
Update MSN Contact tokens when an invalid token error is returned.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
1838 state->post_url = MSN_ADDRESS_BOOK_POST_URL; |
eb8bd060b987
Update MSN Contact tokens when an invalid token error is returned.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
1839 state->cb = msn_group_read_cb; |
eb8bd060b987
Update MSN Contact tokens when an invalid token error is returned.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
1840 msn_contact_request(state); |
20481
eb93710aec4d
Make buddy and group management actually work, add some SOAP templates, redesign some parts of code and separate some bigger functions into its smaller tasks which are completely unrelated to each other
Carlos Silva <typ0@pidgin.im>
parents:
20479
diff
changeset
|
1841 |
eb93710aec4d
Make buddy and group management actually work, add some SOAP templates, redesign some parts of code and separate some bigger functions into its smaller tasks which are completely unrelated to each other
Carlos Silva <typ0@pidgin.im>
parents:
20479
diff
changeset
|
1842 g_free(body); |
eb93710aec4d
Make buddy and group management actually work, add some SOAP templates, redesign some parts of code and separate some bigger functions into its smaller tasks which are completely unrelated to each other
Carlos Silva <typ0@pidgin.im>
parents:
20479
diff
changeset
|
1843 } |
eb93710aec4d
Make buddy and group management actually work, add some SOAP templates, redesign some parts of code and separate some bigger functions into its smaller tasks which are completely unrelated to each other
Carlos Silva <typ0@pidgin.im>
parents:
20479
diff
changeset
|
1844 |
eb93710aec4d
Make buddy and group management actually work, add some SOAP templates, redesign some parts of code and separate some bigger functions into its smaller tasks which are completely unrelated to each other
Carlos Silva <typ0@pidgin.im>
parents:
20479
diff
changeset
|
1845 /* rename group */ |
eb93710aec4d
Make buddy and group management actually work, add some SOAP templates, redesign some parts of code and separate some bigger functions into its smaller tasks which are completely unrelated to each other
Carlos Silva <typ0@pidgin.im>
parents:
20479
diff
changeset
|
1846 void |
eb93710aec4d
Make buddy and group management actually work, add some SOAP templates, redesign some parts of code and separate some bigger functions into its smaller tasks which are completely unrelated to each other
Carlos Silva <typ0@pidgin.im>
parents:
20479
diff
changeset
|
1847 msn_contact_rename_group(MsnSession *session, const char *old_group_name, const char *new_group_name) |
eb93710aec4d
Make buddy and group management actually work, add some SOAP templates, redesign some parts of code and separate some bigger functions into its smaller tasks which are completely unrelated to each other
Carlos Silva <typ0@pidgin.im>
parents:
20479
diff
changeset
|
1848 { |
20538
90fd0826c6ce
finish converting the rest of stuff to the new soap api, signing on, getting
Ka-Hing Cheung <khc@hxbc.us>
parents:
20501
diff
changeset
|
1849 gchar *body = NULL; |
20481
eb93710aec4d
Make buddy and group management actually work, add some SOAP templates, redesign some parts of code and separate some bigger functions into its smaller tasks which are completely unrelated to each other
Carlos Silva <typ0@pidgin.im>
parents:
20479
diff
changeset
|
1850 const gchar * guid; |
20538
90fd0826c6ce
finish converting the rest of stuff to the new soap api, signing on, getting
Ka-Hing Cheung <khc@hxbc.us>
parents:
20501
diff
changeset
|
1851 MsnCallbackState *state; |
23446
f1f5efd679a4
Patch 4 from Qulogic, this one fixes a group name escape bug introduced by
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23445
diff
changeset
|
1852 char *escaped_group_name; |
23298
5cdd93dac7a2
Delete trailing whitespace
Mark Doliner <mark@kingant.net>
parents:
22832
diff
changeset
|
1853 |
20481
eb93710aec4d
Make buddy and group management actually work, add some SOAP templates, redesign some parts of code and separate some bigger functions into its smaller tasks which are completely unrelated to each other
Carlos Silva <typ0@pidgin.im>
parents:
20479
diff
changeset
|
1854 g_return_if_fail(session != NULL); |
eb93710aec4d
Make buddy and group management actually work, add some SOAP templates, redesign some parts of code and separate some bigger functions into its smaller tasks which are completely unrelated to each other
Carlos Silva <typ0@pidgin.im>
parents:
20479
diff
changeset
|
1855 g_return_if_fail(session->userlist != NULL); |
eb93710aec4d
Make buddy and group management actually work, add some SOAP templates, redesign some parts of code and separate some bigger functions into its smaller tasks which are completely unrelated to each other
Carlos Silva <typ0@pidgin.im>
parents:
20479
diff
changeset
|
1856 g_return_if_fail(old_group_name != NULL); |
eb93710aec4d
Make buddy and group management actually work, add some SOAP templates, redesign some parts of code and separate some bigger functions into its smaller tasks which are completely unrelated to each other
Carlos Silva <typ0@pidgin.im>
parents:
20479
diff
changeset
|
1857 g_return_if_fail(new_group_name != NULL); |
23298
5cdd93dac7a2
Delete trailing whitespace
Mark Doliner <mark@kingant.net>
parents:
22832
diff
changeset
|
1858 |
23519
7bceac816e19
The great MSN debug message cleanup! Threw in a few whitespace fixes,
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23507
diff
changeset
|
1859 purple_debug_info("msn", "Renaming group %s to %s.\n", old_group_name, new_group_name); |
23298
5cdd93dac7a2
Delete trailing whitespace
Mark Doliner <mark@kingant.net>
parents:
22832
diff
changeset
|
1860 |
20481
eb93710aec4d
Make buddy and group management actually work, add some SOAP templates, redesign some parts of code and separate some bigger functions into its smaller tasks which are completely unrelated to each other
Carlos Silva <typ0@pidgin.im>
parents:
20479
diff
changeset
|
1861 guid = msn_userlist_find_group_id(session->userlist, old_group_name); |
eb93710aec4d
Make buddy and group management actually work, add some SOAP templates, redesign some parts of code and separate some bigger functions into its smaller tasks which are completely unrelated to each other
Carlos Silva <typ0@pidgin.im>
parents:
20479
diff
changeset
|
1862 if (guid == NULL) |
eb93710aec4d
Make buddy and group management actually work, add some SOAP templates, redesign some parts of code and separate some bigger functions into its smaller tasks which are completely unrelated to each other
Carlos Silva <typ0@pidgin.im>
parents:
20479
diff
changeset
|
1863 return; |
20484
98613886411a
Handle special cases in buddy/group management (wrt MSN_INDIVIDUALS_GROUP and MSN_NON_IM_GROUP).
Carlos Silva <typ0@pidgin.im>
parents:
20481
diff
changeset
|
1864 |
20538
90fd0826c6ce
finish converting the rest of stuff to the new soap api, signing on, getting
Ka-Hing Cheung <khc@hxbc.us>
parents:
20501
diff
changeset
|
1865 state = msn_callback_state_new(session); |
20481
eb93710aec4d
Make buddy and group management actually work, add some SOAP templates, redesign some parts of code and separate some bigger functions into its smaller tasks which are completely unrelated to each other
Carlos Silva <typ0@pidgin.im>
parents:
20479
diff
changeset
|
1866 msn_callback_state_set_guid(state, guid); |
eb93710aec4d
Make buddy and group management actually work, add some SOAP templates, redesign some parts of code and separate some bigger functions into its smaller tasks which are completely unrelated to each other
Carlos Silva <typ0@pidgin.im>
parents:
20479
diff
changeset
|
1867 msn_callback_state_set_new_group_name(state, new_group_name); |
20484
98613886411a
Handle special cases in buddy/group management (wrt MSN_INDIVIDUALS_GROUP and MSN_NON_IM_GROUP).
Carlos Silva <typ0@pidgin.im>
parents:
20481
diff
changeset
|
1868 |
98613886411a
Handle special cases in buddy/group management (wrt MSN_INDIVIDUALS_GROUP and MSN_NON_IM_GROUP).
Carlos Silva <typ0@pidgin.im>
parents:
20481
diff
changeset
|
1869 if ( !strcmp(guid, MSN_INDIVIDUALS_GROUP_ID) || !strcmp(guid, MSN_NON_IM_GROUP_ID) ) { |
23470
eb8bd060b987
Update MSN Contact tokens when an invalid token error is returned.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
1870 MsnCallbackState *new_state = msn_callback_state_dup(state); |
eb8bd060b987
Update MSN Contact tokens when an invalid token error is returned.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
1871 msn_add_group(session, new_state, new_group_name); |
23521
a0e957b7b923
Take care of more cleanup in the MSN code.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23519
diff
changeset
|
1872 /* XXX move every buddy there (we probably need to fix concurrent SOAP reqs first) */ |
20484
98613886411a
Handle special cases in buddy/group management (wrt MSN_INDIVIDUALS_GROUP and MSN_NON_IM_GROUP).
Carlos Silva <typ0@pidgin.im>
parents:
20481
diff
changeset
|
1873 } |
98613886411a
Handle special cases in buddy/group management (wrt MSN_INDIVIDUALS_GROUP and MSN_NON_IM_GROUP).
Carlos Silva <typ0@pidgin.im>
parents:
20481
diff
changeset
|
1874 |
98613886411a
Handle special cases in buddy/group management (wrt MSN_INDIVIDUALS_GROUP and MSN_NON_IM_GROUP).
Carlos Silva <typ0@pidgin.im>
parents:
20481
diff
changeset
|
1875 msn_callback_state_set_action(state, MSN_RENAME_GROUP); |
23298
5cdd93dac7a2
Delete trailing whitespace
Mark Doliner <mark@kingant.net>
parents:
22832
diff
changeset
|
1876 |
23446
f1f5efd679a4
Patch 4 from Qulogic, this one fixes a group name escape bug introduced by
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23445
diff
changeset
|
1877 escaped_group_name = g_markup_escape_text(new_group_name, -1); |
23470
eb8bd060b987
Update MSN Contact tokens when an invalid token error is returned.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
1878 body = g_strdup_printf(MSN_GROUP_RENAME_TEMPLATE, guid, escaped_group_name); |
20538
90fd0826c6ce
finish converting the rest of stuff to the new soap api, signing on, getting
Ka-Hing Cheung <khc@hxbc.us>
parents:
20501
diff
changeset
|
1879 |
23470
eb8bd060b987
Update MSN Contact tokens when an invalid token error is returned.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
1880 state->body = xmlnode_from_str(body, -1); |
eb8bd060b987
Update MSN Contact tokens when an invalid token error is returned.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
1881 state->post_action = MSN_GROUP_RENAME_SOAP_ACTION; |
eb8bd060b987
Update MSN Contact tokens when an invalid token error is returned.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
1882 state->post_url = MSN_ADDRESS_BOOK_POST_URL; |
eb8bd060b987
Update MSN Contact tokens when an invalid token error is returned.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
1883 state->cb = msn_group_read_cb; |
eb8bd060b987
Update MSN Contact tokens when an invalid token error is returned.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
1884 msn_contact_request(state); |
20538
90fd0826c6ce
finish converting the rest of stuff to the new soap api, signing on, getting
Ka-Hing Cheung <khc@hxbc.us>
parents:
20501
diff
changeset
|
1885 |
23447
72aa2ccad28d
fix sending offline message in p15 by sending the correct token. In msnp14,
Ka-Hing Cheung <khc@hxbc.us>
parents:
23446
diff
changeset
|
1886 g_free(escaped_group_name); |
20394
4a099e4d0d09
propagate from branch 'im.pidgin.pidgin' (head 98b6b547b29ea1192b73cc4e1de1e674edef4328)
Richard Laager <rlaager@wiktel.com>
parents:
diff
changeset
|
1887 g_free(body); |
4a099e4d0d09
propagate from branch 'im.pidgin.pidgin' (head 98b6b547b29ea1192b73cc4e1de1e674edef4328)
Richard Laager <rlaager@wiktel.com>
parents:
diff
changeset
|
1888 } |
24516
ff275531cbf2
Send the SOAP faultcode to the callbacks for each Contact operation. They all
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
24515
diff
changeset
|
1889 |