diff options
| author | Thomas Haller <thaller@redhat.com> | 2018-04-11 17:11:32 +0200 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2018-04-18 07:55:15 +0200 |
| commit | 476208d223f7bc14622bb853fd83d7732065f581 (patch) | |
| tree | 12d210a9c95247b9098a4cda5ac2fe20a4f1ae31 | |
| parent | 5284690f180e7671d040bb6992fb3dcf3f5aa9e0 (diff) | |
| download | NetworkManager-476208d223f7bc14622bb853fd83d7732065f581.tar.gz | |
core: don't explicitly set D-Bus path properties to "/"
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.
| -rw-r--r-- | src/nm-act-request.c | 2 | ||||
| -rw-r--r-- | src/nm-active-connection.c | 10 | ||||
| -rw-r--r-- | src/nm-dbus-utils.c | 2 |
3 files changed, 7 insertions, 7 deletions
diff --git a/src/nm-act-request.c b/src/nm-act-request.c index 344084d867..e069fb3a30 100644 --- a/src/nm-act-request.c +++ b/src/nm-act-request.c @@ -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; } diff --git a/src/nm-active-connection.c b/src/nm-active-connection.c index 0673a1db26..be61c472ce 100644 --- a/src/nm-active-connection.c +++ b/src/nm-active-connection.c @@ -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); diff --git a/src/nm-dbus-utils.c b/src/nm-dbus-utils.c index d22245107c..8e7dd122d0 100644 --- a/src/nm-dbus-utils.c +++ b/src/nm-dbus-utils.c @@ -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 |