fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-01-04 06:20:17 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

core: don't explicitly set D-Bus path properties to "/"

Browse source 
NMDBusObject already gets this right, by calling nm_dbus_utils_get_property(),
which calls g_dbus_gvalue_to_gvariant(), which correctly converts NULL
object paths to "/".

We already rely on that elsewhere. No need for this workaround.
This commit is contained in:
Thomas Haller 2018-04-11 17:11:32 +02:00
parent 5284690f18
commit 476208d223
3 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/nm-act-request.c
View file

@ -514,7 +514,7 @@ get_property (GObject *object, guint prop_id,
|| !NM_IN_SET (nm_active_connection_get_state (active),
NM_ACTIVE_CONNECTION_STATE_ACTIVATED,
NM_ACTIVE_CONNECTION_STATE_DEACTIVATING)) {
g_value_set_string (value, "/");
g_value_set_string (value, NULL);
return;
}

10
src/nm-active-connection.c
View file

@ -1225,7 +1225,7 @@ get_property (GObject *object, guint prop_id,
break;
case PROP_SPECIFIC_OBJECT:
g_value_set_string (value, priv->specific_object ? priv->specific_object : "/");
g_value_set_string (value, priv->specific_object);
break;
case PROP_DEVICES:
strv = g_new0 (char *, 2);
@ -1251,19 +1251,19 @@ get_property (GObject *object, guint prop_id,
break;
case PROP_IP4_CONFIG:
/* The IP and DHCP config properties may be overridden by a subclass */
g_value_set_string (value, "/");
g_value_set_string (value, NULL);
break;
case PROP_DHCP4_CONFIG:
g_value_set_string (value, "/");
g_value_set_string (value, NULL);
break;
case PROP_DEFAULT6:
g_value_set_boolean (value, priv->is_default6);
break;
case PROP_IP6_CONFIG:
g_value_set_string (value, "/");
g_value_set_string (value, NULL);
break;
case PROP_DHCP6_CONFIG:
g_value_set_string (value, "/");
g_value_set_string (value, NULL);
break;
case PROP_VPN:
g_value_set_boolean (value, priv->vpn);

2
src/nm-dbus-utils.c
View file

@ -117,7 +117,7 @@ nm_dbus_utils_g_value_set_object_path (GValue *value, gpointer object)
&& (path = nm_dbus_object_get_path (object)))
g_value_set_string (value, path);
else
g_value_set_string (value, "/");
g_value_set_string (value, NULL);
}
void