Attachment 914837 Details for Bug 1034215 – Trivially backported from https://bug712706.bugzilla-attachments.gnome.org/attachment.cgi?id=271468

[patch] Trivially backported from https://bug712706.bugzilla-attachments.gnome.org/attachment.cgi?id=271468

gnome-shell-3.10.4-automatic-sleep-fix.patch (text/plain), 5.18 KB, created by Philippe Troin on 2014-07-05 17:53:17 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Philippe Troin

Created: 2014-07-05 17:53:17 UTC

Size: 5.18 KB

patch

obsolete

>diff -ruN gnome-shell-3.10.4.orig/js/ui/screenShield.js gnome-shell-3.10.4/js/ui/screenShield.js
>--- gnome-shell-3.10.4.orig/js/ui/screenShield.js	2014-02-19 10:19:32.000000000 -0800
>+++ gnome-shell-3.10.4/js/ui/screenShield.js	2014-07-04 18:52:33.911187772 -0700
>@@ -307,7 +307,7 @@
>                              });
> 
>             this._updateVisibility();
>-            Shell.util_wake_up_screen();
>+            this.emit('wake-up-screen');
>         }
>     },
> 
>@@ -333,7 +333,7 @@
> 
>         this._updateVisibility();
>         if (obj.sourceBox.visible)
>-            Shell.util_wake_up_screen();
>+            this.emit('wake-up-screen');
>     },
> 
>     _visibleChanged: function(source, obj) {
>@@ -348,7 +348,7 @@
> 
>         this._updateVisibility();
>         if (obj.sourceBox.visible)
>-            Shell.util_wake_up_screen();
>+            this.emit('wake-up-screen');
>     },
> 
>     _detailedChanged: function(source, obj) {
>@@ -386,6 +386,7 @@
>         this._sources.delete(source);
>     },
> });
>+Signals.addSignalMethods(NotificationsBox.prototype);
> 
> const Arrow = new Lang.Class({
>     Name: 'Arrow',
>@@ -1155,6 +1156,7 @@
>         this._lockScreenContents.add_actor(this._lockScreenContentsBox);
> 
>         this._notificationsBox = new NotificationsBox();
>+        this._wakeUpScreenId = this._notificationsBox.connect('wake-up-screen', Lang.bind(this, this._wakeUpScreen));
>         this._lockScreenContentsBox.add(this._notificationsBox.actor, { x_fill: true,
>                                                                         y_fill: true,
>                                                                         expand: true });
>@@ -1162,11 +1164,17 @@
>         this._hasLockScreen = true;
>     },
> 
>+    _wakeUpScreen: function() {
>+        this._onUserBecameActive();
>+        this.emit('wake-up-screen');
>+    },
>+
>     _clearLockScreen: function() {
>         this._clock.destroy();
>         this._clock = null;
> 
>         if (this._notificationsBox) {
>+            this._notificationsBox.disconnect(this._wakeUpScreenId);
>             this._notificationsBox.destroy();
>             this._notificationsBox = null;
>         }
>diff -ruN gnome-shell-3.10.4.orig/js/ui/shellDBus.js gnome-shell-3.10.4/js/ui/shellDBus.js
>--- gnome-shell-3.10.4.orig/js/ui/shellDBus.js	2014-02-19 10:19:32.000000000 -0800
>+++ gnome-shell-3.10.4/js/ui/shellDBus.js	2014-07-04 18:53:29.904667533 -0700
>@@ -67,6 +67,7 @@
> <signal name="ActiveChanged">
>     <arg name="new_value" type="b" />
> </signal>
>+<signal name="WakeUpScreen" />
> </interface>;
> 
> const GnomeShell = new Lang.Class({
>@@ -396,6 +397,9 @@
>         screenShield.connect('active-changed', Lang.bind(this, function(shield) {
>             this._dbusImpl.emit_signal('ActiveChanged', GLib.Variant.new('(b)', [shield.active]));
>         }));
>+        screenShield.connect('wake-up-screen', Lang.bind(this, function(shield) {
>+            this._dbusImpl.emit_signal('WakeUpScreen', null);
>+        }));
> 
>         this._dbusImpl = Gio.DBusExportedObject.wrapJSObject(ScreenSaverIface, this);
>         this._dbusImpl.export(Gio.DBus.session, '/org/gnome/ScreenSaver');
>diff -ruN gnome-shell-3.10.4.orig/src/shell-util.c gnome-shell-3.10.4/src/shell-util.c
>--- gnome-shell-3.10.4.orig/src/shell-util.c	2014-02-19 10:19:34.000000000 -0800
>+++ gnome-shell-3.10.4/src/shell-util.c	2014-07-04 18:52:33.912187745 -0700
>@@ -405,33 +405,6 @@
>                                    (GdkPixbufDestroyNotify) g_free, NULL);
> }
> 
>-/**
>- * shell_util_wake_up_screen:
>- *
>- * Send a fake key event, resetting the IDLETIME counter and
>- * causing gnome-settings-daemon to wake up the screen.
>- */
>-/* Shamelessly taken from gnome-settings-daemon/plugins/power/gpm-common.c */
>-void
>-shell_util_wake_up_screen (void)
>-{
>-  static gboolean inited = FALSE;
>-  static KeyCode keycode1, keycode2;
>-  static gboolean first_keycode = FALSE;
>-
>-  if (inited == FALSE) {
>-    keycode1 = XKeysymToKeycode (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), GDK_KEY_Alt_L);
>-    keycode2 = XKeysymToKeycode (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), GDK_KEY_Alt_R);
>-  }
>-
>-  gdk_error_trap_push ();
>-  /* send a left or right alt key; first press, then release */
>-  XTestFakeKeyEvent (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), first_keycode ? keycode1 : keycode2, True, CurrentTime);
>-  XTestFakeKeyEvent (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), first_keycode ? keycode1 : keycode2, False, CurrentTime);
>-  first_keycode = !first_keycode;
>-  gdk_error_trap_pop_ignored ();
>-}
>-
> void
> shell_util_cursor_tracker_to_clutter (MetaCursorTracker *tracker,
>                                       ClutterTexture    *texture)
>diff -ruN gnome-shell-3.10.4.orig/src/shell-util.h gnome-shell-3.10.4/src/shell-util.h
>--- gnome-shell-3.10.4.orig/src/shell-util.h	2014-02-19 10:19:34.000000000 -0800
>+++ gnome-shell-3.10.4/src/shell-util.h	2014-07-04 18:52:33.912187745 -0700
>@@ -45,8 +45,6 @@
>                                                int                height,
>                                                int                rowstride);
> 
>-void    shell_util_wake_up_screen             (void);
>-
> void    shell_util_cursor_tracker_to_clutter (MetaCursorTracker *tracker,
>                                               ClutterTexture    *texture);
>

Actions: View | Diff

Attachments on bug 1034215: 914837 | 1044336