[gnome-keyring] Don't warn if the GNOME session manager is not available



commit 8468c70393a600493629beaf491e0866dd19be28
Author: Stef Walter <stefw gnome org>
Date:   Thu Dec 27 20:52:00 2012 +0100

    Don't warn if the GNOME session manager is not available
    
     * When running in other desktop environments don't complain if
       the GNOME session manager isn't running.

 daemon/dbus/gkd-dbus-environment.c |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)
---
diff --git a/daemon/dbus/gkd-dbus-environment.c b/daemon/dbus/gkd-dbus-environment.c
index b1fa033..2da1bc3 100644
--- a/daemon/dbus/gkd-dbus-environment.c
+++ b/daemon/dbus/gkd-dbus-environment.c
@@ -23,6 +23,7 @@
 
 #include "config.h"
 
+
 #include "gkd-dbus-private.h"
 #include "gkd-util.h"
 
@@ -50,7 +51,10 @@ on_setenv_reply (DBusPendingCall *pending, void *user_data)
 	g_return_if_fail (reply);
 
 	if (dbus_set_error_from_message (&derr, reply)) {
-		if (!dbus_error_has_name (&derr, "org.gnome.SessionManager.NotInInitialization"))
+		if (dbus_error_has_name (&derr, "org.gnome.SessionManager.NotInInitialization") ||
+		    dbus_error_has_name (&derr, DBUS_ERROR_SERVICE_UNKNOWN))
+			g_debug ("couldn't set environment variable in session: %s", derr.message);
+		else
 			g_message ("couldn't set environment variable in session: %s", derr.message);
 		dbus_error_free (&derr);
 	}



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]