/usr/share/gnome-shell/js/ui/userMenu.js
--- a/usr/share/gnome-shell/js/ui/userMenu.js 2012-08-27 21:27:02.800846936 +0800 +++ b/usr/share/gnome-shell/js/ui/userMenu.js 2012-08-27 21:30:45.310852968 +0800 @@ -596,7 +596,7 @@ } else if (!this._haveShutdown) { this._suspendOrPowerOffItem.updateText(_("Suspend"), null); } else { - this._suspendOrPowerOffItem.updateText(_("Suspend"), _("Power Off...")); + this._suspendOrPowerOffItem.updateText(_("Power Off..."), _("Suspend")); } }, @@ -665,8 +665,8 @@ item = new PopupMenu.PopupSeparatorMenuItem(); this.menu.addMenuItem(item); - item = new PopupMenu.PopupAlternatingMenuItem(_("Suspend"), - _("Power Off...")); + item = new PopupMenu.PopupAlternatingMenuItem(_("Power Off..."), + _("Suspend")); this.menu.addMenuItem(item); this._suspendOrPowerOffItem = item; item.connect('activate', Lang.bind(this, this._onSuspendOrPowerOffActivate)); @@ -734,12 +734,12 @@ if (this._haveSuspend && this._suspendOrPowerOffItem.state == PopupMenu.PopupAlternatingMenuItemState.DEFAULT) { + this._session.ShutdownRemote(); + } else { // Ensure we only suspend after locking the screen this._screenSaverProxy.LockRemote(Lang.bind(this, function() { this._upClient.suspend_sync(null); })); - } else { - this._session.ShutdownRemote(); } } }); |
Over!