Tue, 13 Feb 2007 22:19:26 +0000
Fixed 3 Jabber memory leaks: in jabber_roster_parse(), there's no need to g_strdup() this normalized jid since it's only used immediately, and there was no correspoding g_free(). When removing an id from jbi->ids, its data should always be freed. Finally, gaim_str_seconds_to_string() returns retained memory -- we must free the returned pointer when we're done using it.
| 7014 | 1 | /* |
| 2 | * gaim - Jabber Protocol Plugin | |
| 3 | * | |
| 4 | * Copyright (C) 2003, Nathan Walp <faceprint@faceprint.com> | |
| 5 | * | |
| 6 | * This program is free software; you can redistribute it and/or modify | |
| 7 | * it under the terms of the GNU General Public License as published by | |
| 8 | * the Free Software Foundation; either version 2 of the License, or | |
| 9 | * (at your option) any later version. | |
| 10 | * | |
| 11 | * This program is distributed in the hope that it will be useful, | |
| 12 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | |
| 13 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
| 14 | * GNU General Public License for more details. | |
| 15 | * | |
| 16 | * You should have received a copy of the GNU General Public License | |
| 17 | * along with this program; if not, write to the Free Software | |
| 18 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | |
| 19 | * | |
| 20 | */ | |
| 21 | #include "internal.h" | |
| 22 | #include "debug.h" | |
| 23 | #include "server.h" | |
| 13809 | 24 | #include "util.h" |
| 7014 | 25 | |
| 26 | #include "buddy.h" | |
| 15265 | 27 | #include "google.h" |
| 7014 | 28 | #include "presence.h" |
| 29 | #include "roster.h" | |
| 30 | #include "iq.h" | |
| 31 | ||
| 32 | #include <string.h> | |
| 33 | ||
| 34 | ||
| 35 | void jabber_roster_request(JabberStream *js) | |
| 36 | { | |
| 37 | JabberIq *iq; | |
| 38 | ||
| 39 | iq = jabber_iq_new_query(js, JABBER_IQ_GET, "jabber:iq:roster"); | |
| 40 | ||
| 41 | jabber_iq_send(iq); | |
| 42 | } | |
| 43 | ||
| 44 | static void remove_gaim_buddies(JabberStream *js, const char *jid) | |
| 45 | { | |
| 46 | GSList *buddies, *l; | |
| 47 | ||
| 48 | buddies = gaim_find_buddies(js->gc->account, jid); | |
| 49 | ||
| 50 | for(l = buddies; l; l = l->next) | |
| 51 | gaim_blist_remove_buddy(l->data); | |
| 52 | ||
| 53 | g_slist_free(buddies); | |
| 54 | } | |
| 55 | ||
|
15608
16f8c5f4c7e5
Rename this function to something that makes more sense to me
Mark Doliner <markdoliner@pidgin.im>
parents:
15530
diff
changeset
|
56 | static void add_gaim_buddies_to_groups(JabberStream *js, const char *jid, |
| 7014 | 57 | const char *alias, GSList *groups) |
| 58 | { | |
| 59 | GSList *buddies, *g2, *l; | |
|
13987
b5b1db6007b0
[gaim-migrate @ 16442]
Mark Doliner <markdoliner@pidgin.im>
parents:
13809
diff
changeset
|
60 | gchar *my_bare_jid; |
| 7014 | 61 | |
| 62 | buddies = gaim_find_buddies(js->gc->account, jid); | |
| 63 | ||
| 64 | g2 = groups; | |
| 65 | ||
| 66 | if(!groups) { | |
| 67 | if(!buddies) | |
| 68 | g2 = g_slist_append(g2, g_strdup(_("Buddies"))); | |
| 69 | else | |
| 70 | return; | |
| 71 | } | |
| 72 | ||
|
13987
b5b1db6007b0
[gaim-migrate @ 16442]
Mark Doliner <markdoliner@pidgin.im>
parents:
13809
diff
changeset
|
73 | my_bare_jid = g_strdup_printf("%s@%s", js->user->node, js->user->domain); |
|
b5b1db6007b0
[gaim-migrate @ 16442]
Mark Doliner <markdoliner@pidgin.im>
parents:
13809
diff
changeset
|
74 | |
| 7014 | 75 | while(buddies) { |
| 76 | GaimBuddy *b = buddies->data; | |
| 12088 | 77 | GaimGroup *g = gaim_buddy_get_group(b); |
| 7014 | 78 | |
| 79 | buddies = g_slist_remove(buddies, b); | |
| 80 | ||
| 81 | if((l = g_slist_find_custom(g2, g->name, (GCompareFunc)strcmp))) { | |
| 7955 | 82 | const char *servernick; |
| 83 | ||
| 84 | if((servernick = gaim_blist_node_get_string((GaimBlistNode*)b, "servernick"))) | |
| 85 | serv_got_alias(js->gc, jid, servernick); | |
| 86 | ||
| 7014 | 87 | if(alias && (!b->alias || strcmp(b->alias, alias))) |
| 88 | gaim_blist_alias_buddy(b, alias); | |
| 89 | g_free(l->data); | |
| 90 | g2 = g_slist_delete_link(g2, l); | |
| 91 | } else { | |
| 92 | gaim_blist_remove_buddy(b); | |
| 93 | } | |
| 94 | } | |
| 95 | ||
| 96 | while(g2) { | |
| 97 | GaimBuddy *b = gaim_buddy_new(js->gc->account, jid, alias); | |
| 98 | GaimGroup *g = gaim_find_group(g2->data); | |
| 99 | ||
| 100 | if(!g) { | |
| 101 | g = gaim_group_new(g2->data); | |
| 102 | gaim_blist_add_group(g, NULL); | |
| 103 | } | |
| 104 | ||
| 105 | gaim_blist_add_buddy(b, NULL, g, NULL); | |
| 7955 | 106 | gaim_blist_alias_buddy(b, alias); |
|
13987
b5b1db6007b0
[gaim-migrate @ 16442]
Mark Doliner <markdoliner@pidgin.im>
parents:
13809
diff
changeset
|
107 | |
|
b5b1db6007b0
[gaim-migrate @ 16442]
Mark Doliner <markdoliner@pidgin.im>
parents:
13809
diff
changeset
|
108 | /* If we just learned about ourself, then fake our status, |
|
b5b1db6007b0
[gaim-migrate @ 16442]
Mark Doliner <markdoliner@pidgin.im>
parents:
13809
diff
changeset
|
109 | * because we won't be receiving a normal presence message |
|
b5b1db6007b0
[gaim-migrate @ 16442]
Mark Doliner <markdoliner@pidgin.im>
parents:
13809
diff
changeset
|
110 | * about ourself. */ |
|
b5b1db6007b0
[gaim-migrate @ 16442]
Mark Doliner <markdoliner@pidgin.im>
parents:
13809
diff
changeset
|
111 | if(!strcmp(b->name, my_bare_jid)) { |
|
b5b1db6007b0
[gaim-migrate @ 16442]
Mark Doliner <markdoliner@pidgin.im>
parents:
13809
diff
changeset
|
112 | GaimPresence *gpresence; |
|
b5b1db6007b0
[gaim-migrate @ 16442]
Mark Doliner <markdoliner@pidgin.im>
parents:
13809
diff
changeset
|
113 | GaimStatus *status; |
|
b5b1db6007b0
[gaim-migrate @ 16442]
Mark Doliner <markdoliner@pidgin.im>
parents:
13809
diff
changeset
|
114 | |
|
b5b1db6007b0
[gaim-migrate @ 16442]
Mark Doliner <markdoliner@pidgin.im>
parents:
13809
diff
changeset
|
115 | gpresence = gaim_account_get_presence(js->gc->account); |
|
b5b1db6007b0
[gaim-migrate @ 16442]
Mark Doliner <markdoliner@pidgin.im>
parents:
13809
diff
changeset
|
116 | status = gaim_presence_get_active_status(gpresence); |
|
b5b1db6007b0
[gaim-migrate @ 16442]
Mark Doliner <markdoliner@pidgin.im>
parents:
13809
diff
changeset
|
117 | jabber_presence_fake_to_self(js, status); |
|
b5b1db6007b0
[gaim-migrate @ 16442]
Mark Doliner <markdoliner@pidgin.im>
parents:
13809
diff
changeset
|
118 | } |
|
b5b1db6007b0
[gaim-migrate @ 16442]
Mark Doliner <markdoliner@pidgin.im>
parents:
13809
diff
changeset
|
119 | |
| 7014 | 120 | g_free(g2->data); |
| 121 | g2 = g_slist_delete_link(g2, g2); | |
| 122 | } | |
| 123 | ||
|
13987
b5b1db6007b0
[gaim-migrate @ 16442]
Mark Doliner <markdoliner@pidgin.im>
parents:
13809
diff
changeset
|
124 | g_free(my_bare_jid); |
| 7014 | 125 | g_slist_free(buddies); |
| 126 | } | |
| 127 | ||
| 128 | void jabber_roster_parse(JabberStream *js, xmlnode *packet) | |
| 129 | { | |
| 130 | xmlnode *query, *item, *group; | |
| 131 | const char *from = xmlnode_get_attrib(packet, "from"); | |
| 7310 | 132 | |
| 133 | if(from) { | |
| 7445 | 134 | char *from_norm; |
| 7310 | 135 | gboolean invalid; |
| 7175 | 136 | |
| 7445 | 137 | from_norm = g_strdup(jabber_normalize(js->gc->account, from)); |
| 138 | ||
| 139 | if(!from_norm) | |
| 7310 | 140 | return; |
| 141 | ||
| 7445 | 142 | invalid = g_utf8_collate(from_norm, |
| 143 | jabber_normalize(js->gc->account, | |
| 144 | gaim_account_get_username(js->gc->account))); | |
| 7175 | 145 | |
| 7310 | 146 | g_free(from_norm); |
| 147 | ||
| 148 | if(invalid) | |
| 149 | return; | |
| 7175 | 150 | } |
| 151 | ||
| 7014 | 152 | query = xmlnode_get_child(packet, "query"); |
| 153 | if(!query) | |
| 154 | return; | |
| 155 | ||
| 156 | js->roster_parsed = TRUE; | |
| 157 | ||
| 8135 | 158 | for(item = xmlnode_get_child(query, "item"); item; item = xmlnode_get_next_twin(item)) |
| 7014 | 159 | { |
| 160 | const char *jid, *name, *subscription, *ask; | |
| 161 | JabberBuddy *jb; | |
| 162 | ||
| 163 | subscription = xmlnode_get_attrib(item, "subscription"); | |
| 164 | jid = xmlnode_get_attrib(item, "jid"); | |
| 165 | name = xmlnode_get_attrib(item, "name"); | |
| 166 | ask = xmlnode_get_attrib(item, "ask"); | |
| 167 | ||
| 8347 | 168 | if(!jid) |
| 169 | continue; | |
| 170 | ||
| 171 | if(!(jb = jabber_buddy_find(js, jid, TRUE))) | |
| 172 | continue; | |
| 7014 | 173 | |
| 10289 | 174 | if(subscription) { |
| 12285 | 175 | gint me = -1; |
| 176 | char *jid_norm; | |
| 177 | const char *username; | |
| 178 | ||
|
15688
048953c6b084
Fixed 3 Jabber memory leaks: in jabber_roster_parse(), there's no need to g_strdup() this normalized jid since it's only used immediately, and there was no correspoding g_free(). When removing an id from jbi->ids, its data should always be freed. Finally, gaim_str_seconds_to_string() returns retained memory -- we must free the returned pointer when we're done using it.
Evan Schoenberg <evands@pidgin.im>
parents:
15608
diff
changeset
|
179 | jid_norm = jabber_normalize(js->gc->account, jid); |
| 12285 | 180 | username = gaim_account_get_username(js->gc->account); |
| 181 | me = g_utf8_collate(jid_norm, | |
| 182 | jabber_normalize(js->gc->account, | |
| 183 | username)); | |
| 184 | ||
| 185 | if(me == 0) | |
| 186 | jb->subscription = JABBER_SUB_BOTH; | |
| 187 | else if(!strcmp(subscription, "none")) | |
| 188 | jb->subscription = JABBER_SUB_NONE; | |
| 189 | else if(!strcmp(subscription, "to")) | |
| 10289 | 190 | jb->subscription = JABBER_SUB_TO; |
| 191 | else if(!strcmp(subscription, "from")) | |
| 192 | jb->subscription = JABBER_SUB_FROM; | |
| 193 | else if(!strcmp(subscription, "both")) | |
| 194 | jb->subscription = JABBER_SUB_BOTH; | |
| 195 | else if(!strcmp(subscription, "remove")) | |
| 196 | jb->subscription = JABBER_SUB_REMOVE; | |
| 10941 | 197 | /* XXX: if subscription is now "from" or "none" we need to |
| 198 | * fake a signoff, since we won't get any presence from them | |
| 199 | * anymore */ | |
| 12285 | 200 | /* YYY: I was going to use this, but I'm not sure it's necessary |
| 201 | * anymore, but it's here in case it is. */ | |
| 202 | /* | |
| 203 | if ((jb->subscription & JABBER_SUB_FROM) || | |
| 204 | (jb->subscription & JABBER_SUB_NONE)) { | |
| 205 | gaim_prpl_got_user_status(js->gc->account, jid, "offline", NULL); | |
| 206 | } | |
| 207 | */ | |
| 10289 | 208 | } |
| 7014 | 209 | |
| 210 | if(ask && !strcmp(ask, "subscribe")) | |
| 211 | jb->subscription |= JABBER_SUB_PENDING; | |
| 212 | else | |
| 213 | jb->subscription &= ~JABBER_SUB_PENDING; | |
| 214 | ||
| 8194 | 215 | if(jb->subscription == JABBER_SUB_REMOVE) { |
| 7014 | 216 | remove_gaim_buddies(js, jid); |
| 217 | } else { | |
| 218 | GSList *groups = NULL; | |
| 8135 | 219 | for(group = xmlnode_get_child(item, "group"); group; group = xmlnode_get_next_twin(group)) { |
| 7316 | 220 | char *group_name; |
| 221 | ||
| 222 | if(!(group_name = xmlnode_get_data(group))) | |
| 223 | group_name = g_strdup(""); | |
| 13809 | 224 | |
| 225 | if (g_slist_find_custom(groups, group_name, (GCompareFunc)gaim_utf8_strcasecmp) == NULL) | |
| 226 | groups = g_slist_append(groups, group_name); | |
| 7014 | 227 | } |
| 15265 | 228 | if (js->server_caps & JABBER_CAP_GOOGLE_ROSTER) |
|
15530
9355a1be068e
Make deleting Google Talk buddies work
Sean Egan <seanegan@pidgin.im>
parents:
15435
diff
changeset
|
229 | if (!jabber_google_roster_incoming(js, item)) |
|
9355a1be068e
Make deleting Google Talk buddies work
Sean Egan <seanegan@pidgin.im>
parents:
15435
diff
changeset
|
230 | continue; |
|
15608
16f8c5f4c7e5
Rename this function to something that makes more sense to me
Mark Doliner <markdoliner@pidgin.im>
parents:
15530
diff
changeset
|
231 | add_gaim_buddies_to_groups(js, jid, name, groups); |
| 7014 | 232 | } |
| 233 | } | |
| 234 | } | |
| 235 | ||
| 236 | static void jabber_roster_update(JabberStream *js, const char *name, | |
| 237 | GSList *grps) | |
| 238 | { | |
| 239 | GaimBuddy *b; | |
| 240 | GaimGroup *g; | |
| 241 | GSList *groups = NULL, *l; | |
| 242 | JabberIq *iq; | |
| 243 | xmlnode *query, *item, *group; | |
| 244 | ||
| 245 | if(grps) { | |
| 246 | groups = grps; | |
| 247 | } else { | |
| 248 | GSList *buddies = gaim_find_buddies(js->gc->account, name); | |
| 249 | if(!buddies) | |
| 250 | return; | |
| 251 | while(buddies) { | |
| 252 | b = buddies->data; | |
| 12088 | 253 | g = gaim_buddy_get_group(b); |
| 7014 | 254 | groups = g_slist_append(groups, g->name); |
| 255 | buddies = g_slist_remove(buddies, b); | |
| 256 | } | |
| 257 | } | |
| 258 | ||
| 8120 | 259 | if(!(b = gaim_find_buddy(js->gc->account, name))) |
| 260 | return; | |
| 7014 | 261 | |
| 262 | iq = jabber_iq_new_query(js, JABBER_IQ_SET, "jabber:iq:roster"); | |
| 263 | ||
| 264 | query = xmlnode_get_child(iq->node, "query"); | |
| 265 | item = xmlnode_new_child(query, "item"); | |
| 266 | ||
| 267 | xmlnode_set_attrib(item, "jid", name); | |
| 268 | ||
| 15162 | 269 | xmlnode_set_attrib(item, "name", b->alias ? b->alias : ""); |
| 7014 | 270 | |
| 271 | for(l = groups; l; l = l->next) { | |
| 272 | group = xmlnode_new_child(item, "group"); | |
| 273 | xmlnode_insert_data(group, l->data, -1); | |
| 274 | } | |
| 275 | ||
| 276 | if(!grps) | |
| 277 | g_slist_free(groups); | |
| 15265 | 278 | |
| 279 | if (js->server_caps & JABBER_CAP_GOOGLE_ROSTER) { | |
| 280 | jabber_google_roster_outgoing(js, query, item); | |
| 281 | xmlnode_set_attrib(query, "xmlns:gr", "google:roster"); | |
| 282 | xmlnode_set_attrib(query, "gr:ext", "2"); | |
| 283 | } | |
| 7014 | 284 | jabber_iq_send(iq); |
| 285 | } | |
| 286 | ||
|
9285
9cedf5d26577
[gaim-migrate @ 10088]
Mark Doliner <markdoliner@pidgin.im>
parents:
8347
diff
changeset
|
287 | void jabber_roster_add_buddy(GaimConnection *gc, GaimBuddy *buddy, |
|
9cedf5d26577
[gaim-migrate @ 10088]
Mark Doliner <markdoliner@pidgin.im>
parents:
8347
diff
changeset
|
288 | GaimGroup *group) |
| 7014 | 289 | { |
| 290 | JabberStream *js = gc->proto_data; | |
| 291 | char *who; | |
| 7425 | 292 | GSList *groups = NULL; |
| 7014 | 293 | JabberBuddy *jb; |
| 7488 | 294 | JabberBuddyResource *jbr; |
| 8194 | 295 | char *my_bare_jid; |
| 7014 | 296 | |
| 297 | if(!js->roster_parsed) | |
| 298 | return; | |
| 299 | ||
|
9285
9cedf5d26577
[gaim-migrate @ 10088]
Mark Doliner <markdoliner@pidgin.im>
parents:
8347
diff
changeset
|
300 | if(!(who = jabber_get_bare_jid(buddy->name))) |
| 7425 | 301 | return; |
| 7014 | 302 | |
|
9285
9cedf5d26577
[gaim-migrate @ 10088]
Mark Doliner <markdoliner@pidgin.im>
parents:
8347
diff
changeset
|
303 | jb = jabber_buddy_find(js, buddy->name, FALSE); |
| 7425 | 304 | |
| 305 | if(!jb || !(jb->subscription & JABBER_SUB_TO)) { | |
|
9285
9cedf5d26577
[gaim-migrate @ 10088]
Mark Doliner <markdoliner@pidgin.im>
parents:
8347
diff
changeset
|
306 | groups = g_slist_append(groups, group->name); |
| 7425 | 307 | } |
| 7014 | 308 | |
| 7449 | 309 | jabber_roster_update(js, who, groups); |
| 7014 | 310 | |
| 8194 | 311 | my_bare_jid = g_strdup_printf("%s@%s", js->user->node, js->user->domain); |
| 9954 | 312 | if(!strcmp(who, my_bare_jid)) { |
| 313 | GaimPresence *gpresence; | |
| 314 | GaimStatus *status; | |
| 315 | ||
| 316 | gpresence = gaim_account_get_presence(js->gc->account); | |
| 317 | status = gaim_presence_get_active_status(gpresence); | |
| 318 | jabber_presence_fake_to_self(js, status); | |
| 319 | } else if(!jb || !(jb->subscription & JABBER_SUB_TO)) { | |
| 7014 | 320 | jabber_presence_subscription_set(js, who, "subscribe"); |
| 9954 | 321 | } else if((jbr =jabber_buddy_find_resource(jb, NULL))) { |
| 322 | gaim_prpl_got_user_status(gc->account, who, | |
| 323 | jabber_buddy_state_get_status_id(jbr->state), | |
| 9990 | 324 | "priority", jbr->priority, jbr->status ? "message" : NULL, jbr->status, NULL); |
| 9954 | 325 | } |
| 7425 | 326 | |
| 8194 | 327 | g_free(my_bare_jid); |
| 7014 | 328 | g_free(who); |
| 329 | } | |
| 330 | ||
| 331 | void jabber_roster_alias_change(GaimConnection *gc, const char *name, const char *alias) | |
| 332 | { | |
| 7449 | 333 | GaimBuddy *b = gaim_find_buddy(gc->account, name); |
| 334 | ||
| 15321 | 335 | if(b != NULL) { |
| 336 | gaim_blist_alias_buddy(b, alias); | |
| 7449 | 337 | |
| 15321 | 338 | jabber_roster_update(gc->proto_data, name, NULL); |
| 339 | } | |
| 7014 | 340 | } |
| 341 | ||
| 342 | void jabber_roster_group_change(GaimConnection *gc, const char *name, | |
| 343 | const char *old_group, const char *new_group) | |
| 344 | { | |
| 345 | GSList *buddies, *groups = NULL; | |
| 346 | GaimBuddy *b; | |
| 347 | GaimGroup *g; | |
| 348 | ||
| 349 | if(!old_group || !new_group || !strcmp(old_group, new_group)) | |
| 350 | return; | |
| 351 | ||
| 352 | buddies = gaim_find_buddies(gc->account, name); | |
| 353 | while(buddies) { | |
| 354 | b = buddies->data; | |
| 12088 | 355 | g = gaim_buddy_get_group(b); |
| 7014 | 356 | if(!strcmp(g->name, old_group)) |
| 357 | groups = g_slist_append(groups, (char*)new_group); /* ick */ | |
| 358 | else | |
| 359 | groups = g_slist_append(groups, g->name); | |
| 360 | buddies = g_slist_remove(buddies, b); | |
| 361 | } | |
| 362 | jabber_roster_update(gc->proto_data, name, groups); | |
| 363 | g_slist_free(groups); | |
| 364 | } | |
| 365 | ||
|
9285
9cedf5d26577
[gaim-migrate @ 10088]
Mark Doliner <markdoliner@pidgin.im>
parents:
8347
diff
changeset
|
366 | void jabber_roster_group_rename(GaimConnection *gc, const char *old_name, |
|
9cedf5d26577
[gaim-migrate @ 10088]
Mark Doliner <markdoliner@pidgin.im>
parents:
8347
diff
changeset
|
367 | GaimGroup *group, GList *moved_buddies) |
| 7014 | 368 | { |
| 369 | GList *l; | |
|
9285
9cedf5d26577
[gaim-migrate @ 10088]
Mark Doliner <markdoliner@pidgin.im>
parents:
8347
diff
changeset
|
370 | for(l = moved_buddies; l; l = l->next) { |
|
9cedf5d26577
[gaim-migrate @ 10088]
Mark Doliner <markdoliner@pidgin.im>
parents:
8347
diff
changeset
|
371 | GaimBuddy *buddy = l->data; |
|
9cedf5d26577
[gaim-migrate @ 10088]
Mark Doliner <markdoliner@pidgin.im>
parents:
8347
diff
changeset
|
372 | jabber_roster_group_change(gc, buddy->name, old_name, group->name); |
| 7014 | 373 | } |
| 374 | } | |
| 375 | ||
|
9285
9cedf5d26577
[gaim-migrate @ 10088]
Mark Doliner <markdoliner@pidgin.im>
parents:
8347
diff
changeset
|
376 | void jabber_roster_remove_buddy(GaimConnection *gc, GaimBuddy *buddy, |
|
9cedf5d26577
[gaim-migrate @ 10088]
Mark Doliner <markdoliner@pidgin.im>
parents:
8347
diff
changeset
|
377 | GaimGroup *group) { |
|
9cedf5d26577
[gaim-migrate @ 10088]
Mark Doliner <markdoliner@pidgin.im>
parents:
8347
diff
changeset
|
378 | GSList *buddies = gaim_find_buddies(gc->account, buddy->name); |
| 7014 | 379 | GSList *groups = NULL; |
| 380 | ||
|
9285
9cedf5d26577
[gaim-migrate @ 10088]
Mark Doliner <markdoliner@pidgin.im>
parents:
8347
diff
changeset
|
381 | buddies = g_slist_remove(buddies, buddy); |
| 7014 | 382 | if(g_slist_length(buddies)) { |
|
9285
9cedf5d26577
[gaim-migrate @ 10088]
Mark Doliner <markdoliner@pidgin.im>
parents:
8347
diff
changeset
|
383 | GaimBuddy *tmpbuddy; |
|
9cedf5d26577
[gaim-migrate @ 10088]
Mark Doliner <markdoliner@pidgin.im>
parents:
8347
diff
changeset
|
384 | GaimGroup *tmpgroup; |
|
9cedf5d26577
[gaim-migrate @ 10088]
Mark Doliner <markdoliner@pidgin.im>
parents:
8347
diff
changeset
|
385 | |
| 7014 | 386 | while(buddies) { |
|
9285
9cedf5d26577
[gaim-migrate @ 10088]
Mark Doliner <markdoliner@pidgin.im>
parents:
8347
diff
changeset
|
387 | tmpbuddy = buddies->data; |
| 12088 | 388 | tmpgroup = gaim_buddy_get_group(tmpbuddy); |
|
9285
9cedf5d26577
[gaim-migrate @ 10088]
Mark Doliner <markdoliner@pidgin.im>
parents:
8347
diff
changeset
|
389 | groups = g_slist_append(groups, tmpgroup->name); |
|
9cedf5d26577
[gaim-migrate @ 10088]
Mark Doliner <markdoliner@pidgin.im>
parents:
8347
diff
changeset
|
390 | buddies = g_slist_remove(buddies, tmpbuddy); |
| 7014 | 391 | } |
|
9285
9cedf5d26577
[gaim-migrate @ 10088]
Mark Doliner <markdoliner@pidgin.im>
parents:
8347
diff
changeset
|
392 | |
|
9cedf5d26577
[gaim-migrate @ 10088]
Mark Doliner <markdoliner@pidgin.im>
parents:
8347
diff
changeset
|
393 | jabber_roster_update(gc->proto_data, buddy->name, groups); |
| 7014 | 394 | } else { |
| 7171 | 395 | JabberIq *iq = jabber_iq_new_query(gc->proto_data, JABBER_IQ_SET, |
| 396 | "jabber:iq:roster"); | |
| 397 | xmlnode *query = xmlnode_get_child(iq->node, "query"); | |
| 398 | xmlnode *item = xmlnode_new_child(query, "item"); | |
| 399 | ||
|
9285
9cedf5d26577
[gaim-migrate @ 10088]
Mark Doliner <markdoliner@pidgin.im>
parents:
8347
diff
changeset
|
400 | xmlnode_set_attrib(item, "jid", buddy->name); |
| 7171 | 401 | xmlnode_set_attrib(item, "subscription", "remove"); |
| 402 | ||
| 403 | jabber_iq_send(iq); | |
| 7014 | 404 | } |
| 405 | ||
| 406 | if(buddies) | |
| 407 | g_slist_free(buddies); | |
| 408 | if(groups) | |
| 409 | g_slist_free(groups); | |
| 410 | } |