Make purple_xfers_uninit, purple_network_uninit, and purple_plugins_uninit

Thu, 18 Oct 2007 02:11:23 +0000

author
Etan Reisner <deryni@pidgin.im>
date
Thu, 18 Oct 2007 02:11:23 +0000
changeset 21143
239b2f43bef5
parent 21142
c2242c1fde7f
child 21144
5742a996604d

Make purple_xfers_uninit, purple_network_uninit, and purple_plugins_uninit
unregister the signals they register in their respective _init functions. This
is just cleanup I added when testing dbus signal export stuff (I'll be
committing that a bit later).

libpurple/ft.c file | annotate | diff | comparison | revisions
libpurple/network.c file | annotate | diff | comparison | revisions
libpurple/plugin.c file | annotate | diff | comparison | revisions
--- a/libpurple/ft.c	Wed Oct 17 04:10:34 2007 +0000
+++ b/libpurple/ft.c	Thu Oct 18 02:11:23 2007 +0000
@@ -1301,8 +1301,12 @@
 }
 
 void
-purple_xfers_uninit(void) {
-	purple_signals_disconnect_by_handle(purple_xfers_get_handle());
+purple_xfers_uninit(void)
+{
+	void *handle = purple_xfers_get_handle();
+
+	purple_signals_disconnect_by_handle(handle);
+	purple_signals_unregister_by_instance(handle);
 }
 
 void
--- a/libpurple/network.c	Wed Oct 17 04:10:34 2007 +0000
+++ b/libpurple/network.c	Thu Oct 18 02:11:23 2007 +0000
@@ -696,4 +696,7 @@
 	if(nm_context)
 		libnm_glib_shutdown(nm_context);
 #endif
+
+	purple_signal_unregister(purple_network_get_handle(),
+	                         "network-configuration-changed");
 }
--- a/libpurple/plugin.c	Wed Oct 17 04:10:34 2007 +0000
+++ b/libpurple/plugin.c	Thu Oct 18 02:11:23 2007 +0000
@@ -1161,7 +1161,7 @@
 purple_plugins_init(void) {
 	void *handle = purple_plugins_get_handle();
 
-        purple_plugins_add_search_path(LIBDIR);
+	purple_plugins_add_search_path(LIBDIR);
 
 	purple_signal_register(handle, "plugin-load",
 						 purple_marshal_VOID__POINTER,
@@ -1176,8 +1176,12 @@
 }
 
 void
-purple_plugins_uninit(void) {
-	purple_signals_disconnect_by_handle(purple_plugins_get_handle());
+purple_plugins_uninit(void)
+{
+	void *handle = purple_plugins_get_handle();
+
+	purple_signals_disconnect_by_handle(handle);
+	purple_signals_unregister_by_instance(handle);
 }
 
 /**************************************************************************

mercurial