libnm: fix accessing enabled and metered properties
This commit is contained in:
parent
24d35df5f2
commit
58e92b645a
|
@ -0,0 +1,57 @@
|
|||
From 34035ceee8e75d8cb7deb6f4aa211067bddcfe97 Mon Sep 17 00:00:00 2001
|
||||
From: Lubomir Rintel <lkundrak@v3.sk>
|
||||
Date: Wed, 1 Nov 2017 21:29:39 +0100
|
||||
Subject: 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 c81005b84650b8e6d709ce6afda96fb55987cdb8)
|
||||
---
|
||||
libnm/nm-client.c | 8 ++++----
|
||||
1 file changed, 4 insertions(+), 4 deletions(-)
|
||||
|
||||
diff --git a/libnm/nm-client.c b/libnm/nm-client.c
|
||||
index c8707f5..4d79317 100644
|
||||
--- a/libnm/nm-client.c
|
||||
+++ b/libnm/nm-client.c
|
||||
@@ -2629,7 +2629,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;
|
||||
@@ -2638,7 +2638,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;
|
||||
@@ -2647,7 +2647,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;
|
||||
@@ -2668,7 +2668,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;
|
||||
--
|
||||
cgit v1.1
|
||||
|
||||
|
|
@ -9,7 +9,7 @@
|
|||
%global epoch_version 1
|
||||
%global rpm_version 1.8.2
|
||||
%global real_version 1.8.2
|
||||
%global release_version 3
|
||||
%global release_version 4
|
||||
%global snapshot %{nil}
|
||||
%global git_sha %{nil}
|
||||
|
||||
|
@ -84,6 +84,7 @@ Source3: 20-connectivity-fedora.conf
|
|||
|
||||
Patch1: 0001-dhcp-interface-parsing.patch
|
||||
Patch2: 0002-dns-fix-domain-suffix-check.patch
|
||||
Patch3: 0003-libnm-client-proxy-_enabled-and-metered-properties-t.patch
|
||||
|
||||
Requires(post): systemd
|
||||
Requires(preun): systemd
|
||||
|
@ -340,6 +341,7 @@ by nm-connection-editor and nm-applet in a non-graphical environment.
|
|||
|
||||
%patch1 -p1
|
||||
%patch2 -p1
|
||||
%patch3 -p1
|
||||
|
||||
%build
|
||||
%if %{with regen_docs}
|
||||
|
@ -652,6 +654,9 @@ fi
|
|||
%endif
|
||||
|
||||
%changelog
|
||||
* Mon Dec 04 2017 Leigh Scott <leigh123linux@googlemail.com> - 1:1.8.2-4
|
||||
- libnm: fix accessing enabled and metered properties
|
||||
|
||||
* Fri Jul 21 2017 Lubomir Rintel <lkundrak@v3.sk> - 1:1.8.2-3
|
||||
- provide NetworkManager-devel
|
||||
|
||||
|
|
Loading…
Reference in New Issue