From d1a897eb499de00abb196df1574bb4b4b14d473e Mon Sep 17 00:00:00 2001 From: Dan Williams Date: Mon, 21 Jul 2008 16:39:43 +0000 Subject: [PATCH] 2008-07-21 Dan Williams * 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 git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@3841 4912f4e0-d625-0410-9fb7-b9a5a253dbdc --- vpn-daemons/pptp/ChangeLog | 7 +++++++ vpn-daemons/pptp/src/nm-pptp-service.c | 1 + 2 files changed, 8 insertions(+) diff --git a/vpn-daemons/pptp/ChangeLog b/vpn-daemons/pptp/ChangeLog index 5d4a6b9b9..66c206790 100644 --- a/vpn-daemons/pptp/ChangeLog +++ b/vpn-daemons/pptp/ChangeLog @@ -1,3 +1,10 @@ +2008-07-21 Dan Williams + + * 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 + 2008-07-20 Dan Williams Port to NM 0.7 VPN plugin API diff --git a/vpn-daemons/pptp/src/nm-pptp-service.c b/vpn-daemons/pptp/src/nm-pptp-service.c index d569883db..5d81a2778 100644 --- a/vpn-daemons/pptp/src/nm-pptp-service.c +++ b/vpn-daemons/pptp/src/nm-pptp-service.c @@ -944,6 +944,7 @@ state_changed_cb (GObject *object, NMVPNServiceState state, gpointer user_data) 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;