summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichard Hughes <richard@hughsie.com>2011-09-13 12:15:10 +0100
committerRichard Hughes <richard@hughsie.com>2011-09-13 12:15:44 +0100
commit3984d31f9b3b5f4d2a7217c4142bc42583a14cf2 (patch)
tree209d8972c4d46c1a2b6d72e6a66bcfaca990f561
parent28146a6b453eef450acfbdda7172246f9b8b0036 (diff)
downloadgnome-settings-daemon-3984d31f9b3b5f4d2a7217c4142bc42583a14cf2.tar.gz
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.
-rw-r--r--plugins/color/gsd-color-manager.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/plugins/color/gsd-color-manager.c b/plugins/color/gsd-color-manager.c
index e6ba132d..967d1c02 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;
}