# HG changeset patch
# User Paul Aurich <paul@darkrain42.org>
# Date 1238476964 0
# Node ID de05bdd931ed242caaf32fe31230708d030b5db1
# Parent  c619bef09bec4df6394c8373a2aa8592a2a961d8
The core should be in charge of setting in_progress to FALSE

diff -r c619bef09bec -r de05bdd931ed libpurple/disco.c
--- a/libpurple/disco.c	Tue Mar 31 05:18:09 2009 +0000
+++ b/libpurple/disco.c	Tue Mar 31 05:22:44 2009 +0000
@@ -196,6 +196,8 @@
 
 	if (prpl_info && PURPLE_PROTOCOL_PLUGIN_HAS_FUNC(prpl_info, disco_cancel))
 		prpl_info->disco_cancel(list);
+
+	purple_disco_list_set_in_progress(list, FALSE);
 }
 
 void purple_disco_service_register(PurpleDiscoService *service)
diff -r c619bef09bec -r de05bdd931ed libpurple/protocols/jabber/disco.c
--- a/libpurple/protocols/jabber/disco.c	Tue Mar 31 05:18:09 2009 +0000
+++ b/libpurple/protocols/jabber/disco.c	Tue Mar 31 05:22:44 2009 +0000
@@ -981,12 +981,9 @@
 	if (list_data->fetch_count == 0) {
 		/* Nothing outstanding, just free it now... */
 		jabber_disco_list_data_destroy(list_data);
-	} else {
+	} else
 		/* We'll free it when the count is 0 */
 		list_data->list = NULL;
-	}
-
-	purple_disco_list_set_in_progress(list, FALSE);	
 }
 
 int