[gnome-shell] windowAttentionHandler: Remove "%s has finished starting"
- From: Jasper St. Pierre <jstpierre src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-shell] windowAttentionHandler: Remove "%s has finished starting"
- Date: Thu, 29 Sep 2011 14:00:21 +0000 (UTC)
commit 6510904711b0bdfcf98befe3b29599d438e7a194
Author: Jasper St. Pierre <jstpierre mecheye net>
Date: Tue Sep 27 21:03:53 2011 -0400
windowAttentionHandler: Remove "%s has finished starting"
The message is verbose and confusing. Use the traditional "'%s' is ready"
for all cases.
https://bugzilla.gnome.org/show_bug.cgi?id=660310
js/ui/windowAttentionHandler.js | 37 ++++++++-----------------------------
1 files changed, 8 insertions(+), 29 deletions(-)
---
diff --git a/js/ui/windowAttentionHandler.js b/js/ui/windowAttentionHandler.js
index 5ce1671..0dc35db 100644
--- a/js/ui/windowAttentionHandler.js
+++ b/js/ui/windowAttentionHandler.js
@@ -12,35 +12,10 @@ function WindowAttentionHandler() {
WindowAttentionHandler.prototype = {
_init : function() {
- this._startupIds = {};
this._tracker = Shell.WindowTracker.get_default();
- this._tracker.connect('startup-sequence-changed', Lang.bind(this, this._onStartupSequenceChanged));
-
global.display.connect('window-demands-attention', Lang.bind(this, this._onWindowDemandsAttention));
},
- _onStartupSequenceChanged : function(tracker) {
- let sequences = tracker.get_startup_sequences();
- this._startupIds = {};
- for(let i = 0; i < sequences.length; i++) {
- this._startupIds[sequences[i].get_id()] = true;
- }
- },
-
- _getTitle : function(app, window) {
- if (this._startupIds[window.get_startup_id()])
- return app.get_name();
- else
- return window.title;
- },
-
- _getBanner : function(app, window) {
- if (this._startupIds[window.get_startup_id()])
- return _("%s has finished starting").format(app.get_name());
- else
- return _("'%s' is ready").format(window.title);
- },
-
_onWindowDemandsAttention : function(display, window) {
// We don't want to show the notification when the window is already focused,
// because this is rather pointless.
@@ -57,12 +32,16 @@ WindowAttentionHandler.prototype = {
let source = new Source(app, window);
Main.messageTray.add(source);
- let notification = new MessageTray.Notification(source, this._getTitle(app, window), this._getBanner(app, window));
+ let banner = _("'%s' is ready").format(window.title);
+ let title = app.get_name();
+
+ let notification = new MessageTray.Notification(source, title, banner);
source.notify(notification);
- source.signalIDs.push(window.connect('notify::title', Lang.bind(this, function(win) {
- notification.update(this._getTitle(app, win), this._getBanner(app, win));
- })));
+ source.signalIDs.push(window.connect('notify::title',
+ Lang.bind(this, function() {
+ notification.update(title, banner);
+ })));
}
};
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]