libnm/client: proxy *_enabled and metered properties to the right object

They're provided by the Manager, not by the RemoteSettings.

(cherry picked from commit c81005b846)
This commit is contained in:
Lubomir Rintel 2017-11-01 21:29:39 +01:00
parent 9fea242f72
commit 34035ceee8

View file

@ -2630,7 +2630,7 @@ get_property (GObject *object, guint prop_id,
break;
case PROP_WIRELESS_HARDWARE_ENABLED:
if (priv->manager)
g_object_get_property (G_OBJECT (priv->settings), pspec->name, value);
g_object_get_property (G_OBJECT (priv->manager), pspec->name, value);
else
g_value_set_boolean (value, FALSE);
break;
@ -2639,7 +2639,7 @@ get_property (GObject *object, guint prop_id,
break;
case PROP_WWAN_HARDWARE_ENABLED:
if (priv->manager)
g_object_get_property (G_OBJECT (priv->settings), pspec->name, value);
g_object_get_property (G_OBJECT (priv->manager), pspec->name, value);
else
g_value_set_boolean (value, FALSE);
break;
@ -2648,7 +2648,7 @@ get_property (GObject *object, guint prop_id,
break;
case PROP_WIMAX_HARDWARE_ENABLED:
if (priv->manager)
g_object_get_property (G_OBJECT (priv->settings), pspec->name, value);
g_object_get_property (G_OBJECT (priv->manager), pspec->name, value);
else
g_value_set_boolean (value, FALSE);
break;
@ -2669,7 +2669,7 @@ get_property (GObject *object, guint prop_id,
break;
case PROP_METERED:
if (priv->manager)
g_object_get_property (G_OBJECT (priv->settings), pspec->name, value);
g_object_get_property (G_OBJECT (priv->manager), pspec->name, value);
else
g_value_set_uint (value, NM_METERED_UNKNOWN);
break;