Mercurial > pidgin
changeset 26255:de05bdd931ed
The core should be in charge of setting in_progress to FALSE
| author | Paul Aurich <paul@darkrain42.org> |
|---|---|
| date | Tue, 31 Mar 2009 05:22:44 +0000 |
| parents | c619bef09bec |
| children | cda9031ecabc |
| files | libpurple/disco.c libpurple/protocols/jabber/disco.c |
| diffstat | 2 files changed, 3 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- 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)
--- 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