NetworkManager r3841 - in trunk/vpn-daemons/pptp: . src

[dcbw svn gnome org]

Author: dcbw
Date: Mon Jul 21 16:39:43 2008
New Revision: 3841
URL: http://svn.gnome.org/viewvc/NetworkManager?rev=3841&view=rev

Log:
2008-07-21  Dan Williams  <dcbw redhat com>

	* src/nm-pptp-service.c
		- (state_changed_cb): remove the timeout handler when it's no longer
			needed either; if pppd died on startup (wrong options) then the
			timeout wouldn't have been removed before



Modified:
   trunk/vpn-daemons/pptp/ChangeLog
   trunk/vpn-daemons/pptp/src/nm-pptp-service.c

Modified: trunk/vpn-daemons/pptp/src/nm-pptp-service.c
==============================================================================
--- trunk/vpn-daemons/pptp/src/nm-pptp-service.c	(original)
+++ trunk/vpn-daemons/pptp/src/nm-pptp-service.c	Mon Jul 21 16:39:43 2008
@@ -944,6 +944,7 @@
 	case NM_VPN_SERVICE_STATE_STARTED:
 	case NM_VPN_SERVICE_STATE_STOPPING:
 	case NM_VPN_SERVICE_STATE_STOPPED:
+		remove_timeout_handler (NM_PPTP_PLUGIN (object));
 		if (priv->service) {
 			g_object_unref (priv->service);
 			priv->service = NULL;