diff options
| author | Dan Williams <dcbw@redhat.com> | 2008-07-21 16:39:43 +0000 |
|---|---|---|
| committer | Dan Williams <dcbw@redhat.com> | 2008-07-21 16:39:43 +0000 |
| commit | d1a897eb499de00abb196df1574bb4b4b14d473e (patch) | |
| tree | e5c443fe01d29ca5200dcda3165b257ad74d0a86 /vpn-daemons/pptp | |
| parent | 481db5021c4ea71004fa8592a6a6021a20aa6a7c (diff) | |
| download | NetworkManager-d1a897eb499de00abb196df1574bb4b4b14d473e.tar.gz | |
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
git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@3841 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
Diffstat (limited to 'vpn-daemons/pptp')
| -rw-r--r-- | vpn-daemons/pptp/ChangeLog | 7 | ||||
| -rw-r--r-- | vpn-daemons/pptp/src/nm-pptp-service.c | 1 |
2 files changed, 8 insertions, 0 deletions
diff --git a/vpn-daemons/pptp/ChangeLog b/vpn-daemons/pptp/ChangeLog index 5d4a6b9b9b..66c2067904 100644 --- a/vpn-daemons/pptp/ChangeLog +++ b/vpn-daemons/pptp/ChangeLog @@ -1,3 +1,10 @@ +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 + 2008-07-20 Dan Williams <dcbw@redhat.com> 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 d569883db4..5d81a27783 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; |