summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBenjamin Berg <bberg@redhat.com>2019-05-14 17:36:56 +0200
committerBenjamin Berg <benjamin@sipsolutions.net>2019-09-05 15:44:10 +0000
commit8a948b3ac17f7d1b0ff31b0cf22e655054eb5c6b (patch)
tree672b74fc4bb26c70db897caf915207f4c55d95b8
parent7447cd7f2b561870ca236724a4826b0857d6ff94 (diff)
downloadgnome-keyring-8a948b3ac17f7d1b0ff31b0cf22e655054eb5c6b.tar.gz
dbus-environment: Log Setenv call failure after initialization
When the GNOME session is already initialized at the point that Setenv is called, then an error is returned. Hidding this error makes it hard to understand why the environment was not setup if things failed.
-rw-r--r--daemon/dbus/gkd-dbus-environment.c6
1 files changed, 1 insertions, 5 deletions
diff --git a/daemon/dbus/gkd-dbus-environment.c b/daemon/dbus/gkd-dbus-environment.c
index 93e2b878..051de953 100644
--- a/daemon/dbus/gkd-dbus-environment.c
+++ b/daemon/dbus/gkd-dbus-environment.c
@@ -49,15 +49,11 @@ on_setenv_reply (GObject *source,
res = g_dbus_connection_call_finish (G_DBUS_CONNECTION (source), result, &error);
if (error != NULL) {
- gchar *dbus_error;
- dbus_error = g_dbus_error_get_remote_error (error);
- if (g_error_matches (error, G_DBUS_ERROR, G_DBUS_ERROR_SERVICE_UNKNOWN) ||
- g_strcmp0 (dbus_error, "org.gnome.SessionManager.NotInInitialization") == 0)
+ if (g_error_matches (error, G_DBUS_ERROR, G_DBUS_ERROR_SERVICE_UNKNOWN))
g_debug ("couldn't set environment variable in session: %s", error->message);
else
g_message ("couldn't set environment variable in session: %s", error->message);
g_error_free (error);
- g_free (dbus_error);
}
g_clear_pointer (&res, g_variant_unref);