Sat, 14 Aug 2010 05:17:38 +0000
Fix some "Dead nested assignment"s and then kill off some useless
variables related to them.
| 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 | */ | |
| 23 | #include "internal.h" | |
| 24 | #include "debug.h" | |
| 25 | #include "server.h" | |
| 13809 | 26 | #include "util.h" |
| 7014 | 27 | |
| 28 | #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
|
29 | #include "chat.h" |
| 15265 | 30 | #include "google.h" |
| 7014 | 31 | #include "presence.h" |
| 32 | #include "roster.h" | |
| 33 | #include "iq.h" | |
| 34 | ||
| 35 | #include <string.h> | |
| 36 | ||
|
27282
791c6a965694
Debug output when changing group memberships.
Paul Aurich <darkrain42@pidgin.im>
parents:
27281
diff
changeset
|
37 | /* 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
|
38 | static gchar *roster_groups_join(GSList *list) |
|
791c6a965694
Debug output when changing group memberships.
Paul Aurich <darkrain42@pidgin.im>
parents:
27281
diff
changeset
|
39 | { |
|
791c6a965694
Debug output when changing group memberships.
Paul Aurich <darkrain42@pidgin.im>
parents:
27281
diff
changeset
|
40 | GString *out = g_string_new(NULL); |
|
791c6a965694
Debug output when changing group memberships.
Paul Aurich <darkrain42@pidgin.im>
parents:
27281
diff
changeset
|
41 | for ( ; list; list = list->next) { |
|
791c6a965694
Debug output when changing group memberships.
Paul Aurich <darkrain42@pidgin.im>
parents:
27281
diff
changeset
|
42 | 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
|
43 | if (list->next) |
|
791c6a965694
Debug output when changing group memberships.
Paul Aurich <darkrain42@pidgin.im>
parents:
27281
diff
changeset
|
44 | out = g_string_append(out, ", "); |
|
791c6a965694
Debug output when changing group memberships.
Paul Aurich <darkrain42@pidgin.im>
parents:
27281
diff
changeset
|
45 | } |
|
791c6a965694
Debug output when changing group memberships.
Paul Aurich <darkrain42@pidgin.im>
parents:
27281
diff
changeset
|
46 | |
|
791c6a965694
Debug output when changing group memberships.
Paul Aurich <darkrain42@pidgin.im>
parents:
27281
diff
changeset
|
47 | return g_string_free(out, FALSE); |
|
791c6a965694
Debug output when changing group memberships.
Paul Aurich <darkrain42@pidgin.im>
parents:
27281
diff
changeset
|
48 | } |
|
791c6a965694
Debug output when changing group memberships.
Paul Aurich <darkrain42@pidgin.im>
parents:
27281
diff
changeset
|
49 | |
|
29096
362b96f6f3da
jabber: Roster Versioning support.
Paul Aurich <darkrain42@pidgin.im>
parents:
28758
diff
changeset
|
50 | static void roster_request_cb(JabberStream *js, const char *from, |
|
362b96f6f3da
jabber: Roster Versioning support.
Paul Aurich <darkrain42@pidgin.im>
parents:
28758
diff
changeset
|
51 | JabberIqType type, const char *id, |
|
362b96f6f3da
jabber: Roster Versioning support.
Paul Aurich <darkrain42@pidgin.im>
parents:
28758
diff
changeset
|
52 | xmlnode *packet, gpointer data) |
|
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 | xmlnode *query; |
|
362b96f6f3da
jabber: Roster Versioning support.
Paul Aurich <darkrain42@pidgin.im>
parents:
28758
diff
changeset
|
55 | |
|
362b96f6f3da
jabber: Roster Versioning support.
Paul Aurich <darkrain42@pidgin.im>
parents:
28758
diff
changeset
|
56 | if (type == JABBER_IQ_ERROR) { |
|
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 | * This shouldn't happen in any real circumstances and |
|
362b96f6f3da
jabber: Roster Versioning support.
Paul Aurich <darkrain42@pidgin.im>
parents:
28758
diff
changeset
|
59 | * likely constitutes a server-side misconfiguration (i.e. |
|
362b96f6f3da
jabber: Roster Versioning support.
Paul Aurich <darkrain42@pidgin.im>
parents:
28758
diff
changeset
|
60 | * explicitly not loading mod_roster...) |
|
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 | purple_debug_error("jabber", "Error retrieving roster!?\n"); |
|
362b96f6f3da
jabber: Roster Versioning support.
Paul Aurich <darkrain42@pidgin.im>
parents:
28758
diff
changeset
|
63 | jabber_stream_set_state(js, JABBER_STREAM_CONNECTED); |
|
362b96f6f3da
jabber: Roster Versioning support.
Paul Aurich <darkrain42@pidgin.im>
parents:
28758
diff
changeset
|
64 | return; |
|
362b96f6f3da
jabber: Roster Versioning support.
Paul Aurich <darkrain42@pidgin.im>
parents:
28758
diff
changeset
|
65 | } |
|
362b96f6f3da
jabber: Roster Versioning support.
Paul Aurich <darkrain42@pidgin.im>
parents:
28758
diff
changeset
|
66 | |
|
362b96f6f3da
jabber: Roster Versioning support.
Paul Aurich <darkrain42@pidgin.im>
parents:
28758
diff
changeset
|
67 | query = xmlnode_get_child(packet, "query"); |
|
362b96f6f3da
jabber: Roster Versioning support.
Paul Aurich <darkrain42@pidgin.im>
parents:
28758
diff
changeset
|
68 | if (query == NULL) { |
|
362b96f6f3da
jabber: Roster Versioning support.
Paul Aurich <darkrain42@pidgin.im>
parents:
28758
diff
changeset
|
69 | jabber_stream_set_state(js, JABBER_STREAM_CONNECTED); |
|
362b96f6f3da
jabber: Roster Versioning support.
Paul Aurich <darkrain42@pidgin.im>
parents:
28758
diff
changeset
|
70 | return; |
|
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 | |
|
362b96f6f3da
jabber: Roster Versioning support.
Paul Aurich <darkrain42@pidgin.im>
parents:
28758
diff
changeset
|
73 | jabber_roster_parse(js, from, type, id, query); |
|
362b96f6f3da
jabber: Roster Versioning support.
Paul Aurich <darkrain42@pidgin.im>
parents:
28758
diff
changeset
|
74 | jabber_stream_set_state(js, JABBER_STREAM_CONNECTED); |
|
362b96f6f3da
jabber: Roster Versioning support.
Paul Aurich <darkrain42@pidgin.im>
parents:
28758
diff
changeset
|
75 | } |
|
362b96f6f3da
jabber: Roster Versioning support.
Paul Aurich <darkrain42@pidgin.im>
parents:
28758
diff
changeset
|
76 | |
| 7014 | 77 | void jabber_roster_request(JabberStream *js) |
| 78 | { | |
|
29096
362b96f6f3da
jabber: Roster Versioning support.
Paul Aurich <darkrain42@pidgin.im>
parents:
28758
diff
changeset
|
79 | PurpleAccount *account; |
| 7014 | 80 | JabberIq *iq; |
|
29096
362b96f6f3da
jabber: Roster Versioning support.
Paul Aurich <darkrain42@pidgin.im>
parents:
28758
diff
changeset
|
81 | xmlnode *query; |
|
362b96f6f3da
jabber: Roster Versioning support.
Paul Aurich <darkrain42@pidgin.im>
parents:
28758
diff
changeset
|
82 | |
|
362b96f6f3da
jabber: Roster Versioning support.
Paul Aurich <darkrain42@pidgin.im>
parents:
28758
diff
changeset
|
83 | account = purple_connection_get_account(js->gc); |
| 7014 | 84 | |
| 85 | iq = jabber_iq_new_query(js, JABBER_IQ_GET, "jabber:iq:roster"); | |
|
29096
362b96f6f3da
jabber: Roster Versioning support.
Paul Aurich <darkrain42@pidgin.im>
parents:
28758
diff
changeset
|
86 | query = xmlnode_get_child(iq->node, "query"); |
|
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
|
87 | |
|
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
|
88 | if (js->server_caps & JABBER_CAP_GOOGLE_ROSTER) { |
|
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
|
89 | xmlnode_set_attrib(query, "xmlns:gr", NS_GOOGLE_ROSTER); |
|
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
|
90 | xmlnode_set_attrib(query, "gr:ext", "2"); |
|
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
|
91 | } |
|
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
|
92 | |
|
29096
362b96f6f3da
jabber: Roster Versioning support.
Paul Aurich <darkrain42@pidgin.im>
parents:
28758
diff
changeset
|
93 | jabber_iq_set_callback(iq, roster_request_cb, NULL); |
| 7014 | 94 | jabber_iq_send(iq); |
| 95 | } | |
| 96 | ||
| 15884 | 97 | static void remove_purple_buddies(JabberStream *js, const char *jid) |
| 7014 | 98 | { |
| 99 | GSList *buddies, *l; | |
| 100 | ||
| 15884 | 101 | buddies = purple_find_buddies(js->gc->account, jid); |
| 7014 | 102 | |
| 103 | for(l = buddies; l; l = l->next) | |
| 15884 | 104 | purple_blist_remove_buddy(l->data); |
| 7014 | 105 | |
| 106 | g_slist_free(buddies); | |
| 107 | } | |
| 108 | ||
|
27277
8a2ecbdd70e4
Various roster cleanups. Refs #7008.
Paul Aurich <darkrain42@pidgin.im>
parents:
27276
diff
changeset
|
109 | 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
|
110 | const char *alias, GSList *groups) |
| 7014 | 111 | { |
|
27277
8a2ecbdd70e4
Various roster cleanups. Refs #7008.
Paul Aurich <darkrain42@pidgin.im>
parents:
27276
diff
changeset
|
112 | GSList *buddies, *l; |
|
28758
6fb73f2ab8e2
jabber: Remove the roster pool stuff.
Paul Aurich <darkrain42@pidgin.im>
parents:
28622
diff
changeset
|
113 | PurpleAccount *account = purple_connection_get_account(js->gc); |
| 7014 | 114 | |
| 15884 | 115 | buddies = purple_find_buddies(js->gc->account, jid); |
| 7014 | 116 | |
| 117 | if(!groups) { | |
| 118 | if(!buddies) | |
|
27277
8a2ecbdd70e4
Various roster cleanups. Refs #7008.
Paul Aurich <darkrain42@pidgin.im>
parents:
27276
diff
changeset
|
119 | groups = g_slist_append(groups, g_strdup(_("Buddies"))); |
|
20221
28e31ee832cd
applied changes from e56db1b8a7bb8729e30fb3bf99a94ff7887fe4ec
Luke Schierer <lschiere@pidgin.im>
parents:
19859
diff
changeset
|
120 | else { |
|
27277
8a2ecbdd70e4
Various roster cleanups. Refs #7008.
Paul Aurich <darkrain42@pidgin.im>
parents:
27276
diff
changeset
|
121 | /* 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
|
122 | * 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
|
123 | * the server. |
|
8a2ecbdd70e4
Various roster cleanups. Refs #7008.
Paul Aurich <darkrain42@pidgin.im>
parents:
27276
diff
changeset
|
124 | */ |
|
20221
28e31ee832cd
applied changes from e56db1b8a7bb8729e30fb3bf99a94ff7887fe4ec
Luke Schierer <lschiere@pidgin.im>
parents:
19859
diff
changeset
|
125 | g_slist_free(buddies); |
| 7014 | 126 | return; |
|
20221
28e31ee832cd
applied changes from e56db1b8a7bb8729e30fb3bf99a94ff7887fe4ec
Luke Schierer <lschiere@pidgin.im>
parents:
19859
diff
changeset
|
127 | } |
| 7014 | 128 | } |
| 129 | ||
| 130 | while(buddies) { | |
| 15884 | 131 | PurpleBuddy *b = buddies->data; |
| 132 | PurpleGroup *g = purple_buddy_get_group(b); | |
| 7014 | 133 | |
|
27277
8a2ecbdd70e4
Various roster cleanups. Refs #7008.
Paul Aurich <darkrain42@pidgin.im>
parents:
27276
diff
changeset
|
134 | buddies = g_slist_delete_link(buddies, buddies); |
| 7014 | 135 | |
|
27277
8a2ecbdd70e4
Various roster cleanups. Refs #7008.
Paul Aurich <darkrain42@pidgin.im>
parents:
27276
diff
changeset
|
136 | /* XMPP groups are case-sensitive, but libpurple groups are |
|
8a2ecbdd70e4
Various roster cleanups. Refs #7008.
Paul Aurich <darkrain42@pidgin.im>
parents:
27276
diff
changeset
|
137 | * 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
|
138 | * 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
|
139 | * 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
|
140 | * 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
|
141 | */ |
|
8a2ecbdd70e4
Various roster cleanups. Refs #7008.
Paul Aurich <darkrain42@pidgin.im>
parents:
27276
diff
changeset
|
142 | if((l = g_slist_find_custom(groups, purple_group_get_name(g), (GCompareFunc)purple_utf8_strcasecmp))) { |
|
8a2ecbdd70e4
Various roster cleanups. Refs #7008.
Paul Aurich <darkrain42@pidgin.im>
parents:
27276
diff
changeset
|
143 | /* 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
|
144 | const char *servernick, *balias; |
| 7955 | 145 | |
|
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
|
146 | /* Previously stored serverside / buddy-supplied alias */ |
| 15884 | 147 | if((servernick = purple_blist_node_get_string((PurpleBlistNode*)b, "servernick"))) |
| 7955 | 148 | serv_got_alias(js->gc, jid, servernick); |
| 149 | ||
|
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
|
150 | /* Alias from our roster retrieval */ |
|
24950
143f594f0cd0
Alias foo. I think blist.h structs are now completely hidden.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
24398
diff
changeset
|
151 | balias = purple_buddy_get_local_buddy_alias(b); |
|
27277
8a2ecbdd70e4
Various roster cleanups. Refs #7008.
Paul Aurich <darkrain42@pidgin.im>
parents:
27276
diff
changeset
|
152 | 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
|
153 | purple_serv_got_private_alias(js->gc, jid, alias); |
| 7014 | 154 | g_free(l->data); |
|
27277
8a2ecbdd70e4
Various roster cleanups. Refs #7008.
Paul Aurich <darkrain42@pidgin.im>
parents:
27276
diff
changeset
|
155 | groups = g_slist_delete_link(groups, l); |
| 7014 | 156 | } else { |
|
27277
8a2ecbdd70e4
Various roster cleanups. Refs #7008.
Paul Aurich <darkrain42@pidgin.im>
parents:
27276
diff
changeset
|
157 | /* This buddy isn't in the group on the server anymore */ |
|
28758
6fb73f2ab8e2
jabber: Remove the roster pool stuff.
Paul Aurich <darkrain42@pidgin.im>
parents:
28622
diff
changeset
|
158 | purple_debug_info("jabber", "jabber_roster_parse(): Removing %s " |
|
6fb73f2ab8e2
jabber: Remove the roster pool stuff.
Paul Aurich <darkrain42@pidgin.im>
parents:
28622
diff
changeset
|
159 | "from group '%s' on the local list\n", |
|
6fb73f2ab8e2
jabber: Remove the roster pool stuff.
Paul Aurich <darkrain42@pidgin.im>
parents:
28622
diff
changeset
|
160 | purple_buddy_get_name(b), |
|
6fb73f2ab8e2
jabber: Remove the roster pool stuff.
Paul Aurich <darkrain42@pidgin.im>
parents:
28622
diff
changeset
|
161 | purple_group_get_name(g)); |
|
6fb73f2ab8e2
jabber: Remove the roster pool stuff.
Paul Aurich <darkrain42@pidgin.im>
parents:
28622
diff
changeset
|
162 | purple_blist_remove_buddy(b); |
| 7014 | 163 | } |
| 164 | } | |
| 165 | ||
|
27282
791c6a965694
Debug output when changing group memberships.
Paul Aurich <darkrain42@pidgin.im>
parents:
27281
diff
changeset
|
166 | if (groups) { |
|
791c6a965694
Debug output when changing group memberships.
Paul Aurich <darkrain42@pidgin.im>
parents:
27281
diff
changeset
|
167 | char *tmp = roster_groups_join(groups); |
|
791c6a965694
Debug output when changing group memberships.
Paul Aurich <darkrain42@pidgin.im>
parents:
27281
diff
changeset
|
168 | 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
|
169 | "groups: %s\n", jid, tmp); |
|
791c6a965694
Debug output when changing group memberships.
Paul Aurich <darkrain42@pidgin.im>
parents:
27281
diff
changeset
|
170 | g_free(tmp); |
|
791c6a965694
Debug output when changing group memberships.
Paul Aurich <darkrain42@pidgin.im>
parents:
27281
diff
changeset
|
171 | } |
|
791c6a965694
Debug output when changing group memberships.
Paul Aurich <darkrain42@pidgin.im>
parents:
27281
diff
changeset
|
172 | |
|
27277
8a2ecbdd70e4
Various roster cleanups. Refs #7008.
Paul Aurich <darkrain42@pidgin.im>
parents:
27276
diff
changeset
|
173 | while(groups) { |
|
8a2ecbdd70e4
Various roster cleanups. Refs #7008.
Paul Aurich <darkrain42@pidgin.im>
parents:
27276
diff
changeset
|
174 | PurpleGroup *g = purple_find_group(groups->data); |
|
28758
6fb73f2ab8e2
jabber: Remove the roster pool stuff.
Paul Aurich <darkrain42@pidgin.im>
parents:
28622
diff
changeset
|
175 | PurpleBuddy *b = purple_buddy_new(account, jid, alias); |
| 7014 | 176 | |
| 177 | if(!g) { | |
|
27277
8a2ecbdd70e4
Various roster cleanups. Refs #7008.
Paul Aurich <darkrain42@pidgin.im>
parents:
27276
diff
changeset
|
178 | g = purple_group_new(groups->data); |
| 15884 | 179 | purple_blist_add_group(g, NULL); |
| 7014 | 180 | } |
| 181 | ||
| 15884 | 182 | purple_blist_add_buddy(b, NULL, g, NULL); |
| 183 | purple_blist_alias_buddy(b, alias); | |
|
13987
b5b1db6007b0
[gaim-migrate @ 16442]
Mark Doliner <markdoliner@pidgin.im>
parents:
13809
diff
changeset
|
184 | |
|
27277
8a2ecbdd70e4
Various roster cleanups. Refs #7008.
Paul Aurich <darkrain42@pidgin.im>
parents:
27276
diff
changeset
|
185 | g_free(groups->data); |
|
8a2ecbdd70e4
Various roster cleanups. Refs #7008.
Paul Aurich <darkrain42@pidgin.im>
parents:
27276
diff
changeset
|
186 | groups = g_slist_delete_link(groups, groups); |
| 7014 | 187 | } |
| 188 | ||
| 189 | g_slist_free(buddies); | |
| 190 | } | |
| 191 | ||
|
25817
09d6a40a341d
Pass IQ handlers type, from, id, and the child node
Paul Aurich <darkrain42@pidgin.im>
parents:
24672
diff
changeset
|
192 | void jabber_roster_parse(JabberStream *js, const char *from, |
|
09d6a40a341d
Pass IQ handlers type, from, id, and the child node
Paul Aurich <darkrain42@pidgin.im>
parents:
24672
diff
changeset
|
193 | JabberIqType type, const char *id, xmlnode *query) |
| 7014 | 194 | { |
|
25817
09d6a40a341d
Pass IQ handlers type, from, id, and the child node
Paul Aurich <darkrain42@pidgin.im>
parents:
24672
diff
changeset
|
195 | xmlnode *item, *group; |
|
29185
e30a3705166b
Disable this part of roster versioning, too (for now). Refs #10935.
Paul Aurich <darkrain42@pidgin.im>
parents:
29116
diff
changeset
|
196 | #if 0 |
|
29096
362b96f6f3da
jabber: Roster Versioning support.
Paul Aurich <darkrain42@pidgin.im>
parents:
28758
diff
changeset
|
197 | const char *ver; |
|
29185
e30a3705166b
Disable this part of roster versioning, too (for now). Refs #10935.
Paul Aurich <darkrain42@pidgin.im>
parents:
29116
diff
changeset
|
198 | #endif |
| 7445 | 199 | |
|
27275
a7836fbdcfa2
Use jabber_is_own_account and perform way fewer normalizations per iteration
Paul Aurich <darkrain42@pidgin.im>
parents:
27242
diff
changeset
|
200 | 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
|
201 | 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
|
202 | from); |
|
a7836fbdcfa2
Use jabber_is_own_account and perform way fewer normalizations per iteration
Paul Aurich <darkrain42@pidgin.im>
parents:
27242
diff
changeset
|
203 | return; |
| 7175 | 204 | } |
| 205 | ||
|
23975
8ee397f04ca9
We talked about this and decided it was probably cleaner to not use
Mark Doliner <markdoliner@pidgin.im>
parents:
23961
diff
changeset
|
206 | 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
|
207 | |
| 8135 | 208 | for(item = xmlnode_get_child(query, "item"); item; item = xmlnode_get_next_twin(item)) |
| 7014 | 209 | { |
| 210 | const char *jid, *name, *subscription, *ask; | |
| 211 | JabberBuddy *jb; | |
| 212 | ||
| 213 | subscription = xmlnode_get_attrib(item, "subscription"); | |
| 214 | jid = xmlnode_get_attrib(item, "jid"); | |
| 215 | name = xmlnode_get_attrib(item, "name"); | |
| 216 | ask = xmlnode_get_attrib(item, "ask"); | |
| 217 | ||
| 8347 | 218 | if(!jid) |
| 219 | continue; | |
| 220 | ||
| 221 | if(!(jb = jabber_buddy_find(js, jid, TRUE))) | |
| 222 | continue; | |
| 7014 | 223 | |
| 10289 | 224 | if(subscription) { |
|
29114
b3876f83a46c
jabber: Fix removing a self-contact.
Paul Aurich <darkrain42@pidgin.im>
parents:
29103
diff
changeset
|
225 | if (g_str_equal(subscription, "remove")) |
|
b3876f83a46c
jabber: Fix removing a self-contact.
Paul Aurich <darkrain42@pidgin.im>
parents:
29103
diff
changeset
|
226 | jb->subscription = JABBER_SUB_REMOVE; |
|
b3876f83a46c
jabber: Fix removing a self-contact.
Paul Aurich <darkrain42@pidgin.im>
parents:
29103
diff
changeset
|
227 | else if (jb == js->user_jb) |
| 12285 | 228 | jb->subscription = JABBER_SUB_BOTH; |
|
29114
b3876f83a46c
jabber: Fix removing a self-contact.
Paul Aurich <darkrain42@pidgin.im>
parents:
29103
diff
changeset
|
229 | else if (g_str_equal(subscription, "none")) |
| 12285 | 230 | jb->subscription = JABBER_SUB_NONE; |
|
29114
b3876f83a46c
jabber: Fix removing a self-contact.
Paul Aurich <darkrain42@pidgin.im>
parents:
29103
diff
changeset
|
231 | else if (g_str_equal(subscription, "to")) |
| 10289 | 232 | jb->subscription = JABBER_SUB_TO; |
|
29114
b3876f83a46c
jabber: Fix removing a self-contact.
Paul Aurich <darkrain42@pidgin.im>
parents:
29103
diff
changeset
|
233 | else if (g_str_equal(subscription, "from")) |
| 10289 | 234 | jb->subscription = JABBER_SUB_FROM; |
|
29114
b3876f83a46c
jabber: Fix removing a self-contact.
Paul Aurich <darkrain42@pidgin.im>
parents:
29103
diff
changeset
|
235 | else if (g_str_equal(subscription, "both")) |
| 10289 | 236 | jb->subscription = JABBER_SUB_BOTH; |
| 237 | } | |
| 7014 | 238 | |
|
27276
d3c4ec6e0b2f
Remove this; it's been commented out for about 3.5 years.
Paul Aurich <darkrain42@pidgin.im>
parents:
27275
diff
changeset
|
239 | if(purple_strequal(ask, "subscribe")) |
| 7014 | 240 | jb->subscription |= JABBER_SUB_PENDING; |
| 241 | else | |
| 242 | jb->subscription &= ~JABBER_SUB_PENDING; | |
| 243 | ||
|
28622
5d971bd4b001
jabber: Fix removing a buddy with a pending subscription.
Paul Aurich <darkrain42@pidgin.im>
parents:
28584
diff
changeset
|
244 | if(jb->subscription & JABBER_SUB_REMOVE) { |
| 15884 | 245 | remove_purple_buddies(js, jid); |
| 7014 | 246 | } else { |
| 247 | GSList *groups = NULL; | |
|
27277
8a2ecbdd70e4
Various roster cleanups. Refs #7008.
Paul Aurich <darkrain42@pidgin.im>
parents:
27276
diff
changeset
|
248 | gboolean seen_empty = FALSE; |
|
20221
28e31ee832cd
applied changes from e56db1b8a7bb8729e30fb3bf99a94ff7887fe4ec
Luke Schierer <lschiere@pidgin.im>
parents:
19859
diff
changeset
|
249 | |
|
28e31ee832cd
applied changes from e56db1b8a7bb8729e30fb3bf99a94ff7887fe4ec
Luke Schierer <lschiere@pidgin.im>
parents:
19859
diff
changeset
|
250 | if (js->server_caps & JABBER_CAP_GOOGLE_ROSTER) |
|
28e31ee832cd
applied changes from e56db1b8a7bb8729e30fb3bf99a94ff7887fe4ec
Luke Schierer <lschiere@pidgin.im>
parents:
19859
diff
changeset
|
251 | if (!jabber_google_roster_incoming(js, item)) |
|
28e31ee832cd
applied changes from e56db1b8a7bb8729e30fb3bf99a94ff7887fe4ec
Luke Schierer <lschiere@pidgin.im>
parents:
19859
diff
changeset
|
252 | continue; |
|
28e31ee832cd
applied changes from e56db1b8a7bb8729e30fb3bf99a94ff7887fe4ec
Luke Schierer <lschiere@pidgin.im>
parents:
19859
diff
changeset
|
253 | |
| 8135 | 254 | for(group = xmlnode_get_child(item, "group"); group; group = xmlnode_get_next_twin(group)) { |
|
27277
8a2ecbdd70e4
Various roster cleanups. Refs #7008.
Paul Aurich <darkrain42@pidgin.im>
parents:
27276
diff
changeset
|
255 | char *group_name = xmlnode_get_data(group); |
| 13809 | 256 | |
|
27277
8a2ecbdd70e4
Various roster cleanups. Refs #7008.
Paul Aurich <darkrain42@pidgin.im>
parents:
27276
diff
changeset
|
257 | if (!group_name && !seen_empty) { |
|
8a2ecbdd70e4
Various roster cleanups. Refs #7008.
Paul Aurich <darkrain42@pidgin.im>
parents:
27276
diff
changeset
|
258 | group_name = g_strdup(""); |
|
8a2ecbdd70e4
Various roster cleanups. Refs #7008.
Paul Aurich <darkrain42@pidgin.im>
parents:
27276
diff
changeset
|
259 | seen_empty = TRUE; |
|
8a2ecbdd70e4
Various roster cleanups. Refs #7008.
Paul Aurich <darkrain42@pidgin.im>
parents:
27276
diff
changeset
|
260 | } |
|
8a2ecbdd70e4
Various roster cleanups. Refs #7008.
Paul Aurich <darkrain42@pidgin.im>
parents:
27276
diff
changeset
|
261 | |
|
29373
481ec7d852d7
jabber: Fix another corner case that introduced duplicates to the list.
Paul Aurich <darkrain42@pidgin.im>
parents:
29358
diff
changeset
|
262 | /* |
|
481ec7d852d7
jabber: Fix another corner case that introduced duplicates to the list.
Paul Aurich <darkrain42@pidgin.im>
parents:
29358
diff
changeset
|
263 | * 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
|
264 | * 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
|
265 | * 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
|
266 | * 'XMPP' and 'xmpp' |
|
481ec7d852d7
jabber: Fix another corner case that introduced duplicates to the list.
Paul Aurich <darkrain42@pidgin.im>
parents:
29358
diff
changeset
|
267 | */ |
|
481ec7d852d7
jabber: Fix another corner case that introduced duplicates to the list.
Paul Aurich <darkrain42@pidgin.im>
parents:
29358
diff
changeset
|
268 | 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
|
269 | 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
|
270 | else |
|
481ec7d852d7
jabber: Fix another corner case that introduced duplicates to the list.
Paul Aurich <darkrain42@pidgin.im>
parents:
29358
diff
changeset
|
271 | groups = g_slist_prepend(groups, group_name); |
| 7014 | 272 | } |
|
27277
8a2ecbdd70e4
Various roster cleanups. Refs #7008.
Paul Aurich <darkrain42@pidgin.im>
parents:
27276
diff
changeset
|
273 | |
|
28071
a0706162fefd
jabber: Store the "own JabberBuddy" in the JabberStream* struct.
Paul Aurich <darkrain42@pidgin.im>
parents:
27743
diff
changeset
|
274 | 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
|
275 | if (jb == js->user_jb) |
|
a0706162fefd
jabber: Store the "own JabberBuddy" in the JabberStream* struct.
Paul Aurich <darkrain42@pidgin.im>
parents:
27743
diff
changeset
|
276 | jabber_presence_fake_to_self(js, NULL); |
| 7014 | 277 | } |
| 278 | } | |
|
18196
a7992a42dc3d
fix inital presence (fixes #1395)
Nathan Walp <nwalp@pidgin.im>
parents:
15884
diff
changeset
|
279 | |
|
29185
e30a3705166b
Disable this part of roster versioning, too (for now). Refs #10935.
Paul Aurich <darkrain42@pidgin.im>
parents:
29116
diff
changeset
|
280 | #if 0 |
|
29096
362b96f6f3da
jabber: Roster Versioning support.
Paul Aurich <darkrain42@pidgin.im>
parents:
28758
diff
changeset
|
281 | ver = xmlnode_get_attrib(query, "ver"); |
|
362b96f6f3da
jabber: Roster Versioning support.
Paul Aurich <darkrain42@pidgin.im>
parents:
28758
diff
changeset
|
282 | if (ver) { |
|
362b96f6f3da
jabber: Roster Versioning support.
Paul Aurich <darkrain42@pidgin.im>
parents:
28758
diff
changeset
|
283 | PurpleAccount *account = purple_connection_get_account(js->gc); |
|
362b96f6f3da
jabber: Roster Versioning support.
Paul Aurich <darkrain42@pidgin.im>
parents:
28758
diff
changeset
|
284 | purple_account_set_string(account, "roster_ver", ver); |
|
362b96f6f3da
jabber: Roster Versioning support.
Paul Aurich <darkrain42@pidgin.im>
parents:
28758
diff
changeset
|
285 | } |
|
29185
e30a3705166b
Disable this part of roster versioning, too (for now). Refs #10935.
Paul Aurich <darkrain42@pidgin.im>
parents:
29116
diff
changeset
|
286 | #endif |
|
23961
0a9e9676f7b5
Hopefully fix the XMPP contact flipping/swapping between groups bug
Mark Doliner <markdoliner@pidgin.im>
parents:
23566
diff
changeset
|
287 | |
|
29358
27de2111e8a1
jabber: Send the RFC-mandated ack IQ
Paul Aurich <darkrain42@pidgin.im>
parents:
29185
diff
changeset
|
288 | if (type == JABBER_IQ_SET) { |
|
27de2111e8a1
jabber: Send the RFC-mandated ack IQ
Paul Aurich <darkrain42@pidgin.im>
parents:
29185
diff
changeset
|
289 | 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
|
290 | jabber_iq_set_id(ack, id); |
|
27de2111e8a1
jabber: Send the RFC-mandated ack IQ
Paul Aurich <darkrain42@pidgin.im>
parents:
29185
diff
changeset
|
291 | jabber_iq_send(ack); |
|
27de2111e8a1
jabber: Send the RFC-mandated ack IQ
Paul Aurich <darkrain42@pidgin.im>
parents:
29185
diff
changeset
|
292 | } |
|
27de2111e8a1
jabber: Send the RFC-mandated ack IQ
Paul Aurich <darkrain42@pidgin.im>
parents:
29185
diff
changeset
|
293 | |
|
29096
362b96f6f3da
jabber: Roster Versioning support.
Paul Aurich <darkrain42@pidgin.im>
parents:
28758
diff
changeset
|
294 | js->currently_parsing_roster_push = FALSE; |
| 7014 | 295 | } |
| 296 | ||
|
27283
9a69f682a3ca
Operate on the passed-in GSList.
Paul Aurich <darkrain42@pidgin.im>
parents:
27282
diff
changeset
|
297 | /* jabber_roster_update frees the GSList* passed in */ |
| 7014 | 298 | 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
|
299 | GSList *groups) |
| 7014 | 300 | { |
| 15884 | 301 | PurpleBuddy *b; |
| 302 | PurpleGroup *g; | |
|
27283
9a69f682a3ca
Operate on the passed-in GSList.
Paul Aurich <darkrain42@pidgin.im>
parents:
27282
diff
changeset
|
303 | GSList *l; |
| 7014 | 304 | JabberIq *iq; |
| 305 | xmlnode *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
|
306 | const char *balias; |
| 7014 | 307 | |
|
23975
8ee397f04ca9
We talked about this and decided it was probably cleaner to not use
Mark Doliner <markdoliner@pidgin.im>
parents:
23961
diff
changeset
|
308 | 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
|
309 | return; |
|
0a9e9676f7b5
Hopefully fix the XMPP contact flipping/swapping between groups bug
Mark Doliner <markdoliner@pidgin.im>
parents:
23566
diff
changeset
|
310 | |
|
20221
28e31ee832cd
applied changes from e56db1b8a7bb8729e30fb3bf99a94ff7887fe4ec
Luke Schierer <lschiere@pidgin.im>
parents:
19859
diff
changeset
|
311 | if(!(b = purple_find_buddy(js->gc->account, name))) |
|
28e31ee832cd
applied changes from e56db1b8a7bb8729e30fb3bf99a94ff7887fe4ec
Luke Schierer <lschiere@pidgin.im>
parents:
19859
diff
changeset
|
312 | return; |
|
28e31ee832cd
applied changes from e56db1b8a7bb8729e30fb3bf99a94ff7887fe4ec
Luke Schierer <lschiere@pidgin.im>
parents:
19859
diff
changeset
|
313 | |
|
27283
9a69f682a3ca
Operate on the passed-in GSList.
Paul Aurich <darkrain42@pidgin.im>
parents:
27282
diff
changeset
|
314 | if (groups) { |
|
27282
791c6a965694
Debug output when changing group memberships.
Paul Aurich <darkrain42@pidgin.im>
parents:
27281
diff
changeset
|
315 | 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
|
316 | |
|
27283
9a69f682a3ca
Operate on the passed-in GSList.
Paul Aurich <darkrain42@pidgin.im>
parents:
27282
diff
changeset
|
317 | 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
|
318 | "groups]: groups: %s\n", name, tmp); |
|
27282
791c6a965694
Debug output when changing group memberships.
Paul Aurich <darkrain42@pidgin.im>
parents:
27281
diff
changeset
|
319 | g_free(tmp); |
| 7014 | 320 | } else { |
| 15884 | 321 | GSList *buddies = purple_find_buddies(js->gc->account, name); |
|
27282
791c6a965694
Debug output when changing group memberships.
Paul Aurich <darkrain42@pidgin.im>
parents:
27281
diff
changeset
|
322 | char *tmp; |
|
27230
17f893b060d7
Add a few more roster debug messages and improve.
Paul Aurich <darkrain42@pidgin.im>
parents:
27229
diff
changeset
|
323 | |
| 7014 | 324 | if(!buddies) |
| 325 | return; | |
| 326 | while(buddies) { | |
| 327 | b = buddies->data; | |
| 15884 | 328 | g = purple_buddy_get_group(b); |
|
24398
4865c2ee6ea8
Start hiding blist.h internals in prpls.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
24199
diff
changeset
|
329 | groups = g_slist_append(groups, (char *)purple_group_get_name(g)); |
| 7014 | 330 | buddies = g_slist_remove(buddies, b); |
| 331 | } | |
|
27230
17f893b060d7
Add a few more roster debug messages and improve.
Paul Aurich <darkrain42@pidgin.im>
parents:
27229
diff
changeset
|
332 | |
|
27282
791c6a965694
Debug output when changing group memberships.
Paul Aurich <darkrain42@pidgin.im>
parents:
27281
diff
changeset
|
333 | 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
|
334 | 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
|
335 | name, tmp); |
|
791c6a965694
Debug output when changing group memberships.
Paul Aurich <darkrain42@pidgin.im>
parents:
27281
diff
changeset
|
336 | g_free(tmp); |
| 7014 | 337 | } |
| 338 | ||
| 339 | iq = jabber_iq_new_query(js, JABBER_IQ_SET, "jabber:iq:roster"); | |
| 340 | ||
| 341 | query = xmlnode_get_child(iq->node, "query"); | |
| 342 | item = xmlnode_new_child(query, "item"); | |
| 343 | ||
| 344 | xmlnode_set_attrib(item, "jid", name); | |
| 345 | ||
|
24950
143f594f0cd0
Alias foo. I think blist.h structs are now completely hidden.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
24398
diff
changeset
|
346 | balias = purple_buddy_get_local_buddy_alias(b); |
|
143f594f0cd0
Alias foo. I think blist.h structs are now completely hidden.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
24398
diff
changeset
|
347 | xmlnode_set_attrib(item, "name", balias ? balias : ""); |
| 7014 | 348 | |
| 349 | for(l = groups; l; l = l->next) { | |
| 350 | group = xmlnode_new_child(item, "group"); | |
| 351 | xmlnode_insert_data(group, l->data, -1); | |
| 352 | } | |
| 353 | ||
|
27283
9a69f682a3ca
Operate on the passed-in GSList.
Paul Aurich <darkrain42@pidgin.im>
parents:
27282
diff
changeset
|
354 | 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
|
355 | |
| 15265 | 356 | if (js->server_caps & JABBER_CAP_GOOGLE_ROSTER) { |
| 357 | jabber_google_roster_outgoing(js, query, item); | |
|
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
|
358 | xmlnode_set_attrib(query, "xmlns:gr", NS_GOOGLE_ROSTER); |
| 15265 | 359 | xmlnode_set_attrib(query, "gr:ext", "2"); |
| 360 | } | |
| 7014 | 361 | jabber_iq_send(iq); |
| 362 | } | |
| 363 | ||
| 15884 | 364 | void jabber_roster_add_buddy(PurpleConnection *gc, PurpleBuddy *buddy, |
| 365 | PurpleGroup *group) | |
| 7014 | 366 | { |
| 367 | JabberStream *js = gc->proto_data; | |
| 368 | char *who; | |
|
28431
8450418b5abd
jabber: Properly handle adding buddies that contain a resource. Closes #10151.
Paul Aurich <darkrain42@pidgin.im>
parents:
28322
diff
changeset
|
369 | JabberID *jid; |
| 7014 | 370 | JabberBuddy *jb; |
| 7488 | 371 | JabberBuddyResource *jbr; |
|
24398
4865c2ee6ea8
Start hiding blist.h internals in prpls.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
24199
diff
changeset
|
372 | const char *name; |
| 7014 | 373 | |
|
27278
b34a1cea4872
Use js->state to track whether the roster has been retrieved.
Paul Aurich <darkrain42@pidgin.im>
parents:
27277
diff
changeset
|
374 | /* 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
|
375 | if (js->state != JABBER_STREAM_CONNECTED) |
| 7014 | 376 | return; |
| 377 | ||
|
24398
4865c2ee6ea8
Start hiding blist.h internals in prpls.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
24199
diff
changeset
|
378 | 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
|
379 | 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
|
380 | if (jid == NULL) { |
|
8450418b5abd
jabber: Properly handle adding buddies that contain a resource. Closes #10151.
Paul Aurich <darkrain42@pidgin.im>
parents:
28322
diff
changeset
|
381 | /* TODO: Remove the buddy from the list? */ |
| 7425 | 382 | return; |
|
28431
8450418b5abd
jabber: Properly handle adding buddies that contain a resource. Closes #10151.
Paul Aurich <darkrain42@pidgin.im>
parents:
28322
diff
changeset
|
383 | } |
| 7014 | 384 | |
|
28431
8450418b5abd
jabber: Properly handle adding buddies that contain a resource. Closes #10151.
Paul Aurich <darkrain42@pidgin.im>
parents:
28322
diff
changeset
|
385 | /* Adding a chat room or a chat buddy 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
|
386 | 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
|
387 | /* |
|
8450418b5abd
jabber: Properly handle adding buddies that contain a resource. Closes #10151.
Paul Aurich <darkrain42@pidgin.im>
parents:
28322
diff
changeset
|
388 | * 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
|
389 | * 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
|
390 | */ |
|
8450418b5abd
jabber: Properly handle adding buddies that contain a resource. Closes #10151.
Paul Aurich <darkrain42@pidgin.im>
parents:
28322
diff
changeset
|
391 | 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
|
392 | "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
|
393 | "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
|
394 | "JID\n"); |
|
8450418b5abd
jabber: Properly handle adding buddies that contain a resource. Closes #10151.
Paul Aurich <darkrain42@pidgin.im>
parents:
28322
diff
changeset
|
395 | 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
|
396 | 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
|
397 | return; |
|
8450418b5abd
jabber: Properly handle adding buddies that contain a resource. Closes #10151.
Paul Aurich <darkrain42@pidgin.im>
parents:
28322
diff
changeset
|
398 | } |
| 7425 | 399 | |
|
28431
8450418b5abd
jabber: Properly handle adding buddies that contain a resource. Closes #10151.
Paul Aurich <darkrain42@pidgin.im>
parents:
28322
diff
changeset
|
400 | 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
|
401 | 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
|
402 | /* |
|
8450418b5abd
jabber: Properly handle adding buddies that contain a resource. Closes #10151.
Paul Aurich <darkrain42@pidgin.im>
parents:
28322
diff
changeset
|
403 | * 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
|
404 | * rename the buddy. |
|
8450418b5abd
jabber: Properly handle adding buddies that contain a resource. Closes #10151.
Paul Aurich <darkrain42@pidgin.im>
parents:
28322
diff
changeset
|
405 | */ |
|
8450418b5abd
jabber: Properly handle adding buddies that contain a resource. Closes #10151.
Paul Aurich <darkrain42@pidgin.im>
parents:
28322
diff
changeset
|
406 | purple_blist_rename_buddy(buddy, who); |
|
8450418b5abd
jabber: Properly handle adding buddies that contain a resource. Closes #10151.
Paul Aurich <darkrain42@pidgin.im>
parents:
28322
diff
changeset
|
407 | } |
|
8450418b5abd
jabber: Properly handle adding buddies that contain a resource. Closes #10151.
Paul Aurich <darkrain42@pidgin.im>
parents:
28322
diff
changeset
|
408 | |
|
8450418b5abd
jabber: Properly handle adding buddies that contain a resource. Closes #10151.
Paul Aurich <darkrain42@pidgin.im>
parents:
28322
diff
changeset
|
409 | 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
|
410 | |
|
8450418b5abd
jabber: Properly handle adding buddies that contain a resource. Closes #10151.
Paul Aurich <darkrain42@pidgin.im>
parents:
28322
diff
changeset
|
411 | 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
|
412 | |
|
23566
fabe91dee1e1
Alright, I'm getting rid of this "groups" thing for the reason listed
Mark Doliner <markdoliner@pidgin.im>
parents:
22993
diff
changeset
|
413 | jabber_roster_update(js, who, NULL); |
| 7014 | 414 | |
|
28071
a0706162fefd
jabber: Store the "own JabberBuddy" in the JabberStream* struct.
Paul Aurich <darkrain42@pidgin.im>
parents:
27743
diff
changeset
|
415 | if (jb == js->user_jb) { |
|
27280
55a39efcf7b8
Simplify the fake_to_self function.
Paul Aurich <darkrain42@pidgin.im>
parents:
27278
diff
changeset
|
416 | jabber_presence_fake_to_self(js, NULL); |
| 9954 | 417 | } else if(!jb || !(jb->subscription & JABBER_SUB_TO)) { |
| 7014 | 418 | jabber_presence_subscription_set(js, who, "subscribe"); |
| 9954 | 419 | } else if((jbr =jabber_buddy_find_resource(jb, NULL))) { |
| 15884 | 420 | purple_prpl_got_user_status(gc->account, who, |
| 9954 | 421 | jabber_buddy_state_get_status_id(jbr->state), |
| 9990 | 422 | "priority", jbr->priority, jbr->status ? "message" : NULL, jbr->status, NULL); |
| 9954 | 423 | } |
| 7425 | 424 | |
| 7014 | 425 | g_free(who); |
| 426 | } | |
| 427 | ||
| 15884 | 428 | void jabber_roster_alias_change(PurpleConnection *gc, const char *name, const char *alias) |
| 7014 | 429 | { |
| 15884 | 430 | PurpleBuddy *b = purple_find_buddy(gc->account, name); |
| 7449 | 431 | |
| 15321 | 432 | if(b != NULL) { |
| 15884 | 433 | purple_blist_alias_buddy(b, alias); |
| 7449 | 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_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
|
436 | name, alias ? alias : "(null)"); |
|
27229
3a0922120d87
Pluck Adium's roster debugging from 86720de21a854aa
Paul Aurich <darkrain42@pidgin.im>
parents:
26707
diff
changeset
|
437 | |
| 15321 | 438 | jabber_roster_update(gc->proto_data, name, NULL); |
| 439 | } | |
| 7014 | 440 | } |
| 441 | ||
| 15884 | 442 | void jabber_roster_group_change(PurpleConnection *gc, const char *name, |
| 7014 | 443 | const char *old_group, const char *new_group) |
| 444 | { | |
| 445 | GSList *buddies, *groups = NULL; | |
| 15884 | 446 | PurpleBuddy *b; |
| 447 | PurpleGroup *g; | |
|
24398
4865c2ee6ea8
Start hiding blist.h internals in prpls.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
24199
diff
changeset
|
448 | const char *gname; |
| 7014 | 449 | |
| 450 | if(!old_group || !new_group || !strcmp(old_group, new_group)) | |
| 451 | return; | |
| 452 | ||
| 15884 | 453 | buddies = purple_find_buddies(gc->account, name); |
| 7014 | 454 | while(buddies) { |
| 455 | b = buddies->data; | |
| 15884 | 456 | g = purple_buddy_get_group(b); |
|
24398
4865c2ee6ea8
Start hiding blist.h internals in prpls.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
24199
diff
changeset
|
457 | gname = purple_group_get_name(g); |
|
4865c2ee6ea8
Start hiding blist.h internals in prpls.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
24199
diff
changeset
|
458 | if(!strcmp(gname, old_group)) |
| 7014 | 459 | groups = g_slist_append(groups, (char*)new_group); /* ick */ |
| 460 | else | |
|
24398
4865c2ee6ea8
Start hiding blist.h internals in prpls.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
24199
diff
changeset
|
461 | groups = g_slist_append(groups, (char*)gname); |
| 7014 | 462 | buddies = g_slist_remove(buddies, b); |
| 463 | } | |
|
27229
3a0922120d87
Pluck Adium's roster debugging from 86720de21a854aa
Paul Aurich <darkrain42@pidgin.im>
parents:
26707
diff
changeset
|
464 | |
|
27230
17f893b060d7
Add a few more roster debug messages and improve.
Paul Aurich <darkrain42@pidgin.im>
parents:
27229
diff
changeset
|
465 | 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
|
466 | name, old_group, new_group); |
|
27229
3a0922120d87
Pluck Adium's roster debugging from 86720de21a854aa
Paul Aurich <darkrain42@pidgin.im>
parents:
26707
diff
changeset
|
467 | |
| 7014 | 468 | jabber_roster_update(gc->proto_data, name, groups); |
| 469 | } | |
| 470 | ||
| 15884 | 471 | void jabber_roster_group_rename(PurpleConnection *gc, const char *old_name, |
| 472 | PurpleGroup *group, GList *moved_buddies) | |
| 7014 | 473 | { |
| 474 | GList *l; | |
|
24398
4865c2ee6ea8
Start hiding blist.h internals in prpls.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
24199
diff
changeset
|
475 | const char *gname = purple_group_get_name(group); |
|
9285
9cedf5d26577
[gaim-migrate @ 10088]
Mark Doliner <markdoliner@pidgin.im>
parents:
8347
diff
changeset
|
476 | for(l = moved_buddies; l; l = l->next) { |
| 15884 | 477 | PurpleBuddy *buddy = l->data; |
|
24398
4865c2ee6ea8
Start hiding blist.h internals in prpls.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
24199
diff
changeset
|
478 | jabber_roster_group_change(gc, purple_buddy_get_name(buddy), old_name, gname); |
| 7014 | 479 | } |
| 480 | } | |
| 481 | ||
| 15884 | 482 | void jabber_roster_remove_buddy(PurpleConnection *gc, PurpleBuddy *buddy, |
| 483 | PurpleGroup *group) { | |
|
24398
4865c2ee6ea8
Start hiding blist.h internals in prpls.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
24199
diff
changeset
|
484 | const char *name = purple_buddy_get_name(buddy); |
|
4865c2ee6ea8
Start hiding blist.h internals in prpls.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
24199
diff
changeset
|
485 | GSList *buddies = purple_find_buddies(purple_connection_get_account(gc), name); |
| 7014 | 486 | |
|
9285
9cedf5d26577
[gaim-migrate @ 10088]
Mark Doliner <markdoliner@pidgin.im>
parents:
8347
diff
changeset
|
487 | 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
|
488 | if(buddies != NULL) { |
| 15884 | 489 | PurpleBuddy *tmpbuddy; |
| 490 | PurpleGroup *tmpgroup; | |
|
20225
684334efdc19
applied changes from d4b316d73ebaf93803ca2642e78b8821c3b5d5c7
Luke Schierer <lschiere@pidgin.im>
parents:
20221
diff
changeset
|
491 | GSList *groups = NULL; |
|
9285
9cedf5d26577
[gaim-migrate @ 10088]
Mark Doliner <markdoliner@pidgin.im>
parents:
8347
diff
changeset
|
492 | |
| 7014 | 493 | while(buddies) { |
|
9285
9cedf5d26577
[gaim-migrate @ 10088]
Mark Doliner <markdoliner@pidgin.im>
parents:
8347
diff
changeset
|
494 | tmpbuddy = buddies->data; |
| 15884 | 495 | tmpgroup = purple_buddy_get_group(tmpbuddy); |
|
24398
4865c2ee6ea8
Start hiding blist.h internals in prpls.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
24199
diff
changeset
|
496 | groups = g_slist_append(groups, (char *)purple_group_get_name(tmpgroup)); |
|
9285
9cedf5d26577
[gaim-migrate @ 10088]
Mark Doliner <markdoliner@pidgin.im>
parents:
8347
diff
changeset
|
497 | buddies = g_slist_remove(buddies, tmpbuddy); |
| 7014 | 498 | } |
|
9285
9cedf5d26577
[gaim-migrate @ 10088]
Mark Doliner <markdoliner@pidgin.im>
parents:
8347
diff
changeset
|
499 | |
|
27230
17f893b060d7
Add a few more roster debug messages and improve.
Paul Aurich <darkrain42@pidgin.im>
parents:
27229
diff
changeset
|
500 | purple_debug_info("jabber", "jabber_roster_remove_buddy(): Removing %s from %s\n", |
|
17f893b060d7
Add a few more roster debug messages and improve.
Paul Aurich <darkrain42@pidgin.im>
parents:
27229
diff
changeset
|
501 | purple_buddy_get_name(buddy), purple_group_get_name(group)); |
|
27229
3a0922120d87
Pluck Adium's roster debugging from 86720de21a854aa
Paul Aurich <darkrain42@pidgin.im>
parents:
26707
diff
changeset
|
502 | |
|
24398
4865c2ee6ea8
Start hiding blist.h internals in prpls.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
24199
diff
changeset
|
503 | jabber_roster_update(gc->proto_data, name, groups); |
| 7014 | 504 | } else { |
| 7171 | 505 | JabberIq *iq = jabber_iq_new_query(gc->proto_data, JABBER_IQ_SET, |
| 506 | "jabber:iq:roster"); | |
| 507 | xmlnode *query = xmlnode_get_child(iq->node, "query"); | |
| 508 | xmlnode *item = xmlnode_new_child(query, "item"); | |
| 509 | ||
|
24398
4865c2ee6ea8
Start hiding blist.h internals in prpls.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
24199
diff
changeset
|
510 | xmlnode_set_attrib(item, "jid", name); |
| 7171 | 511 | xmlnode_set_attrib(item, "subscription", "remove"); |
| 512 | ||
|
27230
17f893b060d7
Add a few more roster debug messages and improve.
Paul Aurich <darkrain42@pidgin.im>
parents:
27229
diff
changeset
|
513 | 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
|
514 | purple_buddy_get_name(buddy)); |
|
17f893b060d7
Add a few more roster debug messages and improve.
Paul Aurich <darkrain42@pidgin.im>
parents:
27229
diff
changeset
|
515 | |
| 7171 | 516 | jabber_iq_send(iq); |
| 7014 | 517 | } |
| 518 | } |