[gnome-shell/gnome-3-12] ScreenShield: remove obsolete comment and hack



commit 5ccbd3a8216ca4ab9f8745af65f39b22584d9c6c
Author: Giovanni Campagna <gcampagna src gnome org>
Date:   Thu Jul 31 16:38:44 2014 +0200

    ScreenShield: remove obsolete comment and hack
    
    We don't need to wait to until the stage window is mapped to take
    the modal grab, because that code now runs in a startup-prepared
    signal handler, which in turn runs some time after the mainloop
    has started and well after the stage window is mapped.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=711682

 js/ui/screenShield.js |   16 +++++-----------
 1 files changed, 5 insertions(+), 11 deletions(-)
---
diff --git a/js/ui/screenShield.js b/js/ui/screenShield.js
index 90642a6..7d3a1f8 100644
--- a/js/ui/screenShield.js
+++ b/js/ui/screenShield.js
@@ -901,17 +901,11 @@ const ScreenShield = new Lang.Class({
     },
 
     showDialog: function() {
-        // Ensure that the stage window is mapped, before taking a grab
-        // otherwise X errors out
-        Meta.later_add(Meta.LaterType.BEFORE_REDRAW, Lang.bind(this, function() {
-            if (!this._becomeModal()) {
-                // In the login screen, this is a hard error. Fail-whale
-                log('Could not acquire modal grab for the login screen. Aborting login process.');
-                Meta.quit(Meta.ExitCode.ERROR);
-            }
-
-            return false;
-        }));
+        if (!this._becomeModal()) {
+            // In the login screen, this is a hard error. Fail-whale
+            log('Could not acquire modal grab for the login screen. Aborting login process.');
+            Meta.quit(Meta.ExitCode.ERROR);
+        }
 
         this.actor.show();
         this._isGreeter = Main.sessionMode.isGreeter;


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]