Dominique Leuenberger
f3f44f9994
Synch with SLE. Forgot to actually remove the old patch (oops!) It's really gone this time. - Only require udev on SLE. Only needed for older filesystem package. - Re-enable gnome-patch-translation on SLE. We don't have any non-rebased patches now, so probably safe. - Drop gnome-settings-daemon-housekeeping-ignore-boot-efi.patch: now handled in branding. - Add gnome-settings-daemon-housekeeping-ignore-boot-efi.patch (bsc#919217). Prevent popup warnings about /boot/efi on a default UEFI installation. - Remove gnome-settings-daemon-bnc877552.patch - fixed upstream - Added back an updated version of gnome-settings-daemon-initial-keyboard.patch for bsc#979051. Suse works differently from GNOME; we set the default keyboard from xkb, and GNOME likes to do it itself. This makes sure there is no keyboard selector icon if there is a single default keyboard defined. - Removed gsettings-do-not-store-autodetected-keyboard-settings.patch. Equivalent code is now upstream. - Removed gnome-settings-daemon-initial-keyboard.patch. Upstream's behavior is fine, as the default keyboard layout needs to be available for the screen lock. - Update to GNOME 3.20.1 Fate#318572 - Rebased gnome-settings-daemon-notify-idle-resumed.patch. OBS-URL: https://build.opensuse.org/request/show/417855 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gnome-settings-daemon?expand=0&rev=248
42 lines
1.4 KiB
Diff
42 lines
1.4 KiB
Diff
From fd0df3003ba7c0ae4d04a8314358db7f82dd2ab1 Mon Sep 17 00:00:00 2001
|
|
From: Felix Zhang <fezhang@suse.com>
|
|
Date: Tue, 6 May 2014 16:13:04 +0800
|
|
Subject: [PATCH] hide warnings
|
|
|
|
---
|
|
plugins/color/gsd-color-profiles.c | 2 ++
|
|
plugins/color/gsd-color-state.c | 2 ++
|
|
2 files changed, 4 insertions(+)
|
|
|
|
diff --git a/plugins/color/gsd-color-profiles.c b/plugins/color/gsd-color-profiles.c
|
|
index 2b01faa..05a728a 100644
|
|
--- a/plugins/color/gsd-color-profiles.c
|
|
+++ b/plugins/color/gsd-color-profiles.c
|
|
@@ -73,7 +73,9 @@ gcm_session_client_connect_cb (GObject *source_object,
|
|
profiles = GSD_COLOR_PROFILES (user_data);
|
|
ret = cd_client_get_has_server (profiles->priv->client);
|
|
if (!ret) {
|
|
+ /* hide this warning for SLES
|
|
g_warning ("There is no colord server available");
|
|
+ */
|
|
return;
|
|
}
|
|
|
|
diff --git a/plugins/color/gsd-color-state.c b/plugins/color/gsd-color-state.c
|
|
index 04823e4..20e8a2b 100644
|
|
--- a/plugins/color/gsd-color-state.c
|
|
+++ b/plugins/color/gsd-color-state.c
|
|
@@ -1297,7 +1297,9 @@ gcm_session_client_connect_cb (GObject *source_object,
|
|
/* is there an available colord instance? */
|
|
ret = cd_client_get_has_server (state->priv->client);
|
|
if (!ret) {
|
|
+ /* hide this warning for SLES
|
|
g_warning ("There is no colord server available");
|
|
+ */
|
|
goto out;
|
|
}
|
|
|
|
--
|
|
1.7.12.4
|
|
|