[gnome-shell] overview: make shellInfo private
- From: Ray Strode <halfline src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-shell] overview: make shellInfo private
- Date: Mon, 29 Aug 2011 16:29:53 +0000 (UTC)
commit 67ae8ed8e9e5e320bc9d37ec20c6a78d4b523e3a
Author: Ray Strode <rstrode redhat com>
Date: Sun Aug 28 10:07:44 2011 -0400
overview: make shellInfo private
This commit forwards the shellInfo setMessage method
to the overview itself and makes shellInfo private.
https://bugzilla.gnome.org/show_bug.cgi?id=657082
js/ui/appFavorites.js | 6 +++---
js/ui/overview.js | 6 +++++-
js/ui/placeDisplay.js | 6 +++---
3 files changed, 11 insertions(+), 7 deletions(-)
---
diff --git a/js/ui/appFavorites.js b/js/ui/appFavorites.js
index d4f7455..bbb8914 100644
--- a/js/ui/appFavorites.js
+++ b/js/ui/appFavorites.js
@@ -86,7 +86,7 @@ AppFavorites.prototype = {
let app = Shell.AppSystem.get_default().lookup_app(appId);
- Main.overview.shellInfo.setMessage(_("%s has been added to your favorites.").format(app.get_name()), Lang.bind(this, function () {
+ Main.overview.setMessage(_("%s has been added to your favorites.").format(app.get_name()), Lang.bind(this, function () {
this._removeFavorite(appId);
}));
},
@@ -117,8 +117,8 @@ AppFavorites.prototype = {
if (!this._removeFavorite(appId))
return;
- Main.overview.shellInfo.setMessage(_("%s has been removed from your favorites.").format(app.get_name()),
- Lang.bind(this, function () {
+ Main.overview.setMessage(_("%s has been removed from your favorites.").format(app.get_name()),
+ Lang.bind(this, function () {
this._addFavorite(appId, pos);
}));
}
diff --git a/js/ui/overview.js b/js/ui/overview.js
index 4cba62a..5326ec5 100644
--- a/js/ui/overview.js
+++ b/js/ui/overview.js
@@ -175,7 +175,7 @@ Overview.prototype = {
// signal handlers and so forth. So we create them after
// construction in this init() method.
init: function() {
- this.shellInfo = new ShellInfo();
+ this._shellInfo = new ShellInfo();
this._viewSelector = new ViewSelector.ViewSelector();
this._group.add_actor(this._viewSelector.actor);
@@ -211,6 +211,10 @@ Overview.prototype = {
this._relayout();
},
+ setMessage: function(text, undoCallback, undoLabel) {
+ this._shellInfo.setMessage(text, undoCallback, undoLabel);
+ },
+
_onDragBegin: function() {
DND.addDragMonitor(this._dragMonitor);
// Remember the workspace we started from
diff --git a/js/ui/placeDisplay.js b/js/ui/placeDisplay.js
index edfef06..28f27f8 100644
--- a/js/ui/placeDisplay.js
+++ b/js/ui/placeDisplay.js
@@ -118,9 +118,9 @@ PlaceDeviceInfo.prototype = {
this._mount.unmount_finish(res);
} catch (e) {
let message = _("Failed to unmount '%s'").format(o.get_name());
- Main.overview.shellInfo.setMessage(message,
- Lang.bind(this, this.remove),
- _("Retry"));
+ Main.overview.setMessage(message,
+ Lang.bind(this, this.remove),
+ _("Retry"));
}
}
};
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]