Re: [PATCH] Remove timeout when freeing data

[Dan Williams <dcbw redhat com>]

On Thu, 2008-12-18 at 10:25 -0700, Drew Moseley wrote:
> 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?

Looks correct.  Thanks!  Applied to both trunk and stable 0.7.

Dan

> 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));
> _______________________________________________
> NetworkManager-list mailing list
> NetworkManager-list gnome org
> http://mail.gnome.org/mailman/listinfo/networkmanager-list