[gnome-settings-daemon] color: Do not show a warning when switching to a new user account



commit 3984d31f9b3b5f4d2a7217c4142bc42583a14cf2
Author: Richard Hughes <richard hughsie com>
Date:   Tue Sep 13 12:15:10 2011 +0100

    color: Do not show a warning when switching to a new user account
    
    The new gnome-settings-daemon instance creates a duplicate device,
    which is completely fine.

 plugins/color/gsd-color-manager.c |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)
---
diff --git a/plugins/color/gsd-color-manager.c b/plugins/color/gsd-color-manager.c
index e6ba132..967d1c0 100644
--- a/plugins/color/gsd-color-manager.c
+++ b/plugins/color/gsd-color-manager.c
@@ -1161,8 +1161,11 @@ gcm_session_create_device_cb (GObject *object,
                                                  res,
                                                  &error);
         if (device == NULL) {
-                g_warning ("failed to create device: %s",
-                           error->message);
+                if (error->domain != CD_CLIENT_ERROR ||
+                    error->code != CD_CLIENT_ERROR_ALREADY_EXISTS) {
+                        g_warning ("failed to create device: %s",
+                                   error->message);
+                }
                 g_error_free (error);
                 return;
         }



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