37 lines
1.1 KiB
Diff
37 lines
1.1 KiB
Diff
From c5761146bc063a2defd9934cd0151b5e5766ab73 Mon Sep 17 00:00:00 2001
|
||
From: Philip Withnall <withnall@endlessm.com>
|
||
Date: Thu, 13 Sep 2018 10:25:05 +0100
|
||
Subject: [PATCH 066/682] gnetworkmonitornm: Set a GError properly on an error
|
||
handling path
|
||
MIME-Version: 1.0
|
||
Content-Type: text/plain; charset=UTF-8
|
||
Content-Transfer-Encoding: 8bit
|
||
|
||
All the other initialisation failure paths set a GError, but this one
|
||
didn’t. Set a GError to avoid breaking the invariant that returning
|
||
FALSE should always have a GError set.
|
||
|
||
Signed-off-by: Philip Withnall <withnall@endlessm.com>
|
||
|
||
https://gitlab.gnome.org/GNOME/glib/issues/1523
|
||
---
|
||
gio/gnetworkmonitornm.c | 2 ++
|
||
1 file changed, 2 insertions(+)
|
||
|
||
diff --git a/gio/gnetworkmonitornm.c b/gio/gnetworkmonitornm.c
|
||
index 20a86571f..5bc8c925a 100644
|
||
--- a/gio/gnetworkmonitornm.c
|
||
+++ b/gio/gnetworkmonitornm.c
|
||
@@ -309,6 +309,8 @@ g_network_monitor_nm_initable_init (GInitable *initable,
|
||
|
||
if (!name_owner)
|
||
{
|
||
+ g_set_error (error, G_IO_ERROR, G_IO_ERROR_FAILED,
|
||
+ _("NetworkManager not running"));
|
||
g_object_unref (proxy);
|
||
return FALSE;
|
||
}
|
||
--
|
||
2.19.1
|
||
|