diff options
Diffstat (limited to 'libnm-glib/nm-client.c')
| -rw-r--r-- | libnm-glib/nm-client.c | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/libnm-glib/nm-client.c b/libnm-glib/nm-client.c index db15c4b3..0da7b0f4 100644 --- a/libnm-glib/nm-client.c +++ b/libnm-glib/nm-client.c @@ -157,7 +157,7 @@ nm_client_init (NMClient *client) priv->state = NM_STATE_UNKNOWN; - priv->permissions = g_hash_table_new (g_direct_hash, g_direct_equal); + priv->permissions = g_hash_table_new (NULL, NULL); } static void @@ -674,7 +674,7 @@ nm_client_activate_connection (NMClient *client, activate_cb, info, NULL, DBUS_TYPE_G_OBJECT_PATH, connection ? nm_connection_get_path (connection) : "/", DBUS_TYPE_G_OBJECT_PATH, device ? nm_object_get_path (NM_OBJECT (device)) : "/", - DBUS_TYPE_G_OBJECT_PATH, specific_object ? specific_object : "/", + DBUS_TYPE_G_OBJECT_PATH, specific_object ?: "/", G_TYPE_INVALID); } @@ -762,7 +762,7 @@ nm_client_add_and_activate_connection (NMClient *client, add_activate_cb, info, NULL, DBUS_TYPE_G_MAP_OF_MAP_OF_VARIANT, hash, DBUS_TYPE_G_OBJECT_PATH, nm_object_get_path (NM_OBJECT (device)), - DBUS_TYPE_G_OBJECT_PATH, specific_object ? specific_object : "/", + DBUS_TYPE_G_OBJECT_PATH, specific_object ?: "/", G_TYPE_INVALID); } else info->idle_id = g_idle_add (activate_nm_not_running, info); @@ -1257,8 +1257,8 @@ nm_client_set_logging (NMClient *client, const char *level, const char *domains, return TRUE; return dbus_g_proxy_call (priv->client_proxy, "SetLogging", error, - G_TYPE_STRING, level ? level : "", - G_TYPE_STRING, domains ? domains : "", + G_TYPE_STRING, level ?: "", + G_TYPE_STRING, domains ?: "", G_TYPE_INVALID, G_TYPE_INVALID); } @@ -2329,10 +2329,9 @@ nm_client_class_init (NMClientClass *client_class) G_PARAM_STATIC_STRINGS)); /** - * NMClient:active-connections: + * NMClient:active-connections: (type GPtrArray): * * The active connections. - * Type: GLib.PtrArray **/ g_object_class_install_property (object_class, PROP_ACTIVE_CONNECTIONS, |