diff options
Diffstat (limited to 'libnm-glib/nm-client.c')
| -rw-r--r-- | libnm-glib/nm-client.c | 40 |
1 files changed, 26 insertions, 14 deletions
diff --git a/libnm-glib/nm-client.c b/libnm-glib/nm-client.c index a21b8147..178a5fdd 100644 --- a/libnm-glib/nm-client.c +++ b/libnm-glib/nm-client.c @@ -1566,6 +1566,17 @@ init_async (GAsyncInitable *initable, int io_priority, G_TYPE_INVALID); } +static gboolean +init_finish (GAsyncInitable *initable, GAsyncResult *result, GError **error) +{ + GSimpleAsyncResult *simple = G_SIMPLE_ASYNC_RESULT (result); + + if (g_simple_async_result_propagate_error (simple, error)) + return FALSE; + else + return TRUE; +} + static void dispose (GObject *object) { @@ -1877,24 +1888,24 @@ nm_client_class_init (NMClientClass *client_class) /** * NMClient::device-removed: - * @widget: the client that received the signal + * @client: the client that received the signal * @device: (type NMClient.Device): the removed device * * Notifies that a #NMDevice is removed. **/ signals[DEVICE_REMOVED] = g_signal_new ("device-removed", - G_OBJECT_CLASS_TYPE (object_class), - G_SIGNAL_RUN_FIRST, - G_STRUCT_OFFSET (NMClientClass, device_removed), - NULL, NULL, - g_cclosure_marshal_VOID__OBJECT, - G_TYPE_NONE, 1, - G_TYPE_OBJECT); + G_OBJECT_CLASS_TYPE (object_class), + G_SIGNAL_RUN_FIRST, + G_STRUCT_OFFSET (NMClientClass, device_removed), + NULL, NULL, + g_cclosure_marshal_VOID__OBJECT, + G_TYPE_NONE, 1, + G_TYPE_OBJECT); /** * NMClient::permission-changed: - * @widget: the client that received the signal + * @client: the client that received the signal * @permission: a permission from #NMClientPermission * @result: the permission's result, one of #NMClientPermissionResult * @@ -1902,11 +1913,11 @@ nm_client_class_init (NMClientClass *client_class) **/ signals[PERMISSION_CHANGED] = g_signal_new ("permission-changed", - G_OBJECT_CLASS_TYPE (object_class), - G_SIGNAL_RUN_FIRST, - 0, NULL, NULL, - _nm_glib_marshal_VOID__UINT_UINT, - G_TYPE_NONE, 2, G_TYPE_UINT, G_TYPE_UINT); + G_OBJECT_CLASS_TYPE (object_class), + G_SIGNAL_RUN_FIRST, + 0, NULL, NULL, + _nm_glib_marshal_VOID__UINT_UINT, + G_TYPE_NONE, 2, G_TYPE_UINT, G_TYPE_UINT); } static void @@ -1923,4 +1934,5 @@ nm_client_async_initable_iface_init (GAsyncInitableIface *iface) nm_client_parent_async_initable_iface = g_type_interface_peek_parent (iface); iface->init_async = init_async; + iface->init_finish = init_finish; } |