Merge tag 'debian/1.34.0-2' into ubuntu/master

network-manager Debian release 1.34.0-2

1 files changed, 4 insertions, 4 deletions

diff --git a/src/libnm-core-impl/nm-vpn-plugin-info.c b/src/libnm-core-impl/nm-vpn-plugin-info.c
index dc77dfd0..2ffb7774 100644
--- a/src/libnm-core-impl/nm-vpn-plugin-info.c
+++ b/src/libnm-core-impl/nm-vpn-plugin-info.c
@@ -337,7 +337,7 @@ nm_vpn_plugin_info_list_load()
     uid = getuid();
 
     for (i = 0; i < G_N_ELEMENTS(dir); i++) {
-        if (!dir[i] || nm_utils_strv_find_first((char **) dir, i, dir[i]) >= 0)
+        if (!dir[i] || nm_strv_find_first(dir, i, dir[i]) >= 0)
             continue;
 
         infos = _nm_vpn_plugin_info_list_load_dir(dir[i], TRUE, uid, NULL, NULL);
@@ -552,7 +552,7 @@ _list_find_by_service(GSList *list, const char *name, const char *service)
         if (name && !nm_streq(name, priv->name))
             continue;
         if (service && !nm_streq(priv->service, service)
-            && (nm_utils_strv_find_first(priv->aliases, -1, service) < 0))
+            && (nm_strv_find_first(priv->aliases, -1, service) < 0))
             continue;
 
         return list->data;
@@ -639,7 +639,7 @@ nm_vpn_plugin_info_list_find_service_type(GSList *list, const char *name)
 
     /* check the hard-coded list of short-names. They all have the same
      * well-known prefix org.freedesktop.NetworkManager and the name. */
-    if (nm_utils_strv_find_first((char **) known_names, G_N_ELEMENTS(known_names), name) >= 0)
+    if (nm_strv_find_first(known_names, G_N_ELEMENTS(known_names), name) >= 0)
         return g_strdup_printf("%s.%s", NM_DBUS_INTERFACE, name);
 
     /* try, if there exists a plugin with @name under org.freedesktop.NetworkManager.
@@ -1277,7 +1277,7 @@ finalize(GObject *object)
     g_free(priv->auth_dialog);
     g_strfreev(priv->aliases);
     g_free(priv->filename);
-    g_hash_table_unref(priv->keys);
+    nm_g_hash_table_unref(priv->keys);
 
     nm_clear_pointer(&priv->keyfile, g_key_file_unref);