# HG changeset patch
# User Eric Warmenhoven <eric@warmenhoven.org>
# Date 977451971 0
# Node ID f6a8bca11766a34be7ad1e161dab60f6618a508d
# Parent  2e82135672780df7d91848be1c4bc40826bf07c8
[gaim-migrate @ 1363]
more fixes

committer: Tailor Script <tailor@pidgin.im>

diff -r 2e8213567278 -r f6a8bca11766 plugins/jabber/jabber.c
--- a/plugins/jabber/jabber.c	Fri Dec 22 02:25:28 2000 +0000
+++ b/plugins/jabber/jabber.c	Fri Dec 22 02:26:11 2000 +0000
@@ -445,11 +445,9 @@
 	from = xmlnode_get_attrib(p->x, "from");
 	type = xmlnode_get_attrib(p->x, "type");
 
-	debug_printf("jabber: presence: %s, %s %s\n", to, from, type);
 	who = jid_new(j->p, from);
 	if (who->user == NULL) {
 		/* FIXME: transport */
-		debug_printf("user was NULL in handlepresence!\n");
 		return;
 	}
 
@@ -521,7 +519,6 @@
 					groupname = xmlnode_get_data(xmlnode_get_firstchild(g));
 					if (who->user == NULL) {
 						/* FIXME: transport */
-						debug_printf("user was NULL in handleroster!\n");
 						g = xmlnode_get_nextsibling(g);
 						continue;
 					}
@@ -549,7 +546,6 @@
 
 			if (who->user == NULL) {
 				/* FIXME: transport */
-				debug_printf("user was NULL in handleroster!\n");
 				x = xmlnode_get_nextsibling(x);
 				continue;
 			}
@@ -735,7 +731,6 @@
 		jid who = jid_new(j->p, name);
 		if (who->user == NULL) {
 			/* FIXME: transport */
-			debug_printf("user was NULL in add_buddy!\n");
 			return;
 		}
 		realwho = g_strdup_printf("%s@%s", who->user, who->server);
@@ -770,6 +765,7 @@
 
 	x = jutil_iqnew(JPACKET__SET, NS_ROSTER);
 	y = xmlnode_insert_tag(xmlnode_get_tag(x, "query"), "item");
+	xmlnode_put_attrib(y, "jid", realwho);
 	xmlnode_put_attrib(y, "subscription", "remove");
 	gjab_send(((struct jabber_data *)gc->proto_data)->jc, x);