← Back to branch summary

~darkxst/ubuntu/quantal/gnome-shell/lp1128804

« back to all changes in this revision

Viewing changes to debian/patches/ubuntu_screensaver_fallback.patch

  • Committer: Package Import Robot
  • Author(s): Jeremy Bicha
  • Date: 2012-11-26 15:57:51 UTC
  • mfrom: (1.1.46)
  • Revision ID: package-import@ubuntu.com-20121126155751-5unrgmmtkc7mtkoz
Tags: 3.6.2-0ubuntu0.1
https://launchpad.net/bugs/1078155
https://launchpad.net/bugs/1072838
https://launchpad.net/bugs/1064269
* New upstream release. (LP: #1078155)
  - Fixes disable-user-list option (LP: #1072838)
  - Many other bugfixes
* debian/control.in
  - Bump minimum mutter
  - Build-depend on gtk-doc-tools to generate updated man page
* debian/patches/ubuntu_screensaver_fallback.patch:
  - Dropped, applied in new version
* debian/patches/ubuntu_lock_on_suspend.patch
  - Refreshed
* debian/patches/ubuntu-lightdm-user-switching.patch:
  - Restored. Accidentally dropped earlier but it just needed to
    be refreshed (LP: #1064269)
* debian/patches/git-set-ally-wm-theme.patch:
  - Git patch to set/reset HighContrast window theme too

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/ubuntu_screensaver_fallback.patch
1
 
From 879a0588ec6b7e3cd50329783761d9dc823ac355 Mon Sep 17 00:00:00 2001
2
 
From: Tim Lunn <tim@feathertop.org>
3
 
Date: Fri, 19 Oct 2012 10:44:28 +1100
4
 
Subject: [PATCH] screenShield: explicitly load gnome-screensaver in fallback
5
 
 mode.
6
 
 
7
 
When running gnome-shell from lightDM, gnome-screensaver is no
8
 
longer auto-loaded. As a result the dbus calls for Lock user etc
9
 
will fail.
10
 
 
11
 
https://bugzilla.gnome.org/show_bug.cgi?id=683060
12
 
Bug-Ubuntu: https://launchpad.net/bugs/1064354
13
 
---
14
 
 js/ui/screenShield.js |    3 +++
15
 
 1 file changed, 3 insertions(+)
16
 
 
17
 
diff --git a/js/ui/screenShield.js b/js/ui/screenShield.js
18
 
index 3a56d31..5ecfb77 100644
19
 
--- a/js/ui/screenShield.js
20
 
+++ b/js/ui/screenShield.js
21
 
@@ -21,6 +21,7 @@ const Overview = imports.ui.overview;
22
 
 const MessageTray = imports.ui.messageTray;
23
 
 const ShellDBus = imports.ui.shellDBus;
24
 
 const Tweener = imports.ui.tweener;
25
 
+const Util = imports.misc.util;
26
 
 
27
 
 const SCREENSAVER_SCHEMA = 'org.gnome.desktop.screensaver';
28
 
 const LOCK_ENABLED_KEY = 'lock-enabled';
29
 
@@ -844,6 +845,8 @@ const ScreenShieldFallback = new Lang.Class({
30
 
     Name: 'ScreenShieldFallback',
31
 
 
32
 
     _init: function() {
33
 
+        Util.spawn(['gnome-screensaver']);
34
 
+
35
 
         this._proxy = new Gio.DBusProxy({ g_connection: Gio.DBus.session,
36
 
                                           g_name: 'org.gnome.ScreenSaver',
37
 
                                           g_object_path: '/org/gnome/ScreenSaver',
38
 
1.7.10.4