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

libnm-glib: allow NULL device for nm_client_activate_connection()

Browse Source
This commit is contained in:
Dan Williams
2011-03-15 17:04:50 -05:00
parent da4928aea7
commit d4f8c43f40
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
libnm-glib/nm-client.c
View File

@@ -1169,7 +1169,8 @@ nm_client_activate_connection (NMClient *client,
ActivateDeviceInfo *info; ActivateDeviceInfo *info;
g_return_if_fail (NM_IS_CLIENT (client)); g_return_if_fail (NM_IS_CLIENT (client));
g_return_if_fail (NM_IS_DEVICE (device)); if (device)
g_return_if_fail (NM_IS_DEVICE (device));
g_return_if_fail (connection_path != NULL); g_return_if_fail (connection_path != NULL);
info = g_slice_new (ActivateDeviceInfo); info = g_slice_new (ActivateDeviceInfo);
@@ -1179,7 +1180,7 @@ nm_client_activate_connection (NMClient *client,
org_freedesktop_NetworkManager_activate_connection_async (NM_CLIENT_GET_PRIVATE (client)->client_proxy, org_freedesktop_NetworkManager_activate_connection_async (NM_CLIENT_GET_PRIVATE (client)->client_proxy,
connection_path, connection_path,
nm_object_get_path (NM_OBJECT (device)), device ? nm_object_get_path (NM_OBJECT (device)) : "/",
specific_object ? specific_object : "/", specific_object ? specific_object : "/",
activate_cb, activate_cb,
info); info);