[gnome-shell/wip/aggregate-menu: 3/36] userMenu: Use addSettingsAction
- From: Jasper St. Pierre <jstpierre src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-shell/wip/aggregate-menu: 3/36] userMenu: Use addSettingsAction
- Date: Wed, 29 May 2013 20:16:31 +0000 (UTC)
commit 7d25262cd042b55957b49b5c6df80c8058846bcc
Author: Jasper St. Pierre <jstpierre mecheye net>
Date: Thu Apr 25 15:45:53 2013 -0400
userMenu: Use addSettingsAction
js/ui/userMenu.js | 12 +-----------
1 files changed, 1 insertions(+), 11 deletions(-)
---
diff --git a/js/ui/userMenu.js b/js/ui/userMenu.js
index 2a0a323..86980c5 100644
--- a/js/ui/userMenu.js
+++ b/js/ui/userMenu.js
@@ -566,7 +566,6 @@ const UserMenuButton = new Lang.Class({
let allowSettings = Main.sessionMode.allowSettings;
this._statusChooser.setSensitive(allowSettings);
- this._systemSettings.visible = allowSettings;
this.setSensitive(!Main.sessionMode.isLocked);
this._updatePresenceIcon();
@@ -742,10 +741,7 @@ const UserMenuButton = new Lang.Class({
item = new PopupMenu.PopupSeparatorMenuItem();
this.menu.addMenuItem(item);
- item = new PopupMenu.PopupMenuItem(_("Settings"));
- item.connect('activate', Lang.bind(this, this._onPreferencesActivate));
- this.menu.addMenuItem(item);
- this._systemSettings = item;
+ this.menu.addSettingsAction(_("Settings"), 'gnome-control-center.desktop');
item = new PopupMenu.PopupSeparatorMenuItem();
this.menu.addMenuItem(item);
@@ -806,12 +802,6 @@ const UserMenuButton = new Lang.Class({
app.activate();
},
- _onPreferencesActivate: function() {
- Main.overview.hide();
- let app = Shell.AppSystem.get_default().lookup_app('gnome-control-center.desktop');
- app.activate();
- },
-
_onLockScreenActivate: function() {
this.menu.close(BoxPointer.PopupAnimation.NONE);
Main.overview.hide();
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]