im.pidgin.pidgin: 368bfef2ab575a899876b7b246223bac8b53c290

[deryni at pidgin.im]

-----------------------------------------------------------------
Revision: 368bfef2ab575a899876b7b246223bac8b53c290
Ancestor: 99406fe660f57150f4f4dd157bc1d8fa6a5991dc
Author: deryni at pidgin.im
Date: 2007-10-18T02:11:23
Branch: im.pidgin.pidgin

Modified files:
        libpurple/ft.c libpurple/network.c libpurple/plugin.c

ChangeLog: 

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).

-------------- next part --------------
============================================================
--- libpurple/ft.c	32dae7657417fd89f64ba4b5563ffbff9ae19013
+++ libpurple/ft.c	1de19ab6b59e9c31b9796603b0865d8e979152e2
@@ -1301,8 +1301,12 @@ void
 }
 
 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
============================================================
--- libpurple/network.c	b4244caf2c0eb63fedac087389113c7f48d7aec6
+++ libpurple/network.c	4b229b71cf324fdb231e5beef73894bb5adc6030
@@ -696,4 +696,7 @@ purple_network_uninit(void)
 	if(nm_context)
 		libnm_glib_shutdown(nm_context);
 #endif
+
+	purple_signal_unregister(purple_network_get_handle(),
+	                         "network-configuration-changed");
 }
============================================================
--- libpurple/plugin.c	9377a1d1619f7662f2d883a0b3d98203d5947bcf
+++ libpurple/plugin.c	7d9aa152e3f86e537442bfb6cb09081d81074e43
@@ -1161,7 +1161,7 @@ purple_plugins_init(void) {
 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
 }
 
 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);
 }
 
 /**************************************************************************