fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-04-18 05:00:38 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

core: more VPN activated/deactivated fixups

Browse source 
More fallout from 330247399c.
This commit is contained in:
Dan Williams 2012-06-14 18:01:58 -05:00
parent bb75026004
commit 26b833cd53
3 changed files with 10 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/nm-manager.c
View file

@ -355,19 +355,20 @@ manager_sleeping (NMManager *self)
static void
vpn_manager_connection_activated_cb (NMVPNManager *manager,
NMVPNConnection *vpn,
NMVPNConnectionState state,
NMVPNConnectionStateReason reason,
gpointer user_data)
{
NMConnection *connection = nm_vpn_connection_get_connection (vpn);
/* Update timestamp for the VPN connection */
nm_settings_connection_update_timestamp (NM_SETTINGS_CONNECTION (nm_vpn_connection_get_connection (vpn)),
nm_settings_connection_update_timestamp (NM_SETTINGS_CONNECTION (connection),
(guint64) time (NULL), TRUE);
}
static void
vpn_manager_connection_deactivated_cb (NMVPNManager *manager,
NMVPNConnection *vpn,
NMVPNConnectionState state,
NMVPNConnectionState new_state,
NMVPNConnectionState old_state,
NMVPNConnectionStateReason reason,
gpointer user_data)
{

5
src/vpn-manager/nm-vpn-manager.c
View file

@ -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);
}

3
src/vpn-manager/nm-vpn-manager.h
View file

@ -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,