[email protected]: Fix screensaver and switch-user activation.

ref: 3fa32cb

Author: mtwebster

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

@@ -78,15 +78,22 @@ class CinnamonUserApplet extends Applet.TextApplet {
 
         item = new PopupMenu.PopupIconMenuItem(_("Lock Screen"), "xsi-lock-screen", St.IconType.SYMBOLIC);
         item.connect('activate', Lang.bind(this, function() {
-            Main.lockScreen(true);
+            Main.screensaverController.lockScreen(true);
         }));
         this.menu.addMenuItem(item);
 
         if (!Main.lockdownSettings.get_boolean('disable-user-switching')) {
             item = new PopupMenu.PopupIconMenuItem(_("Switch User"), "xsi-switch-user", St.IconType.SYMBOLIC);
             item.connect('activate', Lang.bind(this, function() {
-                Main.lockScreen(false);
-                Util.switchToGreeter();
+                let lockedId = Main.screensaverController.connect("locked-changed", () => {
+                    Util.switchToGreeter();
+                    Main.screensaverController.disconnect(lockedId);
+                })
+
+                GLib.idle_add(GLib.PRIORITY_DEFAULT, () => {
+                    Main.screensaverController.lockScreen(false);
+                    return GLib.SOURCE_REMOVE;
+                });
             }));
             this.menu.addMenuItem(item);
         }