cpw.darkrain42.xmpp.disco: 5718640f: The core should be in charge of setting ...

[paul at darkrain42.org]

-----------------------------------------------------------------
Revision: 5718640f5c3ffb0d9ff0fea50bd78278e248f0a4
Ancestor: af47c59c074fa17389abea8161fb8ce796606352
Author: paul at darkrain42.org
Date: 2009-03-31T05:22:44
Branch: im.pidgin.cpw.darkrain42.xmpp.disco
URL: http://d.pidgin.im/viewmtn/revision/info/5718640f5c3ffb0d9ff0fea50bd78278e248f0a4

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

ChangeLog: 

The core should be in charge of setting in_progress to FALSE

-------------- next part --------------
============================================================
--- libpurple/disco.c	8fff4e6d842ff8171e546994f36466a67bc7d2f5
+++ libpurple/disco.c	346c1e9279e50eac59307ae5ec4367a60fb649f5
@@ -196,6 +196,8 @@ void purple_disco_cancel_get_list(Purple
 
 	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)
============================================================
--- libpurple/protocols/jabber/disco.c	772ccf2e46237a1f7bf2c4eaf8567946f69acb60
+++ libpurple/protocols/jabber/disco.c	f4564ea7af56293a38c25cea6c797fee1aa407ee
@@ -981,12 +981,9 @@ jabber_disco_cancel(PurpleDiscoList *lis
 	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