im.pidgin.pidgin: 0e154355bb3e8bdaeb793b142075b60671b37a48

[nwalp at pidgin.im]

-----------------------------------------------------------------
Revision: 0e154355bb3e8bdaeb793b142075b60671b37a48
Ancestor: e6ce6d14c995030c3a6c8d7574f56d3b3e73633a
Author: nwalp at pidgin.im
Date: 2007-11-03T17:04:25
Branch: im.pidgin.pidgin

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

ChangeLog: 

don't send a canceled user query
fixes #3812

-------------- next part --------------
============================================================
--- libpurple/protocols/jabber/buddy.c	cbc174538228da168be426be40fd1ca77d17f85d
+++ libpurple/protocols/jabber/buddy.c	d371ef17dd22c16f9cc12098d31be2ce6a2f7ad5
@@ -2252,7 +2252,17 @@ static void user_search_x_data_cb(Jabber
 	xmlnode *query;
 	JabberIq *iq;
 	char *dir_server = data;
+	const char *type;
 
+	/* if they've cancelled the search, we're
+	 * just going to get an error if we send
+	 * a cancel, so skip it */
+	type = xmlnode_get_attrib(result, "type");
+	if(type && !strcmp(type, "cancel")) {
+		g_free(dir_server);
+		return;
+	}
+
 	iq = jabber_iq_new_query(js, JABBER_IQ_SET, "jabber:iq:search");
 	query = xmlnode_get_child(iq->node, "query");