network-manager-applet r1081 - in trunk: . src

[dcbw svn gnome org]

Author: dcbw
Date: Fri Dec 19 16:22:22 2008
New Revision: 1081
URL: http://svn.gnome.org/viewvc/network-manager-applet?rev=1081&view=rev

Log:
2008-12-19  Dan Williams  <dcbw redhat com>

	Patch from Drew Moseley <dmoseley mvista com>

	* src/applet-device-wifi.c
		- (free_ap_notification_data): remove ap notification timeout when
			freeing ap notification data



Modified:
   trunk/ChangeLog
   trunk/src/applet-device-wifi.c

Modified: trunk/src/applet-device-wifi.c
==============================================================================
--- trunk/src/applet-device-wifi.c	(original)
+++ trunk/src/applet-device-wifi.c	Fri Dec 19 16:22:22 2008
@@ -1060,6 +1060,9 @@
 	struct ap_notification_data *data = user_data;
 	NMSettings *settings = applet_get_settings (data->applet);
 
+	if (data->id)
+		g_source_remove (data->id);
+
 	if (settings)
 		g_signal_handler_disconnect (settings, data->new_con_id);
 	memset (data, 0, sizeof (*data));