|
 |
dfde3b |
From b0895e1998ebc83ab030ec0f17c0685439f5b404 Mon Sep 17 00:00:00 2001
|
|
|
dfde3b |
From: Ray Strode <rstrode@redhat.com>
|
|
|
dfde3b |
Date: Mon, 15 Apr 2013 09:57:34 -0400
|
|
|
dfde3b |
Subject: [PATCH] dbus: Don't spew to console when unable to connect to dbus
|
|
|
dfde3b |
daemon
|
|
|
dfde3b |
|
|
|
dfde3b |
Instead pass the error up for the caller to decide what to do.
|
|
|
dfde3b |
|
|
|
dfde3b |
This prevent untrappable warning messages from showing up at the
|
|
|
dfde3b |
console if gconftool --makefile-install-rule is called.
|
|
|
dfde3b |
---
|
|
|
dfde3b |
gconf/gconf-dbus.c | 24 ++++++++++++------------
|
|
|
dfde3b |
1 file changed, 12 insertions(+), 12 deletions(-)
|
|
|
dfde3b |
|
|
|
dfde3b |
diff --git a/gconf/gconf-dbus.c b/gconf/gconf-dbus.c
|
|
|
dfde3b |
index 5610fcf..048e3ea 100644
|
|
|
dfde3b |
--- a/gconf/gconf-dbus.c
|
|
|
dfde3b |
+++ b/gconf/gconf-dbus.c
|
|
|
dfde3b |
@@ -104,9 +104,9 @@ static GConfEngine *default_engine = NULL;
|
|
|
dfde3b |
static GHashTable *engines_by_db = NULL;
|
|
|
dfde3b |
static GHashTable *engines_by_address = NULL;
|
|
|
dfde3b |
static gboolean dbus_disconnected = FALSE;
|
|
|
dfde3b |
|
|
|
dfde3b |
-static gboolean ensure_dbus_connection (void);
|
|
|
dfde3b |
+static gboolean ensure_dbus_connection (GError **error);
|
|
|
dfde3b |
static gboolean ensure_service (gboolean start_if_not_found,
|
|
|
dfde3b |
GError **err);
|
|
|
dfde3b |
static gboolean ensure_database (GConfEngine *conf,
|
|
|
dfde3b |
gboolean start_if_not_found,
|
|
|
dfde3b |
@@ -382,18 +382,20 @@ gconf_engine_detach (GConfEngine *conf)
|
|
|
dfde3b |
}
|
|
|
dfde3b |
}
|
|
|
dfde3b |
|
|
|
dfde3b |
static gboolean
|
|
|
dfde3b |
-ensure_dbus_connection (void)
|
|
|
dfde3b |
+ensure_dbus_connection (GError **err)
|
|
|
dfde3b |
{
|
|
|
dfde3b |
DBusError error;
|
|
|
dfde3b |
|
|
|
dfde3b |
if (global_conn != NULL)
|
|
|
dfde3b |
return TRUE;
|
|
|
dfde3b |
|
|
|
dfde3b |
if (dbus_disconnected)
|
|
|
dfde3b |
{
|
|
|
dfde3b |
- g_warning ("The connection to DBus was broken. Can't reinitialize it.");
|
|
|
dfde3b |
+ g_set_error (err, GCONF_ERROR,
|
|
|
dfde3b |
+ GCONF_ERROR_NO_SERVER,
|
|
|
dfde3b |
+ "The connection to DBus was broken. Can't reinitialize it.");
|
|
|
dfde3b |
return FALSE;
|
|
|
dfde3b |
}
|
|
|
dfde3b |
|
|
|
dfde3b |
dbus_error_init (&error);
|
|
|
dfde3b |
@@ -401,9 +403,12 @@ ensure_dbus_connection (void)
|
|
|
dfde3b |
global_conn = dbus_bus_get_private (DBUS_BUS_SESSION, &error);
|
|
|
dfde3b |
|
|
|
dfde3b |
if (!global_conn)
|
|
|
dfde3b |
{
|
|
|
dfde3b |
- g_warning ("Client failed to connect to the D-BUS daemon:\n%s", error.message);
|
|
|
dfde3b |
+ g_set_error (err, GCONF_ERROR,
|
|
|
dfde3b |
+ GCONF_ERROR_NO_SERVER,
|
|
|
dfde3b |
+ "Client failed to connect to the D-BUS daemon:\n%s",
|
|
|
dfde3b |
+ error.message);
|
|
|
dfde3b |
|
|
|
dfde3b |
dbus_error_free (&error);
|
|
|
dfde3b |
return FALSE;
|
|
|
dfde3b |
}
|
|
|
dfde3b |
@@ -430,15 +435,10 @@ ensure_service (gboolean start_if_not_found,
|
|
|
dfde3b |
DBusError error;
|
|
|
dfde3b |
|
|
|
dfde3b |
if (global_conn == NULL)
|
|
|
dfde3b |
{
|
|
|
dfde3b |
- if (!ensure_dbus_connection ())
|
|
|
dfde3b |
- {
|
|
|
dfde3b |
- g_set_error (err, GCONF_ERROR,
|
|
|
dfde3b |
- GCONF_ERROR_NO_SERVER,
|
|
|
dfde3b |
- _("No D-BUS daemon running\n"));
|
|
|
dfde3b |
- return FALSE;
|
|
|
dfde3b |
- }
|
|
|
dfde3b |
+ if (!ensure_dbus_connection (err))
|
|
|
dfde3b |
+ return FALSE;
|
|
|
dfde3b |
|
|
|
dfde3b |
g_assert (global_conn != NULL);
|
|
|
dfde3b |
}
|
|
|
dfde3b |
|
|
|
dfde3b |
@@ -2511,9 +2511,9 @@ gboolean
|
|
|
dfde3b |
gconf_ping_daemon (void)
|
|
|
dfde3b |
{
|
|
|
dfde3b |
if (global_conn == NULL)
|
|
|
dfde3b |
{
|
|
|
dfde3b |
- if (!ensure_dbus_connection ())
|
|
|
dfde3b |
+ if (!ensure_dbus_connection (NULL))
|
|
|
dfde3b |
{
|
|
|
dfde3b |
return FALSE;
|
|
|
dfde3b |
}
|
|
|
dfde3b |
g_assert (global_conn != NULL);
|
|
|
dfde3b |
--
|
|
|
dfde3b |
1.8.1.4
|
|
|
dfde3b |
|