pidgin: e8233b3a: jabber_google_roster_add_deny() and jabb...

[evands at pidgin.im]

-----------------------------------------------------------------
Revision: e8233b3a32b1383e10d9591fee51f5ecb99a40ce
Ancestor: 1d533cebad7c0dbda8ec8ebee1334d27dcae5f9c
Author: evands at pidgin.im
Date: 2008-07-01T04:26:19
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/e8233b3a32b1383e10d9591fee51f5ecb99a40ce

Modified files:
        libpurple/protocols/jabber/google.c

ChangeLog: 

jabber_google_roster_add_deny() and jabber_google_roster_rem_deny()
previously recreated the iq, query, and item after inserting group information,
nullifying the usefulness of having done so. I don't know of a specific
problem which this fixes, as I just noticed it while investigating the
"jabber:iq:roster" infinite loop discussed on pidgin-devl and in #5484

-------------- next part --------------
============================================================
--- libpurple/protocols/jabber/google.c	a0d13b8f6207182f5fc8f10066881688229d698c
+++ libpurple/protocols/jabber/google.c	f0624dcce3f7675f95224023738a5bc83d8f8fbb
@@ -314,11 +314,6 @@ void jabber_google_roster_add_deny(Purpl
 		buddies = buddies->next;
 	}
 
-	iq = jabber_iq_new_query(js, JABBER_IQ_SET, "jabber:iq:roster");
-
-	query = xmlnode_get_child(iq->node, "query");
-	item = xmlnode_new_child(query, "item");
-
 	xmlnode_set_attrib(item, "jid", who);
 	xmlnode_set_attrib(item, "name", b->alias ? b->alias : "");
 	xmlnode_set_attrib(item, "gr:t", "B");
@@ -385,11 +380,6 @@ void jabber_google_roster_rem_deny(Purpl
 		buddies = buddies->next;
 	}
 
-	iq = jabber_iq_new_query(js, JABBER_IQ_SET, "jabber:iq:roster");
-
-	query = xmlnode_get_child(iq->node, "query");
-	item = xmlnode_new_child(query, "item");
-
 	xmlnode_set_attrib(item, "jid", who);
 	xmlnode_set_attrib(item, "name", b->alias ? b->alias : "");
 	xmlnode_set_attrib(query, "xmlns:gr", "google:roster");