|
 |
58e92b6 |
From 34035ceee8e75d8cb7deb6f4aa211067bddcfe97 Mon Sep 17 00:00:00 2001
|
|
|
58e92b6 |
From: Lubomir Rintel <lkundrak@v3.sk>
|
|
|
58e92b6 |
Date: Wed, 1 Nov 2017 21:29:39 +0100
|
|
|
58e92b6 |
Subject: libnm/client: proxy *_enabled and metered properties to the right
|
|
|
58e92b6 |
object
|
|
|
58e92b6 |
|
|
|
58e92b6 |
They're provided by the Manager, not by the RemoteSettings.
|
|
|
58e92b6 |
|
|
|
58e92b6 |
(cherry picked from commit c81005b84650b8e6d709ce6afda96fb55987cdb8)
|
|
|
58e92b6 |
---
|
|
|
58e92b6 |
libnm/nm-client.c | 8 ++++----
|
|
|
58e92b6 |
1 file changed, 4 insertions(+), 4 deletions(-)
|
|
|
58e92b6 |
|
|
|
58e92b6 |
diff --git a/libnm/nm-client.c b/libnm/nm-client.c
|
|
|
58e92b6 |
index c8707f5..4d79317 100644
|
|
|
58e92b6 |
--- a/libnm/nm-client.c
|
|
|
58e92b6 |
+++ b/libnm/nm-client.c
|
|
|
58e92b6 |
@@ -2629,7 +2629,7 @@ get_property (GObject *object, guint prop_id,
|
|
|
58e92b6 |
break;
|
|
|
58e92b6 |
case PROP_WIRELESS_HARDWARE_ENABLED:
|
|
|
58e92b6 |
if (priv->manager)
|
|
|
58e92b6 |
- g_object_get_property (G_OBJECT (priv->settings), pspec->name, value);
|
|
|
58e92b6 |
+ g_object_get_property (G_OBJECT (priv->manager), pspec->name, value);
|
|
|
58e92b6 |
else
|
|
|
58e92b6 |
g_value_set_boolean (value, FALSE);
|
|
|
58e92b6 |
break;
|
|
|
58e92b6 |
@@ -2638,7 +2638,7 @@ get_property (GObject *object, guint prop_id,
|
|
|
58e92b6 |
break;
|
|
|
58e92b6 |
case PROP_WWAN_HARDWARE_ENABLED:
|
|
|
58e92b6 |
if (priv->manager)
|
|
|
58e92b6 |
- g_object_get_property (G_OBJECT (priv->settings), pspec->name, value);
|
|
|
58e92b6 |
+ g_object_get_property (G_OBJECT (priv->manager), pspec->name, value);
|
|
|
58e92b6 |
else
|
|
|
58e92b6 |
g_value_set_boolean (value, FALSE);
|
|
|
58e92b6 |
break;
|
|
|
58e92b6 |
@@ -2647,7 +2647,7 @@ get_property (GObject *object, guint prop_id,
|
|
|
58e92b6 |
break;
|
|
|
58e92b6 |
case PROP_WIMAX_HARDWARE_ENABLED:
|
|
|
58e92b6 |
if (priv->manager)
|
|
|
58e92b6 |
- g_object_get_property (G_OBJECT (priv->settings), pspec->name, value);
|
|
|
58e92b6 |
+ g_object_get_property (G_OBJECT (priv->manager), pspec->name, value);
|
|
|
58e92b6 |
else
|
|
|
58e92b6 |
g_value_set_boolean (value, FALSE);
|
|
|
58e92b6 |
break;
|
|
|
58e92b6 |
@@ -2668,7 +2668,7 @@ get_property (GObject *object, guint prop_id,
|
|
|
58e92b6 |
break;
|
|
|
58e92b6 |
case PROP_METERED:
|
|
|
58e92b6 |
if (priv->manager)
|
|
|
58e92b6 |
- g_object_get_property (G_OBJECT (priv->settings), pspec->name, value);
|
|
|
58e92b6 |
+ g_object_get_property (G_OBJECT (priv->manager), pspec->name, value);
|
|
|
58e92b6 |
else
|
|
|
58e92b6 |
g_value_set_uint (value, NM_METERED_UNKNOWN);
|
|
|
58e92b6 |
break;
|
|
|
58e92b6 |
--
|
|
|
58e92b6 |
cgit v1.1
|
|
|
58e92b6 |
|
|
|
58e92b6 |
|