Hello community, here is the log from the commit of package gnome-shell for openSUSE:Factory checked in at 2013-01-22 15:31:05 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/gnome-shell (Old) and /work/SRC/openSUSE:Factory/.gnome-shell.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "gnome-shell", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/gnome-shell/gnome-shell.changes 2013-01-20 07:47:09.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.gnome-shell.new/gnome-shell.changes 2013-01-22 15:31:07.000000000 +0100 @@ -1,0 +2,13 @@ +Mon Jan 21 23:03:02 UTC 2013 - zai...@opensuse.org + +- Add g-s-honor-lock-delay-GSettings.patch, + org.gnome.desktop.screensaver.lock-delay contains the grace + period of the screensaver: if deactivated within that many + seconds from the start of the idle period, the shell should not + prompt for a password. This setting correspond to the "Lock + screen after" combo in screen and privacy panels. (bgo#690766). +- Add g-s-use-the-right-getter.patch, org.gnome.desktop.screensaver + lock-delay is an integer, so don't use get_bool() on it. + (bgo#691170). + +------------------------------------------------------------------- New: ---- g-s-honor-lock-delay-GSettings.patch g-s-use-the-right-getter.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gnome-shell.spec ++++++ --- /var/tmp/diff_new_pack.BKNjTu/_old 2013-01-22 15:31:08.000000000 +0100 +++ /var/tmp/diff_new_pack.BKNjTu/_new 2013-01-22 15:31:08.000000000 +0100 @@ -26,6 +26,10 @@ Source: http://download.gnome.org/sources/gnome-shell/3.6/%{name}-%{version}.tar.xz # PATCH-FIX-UPSTREAM gnome-shell-private-connection.patch bnc#751211 bgo#646187 dims...@opensuse.org -- create private connections if the user is not authorized Patch1: gnome-shell-private-connection.patch +# PATCH-FIX-UPSTREAM g-s-honor-lock-delay-GSettings.patch bgo#690766 zai...@opensuse.org -- This setting correspond to the "Lock screen after" combo in screen and privacy panels. +Patch2: g-s-honor-lock-delay-GSettings.patch +# PATCH-FIX-UPSTREAM g-s-use-the-right-getter.patch bgo#691170 zai...@opensuse.org -- org.gnome.desktop.screensaver lock-delay is an integer, not a boolean, so don't use get_bool() on it. +Patch3: g-s-use-the-right-getter.patch BuildRequires: docbook-xsl-stylesheets BuildRequires: intltool BuildRequires: translation-update-upstream @@ -130,6 +134,8 @@ %prep %setup -q %patch1 -p1 +%patch2 -p1 +%patch3 -p1 translation-update-upstream %build ++++++ g-s-honor-lock-delay-GSettings.patch ++++++ >From db1aea210969e3c9558dd672620d8df2ebab0a4b Mon Sep 17 00:00:00 2001 From: Giovanni Campagna <gcampa...@src.gnome.org> Date: Tue, 25 Dec 2012 00:13:52 +0000 Subject: ScreenShield: honor lock-delay GSettings key org.gnome.desktop.screensaver.lock-delay contains the grace period of the screensaver: if deactivated within that many seconds from the start of the idle period, the shell should not prompt for a password. This setting correspond to the "Lock screen after" combo in screen and privacy panels. https://bugzilla.gnome.org/show_bug.cgi?id=690766 --- diff --git a/js/ui/screenShield.js b/js/ui/screenShield.js index 988e191..94fc2b5 100644 --- a/js/ui/screenShield.js +++ b/js/ui/screenShield.js @@ -26,6 +26,7 @@ const Util = imports.misc.util; const SCREENSAVER_SCHEMA = 'org.gnome.desktop.screensaver'; const LOCK_ENABLED_KEY = 'lock-enabled'; +const LOCK_DELAY_KEY = 'lock-delay'; const CURTAIN_SLIDE_TIME = 0.3; // fraction of screen height the arrow must reach before completing @@ -582,7 +583,11 @@ const ScreenShield = new Lang.Class({ let lightboxWasShown = this._lightbox.shown; this._lightbox.hide(); - let shouldLock = lightboxWasShown && this._settings.get_boolean(LOCK_ENABLED_KEY); + // GLib.get_monotonic_time() returns microseconds, convert to seconds + let elapsedTime = (GLib.get_monotonic_time() - this._activationTime) / 1000000; + let shouldLock = lightboxWasShown && + this._settings.get_boolean(LOCK_ENABLED_KEY) && + (elapsedTime >= this._settings.get_boolean(LOCK_DELAY_KEY)); if (shouldLock || this._isLocked) { this.lock(false); } else if (this._isActive) { -- cgit v0.9.0.2 ++++++ g-s-use-the-right-getter.patch ++++++ >From d339d2db09052b42960250ab713cc4f885f1155f Mon Sep 17 00:00:00 2001 From: Matthias Clasen <mcla...@redhat.com> Date: Sat, 05 Jan 2013 03:00:06 +0000 Subject: Use the right getter org.gnome.desktop.screensaver lock-delay is an integer, not a boolean, so don't use get_bool() on it. https://bugzilla.gnome.org/show_bug.cgi?id=691170 --- diff --git a/js/ui/screenShield.js b/js/ui/screenShield.js index 94fc2b5..d2754df 100644 --- a/js/ui/screenShield.js +++ b/js/ui/screenShield.js @@ -587,7 +587,7 @@ const ScreenShield = new Lang.Class({ let elapsedTime = (GLib.get_monotonic_time() - this._activationTime) / 1000000; let shouldLock = lightboxWasShown && this._settings.get_boolean(LOCK_ENABLED_KEY) && - (elapsedTime >= this._settings.get_boolean(LOCK_DELAY_KEY)); + (elapsedTime >= this._settings.get_int(LOCK_DELAY_KEY)); if (shouldLock || this._isLocked) { this.lock(false); } else if (this._isActive) { -- cgit v0.9.0.2 -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
