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

network-manager Debian release 1.34.0-2

1 files changed, 3 insertions, 17 deletions

diff --git a/src/core/nm-dbus-utils.c b/src/core/nm-dbus-utils.c
index d3e5612d..7f7b9fb9 100644
--- a/src/core/nm-dbus-utils.c
+++ b/src/core/nm-dbus-utils.c
@@ -97,27 +97,13 @@ nm_dbus_utils_get_property(GObject *obj, const char *signature, const char *prop
 void
 nm_dbus_utils_g_value_set_object_path(GValue *value, gpointer object)
 {
-    const char *path;
-
-    g_return_if_fail(!object || NM_IS_DBUS_OBJECT(object));
-
-    if (object && (path = nm_dbus_object_get_path(object)))
-        g_value_set_string(value, path);
-    else
-        g_value_set_string(value, NULL);
+    g_value_set_string(value, object ? nm_dbus_object_get_path(object) : NULL);
 }
 
 void
 nm_dbus_utils_g_value_set_object_path_still_exported(GValue *value, gpointer object)
 {
-    const char *path;
-
-    g_return_if_fail(!object || NM_IS_DBUS_OBJECT(object));
-
-    if (object && (path = nm_dbus_object_get_path_still_exported(object)))
-        g_value_set_string(value, path);
-    else
-        g_value_set_string(value, "/");
+    g_value_set_string(value, object ? nm_dbus_object_get_path_still_exported(object) : "/");
 }
 
 void
@@ -152,7 +138,7 @@ nm_dbus_utils_g_value_set_object_path_from_hash(
     strv[i] = NULL;
 
     /* sort the names, to give a well-defined, stable order. */
-    nm_utils_strv_sort(strv, i);
+    nm_strv_sort(strv, i);
 
     g_value_take_boxed(value, strv);
 }