Accepting request 417855 from home:mgorse:branches:GNOME:Factory

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

gnome-settings-daemon-bnc873545-hide-warnings.patch

@@ -12,8 +12,8 @@ diff --git a/plugins/color/gsd-color-profiles.c b/plugins/color/gsd-color-profil
 index 2b01faa..05a728a 100644
 --- a/plugins/color/gsd-color-profiles.c
 +++ b/plugins/color/gsd-color-profiles.c
-@@ -71,7 +71,9 @@ gcm_session_client_connect_cb (GObject *source_object,
+@@ -73,7 +73,9 @@ gcm_session_client_connect_cb (GObject *source_object,
-         /* is there an available colord instance? */
+         profiles = GSD_COLOR_PROFILES (user_data);
          ret = cd_client_get_has_server (profiles->priv->client);
          if (!ret) {
 +                /* hide this warning for SLES

gnome-settings-daemon-initial-keyboard.patch

@@ -0,0 +1,67 @@
+From c2e0c03c03f47da9b117db0ba876732e84dcf0c4 Mon Sep 17 00:00:00 2001
+From: Federico Mena Quintero <federico@gnome.org>
+Date: Mon, 16 May 2016 19:18:43 -0500
+Subject: [PATCH] Resurrect the code from upstream to set the default keyboard
+ from XKB if there is one.
+
+Suse works differently than GNOME here; we set a default keyboard from
+the system's configuration instead of letting GNOME take care of
+everything itself.
+
+https://bugzilla.suse.com/show_bug.cgi?id=979051
+---
+ plugins/keyboard/gsd-keyboard-manager.c | 18 +++++++++++++-----
+ 1 file changed, 13 insertions(+), 5 deletions(-)
+
+diff --git a/plugins/keyboard/gsd-keyboard-manager.c b/plugins/keyboard/gsd-keyboard-manager.c
+index eb75c92..06be608 100644
+--- a/plugins/keyboard/gsd-keyboard-manager.c
++++ b/plugins/keyboard/gsd-keyboard-manager.c
+@@ -450,7 +450,7 @@ input_sources_changed (GSettings          *settings,
+ }
+ 
+ static void
+-get_sources_from_xkb_config (GsdKeyboardManager *manager)
++get_sources_from_xkb_config (GsdKeyboardManager *manager, gboolean running_under_gdm)
+ {
+         GsdKeyboardManagerPrivate *priv = manager->priv;
+         GVariantBuilder builder;
+@@ -501,7 +501,7 @@ get_sources_from_xkb_config (GsdKeyboardManager *manager)
+                 g_free (id);
+         }
+ 
+-        if (!have_default_layout)
++        if (!have_default_layout && running_under_gdm)
+                 g_variant_builder_add (&builder, "(ss)", INPUT_SOURCE_TYPE_XKB, DEFAULT_LAYOUT);
+ 
+         g_settings_set_value (priv->input_sources_settings, KEY_INPUT_SOURCES, g_variant_builder_end (&builder));
+@@ -653,15 +653,23 @@ maybe_create_initial_settings (GsdKeyboardManager *manager)
+ 
+         settings = manager->priv->input_sources_settings;
+ 
+-        if (g_getenv ("RUNNING_UNDER_GDM"))
+-                return;
++        if (g_getenv ("RUNNING_UNDER_GDM")) {
++                GVariantBuilder builder;
++                /* clean the settings and get them from the "system" */
++                g_variant_builder_init (&builder, G_VARIANT_TYPE ("a(ss)"));
++                g_settings_set_value (settings, KEY_INPUT_SOURCES, g_variant_builder_end (&builder));
++                get_sources_from_xkb_config (manager, TRUE);
++
++                g_settings_set_strv (settings, KEY_KEYBOARD_OPTIONS, NULL);
++                get_options_from_xkb_config (manager);
++        }
+ 
+         maybe_convert_old_settings (settings);
+ 
+         /* if we still don't have anything do some educated guesses */
+         sources = g_settings_get_value (settings, KEY_INPUT_SOURCES);
+         if (g_variant_n_children (sources) < 1)
+-                get_sources_from_xkb_config (manager);
++                get_sources_from_xkb_config (manager, FALSE);
+         g_variant_unref (sources);
+ 
+         options = g_settings_get_strv (settings, KEY_KEYBOARD_OPTIONS);
+-- 
+2.1.4
+

gnome-settings-daemon-notify-idle-resumed.patch

@@ -17,7 +17,7 @@ Index: gnome-settings-daemon-3.18.2/plugins/power/gsd-power-manager.c
 ===================================================================
 --- gnome-settings-daemon-3.18.2.orig/plugins/power/gsd-power-manager.c
 +++ gnome-settings-daemon-3.18.2/plugins/power/gsd-power-manager.c
-@@ -148,6 +148,7 @@ struct GsdPowerManagerPrivate
+@@ -149,6 +149,7 @@ struct GsdPowerManagerPrivate
          NotifyNotification      *notification_ups_discharging;
          NotifyNotification      *notification_low;
          NotifyNotification      *notification_sleep_warning;
@@ -25,7 +25,7 @@ Index: gnome-settings-daemon-3.18.2/plugins/power/gsd-power-manager.c
          GsdPowerActionType       sleep_action_type;
          gboolean                 battery_is_low; /* laptop battery low, or UPS discharging */
  
-@@ -183,6 +184,7 @@ struct GsdPowerManagerPrivate
+@@ -184,6 +185,7 @@ struct GsdPowerManagerPrivate
          guint                    inhibit_lid_switch_timer_id;
          gboolean                 is_virtual_machine;
          gboolean                 is_tablet;
@@ -33,7 +33,7 @@ Index: gnome-settings-daemon-3.18.2/plugins/power/gsd-power-manager.c
  
          /* Idles */
          GnomeIdleMonitor        *idle_monitor;
-@@ -1477,6 +1479,49 @@ is_session_active (GsdPowerManager *mana
+@@ -1475,6 +1477,49 @@ is_session_active (GsdPowerManager *mana
  }
  
  static void
@@ -83,7 +83,7 @@ Index: gnome-settings-daemon-3.18.2/plugins/power/gsd-power-manager.c
  idle_set_mode (GsdPowerManager *manager, GsdPowerIdleMode mode)
  {
          gboolean ret = FALSE;
-@@ -1568,6 +1613,7 @@ idle_set_mode (GsdPowerManager *manager,
+@@ -1564,6 +1609,7 @@ idle_set_mode (GsdPowerManager *manager,
                          action_type = g_settings_get_enum (manager->priv->settings,
                                                             "sleep-inactive-ac-type");
                  }

gnome-settings-daemon.changes

@@ -1,3 +1,25 @@
+-------------------------------------------------------------------
+Fri Aug  5 03:38:22 UTC 2016 - mgorse@suse.com
+
+- 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.
+
+-------------------------------------------------------------------
+Fri Jun 17 16:52:33 UTC 2016 - fezhang@suse.com
+
+- Add gnome-settings-daemon-housekeeping-ignore-boot-efi.patch
+  (bsc#919217). Prevent popup warnings about /boot/efi on a default
+  UEFI installation.
+
+-------------------------------------------------------------------
+Wed Jun  8 23:59:29 UTC 2016 - sreeves@suse.com
+
+- Remove gnome-settings-daemon-bnc877552.patch - fixed upstream
+
 -------------------------------------------------------------------
 Mon Jun  6 09:44:23 UTC 2016 - dimstar@opensuse.org
 
@@ -5,6 +27,63 @@ Mon Jun  6 09:44:23 UTC 2016 - dimstar@opensuse.org
   checks for it and it allows us to specify the minimum version
   required.
 
+-------------------------------------------------------------------
+Mon May 16 21:06:18 CDT 2016 - federico@suse.com
+
+- 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.
+
+-------------------------------------------------------------------
+Mon Apr 18 11:19:11 CDT 2016 - federico@suse.com
+
+- Removed
+  gsettings-do-not-store-autodetected-keyboard-settings.patch.
+  Equivalent code is now upstream.
+
+-------------------------------------------------------------------
+Mon Apr 18 11:16:19 CDT 2016 - federico@suse.com
+
+- 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.
+
+-------------------------------------------------------------------
+Mon Apr 18 08:33:57 UTC 2016 - alarrosa@suse.com
+
+- Update to GNOME 3.20.1  Fate#318572
+
+- Rebased gnome-settings-daemon-notify-idle-resumed.patch.
+- Add gnome-settings-daemon-revert-libinput-mandatory.patch: do not
+      force libinput driver on SLE.
+- Drop SLE patch:
+  gnome-settings-daemon-bnc862603-remove-battery-recall-code.patch:
+  fixed upstream.
+- Drop SLE patch:
+  updates-dont-use-changed-signal-on-UpClient.patch:
+  Removed code upstream.
+- Drop SLE patch:
+  gnome-settings-daemon-bnc872820-gtk-decoration-layout.patch:
+  fixed upstream.
+- Drop SLE patch: gnome-settings-daemon-icewm-cursor.patch:
+  Removed code upstream.
+- Drop SLE patch:
+  gnome-settings-daemon-no-lockscreen-screenshot.patch:
+  fixed upstream.
+- Drop SLE patch:
+  gnome-settings-daemon-bsc945348-disappearing-cursor.patch:
+  Removed code upstream.
+- Rebased SLE patch: sle-configure-timeout-blank.patch .
+- Rebased SLE patch: gnome-settings-daemon-initial-keyboard.patch .
+- Rebased SLE patch:
+  gsettings-do-not-store-autodetected-keyboard-settings.patch .
+- Rebased SLE patch: gnome-settings-daemon-bnc877552.patch .
+- Rebased patch
+  gnome-settings-daemon-bnc873545-hide-warnings.patch .
+
 -------------------------------------------------------------------
 Thu Apr 14 11:09:20 UTC 2016 - zaitor@opensuse.org
 
@@ -110,6 +189,13 @@ Wed Jan 20 15:13:46 UTC 2016 - dimstar@opensuse.org
 - Replace pkgconfig(libnm-glib) and pkgconfig(libnm-util)
   BuildRequires with pkgconfig(libnm): following upstreams changes.
 
+-------------------------------------------------------------------
+Tue Jan 05 14:48:41 CST 2016 - cxiong@suse.com
+
+- Add gsettings-do-not-store-autodetected-keyboard-settings.patch
+  (bnc#931527). Do not store auto-detected values to allow
+  system-wide changes take effect.
+
 -------------------------------------------------------------------
 Sun Dec 20 12:04:15 UTC 2015 - zaitor@opensuse.org
 
@@ -132,6 +218,12 @@ Sun Dec 20 12:04:15 UTC 2015 - zaitor@opensuse.org
 - Drop gnome-settings-daemon-dont-override-xim-presets.patch: Fixed
   upstream.
 
+-------------------------------------------------------------------
+Tue Nov 17 23:42:02 CET 2015 - hpj@suse.com
+
+- Add gnome-settings-daemon-bsc945348-disappearing-cursor.patch
+  (bsc#945348). The cursor would disappear on mutter restart.
+
 -------------------------------------------------------------------
 Tue Nov 10 16:00:08 UTC 2015 - zaitor@opensuse.org
 
@@ -147,6 +239,12 @@ Tue Nov 10 16:00:08 UTC 2015 - zaitor@opensuse.org
   + Updated translations.
 - Rebase gnome-settings-daemon-notify-idle-resumed.patch.
 
+-------------------------------------------------------------------
+Thu Nov  5 18:15:11 UTC 2015 - mgorse@suse.com
+
+- Modify gnome-settings-daemon-initial-keyboard.patch to add
+  English keyboard layout when using ibus (bsc#899530). 
+
 -------------------------------------------------------------------
 Thu Oct 22 21:40:19 CEST 2015 - tiwai@suse.de
 
@@ -347,6 +445,13 @@ Tue Feb 17 14:24:01 UTC 2015 - dimstar@opensuse.org
 - Rebase gnome-settings-daemon-notify-idle-resumed.patch.
 - Toggle with_wayland to 1: enable building the wayland backend.
 
+-------------------------------------------------------------------
+Wed Feb 11 11:25:27 UTC 2015 - cxiong@suse.com
+
+- Add gnome-settings-daemon-no-lockscreen-screenshot.patch:
+  + media-keys: Disallow screenshots when locked (bnc#900031,
+    bgo#737456, CVE-2014-7300).
+
 -------------------------------------------------------------------
 Sat Jan 24 07:15:31 UTC 2015 - badshah400@gmail.com
 
@@ -366,6 +471,12 @@ Sat Jan 24 07:15:31 UTC 2015 - badshah400@gmail.com
   to configure; enabling wayland backend causes builds to
   fail.
 
+-------------------------------------------------------------------
+Mon Jan  5 15:39:06 UTC 2015 - dliang@suse.com
+
+- Add gnome-settings-daemon-icewm-cursor.patch (bnc#905158)
+  Do not hide the cursor while there was no mutter running.
+
 -------------------------------------------------------------------
 Thu Dec 18 02:09:55 UTC 2014 - zaitor@opensuse.org
 
@@ -408,6 +519,14 @@ Sun Oct  5 13:24:21 UTC 2014 - dimstar@opensuse.org
   has been disabled for 3 years with nobody even noticing it to be
   gone or caring to fix it.
 
+-------------------------------------------------------------------
+Thu Sep 25 20:59:09 CDT 2014 - federico@suse.com
+
+- Updated
+  gnome-settings-daemon-bnc872820-gtk-decoration-layout.patch.  Now
+  we pick up the correct dconf key names for Classic and default
+  modes, in order to set the window manager's button layout.
+
 -------------------------------------------------------------------
 Mon Sep 22 17:01:09 UTC 2014 - zaitor@opensuse.org
 
@@ -445,6 +564,13 @@ Mon Aug 18 11:54:35 UTC 2014 - dimstar@opensuse.org
   + Sharing: Fix crash when run against older NM.
   + Wacom: Add support for LEDs API in newer kernels.
 
+-------------------------------------------------------------------
+Fri Aug 15 15:23:53 CDT 2014 - federico@suse.com
+
+- Added gnome-settings-daemon-bnc872820-gtk-decoration-layout.patch
+  for bnc#872820.  This makes the XSettings plugin propagate the
+  Gtk/DecorationLayout setting so GTK+ can use it.
+
 -------------------------------------------------------------------
 Wed Jul 23 16:12:57 UTC 2014 - dimstar@opensuse.org
 
@@ -465,6 +591,12 @@ Wed Jul 23 16:12:57 UTC 2014 - dimstar@opensuse.org
     mapped for different orientations.
   + Updated translations.
 
+-------------------------------------------------------------------
+Fri Jul 18 19:18:39 UTC 2014 - sreeves@suse.com
+
+- Add gnome-settings-daemon-bnc877552.patch
+    gdm respond to power button.
+
 -------------------------------------------------------------------
 Sat Jul 12 19:56:04 UTC 2014 - dimstar@opensuse.org
 
@@ -518,12 +650,39 @@ Sat Jul 12 19:56:04 UTC 2014 - dimstar@opensuse.org
   fixed behaviour of the update plugin, which in turn no longer
   exists.
 
+-------------------------------------------------------------------
+Mon Jun 30 14:31:43 UTC 2014 - fcrozat@suse.com
+
+- Add gnome-settings-daemon-initial-keyboard.patch: do not add
+  english keyboard layout by default, causing keyboard selector to
+  be always visible.
+
+-------------------------------------------------------------------
+Wed May 21 21:47:07 UTC 2014 - mgorse@suse.com
+
+- Fix a crash when notifying after resuming from a suspend entered
+  as a result of the system being idle. 
+  Modified patch: gnome-settings-daemon-notify-idle-resumed.patch.
+
 -------------------------------------------------------------------
 Wed May 21 20:57:44 UTC 2014 - mgorse@suse.com
 
 - Rebased gnome-settings-daemon-notify-idle-resumed.patch.
   Also fixed a crash.
 
+-------------------------------------------------------------------
+Wed May  7 18:59:57 CEST 2014 - sbrabec@suse.cz
+
+- Added support for gnome-patch-translation (5 strings).
+
+-------------------------------------------------------------------
+Tue May  6 09:14:32 UTC 2014 - fezhang@suse.com
+
+- Disable colord warnings in /var/log/messages (bnc#873545) 
+
+- added patch:
+  * gnome-settings-daemon-bnc873545-hide-warnings.patch
+
 -------------------------------------------------------------------
 Mon May  5 15:15:59 UTC 2014 - zaitor@opensuse.org
 
@@ -541,6 +700,15 @@ Mon May  5 15:15:59 UTC 2014 - zaitor@opensuse.org
     - Fix erratic back-light behaviour when the machine has a
       limited number of back-light settings.
 
+-------------------------------------------------------------------
+Fri May  2 19:20:04 UTC 2014 - mgorse@suse.com
+
+- Add updates-dont-use-changed-signal-on-UpClient.patch: Changed
+  signal no longer exists in upower 0.99. From upstream.
+
+- Update gnome-settings-daemon-upower-backport.patch; no longer
+  try to listen to device-changed signal (bnc#873759).
+
 -------------------------------------------------------------------
 Wed Apr 16 13:05:00 UTC 2014 - zaitor@opensuse.org
 
@@ -550,6 +718,38 @@ Wed Apr 16 13:05:00 UTC 2014 - zaitor@opensuse.org
   + Keyboard: Fix consecutive xkb grp: options not being stripped.
   + Updates: Let gnome-software handle update checking.
 
+-------------------------------------------------------------------
+Thu Mar 27 03:50:34 UTC 2014 - cxiong@suse.com
+
+- The default blank timeout is too short, set it longer,
+
+  see bnc#869685
+
+  NOTE: this is actually the delay between screensaver is shown
+  (from blank) and return to blank, more precisely, blank and
+  monitor off. The instant blanking (not monitor off) when user
+  locks the screen, is controlled by GNOME Shell screenShield, not
+  a power management feature. Also this patch is meant for Beta4,
+  the delay is fixed at 5 min. Later, a "gsetting" option might be
+  created.
+
+-------------------------------------------------------------------
+Thu Mar 27 03:24:20 UTC 2014 - cxiong@suse.com
+
+- Fix malformed parts of
+  gnome-settings-daemon-bnc862603-remove-battery-recall-code.patch
+
+  The main removed part is actually patching a backup file, which
+  was created by Patch 19 in spec. Tools like "quilt" would fail
+  to apply this patch, for these
+  tools use "--no-backup-if-mismatch" flag for "patch" and thus
+  Patch 19 would not create a backup file. "rpmbuild" don't use
+  this "--no-backup-if-mismatch" flag and thus didn't catch this
+  error (maybe this is a good time to think whether this flag
+  should be included.)
+
+  There are also some other minor clean up.
+
 -------------------------------------------------------------------
 Wed Mar 26 19:51:14 UTC 2014 - zaitor@opensuse.org
 
@@ -583,6 +783,17 @@ Tue Mar  4 19:38:57 UTC 2014 - dimstar@opensuse.org
 - Update to version 3.11.91:
   + Mouse, Common: Hardening for BadDevice errors.
 
+-------------------------------------------------------------------
+Thu Feb 20 21:38:49 UTC 2014 - mgorse@suse.com
+
+- Remove battery recall code (bnc#862603). The recall dialog is
+  reportedly being displayed erroneously, and it has been removed
+  upstream, since the last recalls date from 2006, so let's
+  remove it. 
+
+- Added patches:
+  * gnome-settings-daemon-bnc862603-remove-battery-recall-code.patch
+
 -------------------------------------------------------------------
 Tue Feb 18 22:35:44 UTC 2014 - zaitor@opensuse.org
 
@@ -672,7 +883,6 @@ Fri Feb  7 03:11:01 UTC 2014 - dimstar@opensuse.org
 - Drop gnome-settings-daemon-upower-backport.patch: fixed upstream.
 - Drop gnome-settings-daemon-upower-fix.patch: fixed upstream.
 
--------------------------------------------------------------------
 Thu Feb  6 15:03:34 UTC 2014 - lpechacek@suse.cz
  
 - Add gnome-settings-daemon-upower-fix.patch: avoid immediate

gnome-settings-daemon.spec

@@ -43,12 +43,15 @@ Patch20:        gnome-settings-daemon-revert-libinput-mandatory.patch
 Patch21:        gnome-settings-daemon-notify-idle-resumed.patch
 # PATCH-FIX-SLE gnome-settings-daemon-bnc873545-hide-warnings.patch bnc#873545 fezhang@suse.com -- hide the warnings when g-s-d cannot find colord running, which is expected on SLES
 Patch22:        gnome-settings-daemon-bnc873545-hide-warnings.patch
+# PATCH-FIX-SLE sle-configure-timeout-blank.patch bnc#869685 bgo#710904 cxiong@suse.com -- monitor off timeout is too short, extends it to 5 min
+Patch24:        sle-configure-timeout-blank.patch
+# PATCH-FIX-SLE gnome-settings-daemon-initial-keyboard.patch bsc979051 federico@suse.com -- Deal with the default keyboard being set from xkb instead of GNOME
+Patch29:        gnome-settings-daemon-initial-keyboard.patch
 BuildRequires:  cups-devel
 BuildRequires:  fdupes
 BuildRequires:  gnome-common
 %if !0%{?is_opensuse}
-# Disabled because of the non-rebased patch
+BuildRequires:  gnome-patch-translation
-#BuildRequires:  gnome-patch-translation
 BuildRequires:  translation-update-upstream
 %endif
 BuildRequires:  intltool
@@ -84,6 +87,11 @@ BuildRequires:  pkgconfig(xorg-wacom)
 BuildRequires:  pkgconfig(nss)
 BuildRequires:  pkgconfig(pango) >= 1.20.0
 BuildRequires:  pkgconfig(polkit-gobject-1) >= 0.103
+%if !0%{?is_opensuse}
+# For directory ownership. No longer needed in TW, since filesystem package
+# now owns
+BuildRequires:  pkgconfig(udev)
+%endif
 BuildRequires:  pkgconfig(upower-glib) >= 0.99.0
 BuildRequires:  pkgconfig(x11)
 BuildRequires:  pkgconfig(xext)
@@ -134,13 +142,12 @@ contact the settings daemon via its DBus interface.
 %setup -q
 %if !0%{?is_opensuse}
 translation-update-upstream
-# Disabled because of the non-rebased patch
+gnome-patch-translation-prepare
-#gnome-patch-translation-prepare
 %patch20 -p1
 %patch21 -p1
-%endif
-%if 0%{?sles_version} > 0
 %patch22 -p1
+%patch24
+%patch29 -p1
 %endif
 
 %build

sle-configure-timeout-blank.patch

@@ -0,0 +1,28 @@
+Index: plugins/power/gsd-power-constants.h
+===================================================================
+--- plugins/power/gsd-power-constants.h.orig	2013-11-12 01:25:13.000000000 +0800
++++ plugins/power/gsd-power-constants.h	2014-03-27 11:39:34.100125030 +0800
+@@ -18,7 +18,7 @@
+  */
+ 
+ /* The blank delay when the screensaver is active */
+-#define SCREENSAVER_TIMEOUT_BLANK                       15 /* seconds */
++#define SCREENSAVER_TIMEOUT_BLANK                       300 /* seconds */
+ 
+ /* The dim delay when dimming on idle is requested but idle-delay
+  * is set to "Never" */
+Index: plugins/power/gsd-power-manager.c
+===================================================================
+--- plugins/power/gsd-power-manager.c.orig	2014-03-27 11:39:34.089124716 +0800
++++ plugins/power/gsd-power-manager.c	2014-03-27 11:39:34.101125059 +0800
+@@ -1921,8 +1921,8 @@ handle_screensaver_active (GsdPowerManag
+                  * and its fade has finished.
+                  *
+                  * See also idle_configure() */
+-                if (active)
+-                        idle_set_mode (manager, GSD_POWER_IDLE_MODE_BLANK);
++                /* if (active) */
++                /*         idle_set_mode (manager, GSD_POWER_IDLE_MODE_BLANK); */
+         }
+ }
+