diff options
| author | Dan Williams <dcbw@redhat.com> | 2014-11-04 12:06:24 -0600 |
|---|---|---|
| committer | Dan Williams <dcbw@redhat.com> | 2014-11-04 12:06:24 -0600 |
| commit | 7138c4816668004e29fc5fec18e59636180db0b4 (patch) | |
| tree | af368d8c84838e99f41e718cb6be648e32974aa7 | |
| parent | a405ce49221721c03488e49b3c0e8cadae6f4d1e (diff) | |
| download | NetworkManager-dcbw/vpn-reconnect.tar.gz | |
fixup! vpn: reconnect on service failures (bgo #349151)dcbw/vpn-reconnect
| -rw-r--r-- | src/nm-policy.c | 8 | ||||
| -rw-r--r-- | src/vpn-manager/nm-vpn-connection.c | 8 | ||||
| -rw-r--r-- | src/vpn-manager/nm-vpn-connection.h | 4 |
3 files changed, 10 insertions, 10 deletions
diff --git a/src/nm-policy.c b/src/nm-policy.c index 7643c6bb45..e21df28a9c 100644 --- a/src/nm-policy.c +++ b/src/nm-policy.c @@ -1836,7 +1836,7 @@ vpn_connection_state_changed (NMVpnConnection *vpn, } static void -vpn_connection_retry_failed (NMVpnConnection *vpn, NMPolicy *policy) +vpn_connection_retry_after_failure (NMVpnConnection *vpn, NMPolicy *policy) { NMPolicyPrivate *priv = NM_POLICY_GET_PRIVATE (policy); NMActiveConnection *ac = NM_ACTIVE_CONNECTION (vpn); @@ -1881,8 +1881,8 @@ active_connection_added (NMManager *manager, g_signal_connect (active, NM_VPN_CONNECTION_INTERNAL_STATE_CHANGED, G_CALLBACK (vpn_connection_state_changed), policy); - g_signal_connect (active, NM_VPN_CONNECTION_INTERNAL_RETRY_FAILED, - G_CALLBACK (vpn_connection_retry_failed), + g_signal_connect (active, NM_VPN_CONNECTION_INTERNAL_RETRY_AFTER_FAILURE, + G_CALLBACK (vpn_connection_retry_after_failure), policy); } @@ -1902,7 +1902,7 @@ active_connection_removed (NMManager *manager, vpn_connection_state_changed, policy); g_signal_handlers_disconnect_by_func (active, - vpn_connection_retry_failed, + vpn_connection_retry_after_failure, policy); g_signal_handlers_disconnect_by_func (active, active_connection_state_changed, diff --git a/src/vpn-manager/nm-vpn-connection.c b/src/vpn-manager/nm-vpn-connection.c index 01e4f9c4bb..a348ab7182 100644 --- a/src/vpn-manager/nm-vpn-connection.c +++ b/src/vpn-manager/nm-vpn-connection.c @@ -111,7 +111,7 @@ typedef struct { enum { VPN_STATE_CHANGED, INTERNAL_STATE_CHANGED, - INTERNAL_RETRY_FAILED, + INTERNAL_RETRY_AFTER_FAILURE, LAST_SIGNAL }; @@ -759,7 +759,7 @@ plugin_state_changed (DBusGProxy *proxy, if ( old_state == STATE_ACTIVATED && priv->vpn_state == STATE_FAILED && _connection_only_can_persist (connection)) - g_signal_emit (connection, signals[INTERNAL_RETRY_FAILED], 0); + g_signal_emit (connection, signals[INTERNAL_RETRY_AFTER_FAILURE], 0); } } else if (new_service_state == NM_VPN_SERVICE_STATE_STARTING && old_service_state == NM_VPN_SERVICE_STATE_STARTED) { @@ -2166,8 +2166,8 @@ nm_vpn_connection_class_init (NMVpnConnectionClass *connection_class) 0, NULL, NULL, NULL, G_TYPE_NONE, 3, G_TYPE_UINT, G_TYPE_UINT, G_TYPE_UINT); - signals[INTERNAL_RETRY_FAILED] = - g_signal_new (NM_VPN_CONNECTION_INTERNAL_RETRY_FAILED, + signals[INTERNAL_RETRY_AFTER_FAILURE] = + g_signal_new (NM_VPN_CONNECTION_INTERNAL_RETRY_AFTER_FAILURE, G_OBJECT_CLASS_TYPE (object_class), G_SIGNAL_RUN_FIRST, 0, NULL, NULL, NULL, diff --git a/src/vpn-manager/nm-vpn-connection.h b/src/vpn-manager/nm-vpn-connection.h index 189e311bd1..74ea38a5db 100644 --- a/src/vpn-manager/nm-vpn-connection.h +++ b/src/vpn-manager/nm-vpn-connection.h @@ -42,8 +42,8 @@ /* Signals */ /* not exported: includes old reason code */ -#define NM_VPN_CONNECTION_INTERNAL_STATE_CHANGED "internal-state-changed" -#define NM_VPN_CONNECTION_INTERNAL_RETRY_FAILED "internal-retry-failed" +#define NM_VPN_CONNECTION_INTERNAL_STATE_CHANGED "internal-state-changed" +#define NM_VPN_CONNECTION_INTERNAL_RETRY_AFTER_FAILURE "internal-retry-after-failure" typedef struct { |