[PATCH] Remove timeout when freeing data

[Drew Moseley <dmoseley mvista com>]

The patch below is needed on my system when the device_added method
is called twice.  On the second call, the call to g_object_set_data_full()
causes the data struct from the first call to be destroyed but the timeout
function may still run.

Comments?

Drew


Index: src/applet-device-wifi.c
===================================================================
--- src/applet-device-wifi.c	(revision 1076)
+++ src/applet-device-wifi.c	(working copy)
@@ -1060,6 +1060,9 @@
 	struct ap_notification_data *data = user_data;
 	NMSettings *settings = applet_get_settings (data->applet);
 
+	if (data->id != 0)
+		g_source_remove(data->id);
+
 	if (settings)
 		g_signal_handler_disconnect (settings, data->new_con_id);
 	memset (data, 0, sizeof (*data));