Advertisement
Not a member of Pastebin yet?
Sign Up,
it unlocks many cool features!
- --- js/ui/panel.js.orig 2014-05-14 08:28:08.000000000 +0000
- +++ js/ui/panel.js 2014-07-24 09:09:07.514520273 +0000
- @@ -495,27 +495,37 @@
- if (this._targetApp == null) {
- menu = null;
- - } else if (this._targetApp.action_group && this._targetApp.menu) {
- - if (this.menu instanceof RemoteMenu.RemoteMenu &&
- - this.menu.actionGroup == this._targetApp.action_group)
- - return;
- -
- - menu = new RemoteMenu.RemoteMenu(this.actor, this._targetApp.menu, this._targetApp.action_group);
- - menu.connect('activate', Lang.bind(this, function() {
- - let win = this._targetApp.get_windows()[0];
- - win.check_alive(global.get_current_time());
- - }));
- -
- - } else {
- - if (this.menu && this.menu.isDummyQuitMenu)
- - return;
- + }
- + else {
- + print("Begin 1");
- + print("this._targetApp.action_group"+this._targetApp.action_group);
- + print("this._targetApp.menu"+this._targetApp.menu);
- + print("End 1");
- + if (this._targetApp.action_group && this._targetApp.menu) {
- +
- + if (this.menu instanceof RemoteMenu.RemoteMenu &&
- + this.menu.actionGroup == this._targetApp.action_group){
- + return;
- + }
- +
- + menu = new RemoteMenu.RemoteMenu(this.actor, this._targetApp.menu, this._targetApp.action_group);
- + menu.connect('activate', Lang.bind(this, function() {
- + let win = this._targetApp.get_windows()[0];
- + win.check_alive(global.get_current_time());
- + }));
- - // fallback to older menu
- - menu = new PopupMenu.PopupMenu(this.actor, 0.0, St.Side.TOP, 0);
- - menu.isDummyQuitMenu = true;
- - menu.addAction(_("Quit"), Lang.bind(this, function() {
- - this._targetApp.request_quit();
- - }));
- + }
- + else {
- + if (this.menu && this.menu.isDummyQuitMenu)
- + return;
- +
- + // fallback to older menu
- + menu = new PopupMenu.PopupMenu(this.actor, 0.0, St.Side.TOP, 0);
- + menu.isDummyQuitMenu = true;
- + menu.addAction(_("Quit"), Lang.bind(this, function() {
- + this._targetApp.request_quit();
- + }));
- + }
- }
- this.setMenu(menu);
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement