libpurple/protocols/msn/contact.c

Sun, 01 Feb 2009 08:17:31 +0000

author
Elliott Sales de Andrade <qulogic@pidgin.im>
date
Sun, 01 Feb 2009 08:17:31 +0000
changeset 25537
2d76214cde98
parent 25536
3db8fa7ba81e
child 25611
c85beaeb4538
permissions
-rw-r--r--

Remove warning in contact.c.

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

mercurial