[gnome-shell] appDisplay: remove unused parameter to AppWellIcon constructor
- From: Cosimo Cecchi <cosimoc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-shell] appDisplay: remove unused parameter to AppWellIcon constructor
- Date: Mon, 18 Feb 2013 19:55:04 +0000 (UTC)
commit 6bb38b873b80563fc2626e5431094ce758fb1ad4
Author: Cosimo Cecchi <cosimoc gnome org>
Date: Sun Feb 17 23:08:41 2013 -0500
appDisplay: remove unused parameter to AppWellIcon constructor
https://bugzilla.gnome.org/show_bug.cgi?id=686984
js/ui/appDisplay.js | 17 ++++++-----------
1 files changed, 6 insertions(+), 11 deletions(-)
---
diff --git a/js/ui/appDisplay.js b/js/ui/appDisplay.js
index c3cd382..5cd1572 100644
--- a/js/ui/appDisplay.js
+++ b/js/ui/appDisplay.js
@@ -386,7 +386,7 @@ const AppIcon = new Lang.Class({
const AppWellIcon = new Lang.Class({
Name: 'AppWellIcon',
- _init : function(app, iconParams, onActivateOverride) {
+ _init : function(app, iconParams) {
this.app = app;
this.actor = new St.Button({ style_class: 'app-well-app',
reactive: true,
@@ -401,8 +401,6 @@ const AppWellIcon = new Lang.Class({
this.actor.label_actor = this.icon.label;
- // A function callback to override the default "app.activate()"; used by preferences
- this._onActivateOverride = onActivateOverride;
this.actor.connect('button-press-event', Lang.bind(this, this._onButtonPress));
this.actor.connect('clicked', Lang.bind(this, this._onClicked));
this.actor.connect('popup-menu', Lang.bind(this, this._onKeyboardPopupMenu));
@@ -539,16 +537,13 @@ const AppWellIcon = new Lang.Class({
this.emit('launching');
let modifiers = event.get_state();
- if (this._onActivateOverride) {
- this._onActivateOverride(event);
+ if (modifiers & Clutter.ModifierType.CONTROL_MASK
+ && this.app.state == Shell.AppState.RUNNING) {
+ this.app.open_new_window(-1);
} else {
- if (modifiers & Clutter.ModifierType.CONTROL_MASK
- && this.app.state == Shell.AppState.RUNNING) {
- this.app.open_new_window(-1);
- } else {
- this.app.activate();
- }
+ this.app.activate();
}
+
Main.overview.hide();
},
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]