Merge pull request #48 from nlpsuge/fix-47-gnome-freezing

Create EndSessionDialog dbus proxy and connect dbus signals asynchronously, otherwise gnome freezes for some time (about 25 seconds in my machine, maybe it is timeout of connecting dbus signals) when logging in, unlocking the screen or disable/enable it. 

Fixes #47.

Author: nlpsuge

extension.js

@@ -13,14 +13,15 @@ const Autostart = Me.imports.ui.autostart;
 
 let _indicator;
 let _autostartServiceProvider;
+let _openWindowsInfoTracker;
 
 function enable() {
     _indicator = new Indicator.AwsIndicator();
     Main.panel.addToStatusArea('Another Window Session Manager', _indicator);
 
     _autostartServiceProvider = new Autostart.AutostartServiceProvider();
 
-    new OpenWindowsInfoTracker.OpenWindowsInfoTracker();
+    _openWindowsInfoTracker = new OpenWindowsInfoTracker.OpenWindowsInfoTracker();
 
 }
 
@@ -34,6 +35,11 @@ function disable() {
         _autostartServiceProvider.disable();
         _autostartServiceProvider = null;
     }
+
+    if (_openWindowsInfoTracker) {
+        _openWindowsInfoTracker.destroy();
+        _openWindowsInfoTracker = null;
+    }
 
 }
 

metadata.json

@@ -9,5 +9,5 @@
     ],
     "url": "https://github.com/nlpsuge/gnome-shell-extension-another-window-session-manager",
     "uuid": "another-window-session-manager@gmail.com",
-    "version": 19
+    "version": 20
   }

openWindowsInfoTracker.js

@@ -29,20 +29,51 @@ var OpenWindowsInfoTracker = class {
         this._prefsUtils = new PrefsUtils.PrefsUtils();
         this._settings = this._prefsUtils.getSettings();
 
-        this._endSessionProxy = new EndSessionDialogProxy(Gio.DBus.session,
-                                                          'org.gnome.Shell',
-                                                          '/org/gnome/SessionManager/EndSessionDialog');
-        
-        this._endSessionProxy.connectSignal('ConfirmedLogout', this._onConfirmedLogout.bind(this));
-        this._endSessionProxy.connectSignal('ConfirmedReboot', this._onConfirmedReboot.bind(this));
-        this._endSessionProxy.connectSignal('ConfirmedShutdown', this._onConfirmedShutdown.bind(this));
-        this._endSessionProxy.connectSignal('Closed', this._onClose.bind(this));
-        this._endSessionProxy.connectSignal('Canceled', this._onCancel.bind(this));
+        this._confirmedLogoutId = 0;
+        this._confirmedRebootId = 0;
+        this._confirmedShutdownId = 0;
+        this._closedId = 0;
+        this._canceledId = 0;        
+
+        this._busWatchId = Gio.bus_watch_name(
+            Gio.BusType.SESSION,
+            'org.gnome.Shell',
+            Gio.BusNameWatcherFlags.NONE,
+            this._onNameAppeared.bind(this),
+            this._onNameVanished.bind(this)
+        ); 
 
         this._display = global.display;
         this._displayId = this._display.connect('window-created', this._windowCreated.bind(this));
     }
 
+    _onNameAppeared() {
+        this._endSessionProxy = new EndSessionDialogProxy(Gio.DBus.session,
+            'org.gnome.Shell',
+            '/org/gnome/SessionManager/EndSessionDialog',
+            (proxy, error) => {
+                // If `error` is not `null` it will be an Error object indicating the
+                // failure, and `proxy` will be `null` in this case.
+                if (error !== null) {
+                    this._log.error(error);
+                    return;
+                }
+                
+                this._confirmedLogoutId = this._endSessionProxy.connectSignal('ConfirmedLogout', this._onConfirmedLogout.bind(this));
+                this._confirmedRebootId = this._endSessionProxy.connectSignal('ConfirmedReboot', this._onConfirmedReboot.bind(this));
+                this._confirmedShutdownId = this._endSessionProxy.connectSignal('ConfirmedShutdown', this._onConfirmedShutdown.bind(this));
+                this._closedId = this._endSessionProxy.connectSignal('Closed', this._onClose.bind(this));
+                this._canceledId = this._endSessionProxy.connectSignal('Canceled', this._onCancel.bind(this));
+            },
+            null,
+            Gio.DBusProxyFlags.NONE
+        );
+    }
+
+    _onNameVanished(connection, name) {
+        this._log.debug(`Dbus name ${name} vanished`);   
+    }
+
     _onClose() {
         this._log.debug(`User closed endSessionDialog`);
     }
@@ -127,6 +158,31 @@ var OpenWindowsInfoTracker = class {
             this._displayId = 0;
         }
 
+        if (this._busWatchId) {
+            Gio.bus_unwatch_name(this._busWatchId);
+            this._busWatchId = 0;
+        }
+
+        if (this._confirmedLogoutId) {
+            this._endSessionProxy?.disconnectSignal(this._confirmedLogoutId);
+            this._confirmedLogoutId = 0;
+        }
+        if (this._confirmedRebootId) {
+            this._endSessionProxy?.disconnectSignal(this._confirmedRebootId);
+            this._confirmedRebootId = 0;
+        }
+        if (this._confirmedShutdownId) {
+            this._endSessionProxy?.disconnectSignal(this._confirmedShutdownId);
+            this._confirmedShutdownId = 0;
+        }
+        if (this._closedId) {
+            this._endSessionProxy?.disconnectSignal(this._closedId);
+            this._closedId = 0;
+        }
+        if (this._canceledId) {
+            this._endSessionProxy?.disconnectSignal(this._canceledId);
+            this._canceledId = 0;
+        }
     }
 
 }

ui/autostart.js

@@ -69,7 +69,7 @@ var AutostartServiceProvider = GObject.registerClass(
             this._log.debug(`DBus name ${name} acquired!`);
         }
 
-        onNameLost(_connection, name) {
+        onNameLost(connection, name) {
             this._log.debug(`Dbus name ${name} lost`);
         }