colin/NetworkManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

core: export new active connection from the manager

Browse Source 
When we eventually do authorization in the ActiveConnection itself,
we want to make sure the AC doesn't get exported until everything
is authorized.  Thus let the manager handle exporting the objects
since it knows when the AC will be authorized or not.
This commit is contained in:
Dan Williams
2013-04-22 13:29:36 -05:00
parent f6f626de34
commit 3660a80c29
3 changed files with 4 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/nm-activation-request.c
View File

@@ -412,7 +412,6 @@ constructed (GObject *object)
"notify::" NM_DEVICE_STATE, "notify::" NM_DEVICE_STATE,
G_CALLBACK (device_state_changed), G_CALLBACK (device_state_changed),
NM_ACT_REQUEST (object)); NM_ACT_REQUEST (object));
nm_active_connection_export (NM_ACTIVE_CONNECTION (object));
} }
static void static void

4
src/nm-manager.c
View File

@@ -3092,8 +3092,10 @@ nm_manager_activate_connection (NMManager *manager,
error); error);
activated: activated:
if (ac) if (ac) {
active_connection_add (manager, ac); active_connection_add (manager, ac);
nm_active_connection_export (ac);
}
return ac; return ac;
} }

8
src/vpn-manager/nm-vpn-connection.c
View File

@@ -403,12 +403,10 @@ nm_vpn_connection_new (NMConnection *connection,
gboolean user_requested, gboolean user_requested,
gulong user_uid) gulong user_uid)
{ {
NMVPNConnection *self;
g_return_val_if_fail (NM_IS_CONNECTION (connection), NULL); g_return_val_if_fail (NM_IS_CONNECTION (connection), NULL);
g_return_val_if_fail (NM_IS_DEVICE (parent_device), NULL); g_return_val_if_fail (NM_IS_DEVICE (parent_device), NULL);
self = (NMVPNConnection *) g_object_new (NM_TYPE_VPN_CONNECTION, return (NMVPNConnection *) g_object_new (NM_TYPE_VPN_CONNECTION,
NM_ACTIVE_CONNECTION_INT_CONNECTION, connection, NM_ACTIVE_CONNECTION_INT_CONNECTION, connection,
NM_ACTIVE_CONNECTION_INT_DEVICE, parent_device, NM_ACTIVE_CONNECTION_INT_DEVICE, parent_device,
NM_ACTIVE_CONNECTION_SPECIFIC_OBJECT, specific_object, NM_ACTIVE_CONNECTION_SPECIFIC_OBJECT, specific_object,
@@ -416,10 +414,6 @@ nm_vpn_connection_new (NMConnection *connection,
NM_ACTIVE_CONNECTION_INT_USER_UID, user_uid, NM_ACTIVE_CONNECTION_INT_USER_UID, user_uid,
NM_ACTIVE_CONNECTION_VPN, TRUE, NM_ACTIVE_CONNECTION_VPN, TRUE,
NULL); NULL);
if (self)
nm_active_connection_export (NM_ACTIVE_CONNECTION (self));
return self;
} }
static const char * static const char *