system/NetworkManager
system/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager synced 2024-07-23 19:24:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

libnm-glib: fix the object creation warning for remote connections

Browse source 
NMRemoteConnection is not a NMObject, so we can't always use
nm_object_get_path(),

https://bugzilla.gnome.org/show_bug.cgi?id=701762
This commit is contained in:
Dan Winship 2013-06-07 10:36:45 -03:00
parent 790c102fff
commit 3b498b3ec0
1 changed files with 12 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
libnm-glib/nm-object.c
View file

@ -619,6 +619,17 @@ create_async_complete (GObject *object, NMObjectTypeAsyncData *async_data)
g_slice_free (NMObjectTypeAsyncData, async_data);
}
static const char *
nm_object_or_connection_get_path (gpointer instance)
{
if (NM_IS_OBJECT (instance))
return nm_object_get_path (instance);
else if (NM_IS_CONNECTION (instance))
return nm_connection_get_path (instance);
g_assert_not_reached ();
}
static void
async_inited (GObject *source, GAsyncResult *result, gpointer user_data)
{
@ -628,7 +639,7 @@ async_inited (GObject *source, GAsyncResult *result, gpointer user_data)
if (!g_async_initable_init_finish (G_ASYNC_INITABLE (object), result, &error)) {
g_warning ("Could not create object for %s: %s",
nm_object_get_path (NM_OBJECT (object)), error->message);
nm_object_or_connection_get_path (object), error->message);
g_error_free (error);
g_object_unref (object);
object = NULL;