Mercurial > pidgin.yaz
changeset 28246:c93ed4d7cabe
merge of 'abdecd59fbf18da0d4f391df390910b525356ffb'
and 'f005961acc673854916055d8bc491c28f9fb63f0'
| author | Paul Aurich <paul@darkrain42.org> |
|---|---|
| date | Thu, 13 Aug 2009 03:28:38 +0000 |
| parents | 32a707746454 (diff) 28485b9ea656 (current diff) |
| children | e30de9ebfa69 3a52cc5eb30a |
| files | |
| diffstat | 5 files changed, 16 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/libpurple/pounce.c Thu Aug 13 02:32:33 2009 +0000 +++ b/libpurple/pounce.c Thu Aug 13 03:28:38 2009 +0000 @@ -1157,4 +1157,7 @@ } purple_signals_disconnect_by_handle(purple_pounces_get_handle()); + + g_hash_table_destroy(pounce_handlers); + pounce_handlers = NULL; }
--- a/libpurple/prefs.c Thu Aug 13 02:32:33 2009 +0000 +++ b/libpurple/prefs.c Thu Aug 13 03:28:38 2009 +0000 @@ -1450,6 +1450,8 @@ sync_prefs(); } + purple_prefs_disconnect_by_handle(purple_prefs_get_handle()); + prefs_loaded = FALSE; purple_prefs_destroy(); g_hash_table_destroy(prefs_hash);
--- a/libpurple/proxy.c Thu Aug 13 02:32:33 2009 +0000 +++ b/libpurple/proxy.c Thu Aug 13 03:28:38 2009 +0000 @@ -2531,4 +2531,9 @@ purple_proxy_connect_data_disconnect(handles->data, NULL); purple_proxy_connect_data_destroy(handles->data); } + + purple_prefs_disconnect_by_handle(purple_proxy_get_handle()); + + purple_proxy_info_destroy(global_proxy_info); + global_proxy_info = NULL; }
--- a/libpurple/savedstatuses.c Thu Aug 13 02:32:33 2009 +0000 +++ b/libpurple/savedstatuses.c Thu Aug 13 03:28:38 2009 +0000 @@ -1235,6 +1235,8 @@ void purple_savedstatuses_uninit(void) { + gpointer handle = purple_savedstatuses_get_handle(); + remove_old_transient_statuses(); if (save_timer != 0) @@ -1253,6 +1255,7 @@ g_hash_table_destroy(creation_times); creation_times = NULL; - purple_signals_unregister_by_instance(purple_savedstatuses_get_handle()); + purple_signals_unregister_by_instance(handle); + purple_signals_disconnect_by_handle(handle); }
--- a/libpurple/status.c Thu Aug 13 02:32:33 2009 +0000 +++ b/libpurple/status.c Thu Aug 13 03:28:38 2009 +0000 @@ -1660,7 +1660,7 @@ void purple_status_init(void) { - void *handle = purple_status_get_handle; + void *handle = purple_status_get_handle(); purple_prefs_add_none("/purple/status"); purple_prefs_add_none("/purple/status/scores"); @@ -1714,4 +1714,5 @@ void purple_status_uninit(void) { + purple_prefs_disconnect_by_handle(purple_prefs_get_handle()); }