diff options
author | Dan Williams <dcbw@redhat.com> | 2012-06-14 18:01:58 -0500 |
---|---|---|
committer | Dan Williams <dcbw@redhat.com> | 2012-06-14 18:01:58 -0500 |
commit | 26b833cd53cd90afa6e57386f0e4265394982a92 (patch) | |
tree | 2e869fbad43c10ec6467ad270d9573fbc534d9c6 /src/vpn-manager | |
parent | bb750260045239ab85574366bae8102eff8058cc (diff) | |
download | NetworkManager-26b833cd53cd90afa6e57386f0e4265394982a92.tar.gz |
core: more VPN activated/deactivated fixups
More fallout from 330247399c9d1b730b84ac2409038ecfd574c0d6.
Diffstat (limited to 'src/vpn-manager')
-rw-r--r-- | src/vpn-manager/nm-vpn-manager.c | 5 | ||||
-rw-r--r-- | src/vpn-manager/nm-vpn-manager.h | 3 |
2 files changed, 5 insertions, 3 deletions
diff --git a/src/vpn-manager/nm-vpn-manager.c b/src/vpn-manager/nm-vpn-manager.c index 7dfa9fa5ca..a462f54735 100644 --- a/src/vpn-manager/nm-vpn-manager.c +++ b/src/vpn-manager/nm-vpn-manager.c @@ -519,10 +519,9 @@ nm_vpn_manager_class_init (NMVPNManagerClass *manager_class) g_signal_new ("connection-deactivated", G_OBJECT_CLASS_TYPE (object_class), G_SIGNAL_RUN_FIRST, - G_STRUCT_OFFSET (NMVPNManagerClass, connection_deactivated), - NULL, NULL, + 0, NULL, NULL, _nm_marshal_VOID__OBJECT_UINT_UINT_UINT, - G_TYPE_NONE, 3, G_TYPE_OBJECT, G_TYPE_UINT, G_TYPE_UINT, G_TYPE_UINT); + G_TYPE_NONE, 4, G_TYPE_OBJECT, G_TYPE_UINT, G_TYPE_UINT, G_TYPE_UINT); dbus_g_error_domain_register (NM_VPN_MANAGER_ERROR, NULL, NM_TYPE_VPN_MANAGER_ERROR); } diff --git a/src/vpn-manager/nm-vpn-manager.h b/src/vpn-manager/nm-vpn-manager.h index b23d8d2f60..17225b4412 100644 --- a/src/vpn-manager/nm-vpn-manager.h +++ b/src/vpn-manager/nm-vpn-manager.h @@ -55,6 +55,9 @@ typedef struct { GObjectClass parent; /* Signals */ + void (*connection_activated) (NMVPNManager *manager, + NMVPNConnection *connection); + void (*connection_deactivated) (NMVPNManager *manager, NMVPNConnection *connection, NMVPNConnectionState new_state, |