Tue, 02 Nov 2021 00:30:07 -0500
Fix some bugs with proxies for xmpp
Testing Done:
Compiled and ran, was unable to get it to actually use charles proxy though.
Reviewed at https://reviews.imfreedom.org/r/1118/
| 7014 | 1 | /* |
| 15884 | 2 | * purple - Jabber Protocol Plugin |
| 7014 | 3 | * |
|
28322
ac8fec1d2234
Remove specific copyright lines from the XMPP prpl.
Paul Aurich <darkrain42@pidgin.im>
parents:
28071
diff
changeset
|
4 | * Purple is the legal property of its developers, whose names are too numerous |
|
ac8fec1d2234
Remove specific copyright lines from the XMPP prpl.
Paul Aurich <darkrain42@pidgin.im>
parents:
28071
diff
changeset
|
5 | * to list here. Please refer to the COPYRIGHT file distributed with this |
|
ac8fec1d2234
Remove specific copyright lines from the XMPP prpl.
Paul Aurich <darkrain42@pidgin.im>
parents:
28071
diff
changeset
|
6 | * source distribution. |
| 7014 | 7 | * |
| 8 | * This program is free software; you can redistribute it and/or modify | |
| 9 | * it under the terms of the GNU General Public License as published by | |
| 10 | * the Free Software Foundation; either version 2 of the License, or | |
| 11 | * (at your option) any later version. | |
| 12 | * | |
| 13 | * This program is distributed in the hope that it will be useful, | |
| 14 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | |
| 15 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
| 16 | * GNU General Public License for more details. | |
| 17 | * | |
| 18 | * You should have received a copy of the GNU General Public License | |
| 19 | * along with this program; if not, write to the Free Software | |
|
19859
71d37b57eff2
The FSF changed its address a while ago; our files were out of date.
John Bailey <rekkanoryo@rekkanoryo.org>
parents:
19630
diff
changeset
|
20 | * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA |
| 7014 | 21 | * |
| 22 | */ | |
|
40358
e6fe6fc1f516
move all protocols, purple plugins, and purple tests to use purple.h instead of including files individually
Gary Kramlich <grim@reaperworld.com>
parents:
40096
diff
changeset
|
23 | #include <purple.h> |
| 7014 | 24 | |
| 25 | #include "buddy.h" | |
|
28431
8450418b5abd
jabber: Properly handle adding buddies that contain a resource. Closes #10151.
Paul Aurich <darkrain42@pidgin.im>
parents:
28322
diff
changeset
|
26 | #include "chat.h" |
| 7014 | 27 | #include "presence.h" |
| 28 | #include "roster.h" | |
| 29 | #include "iq.h" | |
| 30 | ||
| 31 | #include <string.h> | |
| 32 | ||
|
27282
791c6a965694
Debug output when changing group memberships.
Paul Aurich <darkrain42@pidgin.im>
parents:
27281
diff
changeset
|
33 | /* Take a list of strings and join them with a ", " separator */ |
|
791c6a965694
Debug output when changing group memberships.
Paul Aurich <darkrain42@pidgin.im>
parents:
27281
diff
changeset
|
34 | static gchar *roster_groups_join(GSList *list) |
|
791c6a965694
Debug output when changing group memberships.
Paul Aurich <darkrain42@pidgin.im>
parents:
27281
diff
changeset
|
35 | { |
|
791c6a965694
Debug output when changing group memberships.
Paul Aurich <darkrain42@pidgin.im>
parents:
27281
diff
changeset
|
36 | GString *out = g_string_new(NULL); |
|
791c6a965694
Debug output when changing group memberships.
Paul Aurich <darkrain42@pidgin.im>
parents:
27281
diff
changeset
|
37 | for ( ; list; list = list->next) { |
|
791c6a965694
Debug output when changing group memberships.
Paul Aurich <darkrain42@pidgin.im>
parents:
27281
diff
changeset
|
38 | out = g_string_append(out, (const char *)list->data); |
|
791c6a965694
Debug output when changing group memberships.
Paul Aurich <darkrain42@pidgin.im>
parents:
27281
diff
changeset
|
39 | if (list->next) |
|
791c6a965694
Debug output when changing group memberships.
Paul Aurich <darkrain42@pidgin.im>
parents:
27281
diff
changeset
|
40 | out = g_string_append(out, ", "); |
|
791c6a965694
Debug output when changing group memberships.
Paul Aurich <darkrain42@pidgin.im>
parents:
27281
diff
changeset
|
41 | } |
|
791c6a965694
Debug output when changing group memberships.
Paul Aurich <darkrain42@pidgin.im>
parents:
27281
diff
changeset
|
42 | |
|
791c6a965694
Debug output when changing group memberships.
Paul Aurich <darkrain42@pidgin.im>
parents:
27281
diff
changeset
|
43 | return g_string_free(out, FALSE); |
|
791c6a965694
Debug output when changing group memberships.
Paul Aurich <darkrain42@pidgin.im>
parents:
27281
diff
changeset
|
44 | } |
|
791c6a965694
Debug output when changing group memberships.
Paul Aurich <darkrain42@pidgin.im>
parents:
27281
diff
changeset
|
45 | |
|
29096
362b96f6f3da
jabber: Roster Versioning support.
Paul Aurich <darkrain42@pidgin.im>
parents:
28758
diff
changeset
|
46 | static void roster_request_cb(JabberStream *js, const char *from, |
|
362b96f6f3da
jabber: Roster Versioning support.
Paul Aurich <darkrain42@pidgin.im>
parents:
28758
diff
changeset
|
47 | JabberIqType type, const char *id, |
|
34935
686fa55b0deb
Replaced xmlnode with PurpleXmlNode, and xmlnode_* API with purple_xmlnode_* API
Ankit Vani <a@nevitus.org>
parents:
34864
diff
changeset
|
48 | PurpleXmlNode *packet, gpointer data) |
|
29096
362b96f6f3da
jabber: Roster Versioning support.
Paul Aurich <darkrain42@pidgin.im>
parents:
28758
diff
changeset
|
49 | { |
|
34935
686fa55b0deb
Replaced xmlnode with PurpleXmlNode, and xmlnode_* API with purple_xmlnode_* API
Ankit Vani <a@nevitus.org>
parents:
34864
diff
changeset
|
50 | PurpleXmlNode *query; |
|
29096
362b96f6f3da
jabber: Roster Versioning support.
Paul Aurich <darkrain42@pidgin.im>
parents:
28758
diff
changeset
|
51 | |
|
362b96f6f3da
jabber: Roster Versioning support.
Paul Aurich <darkrain42@pidgin.im>
parents:
28758
diff
changeset
|
52 | if (type == JABBER_IQ_ERROR) { |
|
362b96f6f3da
jabber: Roster Versioning support.
Paul Aurich <darkrain42@pidgin.im>
parents:
28758
diff
changeset
|
53 | /* |
|
362b96f6f3da
jabber: Roster Versioning support.
Paul Aurich <darkrain42@pidgin.im>
parents:
28758
diff
changeset
|
54 | * This shouldn't happen in any real circumstances and |
|
362b96f6f3da
jabber: Roster Versioning support.
Paul Aurich <darkrain42@pidgin.im>
parents:
28758
diff
changeset
|
55 | * likely constitutes a server-side misconfiguration (i.e. |
|
362b96f6f3da
jabber: Roster Versioning support.
Paul Aurich <darkrain42@pidgin.im>
parents:
28758
diff
changeset
|
56 | * explicitly not loading mod_roster...) |
|
362b96f6f3da
jabber: Roster Versioning support.
Paul Aurich <darkrain42@pidgin.im>
parents:
28758
diff
changeset
|
57 | */ |
|
362b96f6f3da
jabber: Roster Versioning support.
Paul Aurich <darkrain42@pidgin.im>
parents:
28758
diff
changeset
|
58 | purple_debug_error("jabber", "Error retrieving roster!?\n"); |
|
362b96f6f3da
jabber: Roster Versioning support.
Paul Aurich <darkrain42@pidgin.im>
parents:
28758
diff
changeset
|
59 | jabber_stream_set_state(js, JABBER_STREAM_CONNECTED); |
|
362b96f6f3da
jabber: Roster Versioning support.
Paul Aurich <darkrain42@pidgin.im>
parents:
28758
diff
changeset
|
60 | return; |
|
362b96f6f3da
jabber: Roster Versioning support.
Paul Aurich <darkrain42@pidgin.im>
parents:
28758
diff
changeset
|
61 | } |
|
362b96f6f3da
jabber: Roster Versioning support.
Paul Aurich <darkrain42@pidgin.im>
parents:
28758
diff
changeset
|
62 | |
|
34935
686fa55b0deb
Replaced xmlnode with PurpleXmlNode, and xmlnode_* API with purple_xmlnode_* API
Ankit Vani <a@nevitus.org>
parents:
34864
diff
changeset
|
63 | query = purple_xmlnode_get_child(packet, "query"); |
|
29096
362b96f6f3da
jabber: Roster Versioning support.
Paul Aurich <darkrain42@pidgin.im>
parents:
28758
diff
changeset
|
64 | if (query == NULL) { |
|
362b96f6f3da
jabber: Roster Versioning support.
Paul Aurich <darkrain42@pidgin.im>
parents:
28758
diff
changeset
|
65 | jabber_stream_set_state(js, JABBER_STREAM_CONNECTED); |
|
362b96f6f3da
jabber: Roster Versioning support.
Paul Aurich <darkrain42@pidgin.im>
parents:
28758
diff
changeset
|
66 | return; |
|
362b96f6f3da
jabber: Roster Versioning support.
Paul Aurich <darkrain42@pidgin.im>
parents:
28758
diff
changeset
|
67 | } |
|
362b96f6f3da
jabber: Roster Versioning support.
Paul Aurich <darkrain42@pidgin.im>
parents:
28758
diff
changeset
|
68 | |
|
362b96f6f3da
jabber: Roster Versioning support.
Paul Aurich <darkrain42@pidgin.im>
parents:
28758
diff
changeset
|
69 | jabber_roster_parse(js, from, type, id, query); |
|
362b96f6f3da
jabber: Roster Versioning support.
Paul Aurich <darkrain42@pidgin.im>
parents:
28758
diff
changeset
|
70 | jabber_stream_set_state(js, JABBER_STREAM_CONNECTED); |
|
362b96f6f3da
jabber: Roster Versioning support.
Paul Aurich <darkrain42@pidgin.im>
parents:
28758
diff
changeset
|
71 | } |
|
362b96f6f3da
jabber: Roster Versioning support.
Paul Aurich <darkrain42@pidgin.im>
parents:
28758
diff
changeset
|
72 | |
| 7014 | 73 | void jabber_roster_request(JabberStream *js) |
| 74 | { | |
| 75 | JabberIq *iq; | |
|
29096
362b96f6f3da
jabber: Roster Versioning support.
Paul Aurich <darkrain42@pidgin.im>
parents:
28758
diff
changeset
|
76 | |
| 7014 | 77 | iq = jabber_iq_new_query(js, JABBER_IQ_GET, "jabber:iq:roster"); |
|
29103
aefa3f414775
jabber: The google roster request code was so lonely, so let's just drop-kick it and add the little custom logic to roster.c
Paul Aurich <darkrain42@pidgin.im>
parents:
29096
diff
changeset
|
78 | |
|
29096
362b96f6f3da
jabber: Roster Versioning support.
Paul Aurich <darkrain42@pidgin.im>
parents:
28758
diff
changeset
|
79 | jabber_iq_set_callback(iq, roster_request_cb, NULL); |
| 7014 | 80 | jabber_iq_send(iq); |
| 81 | } | |
| 82 | ||
| 15884 | 83 | static void remove_purple_buddies(JabberStream *js, const char *jid) |
| 7014 | 84 | { |
|
40052
cc03b5af25ea
Use GSList functions instead of manual iterations
qarkai <qarkai@gmail.com>
parents:
39915
diff
changeset
|
85 | GSList *buddies; |
| 7014 | 86 | |
|
34728
8efd73063ecf
Renamed buddy list functions to more appropriate/simler names.
Ankit Vani <a@nevitus.org>
parents:
34717
diff
changeset
|
87 | buddies = purple_blist_find_buddies(purple_connection_get_account(js->gc), jid); |
| 7014 | 88 | |
|
40052
cc03b5af25ea
Use GSList functions instead of manual iterations
qarkai <qarkai@gmail.com>
parents:
39915
diff
changeset
|
89 | g_slist_free_full(buddies, (GDestroyNotify)purple_blist_remove_buddy); |
| 7014 | 90 | } |
| 91 | ||
|
27277
8a2ecbdd70e4
Various roster cleanups. Refs #7008.
Paul Aurich <darkrain42@pidgin.im>
parents:
27276
diff
changeset
|
92 | static void add_purple_buddy_to_groups(JabberStream *js, const char *jid, |
|
28071
a0706162fefd
jabber: Store the "own JabberBuddy" in the JabberStream* struct.
Paul Aurich <darkrain42@pidgin.im>
parents:
27743
diff
changeset
|
93 | const char *alias, GSList *groups) |
| 7014 | 94 | { |
|
27277
8a2ecbdd70e4
Various roster cleanups. Refs #7008.
Paul Aurich <darkrain42@pidgin.im>
parents:
27276
diff
changeset
|
95 | GSList *buddies, *l; |
|
28758
6fb73f2ab8e2
jabber: Remove the roster pool stuff.
Paul Aurich <darkrain42@pidgin.im>
parents:
28622
diff
changeset
|
96 | PurpleAccount *account = purple_connection_get_account(js->gc); |
| 7014 | 97 | |
|
34728
8efd73063ecf
Renamed buddy list functions to more appropriate/simler names.
Ankit Vani <a@nevitus.org>
parents:
34717
diff
changeset
|
98 | buddies = purple_blist_find_buddies(purple_connection_get_account(js->gc), jid); |
| 7014 | 99 | |
| 100 | if(!groups) { | |
|
35958
1d8446f396b6
blist: define default group better
Tomasz Wasilczyk <twasilczyk@pidgin.im>
parents:
35499
diff
changeset
|
101 | if(!buddies) { |
|
36009
4db2936dd842
Backport 407e0fa6f7d1: don't split contacts on default group (xmpp)
Tomasz Wasilczyk <twasilczyk@pidgin.im>
parents:
31794
diff
changeset
|
102 | groups = g_slist_append(groups, g_strdup(JABBER_ROSTER_DEFAULT_GROUP)); |
|
35958
1d8446f396b6
blist: define default group better
Tomasz Wasilczyk <twasilczyk@pidgin.im>
parents:
35499
diff
changeset
|
103 | } else { |
|
27277
8a2ecbdd70e4
Various roster cleanups. Refs #7008.
Paul Aurich <darkrain42@pidgin.im>
parents:
27276
diff
changeset
|
104 | /* TODO: What should we do here? Removing the local buddies |
|
8a2ecbdd70e4
Various roster cleanups. Refs #7008.
Paul Aurich <darkrain42@pidgin.im>
parents:
27276
diff
changeset
|
105 | * is wrong, but so is letting the group state get out of sync with |
|
8a2ecbdd70e4
Various roster cleanups. Refs #7008.
Paul Aurich <darkrain42@pidgin.im>
parents:
27276
diff
changeset
|
106 | * the server. |
|
8a2ecbdd70e4
Various roster cleanups. Refs #7008.
Paul Aurich <darkrain42@pidgin.im>
parents:
27276
diff
changeset
|
107 | */ |
|
20221
28e31ee832cd
applied changes from e56db1b8a7bb8729e30fb3bf99a94ff7887fe4ec
Luke Schierer <lschiere@pidgin.im>
parents:
19859
diff
changeset
|
108 | g_slist_free(buddies); |
| 7014 | 109 | return; |
|
20221
28e31ee832cd
applied changes from e56db1b8a7bb8729e30fb3bf99a94ff7887fe4ec
Luke Schierer <lschiere@pidgin.im>
parents:
19859
diff
changeset
|
110 | } |
| 7014 | 111 | } |
| 112 | ||
| 113 | while(buddies) { | |
| 15884 | 114 | PurpleBuddy *b = buddies->data; |
| 115 | PurpleGroup *g = purple_buddy_get_group(b); | |
| 7014 | 116 | |
|
27277
8a2ecbdd70e4
Various roster cleanups. Refs #7008.
Paul Aurich <darkrain42@pidgin.im>
parents:
27276
diff
changeset
|
117 | buddies = g_slist_delete_link(buddies, buddies); |
| 7014 | 118 | |
|
27277
8a2ecbdd70e4
Various roster cleanups. Refs #7008.
Paul Aurich <darkrain42@pidgin.im>
parents:
27276
diff
changeset
|
119 | /* XMPP groups are case-sensitive, but libpurple groups are |
|
8a2ecbdd70e4
Various roster cleanups. Refs #7008.
Paul Aurich <darkrain42@pidgin.im>
parents:
27276
diff
changeset
|
120 | * case-insensitive. We treat a buddy in both "Friends" and "friends" |
|
27743
ce49b08a7990
Clarify a comment a little.
Paul Aurich <darkrain42@pidgin.im>
parents:
27742
diff
changeset
|
121 | * as only being in one group, but if we push changes about the buddy |
|
27277
8a2ecbdd70e4
Various roster cleanups. Refs #7008.
Paul Aurich <darkrain42@pidgin.im>
parents:
27276
diff
changeset
|
122 | * to the server, the buddy will be dropped from one of the groups. |
|
27743
ce49b08a7990
Clarify a comment a little.
Paul Aurich <darkrain42@pidgin.im>
parents:
27742
diff
changeset
|
123 | * Not optimal, but better than the alternative, I think. |
|
27277
8a2ecbdd70e4
Various roster cleanups. Refs #7008.
Paul Aurich <darkrain42@pidgin.im>
parents:
27276
diff
changeset
|
124 | */ |
|
36009
4db2936dd842
Backport 407e0fa6f7d1: don't split contacts on default group (xmpp)
Tomasz Wasilczyk <twasilczyk@pidgin.im>
parents:
31794
diff
changeset
|
125 | l = g_slist_find_custom(groups, purple_group_get_name(g), |
|
4db2936dd842
Backport 407e0fa6f7d1: don't split contacts on default group (xmpp)
Tomasz Wasilczyk <twasilczyk@pidgin.im>
parents:
31794
diff
changeset
|
126 | (GCompareFunc)purple_utf8_strcasecmp); |
|
35960
407e0fa6f7d1
blist: don't localize roster group name to avoid contact splitting
Tomasz Wasilczyk <twasilczyk@pidgin.im>
parents:
35958
diff
changeset
|
127 | if (!l && g == purple_blist_get_default_group()) { |
|
36009
4db2936dd842
Backport 407e0fa6f7d1: don't split contacts on default group (xmpp)
Tomasz Wasilczyk <twasilczyk@pidgin.im>
parents:
31794
diff
changeset
|
128 | l = g_slist_find_custom(groups, JABBER_ROSTER_DEFAULT_GROUP, |
|
4db2936dd842
Backport 407e0fa6f7d1: don't split contacts on default group (xmpp)
Tomasz Wasilczyk <twasilczyk@pidgin.im>
parents:
31794
diff
changeset
|
129 | (GCompareFunc)purple_utf8_strcasecmp); |
|
4db2936dd842
Backport 407e0fa6f7d1: don't split contacts on default group (xmpp)
Tomasz Wasilczyk <twasilczyk@pidgin.im>
parents:
31794
diff
changeset
|
130 | } |
|
35961
87fd9126902a
blist: store localized name of default group to avoid contact splitting
Tomasz Wasilczyk <twasilczyk@pidgin.im>
parents:
35960
diff
changeset
|
131 | if (!l && g == purple_blist_get_default_group()) { |
|
87fd9126902a
blist: store localized name of default group to avoid contact splitting
Tomasz Wasilczyk <twasilczyk@pidgin.im>
parents:
35960
diff
changeset
|
132 | l = g_slist_find_custom(groups, |
|
87fd9126902a
blist: store localized name of default group to avoid contact splitting
Tomasz Wasilczyk <twasilczyk@pidgin.im>
parents:
35960
diff
changeset
|
133 | _purple_blist_get_localized_default_group_name(), |
|
87fd9126902a
blist: store localized name of default group to avoid contact splitting
Tomasz Wasilczyk <twasilczyk@pidgin.im>
parents:
35960
diff
changeset
|
134 | (GCompareFunc)purple_utf8_strcasecmp); |
|
87fd9126902a
blist: store localized name of default group to avoid contact splitting
Tomasz Wasilczyk <twasilczyk@pidgin.im>
parents:
35960
diff
changeset
|
135 | } |
|
36009
4db2936dd842
Backport 407e0fa6f7d1: don't split contacts on default group (xmpp)
Tomasz Wasilczyk <twasilczyk@pidgin.im>
parents:
31794
diff
changeset
|
136 | |
|
4db2936dd842
Backport 407e0fa6f7d1: don't split contacts on default group (xmpp)
Tomasz Wasilczyk <twasilczyk@pidgin.im>
parents:
31794
diff
changeset
|
137 | if (l) { |
|
27277
8a2ecbdd70e4
Various roster cleanups. Refs #7008.
Paul Aurich <darkrain42@pidgin.im>
parents:
27276
diff
changeset
|
138 | /* The buddy is already on the local list. Update info. */ |
|
24950
143f594f0cd0
Alias foo. I think blist.h structs are now completely hidden.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
24398
diff
changeset
|
139 | const char *servernick, *balias; |
| 7955 | 140 | |
|
24199
8606cb4e94f5
The alias we retrieve from the roster is a private alias; use purple_serv_got_private_alias() to tell the core about it
Evan Schoenberg <evands@pidgin.im>
parents:
23975
diff
changeset
|
141 | /* Previously stored serverside / buddy-supplied alias */ |
| 15884 | 142 | if((servernick = purple_blist_node_get_string((PurpleBlistNode*)b, "servernick"))) |
|
35499
c4c5e0a670b1
Fix namespaces issues in libpurple.
Ankit Vani <a@nevitus.org>
parents:
34935
diff
changeset
|
143 | purple_serv_got_alias(js->gc, jid, servernick); |
| 7955 | 144 | |
|
24199
8606cb4e94f5
The alias we retrieve from the roster is a private alias; use purple_serv_got_private_alias() to tell the core about it
Evan Schoenberg <evands@pidgin.im>
parents:
23975
diff
changeset
|
145 | /* Alias from our roster retrieval */ |
|
34717
b3e588adef5a
Global replace purple_buddy_get_local_buddy_alias() with purple_buddy_get_local_alias()
Ankit Vani <a@nevitus.org>
parents:
34699
diff
changeset
|
146 | balias = purple_buddy_get_local_alias(b); |
|
27277
8a2ecbdd70e4
Various roster cleanups. Refs #7008.
Paul Aurich <darkrain42@pidgin.im>
parents:
27276
diff
changeset
|
147 | if(alias && !purple_strequal(alias, balias)) |
|
24199
8606cb4e94f5
The alias we retrieve from the roster is a private alias; use purple_serv_got_private_alias() to tell the core about it
Evan Schoenberg <evands@pidgin.im>
parents:
23975
diff
changeset
|
148 | purple_serv_got_private_alias(js->gc, jid, alias); |
| 7014 | 149 | g_free(l->data); |
|
27277
8a2ecbdd70e4
Various roster cleanups. Refs #7008.
Paul Aurich <darkrain42@pidgin.im>
parents:
27276
diff
changeset
|
150 | groups = g_slist_delete_link(groups, l); |
| 7014 | 151 | } else { |
|
27277
8a2ecbdd70e4
Various roster cleanups. Refs #7008.
Paul Aurich <darkrain42@pidgin.im>
parents:
27276
diff
changeset
|
152 | /* This buddy isn't in the group on the server anymore */ |
|
35960
407e0fa6f7d1
blist: don't localize roster group name to avoid contact splitting
Tomasz Wasilczyk <twasilczyk@pidgin.im>
parents:
35958
diff
changeset
|
153 | purple_debug_info("jabber", "jabber_roster_parse(): " |
|
407e0fa6f7d1
blist: don't localize roster group name to avoid contact splitting
Tomasz Wasilczyk <twasilczyk@pidgin.im>
parents:
35958
diff
changeset
|
154 | "Removing %s from group '%s' on the local list", |
|
407e0fa6f7d1
blist: don't localize roster group name to avoid contact splitting
Tomasz Wasilczyk <twasilczyk@pidgin.im>
parents:
35958
diff
changeset
|
155 | purple_buddy_get_name(b), |
|
407e0fa6f7d1
blist: don't localize roster group name to avoid contact splitting
Tomasz Wasilczyk <twasilczyk@pidgin.im>
parents:
35958
diff
changeset
|
156 | jabber_roster_group_get_global_name(g)); |
|
28758
6fb73f2ab8e2
jabber: Remove the roster pool stuff.
Paul Aurich <darkrain42@pidgin.im>
parents:
28622
diff
changeset
|
157 | purple_blist_remove_buddy(b); |
| 7014 | 158 | } |
| 159 | } | |
| 160 | ||
|
27282
791c6a965694
Debug output when changing group memberships.
Paul Aurich <darkrain42@pidgin.im>
parents:
27281
diff
changeset
|
161 | if (groups) { |
|
791c6a965694
Debug output when changing group memberships.
Paul Aurich <darkrain42@pidgin.im>
parents:
27281
diff
changeset
|
162 | char *tmp = roster_groups_join(groups); |
|
791c6a965694
Debug output when changing group memberships.
Paul Aurich <darkrain42@pidgin.im>
parents:
27281
diff
changeset
|
163 | purple_debug_info("jabber", "jabber_roster_parse(): Adding %s to " |
|
791c6a965694
Debug output when changing group memberships.
Paul Aurich <darkrain42@pidgin.im>
parents:
27281
diff
changeset
|
164 | "groups: %s\n", jid, tmp); |
|
791c6a965694
Debug output when changing group memberships.
Paul Aurich <darkrain42@pidgin.im>
parents:
27281
diff
changeset
|
165 | g_free(tmp); |
|
791c6a965694
Debug output when changing group memberships.
Paul Aurich <darkrain42@pidgin.im>
parents:
27281
diff
changeset
|
166 | } |
|
791c6a965694
Debug output when changing group memberships.
Paul Aurich <darkrain42@pidgin.im>
parents:
27281
diff
changeset
|
167 | |
|
27277
8a2ecbdd70e4
Various roster cleanups. Refs #7008.
Paul Aurich <darkrain42@pidgin.im>
parents:
27276
diff
changeset
|
168 | while(groups) { |
|
34728
8efd73063ecf
Renamed buddy list functions to more appropriate/simler names.
Ankit Vani <a@nevitus.org>
parents:
34717
diff
changeset
|
169 | PurpleGroup *g = purple_blist_find_group(groups->data); |
|
28758
6fb73f2ab8e2
jabber: Remove the roster pool stuff.
Paul Aurich <darkrain42@pidgin.im>
parents:
28622
diff
changeset
|
170 | PurpleBuddy *b = purple_buddy_new(account, jid, alias); |
| 7014 | 171 | |
| 172 | if(!g) { | |
|
27277
8a2ecbdd70e4
Various roster cleanups. Refs #7008.
Paul Aurich <darkrain42@pidgin.im>
parents:
27276
diff
changeset
|
173 | g = purple_group_new(groups->data); |
| 15884 | 174 | purple_blist_add_group(g, NULL); |
| 7014 | 175 | } |
| 176 | ||
| 15884 | 177 | purple_blist_add_buddy(b, NULL, g, NULL); |
|
34728
8efd73063ecf
Renamed buddy list functions to more appropriate/simler names.
Ankit Vani <a@nevitus.org>
parents:
34717
diff
changeset
|
178 | purple_buddy_set_local_alias(b, alias); |
|
13987
b5b1db6007b0
[gaim-migrate @ 16442]
Mark Doliner <markdoliner@pidgin.im>
parents:
13809
diff
changeset
|
179 | |
|
27277
8a2ecbdd70e4
Various roster cleanups. Refs #7008.
Paul Aurich <darkrain42@pidgin.im>
parents:
27276
diff
changeset
|
180 | g_free(groups->data); |
|
8a2ecbdd70e4
Various roster cleanups. Refs #7008.
Paul Aurich <darkrain42@pidgin.im>
parents:
27276
diff
changeset
|
181 | groups = g_slist_delete_link(groups, groups); |
| 7014 | 182 | } |
| 183 | } | |
| 184 | ||
|
25817
09d6a40a341d
Pass IQ handlers type, from, id, and the child node
Paul Aurich <darkrain42@pidgin.im>
parents:
24672
diff
changeset
|
185 | void jabber_roster_parse(JabberStream *js, const char *from, |
|
34935
686fa55b0deb
Replaced xmlnode with PurpleXmlNode, and xmlnode_* API with purple_xmlnode_* API
Ankit Vani <a@nevitus.org>
parents:
34864
diff
changeset
|
186 | JabberIqType type, const char *id, PurpleXmlNode *query) |
| 7014 | 187 | { |
|
34935
686fa55b0deb
Replaced xmlnode with PurpleXmlNode, and xmlnode_* API with purple_xmlnode_* API
Ankit Vani <a@nevitus.org>
parents:
34864
diff
changeset
|
188 | PurpleXmlNode *item, *group; |
| 7445 | 189 | |
|
27275
a7836fbdcfa2
Use jabber_is_own_account and perform way fewer normalizations per iteration
Paul Aurich <darkrain42@pidgin.im>
parents:
27242
diff
changeset
|
190 | if (!jabber_is_own_account(js, from)) { |
|
a7836fbdcfa2
Use jabber_is_own_account and perform way fewer normalizations per iteration
Paul Aurich <darkrain42@pidgin.im>
parents:
27242
diff
changeset
|
191 | purple_debug_warning("jabber", "Received bogon roster push from %s\n", |
|
a7836fbdcfa2
Use jabber_is_own_account and perform way fewer normalizations per iteration
Paul Aurich <darkrain42@pidgin.im>
parents:
27242
diff
changeset
|
192 | from); |
|
a7836fbdcfa2
Use jabber_is_own_account and perform way fewer normalizations per iteration
Paul Aurich <darkrain42@pidgin.im>
parents:
27242
diff
changeset
|
193 | return; |
| 7175 | 194 | } |
| 195 | ||
|
23975
8ee397f04ca9
We talked about this and decided it was probably cleaner to not use
Mark Doliner <markdoliner@pidgin.im>
parents:
23961
diff
changeset
|
196 | js->currently_parsing_roster_push = TRUE; |
|
23961
0a9e9676f7b5
Hopefully fix the XMPP contact flipping/swapping between groups bug
Mark Doliner <markdoliner@pidgin.im>
parents:
23566
diff
changeset
|
197 | |
|
34935
686fa55b0deb
Replaced xmlnode with PurpleXmlNode, and xmlnode_* API with purple_xmlnode_* API
Ankit Vani <a@nevitus.org>
parents:
34864
diff
changeset
|
198 | for(item = purple_xmlnode_get_child(query, "item"); item; item = purple_xmlnode_get_next_twin(item)) |
| 7014 | 199 | { |
| 200 | const char *jid, *name, *subscription, *ask; | |
| 201 | JabberBuddy *jb; | |
| 202 | ||
|
34935
686fa55b0deb
Replaced xmlnode with PurpleXmlNode, and xmlnode_* API with purple_xmlnode_* API
Ankit Vani <a@nevitus.org>
parents:
34864
diff
changeset
|
203 | subscription = purple_xmlnode_get_attrib(item, "subscription"); |
|
686fa55b0deb
Replaced xmlnode with PurpleXmlNode, and xmlnode_* API with purple_xmlnode_* API
Ankit Vani <a@nevitus.org>
parents:
34864
diff
changeset
|
204 | jid = purple_xmlnode_get_attrib(item, "jid"); |
|
686fa55b0deb
Replaced xmlnode with PurpleXmlNode, and xmlnode_* API with purple_xmlnode_* API
Ankit Vani <a@nevitus.org>
parents:
34864
diff
changeset
|
205 | name = purple_xmlnode_get_attrib(item, "name"); |
|
686fa55b0deb
Replaced xmlnode with PurpleXmlNode, and xmlnode_* API with purple_xmlnode_* API
Ankit Vani <a@nevitus.org>
parents:
34864
diff
changeset
|
206 | ask = purple_xmlnode_get_attrib(item, "ask"); |
| 7014 | 207 | |
| 8347 | 208 | if(!jid) |
| 209 | continue; | |
| 210 | ||
| 211 | if(!(jb = jabber_buddy_find(js, jid, TRUE))) | |
| 212 | continue; | |
| 7014 | 213 | |
| 10289 | 214 | if(subscription) { |
|
38256
035f00c4fd87
Replace misused g_str_equal() with purple_strequal()
qarkai <qarkai@gmail.com>
parents:
38091
diff
changeset
|
215 | if (purple_strequal(subscription, "remove")) |
|
29114
b3876f83a46c
jabber: Fix removing a self-contact.
Paul Aurich <darkrain42@pidgin.im>
parents:
29103
diff
changeset
|
216 | jb->subscription = JABBER_SUB_REMOVE; |
|
b3876f83a46c
jabber: Fix removing a self-contact.
Paul Aurich <darkrain42@pidgin.im>
parents:
29103
diff
changeset
|
217 | else if (jb == js->user_jb) |
| 12285 | 218 | jb->subscription = JABBER_SUB_BOTH; |
|
38256
035f00c4fd87
Replace misused g_str_equal() with purple_strequal()
qarkai <qarkai@gmail.com>
parents:
38091
diff
changeset
|
219 | else if (purple_strequal(subscription, "none")) |
| 12285 | 220 | jb->subscription = JABBER_SUB_NONE; |
|
38256
035f00c4fd87
Replace misused g_str_equal() with purple_strequal()
qarkai <qarkai@gmail.com>
parents:
38091
diff
changeset
|
221 | else if (purple_strequal(subscription, "to")) |
| 10289 | 222 | jb->subscription = JABBER_SUB_TO; |
|
38256
035f00c4fd87
Replace misused g_str_equal() with purple_strequal()
qarkai <qarkai@gmail.com>
parents:
38091
diff
changeset
|
223 | else if (purple_strequal(subscription, "from")) |
| 10289 | 224 | jb->subscription = JABBER_SUB_FROM; |
|
38256
035f00c4fd87
Replace misused g_str_equal() with purple_strequal()
qarkai <qarkai@gmail.com>
parents:
38091
diff
changeset
|
225 | else if (purple_strequal(subscription, "both")) |
| 10289 | 226 | jb->subscription = JABBER_SUB_BOTH; |
| 227 | } | |
| 7014 | 228 | |
|
27276
d3c4ec6e0b2f
Remove this; it's been commented out for about 3.5 years.
Paul Aurich <darkrain42@pidgin.im>
parents:
27275
diff
changeset
|
229 | if(purple_strequal(ask, "subscribe")) |
| 7014 | 230 | jb->subscription |= JABBER_SUB_PENDING; |
| 231 | else | |
| 232 | jb->subscription &= ~JABBER_SUB_PENDING; | |
| 233 | ||
|
28622
5d971bd4b001
jabber: Fix removing a buddy with a pending subscription.
Paul Aurich <darkrain42@pidgin.im>
parents:
28584
diff
changeset
|
234 | if(jb->subscription & JABBER_SUB_REMOVE) { |
| 15884 | 235 | remove_purple_buddies(js, jid); |
| 7014 | 236 | } else { |
| 237 | GSList *groups = NULL; | |
|
20221
28e31ee832cd
applied changes from e56db1b8a7bb8729e30fb3bf99a94ff7887fe4ec
Luke Schierer <lschiere@pidgin.im>
parents:
19859
diff
changeset
|
238 | |
|
34935
686fa55b0deb
Replaced xmlnode with PurpleXmlNode, and xmlnode_* API with purple_xmlnode_* API
Ankit Vani <a@nevitus.org>
parents:
34864
diff
changeset
|
239 | for(group = purple_xmlnode_get_child(item, "group"); group; group = purple_xmlnode_get_next_twin(group)) { |
|
686fa55b0deb
Replaced xmlnode with PurpleXmlNode, and xmlnode_* API with purple_xmlnode_* API
Ankit Vani <a@nevitus.org>
parents:
34864
diff
changeset
|
240 | char *group_name = purple_xmlnode_get_data(group); |
| 13809 | 241 | |
|
31794
9725839f5a19
jabber: Treat empty <group/> elements as "Buddies", not ""
Paul Aurich <darkrain42@pidgin.im>
parents:
30744
diff
changeset
|
242 | if (group_name == NULL || *group_name == '\0') |
|
9725839f5a19
jabber: Treat empty <group/> elements as "Buddies", not ""
Paul Aurich <darkrain42@pidgin.im>
parents:
30744
diff
changeset
|
243 | /* Changing this string? Look in add_purple_buddy_to_groups */ |
|
36009
4db2936dd842
Backport 407e0fa6f7d1: don't split contacts on default group (xmpp)
Tomasz Wasilczyk <twasilczyk@pidgin.im>
parents:
31794
diff
changeset
|
244 | group_name = g_strdup(JABBER_ROSTER_DEFAULT_GROUP); |
|
27277
8a2ecbdd70e4
Various roster cleanups. Refs #7008.
Paul Aurich <darkrain42@pidgin.im>
parents:
27276
diff
changeset
|
245 | |
|
29373
481ec7d852d7
jabber: Fix another corner case that introduced duplicates to the list.
Paul Aurich <darkrain42@pidgin.im>
parents:
29358
diff
changeset
|
246 | /* |
|
481ec7d852d7
jabber: Fix another corner case that introduced duplicates to the list.
Paul Aurich <darkrain42@pidgin.im>
parents:
29358
diff
changeset
|
247 | * See the note in add_purple_buddy_to_groups; the core handles |
|
481ec7d852d7
jabber: Fix another corner case that introduced duplicates to the list.
Paul Aurich <darkrain42@pidgin.im>
parents:
29358
diff
changeset
|
248 | * names case-insensitively and this is required to not |
|
481ec7d852d7
jabber: Fix another corner case that introduced duplicates to the list.
Paul Aurich <darkrain42@pidgin.im>
parents:
29358
diff
changeset
|
249 | * end up with duplicates if a buddy is in, e.g., |
|
481ec7d852d7
jabber: Fix another corner case that introduced duplicates to the list.
Paul Aurich <darkrain42@pidgin.im>
parents:
29358
diff
changeset
|
250 | * 'XMPP' and 'xmpp' |
|
481ec7d852d7
jabber: Fix another corner case that introduced duplicates to the list.
Paul Aurich <darkrain42@pidgin.im>
parents:
29358
diff
changeset
|
251 | */ |
|
481ec7d852d7
jabber: Fix another corner case that introduced duplicates to the list.
Paul Aurich <darkrain42@pidgin.im>
parents:
29358
diff
changeset
|
252 | if (g_slist_find_custom(groups, group_name, (GCompareFunc)purple_utf8_strcasecmp)) |
|
481ec7d852d7
jabber: Fix another corner case that introduced duplicates to the list.
Paul Aurich <darkrain42@pidgin.im>
parents:
29358
diff
changeset
|
253 | g_free(group_name); |
|
481ec7d852d7
jabber: Fix another corner case that introduced duplicates to the list.
Paul Aurich <darkrain42@pidgin.im>
parents:
29358
diff
changeset
|
254 | else |
|
481ec7d852d7
jabber: Fix another corner case that introduced duplicates to the list.
Paul Aurich <darkrain42@pidgin.im>
parents:
29358
diff
changeset
|
255 | groups = g_slist_prepend(groups, group_name); |
| 7014 | 256 | } |
|
27277
8a2ecbdd70e4
Various roster cleanups. Refs #7008.
Paul Aurich <darkrain42@pidgin.im>
parents:
27276
diff
changeset
|
257 | |
|
28071
a0706162fefd
jabber: Store the "own JabberBuddy" in the JabberStream* struct.
Paul Aurich <darkrain42@pidgin.im>
parents:
27743
diff
changeset
|
258 | add_purple_buddy_to_groups(js, jid, name, groups); |
|
a0706162fefd
jabber: Store the "own JabberBuddy" in the JabberStream* struct.
Paul Aurich <darkrain42@pidgin.im>
parents:
27743
diff
changeset
|
259 | if (jb == js->user_jb) |
|
a0706162fefd
jabber: Store the "own JabberBuddy" in the JabberStream* struct.
Paul Aurich <darkrain42@pidgin.im>
parents:
27743
diff
changeset
|
260 | jabber_presence_fake_to_self(js, NULL); |
| 7014 | 261 | } |
| 262 | } | |
|
18196
a7992a42dc3d
fix inital presence (fixes #1395)
Nathan Walp <nwalp@pidgin.im>
parents:
15884
diff
changeset
|
263 | |
|
29358
27de2111e8a1
jabber: Send the RFC-mandated ack IQ
Paul Aurich <darkrain42@pidgin.im>
parents:
29185
diff
changeset
|
264 | if (type == JABBER_IQ_SET) { |
|
27de2111e8a1
jabber: Send the RFC-mandated ack IQ
Paul Aurich <darkrain42@pidgin.im>
parents:
29185
diff
changeset
|
265 | JabberIq *ack = jabber_iq_new(js, JABBER_IQ_RESULT); |
|
27de2111e8a1
jabber: Send the RFC-mandated ack IQ
Paul Aurich <darkrain42@pidgin.im>
parents:
29185
diff
changeset
|
266 | jabber_iq_set_id(ack, id); |
|
27de2111e8a1
jabber: Send the RFC-mandated ack IQ
Paul Aurich <darkrain42@pidgin.im>
parents:
29185
diff
changeset
|
267 | jabber_iq_send(ack); |
|
27de2111e8a1
jabber: Send the RFC-mandated ack IQ
Paul Aurich <darkrain42@pidgin.im>
parents:
29185
diff
changeset
|
268 | } |
|
27de2111e8a1
jabber: Send the RFC-mandated ack IQ
Paul Aurich <darkrain42@pidgin.im>
parents:
29185
diff
changeset
|
269 | |
|
29096
362b96f6f3da
jabber: Roster Versioning support.
Paul Aurich <darkrain42@pidgin.im>
parents:
28758
diff
changeset
|
270 | js->currently_parsing_roster_push = FALSE; |
| 7014 | 271 | } |
| 272 | ||
|
27283
9a69f682a3ca
Operate on the passed-in GSList.
Paul Aurich <darkrain42@pidgin.im>
parents:
27282
diff
changeset
|
273 | /* jabber_roster_update frees the GSList* passed in */ |
| 7014 | 274 | static void jabber_roster_update(JabberStream *js, const char *name, |
|
27283
9a69f682a3ca
Operate on the passed-in GSList.
Paul Aurich <darkrain42@pidgin.im>
parents:
27282
diff
changeset
|
275 | GSList *groups) |
| 7014 | 276 | { |
| 15884 | 277 | PurpleBuddy *b; |
| 278 | PurpleGroup *g; | |
|
27283
9a69f682a3ca
Operate on the passed-in GSList.
Paul Aurich <darkrain42@pidgin.im>
parents:
27282
diff
changeset
|
279 | GSList *l; |
| 7014 | 280 | JabberIq *iq; |
|
34935
686fa55b0deb
Replaced xmlnode with PurpleXmlNode, and xmlnode_* API with purple_xmlnode_* API
Ankit Vani <a@nevitus.org>
parents:
34864
diff
changeset
|
281 | PurpleXmlNode *query, *item, *group; |
|
24950
143f594f0cd0
Alias foo. I think blist.h structs are now completely hidden.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
24398
diff
changeset
|
282 | const char *balias; |
| 7014 | 283 | |
|
23975
8ee397f04ca9
We talked about this and decided it was probably cleaner to not use
Mark Doliner <markdoliner@pidgin.im>
parents:
23961
diff
changeset
|
284 | if (js->currently_parsing_roster_push) |
|
23961
0a9e9676f7b5
Hopefully fix the XMPP contact flipping/swapping between groups bug
Mark Doliner <markdoliner@pidgin.im>
parents:
23566
diff
changeset
|
285 | return; |
|
0a9e9676f7b5
Hopefully fix the XMPP contact flipping/swapping between groups bug
Mark Doliner <markdoliner@pidgin.im>
parents:
23566
diff
changeset
|
286 | |
|
34728
8efd73063ecf
Renamed buddy list functions to more appropriate/simler names.
Ankit Vani <a@nevitus.org>
parents:
34717
diff
changeset
|
287 | if(!(b = purple_blist_find_buddy(purple_connection_get_account(js->gc), name))) |
|
20221
28e31ee832cd
applied changes from e56db1b8a7bb8729e30fb3bf99a94ff7887fe4ec
Luke Schierer <lschiere@pidgin.im>
parents:
19859
diff
changeset
|
288 | return; |
|
28e31ee832cd
applied changes from e56db1b8a7bb8729e30fb3bf99a94ff7887fe4ec
Luke Schierer <lschiere@pidgin.im>
parents:
19859
diff
changeset
|
289 | |
|
27283
9a69f682a3ca
Operate on the passed-in GSList.
Paul Aurich <darkrain42@pidgin.im>
parents:
27282
diff
changeset
|
290 | if (groups) { |
|
27282
791c6a965694
Debug output when changing group memberships.
Paul Aurich <darkrain42@pidgin.im>
parents:
27281
diff
changeset
|
291 | char *tmp = roster_groups_join(groups); |
|
27230
17f893b060d7
Add a few more roster debug messages and improve.
Paul Aurich <darkrain42@pidgin.im>
parents:
27229
diff
changeset
|
292 | |
|
27283
9a69f682a3ca
Operate on the passed-in GSList.
Paul Aurich <darkrain42@pidgin.im>
parents:
27282
diff
changeset
|
293 | purple_debug_info("jabber", "jabber_roster_update(%s): [Source: " |
|
9a69f682a3ca
Operate on the passed-in GSList.
Paul Aurich <darkrain42@pidgin.im>
parents:
27282
diff
changeset
|
294 | "groups]: groups: %s\n", name, tmp); |
|
27282
791c6a965694
Debug output when changing group memberships.
Paul Aurich <darkrain42@pidgin.im>
parents:
27281
diff
changeset
|
295 | g_free(tmp); |
| 7014 | 296 | } else { |
|
34728
8efd73063ecf
Renamed buddy list functions to more appropriate/simler names.
Ankit Vani <a@nevitus.org>
parents:
34717
diff
changeset
|
297 | GSList *buddies = purple_blist_find_buddies(purple_connection_get_account(js->gc), name); |
|
27282
791c6a965694
Debug output when changing group memberships.
Paul Aurich <darkrain42@pidgin.im>
parents:
27281
diff
changeset
|
298 | char *tmp; |
|
27230
17f893b060d7
Add a few more roster debug messages and improve.
Paul Aurich <darkrain42@pidgin.im>
parents:
27229
diff
changeset
|
299 | |
| 7014 | 300 | if(!buddies) |
| 301 | return; | |
| 302 | while(buddies) { | |
| 303 | b = buddies->data; | |
| 15884 | 304 | g = purple_buddy_get_group(b); |
|
36009
4db2936dd842
Backport 407e0fa6f7d1: don't split contacts on default group (xmpp)
Tomasz Wasilczyk <twasilczyk@pidgin.im>
parents:
31794
diff
changeset
|
305 | groups = g_slist_append(groups, |
|
4db2936dd842
Backport 407e0fa6f7d1: don't split contacts on default group (xmpp)
Tomasz Wasilczyk <twasilczyk@pidgin.im>
parents:
31794
diff
changeset
|
306 | (char *)jabber_roster_group_get_global_name(g)); |
|
40079
a37a1e349491
Replace g_[s]list_remove with g_[s]list_delete_link.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
40052
diff
changeset
|
307 | buddies = g_slist_delete_link(buddies, buddies); |
| 7014 | 308 | } |
|
27230
17f893b060d7
Add a few more roster debug messages and improve.
Paul Aurich <darkrain42@pidgin.im>
parents:
27229
diff
changeset
|
309 | |
|
27282
791c6a965694
Debug output when changing group memberships.
Paul Aurich <darkrain42@pidgin.im>
parents:
27281
diff
changeset
|
310 | tmp = roster_groups_join(groups); |
|
27230
17f893b060d7
Add a few more roster debug messages and improve.
Paul Aurich <darkrain42@pidgin.im>
parents:
27229
diff
changeset
|
311 | purple_debug_info("jabber", "jabber_roster_update(%s): [Source: local blist]: groups: %s\n", |
|
27282
791c6a965694
Debug output when changing group memberships.
Paul Aurich <darkrain42@pidgin.im>
parents:
27281
diff
changeset
|
312 | name, tmp); |
|
791c6a965694
Debug output when changing group memberships.
Paul Aurich <darkrain42@pidgin.im>
parents:
27281
diff
changeset
|
313 | g_free(tmp); |
| 7014 | 314 | } |
| 315 | ||
| 316 | iq = jabber_iq_new_query(js, JABBER_IQ_SET, "jabber:iq:roster"); | |
| 317 | ||
|
34935
686fa55b0deb
Replaced xmlnode with PurpleXmlNode, and xmlnode_* API with purple_xmlnode_* API
Ankit Vani <a@nevitus.org>
parents:
34864
diff
changeset
|
318 | query = purple_xmlnode_get_child(iq->node, "query"); |
|
686fa55b0deb
Replaced xmlnode with PurpleXmlNode, and xmlnode_* API with purple_xmlnode_* API
Ankit Vani <a@nevitus.org>
parents:
34864
diff
changeset
|
319 | item = purple_xmlnode_new_child(query, "item"); |
| 7014 | 320 | |
|
34935
686fa55b0deb
Replaced xmlnode with PurpleXmlNode, and xmlnode_* API with purple_xmlnode_* API
Ankit Vani <a@nevitus.org>
parents:
34864
diff
changeset
|
321 | purple_xmlnode_set_attrib(item, "jid", name); |
| 7014 | 322 | |
|
34717
b3e588adef5a
Global replace purple_buddy_get_local_buddy_alias() with purple_buddy_get_local_alias()
Ankit Vani <a@nevitus.org>
parents:
34699
diff
changeset
|
323 | balias = purple_buddy_get_local_alias(b); |
|
34935
686fa55b0deb
Replaced xmlnode with PurpleXmlNode, and xmlnode_* API with purple_xmlnode_* API
Ankit Vani <a@nevitus.org>
parents:
34864
diff
changeset
|
324 | purple_xmlnode_set_attrib(item, "name", balias ? balias : ""); |
| 7014 | 325 | |
| 326 | for(l = groups; l; l = l->next) { | |
|
34935
686fa55b0deb
Replaced xmlnode with PurpleXmlNode, and xmlnode_* API with purple_xmlnode_* API
Ankit Vani <a@nevitus.org>
parents:
34864
diff
changeset
|
327 | group = purple_xmlnode_new_child(item, "group"); |
|
686fa55b0deb
Replaced xmlnode with PurpleXmlNode, and xmlnode_* API with purple_xmlnode_* API
Ankit Vani <a@nevitus.org>
parents:
34864
diff
changeset
|
328 | purple_xmlnode_insert_data(group, l->data, -1); |
| 7014 | 329 | } |
| 330 | ||
|
27283
9a69f682a3ca
Operate on the passed-in GSList.
Paul Aurich <darkrain42@pidgin.im>
parents:
27282
diff
changeset
|
331 | g_slist_free(groups); |
|
26042
4dabdb5fe213
Remove some extra trailing whitespace I noticed after merging mlundblad's
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
24983
diff
changeset
|
332 | |
| 7014 | 333 | jabber_iq_send(iq); |
| 334 | } | |
| 335 | ||
|
40708
53a26c29d26c
Move the PurpleProtocolServer interface to its own file.
Gary Kramlich <grim@reaperworld.com>
parents:
40474
diff
changeset
|
336 | void |
|
53a26c29d26c
Move the PurpleProtocolServer interface to its own file.
Gary Kramlich <grim@reaperworld.com>
parents:
40474
diff
changeset
|
337 | jabber_roster_add_buddy(PurpleProtocolServer *protocol_server, |
|
53a26c29d26c
Move the PurpleProtocolServer interface to its own file.
Gary Kramlich <grim@reaperworld.com>
parents:
40474
diff
changeset
|
338 | PurpleConnection *gc, PurpleBuddy *buddy, |
|
53a26c29d26c
Move the PurpleProtocolServer interface to its own file.
Gary Kramlich <grim@reaperworld.com>
parents:
40474
diff
changeset
|
339 | PurpleGroup *group, const gchar *message) |
| 7014 | 340 | { |
|
32277
97f16af01a05
Convert jabber prpl to use accessor functions purple_connection_get_protocol_data() and purple_connection_set_protocol_data().
Andrew Victor <andrew.victor@mxit.com>
parents:
31794
diff
changeset
|
341 | JabberStream *js = purple_connection_get_protocol_data(gc); |
| 7014 | 342 | char *who; |
|
28431
8450418b5abd
jabber: Properly handle adding buddies that contain a resource. Closes #10151.
Paul Aurich <darkrain42@pidgin.im>
parents:
28322
diff
changeset
|
343 | JabberID *jid; |
| 7014 | 344 | JabberBuddy *jb; |
| 7488 | 345 | JabberBuddyResource *jbr; |
|
24398
4865c2ee6ea8
Start hiding blist.h internals in prpls.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
24199
diff
changeset
|
346 | const char *name; |
| 7014 | 347 | |
|
27278
b34a1cea4872
Use js->state to track whether the roster has been retrieved.
Paul Aurich <darkrain42@pidgin.im>
parents:
27277
diff
changeset
|
348 | /* If we haven't received the roster yet, ignore any adds */ |
|
b34a1cea4872
Use js->state to track whether the roster has been retrieved.
Paul Aurich <darkrain42@pidgin.im>
parents:
27277
diff
changeset
|
349 | if (js->state != JABBER_STREAM_CONNECTED) |
| 7014 | 350 | return; |
| 351 | ||
|
24398
4865c2ee6ea8
Start hiding blist.h internals in prpls.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
24199
diff
changeset
|
352 | name = purple_buddy_get_name(buddy); |
|
28431
8450418b5abd
jabber: Properly handle adding buddies that contain a resource. Closes #10151.
Paul Aurich <darkrain42@pidgin.im>
parents:
28322
diff
changeset
|
353 | jid = jabber_id_new(name); |
|
8450418b5abd
jabber: Properly handle adding buddies that contain a resource. Closes #10151.
Paul Aurich <darkrain42@pidgin.im>
parents:
28322
diff
changeset
|
354 | if (jid == NULL) { |
|
8450418b5abd
jabber: Properly handle adding buddies that contain a resource. Closes #10151.
Paul Aurich <darkrain42@pidgin.im>
parents:
28322
diff
changeset
|
355 | /* TODO: Remove the buddy from the list? */ |
| 7425 | 356 | return; |
|
28431
8450418b5abd
jabber: Properly handle adding buddies that contain a resource. Closes #10151.
Paul Aurich <darkrain42@pidgin.im>
parents:
28322
diff
changeset
|
357 | } |
| 7014 | 358 | |
|
34670
9bd5bd903dc7
Renamed chat buddies to chat users, and IM conversation typing state to IM typing state.
Ankit Vani <a@nevitus.org>
parents:
32678
diff
changeset
|
359 | /* Adding a chat room or a chat user to the roster is *not* supported. */ |
|
28584
1226297d1ba9
jabber: Don't crash when adding a buddy without a node (no '@'). Closes #10261.
Paul Aurich <darkrain42@pidgin.im>
parents:
28431
diff
changeset
|
360 | if (jid->node && jabber_chat_find(js, jid->node, jid->domain) != NULL) { |
|
28431
8450418b5abd
jabber: Properly handle adding buddies that contain a resource. Closes #10151.
Paul Aurich <darkrain42@pidgin.im>
parents:
28322
diff
changeset
|
361 | /* |
|
8450418b5abd
jabber: Properly handle adding buddies that contain a resource. Closes #10151.
Paul Aurich <darkrain42@pidgin.im>
parents:
28322
diff
changeset
|
362 | * This is the same thing Bonjour does. If it causes problems, move |
|
8450418b5abd
jabber: Properly handle adding buddies that contain a resource. Closes #10151.
Paul Aurich <darkrain42@pidgin.im>
parents:
28322
diff
changeset
|
363 | * it to an idle callback. |
|
8450418b5abd
jabber: Properly handle adding buddies that contain a resource. Closes #10151.
Paul Aurich <darkrain42@pidgin.im>
parents:
28322
diff
changeset
|
364 | */ |
|
8450418b5abd
jabber: Properly handle adding buddies that contain a resource. Closes #10151.
Paul Aurich <darkrain42@pidgin.im>
parents:
28322
diff
changeset
|
365 | purple_debug_warning("jabber", "Cowardly refusing to add a MUC user " |
|
8450418b5abd
jabber: Properly handle adding buddies that contain a resource. Closes #10151.
Paul Aurich <darkrain42@pidgin.im>
parents:
28322
diff
changeset
|
366 | "to your buddy list and removing the buddy. " |
|
8450418b5abd
jabber: Properly handle adding buddies that contain a resource. Closes #10151.
Paul Aurich <darkrain42@pidgin.im>
parents:
28322
diff
changeset
|
367 | "Buddies can only be added by real (non-MUC) " |
|
8450418b5abd
jabber: Properly handle adding buddies that contain a resource. Closes #10151.
Paul Aurich <darkrain42@pidgin.im>
parents:
28322
diff
changeset
|
368 | "JID\n"); |
|
8450418b5abd
jabber: Properly handle adding buddies that contain a resource. Closes #10151.
Paul Aurich <darkrain42@pidgin.im>
parents:
28322
diff
changeset
|
369 | purple_blist_remove_buddy(buddy); |
|
8450418b5abd
jabber: Properly handle adding buddies that contain a resource. Closes #10151.
Paul Aurich <darkrain42@pidgin.im>
parents:
28322
diff
changeset
|
370 | jabber_id_free(jid); |
|
8450418b5abd
jabber: Properly handle adding buddies that contain a resource. Closes #10151.
Paul Aurich <darkrain42@pidgin.im>
parents:
28322
diff
changeset
|
371 | return; |
|
8450418b5abd
jabber: Properly handle adding buddies that contain a resource. Closes #10151.
Paul Aurich <darkrain42@pidgin.im>
parents:
28322
diff
changeset
|
372 | } |
| 7425 | 373 | |
|
28431
8450418b5abd
jabber: Properly handle adding buddies that contain a resource. Closes #10151.
Paul Aurich <darkrain42@pidgin.im>
parents:
28322
diff
changeset
|
374 | who = jabber_id_get_bare_jid(jid); |
|
8450418b5abd
jabber: Properly handle adding buddies that contain a resource. Closes #10151.
Paul Aurich <darkrain42@pidgin.im>
parents:
28322
diff
changeset
|
375 | if (jid->resource != NULL) { |
|
8450418b5abd
jabber: Properly handle adding buddies that contain a resource. Closes #10151.
Paul Aurich <darkrain42@pidgin.im>
parents:
28322
diff
changeset
|
376 | /* |
|
8450418b5abd
jabber: Properly handle adding buddies that contain a resource. Closes #10151.
Paul Aurich <darkrain42@pidgin.im>
parents:
28322
diff
changeset
|
377 | * If the buddy name added contains a resource, strip that off and |
|
8450418b5abd
jabber: Properly handle adding buddies that contain a resource. Closes #10151.
Paul Aurich <darkrain42@pidgin.im>
parents:
28322
diff
changeset
|
378 | * rename the buddy. |
|
8450418b5abd
jabber: Properly handle adding buddies that contain a resource. Closes #10151.
Paul Aurich <darkrain42@pidgin.im>
parents:
28322
diff
changeset
|
379 | */ |
|
34728
8efd73063ecf
Renamed buddy list functions to more appropriate/simler names.
Ankit Vani <a@nevitus.org>
parents:
34717
diff
changeset
|
380 | purple_buddy_set_name(buddy, who); |
|
28431
8450418b5abd
jabber: Properly handle adding buddies that contain a resource. Closes #10151.
Paul Aurich <darkrain42@pidgin.im>
parents:
28322
diff
changeset
|
381 | } |
|
8450418b5abd
jabber: Properly handle adding buddies that contain a resource. Closes #10151.
Paul Aurich <darkrain42@pidgin.im>
parents:
28322
diff
changeset
|
382 | |
|
8450418b5abd
jabber: Properly handle adding buddies that contain a resource. Closes #10151.
Paul Aurich <darkrain42@pidgin.im>
parents:
28322
diff
changeset
|
383 | jb = jabber_buddy_find(js, who, FALSE); |
|
8450418b5abd
jabber: Properly handle adding buddies that contain a resource. Closes #10151.
Paul Aurich <darkrain42@pidgin.im>
parents:
28322
diff
changeset
|
384 | |
|
8450418b5abd
jabber: Properly handle adding buddies that contain a resource. Closes #10151.
Paul Aurich <darkrain42@pidgin.im>
parents:
28322
diff
changeset
|
385 | purple_debug_info("jabber", "jabber_roster_add_buddy(): Adding %s\n", who); |
|
27230
17f893b060d7
Add a few more roster debug messages and improve.
Paul Aurich <darkrain42@pidgin.im>
parents:
27229
diff
changeset
|
386 | |
|
23566
fabe91dee1e1
Alright, I'm getting rid of this "groups" thing for the reason listed
Mark Doliner <markdoliner@pidgin.im>
parents:
22993
diff
changeset
|
387 | jabber_roster_update(js, who, NULL); |
| 7014 | 388 | |
|
28071
a0706162fefd
jabber: Store the "own JabberBuddy" in the JabberStream* struct.
Paul Aurich <darkrain42@pidgin.im>
parents:
27743
diff
changeset
|
389 | if (jb == js->user_jb) { |
|
27280
55a39efcf7b8
Simplify the fake_to_self function.
Paul Aurich <darkrain42@pidgin.im>
parents:
27278
diff
changeset
|
390 | jabber_presence_fake_to_self(js, NULL); |
| 9954 | 391 | } else if(!jb || !(jb->subscription & JABBER_SUB_TO)) { |
| 7014 | 392 | jabber_presence_subscription_set(js, who, "subscribe"); |
| 9954 | 393 | } else if((jbr =jabber_buddy_find_resource(jb, NULL))) { |
|
36545
23b59a16c808
Replaced some _prpl_ stuff with _protocol_
Ankit Vani <a@nevitus.org>
parents:
34864
diff
changeset
|
394 | purple_protocol_got_user_status(purple_connection_get_account(gc), who, |
| 9954 | 395 | jabber_buddy_state_get_status_id(jbr->state), |
| 9990 | 396 | "priority", jbr->priority, jbr->status ? "message" : NULL, jbr->status, NULL); |
| 9954 | 397 | } |
| 7425 | 398 | |
| 7014 | 399 | g_free(who); |
| 400 | } | |
| 401 | ||
|
40708
53a26c29d26c
Move the PurpleProtocolServer interface to its own file.
Gary Kramlich <grim@reaperworld.com>
parents:
40474
diff
changeset
|
402 | void |
|
53a26c29d26c
Move the PurpleProtocolServer interface to its own file.
Gary Kramlich <grim@reaperworld.com>
parents:
40474
diff
changeset
|
403 | jabber_roster_alias_change(PurpleProtocolServer *protocol_server, |
|
53a26c29d26c
Move the PurpleProtocolServer interface to its own file.
Gary Kramlich <grim@reaperworld.com>
parents:
40474
diff
changeset
|
404 | PurpleConnection *gc, const gchar *name, |
|
53a26c29d26c
Move the PurpleProtocolServer interface to its own file.
Gary Kramlich <grim@reaperworld.com>
parents:
40474
diff
changeset
|
405 | const gchar *alias) |
| 7014 | 406 | { |
|
34728
8efd73063ecf
Renamed buddy list functions to more appropriate/simler names.
Ankit Vani <a@nevitus.org>
parents:
34717
diff
changeset
|
407 | PurpleBuddy *b = purple_blist_find_buddy(purple_connection_get_account(gc), name); |
| 7449 | 408 | |
| 15321 | 409 | if(b != NULL) { |
|
34728
8efd73063ecf
Renamed buddy list functions to more appropriate/simler names.
Ankit Vani <a@nevitus.org>
parents:
34717
diff
changeset
|
410 | purple_buddy_set_local_alias(b, alias); |
| 7449 | 411 | |
|
27230
17f893b060d7
Add a few more roster debug messages and improve.
Paul Aurich <darkrain42@pidgin.im>
parents:
27229
diff
changeset
|
412 | purple_debug_info("jabber", "jabber_roster_alias_change(): Aliased %s to %s\n", |
|
27242
05618d46ac91
Ladedah I dislike the need to explicitly check for NULL strings.
Paul Aurich <darkrain42@pidgin.im>
parents:
27230
diff
changeset
|
413 | name, alias ? alias : "(null)"); |
|
27229
3a0922120d87
Pluck Adium's roster debugging from 86720de21a854aa
Paul Aurich <darkrain42@pidgin.im>
parents:
26707
diff
changeset
|
414 | |
|
32277
97f16af01a05
Convert jabber prpl to use accessor functions purple_connection_get_protocol_data() and purple_connection_set_protocol_data().
Andrew Victor <andrew.victor@mxit.com>
parents:
31794
diff
changeset
|
415 | jabber_roster_update(purple_connection_get_protocol_data(gc), name, NULL); |
| 15321 | 416 | } |
| 7014 | 417 | } |
| 418 | ||
|
40708
53a26c29d26c
Move the PurpleProtocolServer interface to its own file.
Gary Kramlich <grim@reaperworld.com>
parents:
40474
diff
changeset
|
419 | void |
|
53a26c29d26c
Move the PurpleProtocolServer interface to its own file.
Gary Kramlich <grim@reaperworld.com>
parents:
40474
diff
changeset
|
420 | jabber_roster_group_change(PurpleProtocolServer *protocol_server, |
|
53a26c29d26c
Move the PurpleProtocolServer interface to its own file.
Gary Kramlich <grim@reaperworld.com>
parents:
40474
diff
changeset
|
421 | PurpleConnection *gc, const gchar *name, |
|
53a26c29d26c
Move the PurpleProtocolServer interface to its own file.
Gary Kramlich <grim@reaperworld.com>
parents:
40474
diff
changeset
|
422 | const gchar *old_group, const gchar *new_group) |
| 7014 | 423 | { |
| 424 | GSList *buddies, *groups = NULL; | |
| 425 | ||
|
38258
9a6551eba09c
Replace !strcmp() with purple_strequal()
qarkai <qarkai@gmail.com>
parents:
38257
diff
changeset
|
426 | if(!old_group || !new_group || purple_strequal(old_group, new_group)) |
| 7014 | 427 | return; |
| 428 | ||
|
34728
8efd73063ecf
Renamed buddy list functions to more appropriate/simler names.
Ankit Vani <a@nevitus.org>
parents:
34717
diff
changeset
|
429 | buddies = purple_blist_find_buddies(purple_connection_get_account(gc), name); |
| 7014 | 430 | while(buddies) { |
|
36022
256604cbbe34
Make it possible to move buddies out of default group
Tomasz Wasilczyk <twasilczyk@pidgin.im>
parents:
36013
diff
changeset
|
431 | groups = g_slist_append(groups, (char*)new_group); |
|
40079
a37a1e349491
Replace g_[s]list_remove with g_[s]list_delete_link.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
40052
diff
changeset
|
432 | buddies = g_slist_delete_link(buddies, buddies); |
| 7014 | 433 | } |
|
27229
3a0922120d87
Pluck Adium's roster debugging from 86720de21a854aa
Paul Aurich <darkrain42@pidgin.im>
parents:
26707
diff
changeset
|
434 | |
|
27230
17f893b060d7
Add a few more roster debug messages and improve.
Paul Aurich <darkrain42@pidgin.im>
parents:
27229
diff
changeset
|
435 | purple_debug_info("jabber", "jabber_roster_group_change(): Moving %s from %s to %s\n", |
|
17f893b060d7
Add a few more roster debug messages and improve.
Paul Aurich <darkrain42@pidgin.im>
parents:
27229
diff
changeset
|
436 | name, old_group, new_group); |
|
27229
3a0922120d87
Pluck Adium's roster debugging from 86720de21a854aa
Paul Aurich <darkrain42@pidgin.im>
parents:
26707
diff
changeset
|
437 | |
|
32277
97f16af01a05
Convert jabber prpl to use accessor functions purple_connection_get_protocol_data() and purple_connection_set_protocol_data().
Andrew Victor <andrew.victor@mxit.com>
parents:
31794
diff
changeset
|
438 | jabber_roster_update(purple_connection_get_protocol_data(gc), name, groups); |
| 7014 | 439 | } |
| 440 | ||
|
40708
53a26c29d26c
Move the PurpleProtocolServer interface to its own file.
Gary Kramlich <grim@reaperworld.com>
parents:
40474
diff
changeset
|
441 | void |
|
53a26c29d26c
Move the PurpleProtocolServer interface to its own file.
Gary Kramlich <grim@reaperworld.com>
parents:
40474
diff
changeset
|
442 | jabber_roster_group_rename(PurpleProtocolServer *protocol_server, |
|
53a26c29d26c
Move the PurpleProtocolServer interface to its own file.
Gary Kramlich <grim@reaperworld.com>
parents:
40474
diff
changeset
|
443 | PurpleConnection *gc, const gchar *old_name, |
|
53a26c29d26c
Move the PurpleProtocolServer interface to its own file.
Gary Kramlich <grim@reaperworld.com>
parents:
40474
diff
changeset
|
444 | PurpleGroup *group, GList *moved_buddies) |
| 7014 | 445 | { |
| 446 | GList *l; | |
|
36009
4db2936dd842
Backport 407e0fa6f7d1: don't split contacts on default group (xmpp)
Tomasz Wasilczyk <twasilczyk@pidgin.im>
parents:
31794
diff
changeset
|
447 | const char *gname = jabber_roster_group_get_global_name(group); |
|
40708
53a26c29d26c
Move the PurpleProtocolServer interface to its own file.
Gary Kramlich <grim@reaperworld.com>
parents:
40474
diff
changeset
|
448 | |
|
9285
9cedf5d26577
[gaim-migrate @ 10088]
Mark Doliner <markdoliner@pidgin.im>
parents:
8347
diff
changeset
|
449 | for(l = moved_buddies; l; l = l->next) { |
| 15884 | 450 | PurpleBuddy *buddy = l->data; |
|
40708
53a26c29d26c
Move the PurpleProtocolServer interface to its own file.
Gary Kramlich <grim@reaperworld.com>
parents:
40474
diff
changeset
|
451 | |
|
53a26c29d26c
Move the PurpleProtocolServer interface to its own file.
Gary Kramlich <grim@reaperworld.com>
parents:
40474
diff
changeset
|
452 | jabber_roster_group_change(protocol_server, gc, |
|
53a26c29d26c
Move the PurpleProtocolServer interface to its own file.
Gary Kramlich <grim@reaperworld.com>
parents:
40474
diff
changeset
|
453 | purple_buddy_get_name(buddy), old_name, |
|
53a26c29d26c
Move the PurpleProtocolServer interface to its own file.
Gary Kramlich <grim@reaperworld.com>
parents:
40474
diff
changeset
|
454 | gname); |
| 7014 | 455 | } |
| 456 | } | |
| 457 | ||
|
40708
53a26c29d26c
Move the PurpleProtocolServer interface to its own file.
Gary Kramlich <grim@reaperworld.com>
parents:
40474
diff
changeset
|
458 | void |
|
53a26c29d26c
Move the PurpleProtocolServer interface to its own file.
Gary Kramlich <grim@reaperworld.com>
parents:
40474
diff
changeset
|
459 | jabber_roster_remove_buddy(PurpleProtocolServer *protocol_server, |
|
53a26c29d26c
Move the PurpleProtocolServer interface to its own file.
Gary Kramlich <grim@reaperworld.com>
parents:
40474
diff
changeset
|
460 | PurpleConnection *gc, PurpleBuddy *buddy, |
|
53a26c29d26c
Move the PurpleProtocolServer interface to its own file.
Gary Kramlich <grim@reaperworld.com>
parents:
40474
diff
changeset
|
461 | PurpleGroup *group) |
|
53a26c29d26c
Move the PurpleProtocolServer interface to its own file.
Gary Kramlich <grim@reaperworld.com>
parents:
40474
diff
changeset
|
462 | { |
|
24398
4865c2ee6ea8
Start hiding blist.h internals in prpls.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
24199
diff
changeset
|
463 | const char *name = purple_buddy_get_name(buddy); |
|
34728
8efd73063ecf
Renamed buddy list functions to more appropriate/simler names.
Ankit Vani <a@nevitus.org>
parents:
34717
diff
changeset
|
464 | GSList *buddies = purple_blist_find_buddies(purple_connection_get_account(gc), name); |
| 7014 | 465 | |
|
9285
9cedf5d26577
[gaim-migrate @ 10088]
Mark Doliner <markdoliner@pidgin.im>
parents:
8347
diff
changeset
|
466 | buddies = g_slist_remove(buddies, buddy); |
|
15847
da522f9a7743
Don't use g_list_length() and g_slist_length() when all you want to
Mark Doliner <markdoliner@pidgin.im>
parents:
15695
diff
changeset
|
467 | if(buddies != NULL) { |
| 15884 | 468 | PurpleBuddy *tmpbuddy; |
| 469 | PurpleGroup *tmpgroup; | |
|
20225
684334efdc19
applied changes from d4b316d73ebaf93803ca2642e78b8821c3b5d5c7
Luke Schierer <lschiere@pidgin.im>
parents:
20221
diff
changeset
|
470 | GSList *groups = NULL; |
|
9285
9cedf5d26577
[gaim-migrate @ 10088]
Mark Doliner <markdoliner@pidgin.im>
parents:
8347
diff
changeset
|
471 | |
| 7014 | 472 | while(buddies) { |
|
9285
9cedf5d26577
[gaim-migrate @ 10088]
Mark Doliner <markdoliner@pidgin.im>
parents:
8347
diff
changeset
|
473 | tmpbuddy = buddies->data; |
| 15884 | 474 | tmpgroup = purple_buddy_get_group(tmpbuddy); |
|
36009
4db2936dd842
Backport 407e0fa6f7d1: don't split contacts on default group (xmpp)
Tomasz Wasilczyk <twasilczyk@pidgin.im>
parents:
31794
diff
changeset
|
475 | groups = g_slist_append(groups, |
|
4db2936dd842
Backport 407e0fa6f7d1: don't split contacts on default group (xmpp)
Tomasz Wasilczyk <twasilczyk@pidgin.im>
parents:
31794
diff
changeset
|
476 | (char *)jabber_roster_group_get_global_name(tmpgroup)); |
|
40079
a37a1e349491
Replace g_[s]list_remove with g_[s]list_delete_link.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
40052
diff
changeset
|
477 | buddies = g_slist_delete_link(buddies, buddies); |
| 7014 | 478 | } |
|
9285
9cedf5d26577
[gaim-migrate @ 10088]
Mark Doliner <markdoliner@pidgin.im>
parents:
8347
diff
changeset
|
479 | |
|
36009
4db2936dd842
Backport 407e0fa6f7d1: don't split contacts on default group (xmpp)
Tomasz Wasilczyk <twasilczyk@pidgin.im>
parents:
31794
diff
changeset
|
480 | purple_debug_info("jabber", "jabber_roster_remove_buddy(): " |
|
35960
407e0fa6f7d1
blist: don't localize roster group name to avoid contact splitting
Tomasz Wasilczyk <twasilczyk@pidgin.im>
parents:
35958
diff
changeset
|
481 | "Removing %s from %s", purple_buddy_get_name(buddy), |
|
36009
4db2936dd842
Backport 407e0fa6f7d1: don't split contacts on default group (xmpp)
Tomasz Wasilczyk <twasilczyk@pidgin.im>
parents:
31794
diff
changeset
|
482 | jabber_roster_group_get_global_name(group)); |
|
27229
3a0922120d87
Pluck Adium's roster debugging from 86720de21a854aa
Paul Aurich <darkrain42@pidgin.im>
parents:
26707
diff
changeset
|
483 | |
|
32277
97f16af01a05
Convert jabber prpl to use accessor functions purple_connection_get_protocol_data() and purple_connection_set_protocol_data().
Andrew Victor <andrew.victor@mxit.com>
parents:
31794
diff
changeset
|
484 | jabber_roster_update(purple_connection_get_protocol_data(gc), name, groups); |
| 7014 | 485 | } else { |
|
32277
97f16af01a05
Convert jabber prpl to use accessor functions purple_connection_get_protocol_data() and purple_connection_set_protocol_data().
Andrew Victor <andrew.victor@mxit.com>
parents:
31794
diff
changeset
|
486 | JabberIq *iq = jabber_iq_new_query(purple_connection_get_protocol_data(gc), JABBER_IQ_SET, |
| 7171 | 487 | "jabber:iq:roster"); |
|
34935
686fa55b0deb
Replaced xmlnode with PurpleXmlNode, and xmlnode_* API with purple_xmlnode_* API
Ankit Vani <a@nevitus.org>
parents:
34864
diff
changeset
|
488 | PurpleXmlNode *query = purple_xmlnode_get_child(iq->node, "query"); |
|
686fa55b0deb
Replaced xmlnode with PurpleXmlNode, and xmlnode_* API with purple_xmlnode_* API
Ankit Vani <a@nevitus.org>
parents:
34864
diff
changeset
|
489 | PurpleXmlNode *item = purple_xmlnode_new_child(query, "item"); |
| 7171 | 490 | |
|
34935
686fa55b0deb
Replaced xmlnode with PurpleXmlNode, and xmlnode_* API with purple_xmlnode_* API
Ankit Vani <a@nevitus.org>
parents:
34864
diff
changeset
|
491 | purple_xmlnode_set_attrib(item, "jid", name); |
|
686fa55b0deb
Replaced xmlnode with PurpleXmlNode, and xmlnode_* API with purple_xmlnode_* API
Ankit Vani <a@nevitus.org>
parents:
34864
diff
changeset
|
492 | purple_xmlnode_set_attrib(item, "subscription", "remove"); |
| 7171 | 493 | |
|
27230
17f893b060d7
Add a few more roster debug messages and improve.
Paul Aurich <darkrain42@pidgin.im>
parents:
27229
diff
changeset
|
494 | purple_debug_info("jabber", "jabber_roster_remove_buddy(): Removing %s\n", |
|
17f893b060d7
Add a few more roster debug messages and improve.
Paul Aurich <darkrain42@pidgin.im>
parents:
27229
diff
changeset
|
495 | purple_buddy_get_name(buddy)); |
|
17f893b060d7
Add a few more roster debug messages and improve.
Paul Aurich <darkrain42@pidgin.im>
parents:
27229
diff
changeset
|
496 | |
| 7171 | 497 | jabber_iq_send(iq); |
| 7014 | 498 | } |
| 499 | } | |
|
36009
4db2936dd842
Backport 407e0fa6f7d1: don't split contacts on default group (xmpp)
Tomasz Wasilczyk <twasilczyk@pidgin.im>
parents:
31794
diff
changeset
|
500 | |
|
4db2936dd842
Backport 407e0fa6f7d1: don't split contacts on default group (xmpp)
Tomasz Wasilczyk <twasilczyk@pidgin.im>
parents:
31794
diff
changeset
|
501 | const gchar * |
|
4db2936dd842
Backport 407e0fa6f7d1: don't split contacts on default group (xmpp)
Tomasz Wasilczyk <twasilczyk@pidgin.im>
parents:
31794
diff
changeset
|
502 | jabber_roster_group_get_global_name(PurpleGroup *group) |
|
4db2936dd842
Backport 407e0fa6f7d1: don't split contacts on default group (xmpp)
Tomasz Wasilczyk <twasilczyk@pidgin.im>
parents:
31794
diff
changeset
|
503 | { |
|
4db2936dd842
Backport 407e0fa6f7d1: don't split contacts on default group (xmpp)
Tomasz Wasilczyk <twasilczyk@pidgin.im>
parents:
31794
diff
changeset
|
504 | const gchar *name = NULL; |
|
4db2936dd842
Backport 407e0fa6f7d1: don't split contacts on default group (xmpp)
Tomasz Wasilczyk <twasilczyk@pidgin.im>
parents:
31794
diff
changeset
|
505 | |
|
4db2936dd842
Backport 407e0fa6f7d1: don't split contacts on default group (xmpp)
Tomasz Wasilczyk <twasilczyk@pidgin.im>
parents:
31794
diff
changeset
|
506 | if (group) |
|
4db2936dd842
Backport 407e0fa6f7d1: don't split contacts on default group (xmpp)
Tomasz Wasilczyk <twasilczyk@pidgin.im>
parents:
31794
diff
changeset
|
507 | name = purple_group_get_name(group); |
|
4db2936dd842
Backport 407e0fa6f7d1: don't split contacts on default group (xmpp)
Tomasz Wasilczyk <twasilczyk@pidgin.im>
parents:
31794
diff
changeset
|
508 | |
|
4db2936dd842
Backport 407e0fa6f7d1: don't split contacts on default group (xmpp)
Tomasz Wasilczyk <twasilczyk@pidgin.im>
parents:
31794
diff
changeset
|
509 | if (name == NULL) |
|
4db2936dd842
Backport 407e0fa6f7d1: don't split contacts on default group (xmpp)
Tomasz Wasilczyk <twasilczyk@pidgin.im>
parents:
31794
diff
changeset
|
510 | name = JABBER_ROSTER_DEFAULT_GROUP; |
| 38358 | 511 | else if (purple_strequal(name, PURPLE_BLIST_DEFAULT_GROUP_NAME)) |
|
36009
4db2936dd842
Backport 407e0fa6f7d1: don't split contacts on default group (xmpp)
Tomasz Wasilczyk <twasilczyk@pidgin.im>
parents:
31794
diff
changeset
|
512 | name = JABBER_ROSTER_DEFAULT_GROUP; |
| 38358 | 513 | else if (purple_strequal(name, _purple_blist_get_localized_default_group_name())) |
|
35961
87fd9126902a
blist: store localized name of default group to avoid contact splitting
Tomasz Wasilczyk <twasilczyk@pidgin.im>
parents:
35960
diff
changeset
|
514 | name = JABBER_ROSTER_DEFAULT_GROUP; |
|
36009
4db2936dd842
Backport 407e0fa6f7d1: don't split contacts on default group (xmpp)
Tomasz Wasilczyk <twasilczyk@pidgin.im>
parents:
31794
diff
changeset
|
515 | |
|
4db2936dd842
Backport 407e0fa6f7d1: don't split contacts on default group (xmpp)
Tomasz Wasilczyk <twasilczyk@pidgin.im>
parents:
31794
diff
changeset
|
516 | return name; |
|
4db2936dd842
Backport 407e0fa6f7d1: don't split contacts on default group (xmpp)
Tomasz Wasilczyk <twasilczyk@pidgin.im>
parents:
31794
diff
changeset
|
517 | } |