From d4f8c43f40e2ec6c46b6d64ec2626a2c9c0d7da9 Mon Sep 17 00:00:00 2001 From: Dan Williams Date: Tue, 15 Mar 2011 17:04:50 -0500 Subject: [PATCH] libnm-glib: allow NULL device for nm_client_activate_connection() --- libnm-glib/nm-client.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/libnm-glib/nm-client.c b/libnm-glib/nm-client.c index 9a49d3a524..c4e631297c 100644 --- a/libnm-glib/nm-client.c +++ b/libnm-glib/nm-client.c @@ -1169,7 +1169,8 @@ nm_client_activate_connection (NMClient *client, ActivateDeviceInfo *info; 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); 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, connection_path, - nm_object_get_path (NM_OBJECT (device)), + device ? nm_object_get_path (NM_OBJECT (device)) : "/", specific_object ? specific_object : "/", activate_cb, info);