isa/gnome-shell
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

popupMenu: Always use a PopupMenuItem

Browse Source 
By this point, we'll know we'll always have a PopupMenuItem.

https://bugzilla.gnome.org/show_bug.cgi?id=698427
This commit is contained in:
Jasper St. Pierre 2013-04-19 21:25:28 -04:00
parent b03e480dbf
commit 099c8703ae
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
js/ui/popupMenu.js
View File

@ -1860,7 +1860,9 @@ const RemoteMenu = new Lang.Class({
items: [ ], items: [ ],
}; };
let action = this._actions[action_id]; let action = this._actions[action_id];
let item, target, destroyId, specificSignalId; let target, destroyId, specificSignalId;
let item = new PopupMenuItem(label);
if (action.state) { if (action.state) {
// Docs have get_state_hint(), except that the DBus protocol // Docs have get_state_hint(), except that the DBus protocol
@ -1869,8 +1871,6 @@ const RemoteMenu = new Lang.Class({
// always returns null // always returns null
// Funny :) // Funny :)
item = new PopupMenuItem(label);
switch (String.fromCharCode(action.state.classify())) { switch (String.fromCharCode(action.state.classify())) {
case 'b': case 'b':
action.items.push(item); action.items.push(item);
@ -1895,7 +1895,6 @@ const RemoteMenu = new Lang.Class({
} }
} else { } else {
target = model.get_item_attribute_value(index, Gio.MENU_ATTRIBUTE_TARGET, null); target = model.get_item_attribute_value(index, Gio.MENU_ATTRIBUTE_TARGET, null);
item = new PopupMenuItem(label);
action.items.push(item); action.items.push(item);
specificSignalId = item.connect('activate', Lang.bind(this, function() { specificSignalId = item.connect('activate', Lang.bind(this, function() {
this.actionGroup.activate_action(action_id, target); this.actionGroup.activate_action(action_id, target);