loginManager.js: Use a normal signal connection for PrepareForSleep.

Update the calendar and power applets to refresh on resume, and
update the ScreenShield to connect to the signal directly.

The UPowerGLib.Client code in the calendar applet has been dead code
since 0.99 (notify-resume signal was removed and the 'resume' property
was never never a thing).

Author: mtwebster

files/usr/share/cinnamon/applets/[email protected]/applet.js

@@ -6,7 +6,7 @@ const Clutter = imports.gi.Clutter;
 const St = imports.gi.St;
 const Util = imports.misc.util;
 const PopupMenu = imports.ui.popupMenu;
-const UPowerGlib = imports.gi.UPowerGlib;
+const LoginManager = imports.misc.loginManager;
 const Settings = imports.ui.settings;
 const CinnamonDesktop = imports.gi.CinnamonDesktop;
 const Main = imports.ui.main;
@@ -151,13 +151,11 @@ class CinnamonCalendarApplet extends Applet.TextApplet {
                 this._onSettingsChanged();
             }));
 
-            // https://bugzilla.gnome.org/show_bug.cgi?id=655129
-            this._upClient = new UPowerGlib.Client();
-            try {
-                this._upClient.connect('notify-resume', Lang.bind(this, this._updateClockAndDate));
-            } catch (e) {
-                this._upClient.connect('notify::resume', Lang.bind(this, this._updateClockAndDate));
-            }
+            this._loginManager = LoginManager.getLoginManager();
+            this._loginManager.connect('prepare-for-sleep', (aboutToSuspend) => {
+                if (!aboutToSuspend)
+                    this._updateClockAndDate();
+            });
 
             // Change the format string if the mouse is over the calender to account for the tooltip.
             this._is_entered = false;

files/usr/share/cinnamon/applets/[email protected]/applet.js

@@ -3,10 +3,10 @@ const Clutter = imports.gi.Clutter;
 const Gio = imports.gi.Gio;
 const Interfaces = imports.misc.interfaces
 const Lang = imports.lang;
+const LoginManager = imports.misc.loginManager;
 const PowerUtils = imports.misc.powerUtils;
 const St = imports.gi.St;
 const Tooltips = imports.ui.tooltips;
-const UPowerGlib = imports.gi.UPowerGlib;
 const PopupMenu = imports.ui.popupMenu;
 const Main = imports.ui.main;
 const Settings = imports.ui.settings;
@@ -337,6 +337,12 @@ class CinnamonPowerApplet extends Applet.TextIconApplet {
             }));
         }, null);
 
+        this._loginManager = LoginManager.getLoginManager();
+        this._loginManager.connect('prepare-for-sleep', (aboutToSuspend) => {
+            if (!aboutToSuspend)
+                this._devicesChanged();
+        });
+
         this.set_show_label_in_vertical_panels(false);
     }
 

js/misc/loginManager.js

@@ -93,6 +93,7 @@ var LoginManagerSystemd = class {
                 '/org/freedesktop/login1'
             );
 
+            this._connectPrepareForSleep();
             this._getCurrentSession();
         } catch (e) {
             global.logError('LoginManager: Failed to connect to logind: ' + e.message);
@@ -175,14 +176,13 @@ var LoginManagerSystemd = class {
         }
     }
 
-    connectPrepareForSleep(callback) {
-        if (!this._managerProxy) {
-            return null;
-        }
+    _connectPrepareForSleep() {
+        if (!this._managerProxy)
+            return;
 
-        return this._managerProxy.connectSignal('PrepareForSleep', (proxy, sender, [aboutToSuspend]) => {
+        this._managerProxy.connectSignal('PrepareForSleep', (proxy, sender, [aboutToSuspend]) => {
             _log(`LoginManager: PrepareForSleep signal received (aboutToSuspend=${aboutToSuspend})`);
-            callback(aboutToSuspend);
+            this.emit('prepare-for-sleep', aboutToSuspend);
         });
     }
 
@@ -296,11 +296,6 @@ var LoginManagerConsoleKit = class {
         }
     }
 
-    connectPrepareForSleep(callback) {
-        // ConsoleKit doesn't have PrepareForSleep
-        return null;
-    }
-
     inhibit(reason, callback) {
         // ConsoleKit doesn't have inhibitors
         callback(null);

js/ui/screensaver/screenShield.js

@@ -183,7 +183,7 @@ var ScreenShield = GObject.registerClass({
         this._lastMotionY = -1;
 
         this._loginManager = LoginManager.getLoginManager();
-        this._loginManager.connectPrepareForSleep(this._prepareForSleep.bind(this));
+        this._loginManager.connect('prepare-for-sleep', this._prepareForSleep.bind(this));
         this._syncInhibitor();
 
         this._loginManager.connect('lock', this._onSessionLock.bind(this));