diff options
| author | Beniamino Galvani <bgalvani@redhat.com> | 2015-05-25 11:01:22 +0200 |
|---|---|---|
| committer | Beniamino Galvani <bgalvani@redhat.com> | 2015-05-25 11:17:23 +0200 |
| commit | 05de744d6c82e43dbeb6eec32003eafee5c36ea3 (patch) | |
| tree | 9327831d81d361dc9b25dbbb21d815e0e11430b0 | |
| parent | 8448a0686382676ab04b5b7f6e6a9f6b61716166 (diff) | |
| download | NetworkManager-bg/hostname-bgo740409-squashed.tar.gz | |
fixup! settings: add hostnamed supportbg/hostname-bgo740409-squashed
| -rw-r--r-- | src/settings/nm-settings.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/settings/nm-settings.c b/src/settings/nm-settings.c index cc64a95410..3964522637 100644 --- a/src/settings/nm-settings.c +++ b/src/settings/nm-settings.c @@ -2098,21 +2098,21 @@ on_proxy_acquired (GObject *object, GAsyncResult *res, NMSettings *self) { NMSettingsPrivate *priv = NM_SETTINGS_GET_PRIVATE (self); GError *error = NULL; - char *owner; + GVariant *variant; priv->hostname.hostnamed_proxy = g_dbus_proxy_new_for_bus_finish (res, &error); if (priv->hostname.hostnamed_proxy) { - owner = g_dbus_proxy_get_name_owner (priv->hostname.hostnamed_proxy); - if (!owner) { - nm_log_info (LOGD_SETTINGS, "hostname: hostnamed not used"); - g_clear_object (&priv->hostname.hostnamed_proxy); - } else { - nm_log_info (LOGD_SETTINGS, "hostname: use hostnamed"); + variant = g_dbus_proxy_get_cached_property (priv->hostname.hostnamed_proxy, "StaticHostname"); + if (variant) { + nm_log_info (LOGD_SETTINGS, "hostname: using hostnamed"); g_signal_connect (priv->hostname.hostnamed_proxy, "g-properties-changed", G_CALLBACK (hostnamed_properties_changed), self); hostnamed_properties_changed (priv->hostname.hostnamed_proxy, NULL, NULL, self); - g_free (owner); + g_variant_unref (variant); + } else { + nm_log_info (LOGD_SETTINGS, "hostname: couldn't get property from hostnamed"); + g_clear_object (&priv->hostname.hostnamed_proxy); } } else { nm_log_info (LOGD_SETTINGS, "hostname: hostnamed not used as proxy creation failed with: %s", |