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

MessageTray: remove source if associated application exits

Browse Source 
We don't want sources that are no longer associated with a running
application to stick around in the message tray.

https://bugzilla.gnome.org/show_bug.cgi?id=642659
This commit is contained in:
Neha Doijode 2011-03-08 04:40:10 +05:30 committed by Marina Zhurakhinskaya
parent 36287fc33b
commit c4dad3d2c1
1 changed files with 23 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
js/ui/notificationDaemon.js
View File

@ -435,6 +435,7 @@ Source.prototype = {
MessageTray.Source.prototype._init.call(this, title); MessageTray.Source.prototype._init.call(this, title);
this._pid = pid; this._pid = pid;
this._appStateChangedId = 0;
this._setApp(); this._setApp();
if (this.app) if (this.app)
this.title = this.app.get_name(); this.title = this.app.get_name();
@ -459,6 +460,10 @@ Source.prototype = {
if (!this.app) if (!this.app)
return; return;
// We only update the app if this.app is null, so we can't disconnect the old this._appStateChangedId
// even if it were non-zero for some reason.
this._appStateChangedId = this.app.connect('notify::state', Lang.bind(this, this._appStateChanged));
// Only override the icon if we were previously using // Only override the icon if we were previously using
// notification-based icons (ie, not a trayicon) or if it was unset before // notification-based icons (ie, not a trayicon) or if it was unset before
if (!this._isTrayIcon) { if (!this._isTrayIcon) {
@ -482,6 +487,16 @@ Source.prototype = {
this.destroy(); this.destroy();
}, },
_appStateChanged: function() {
// Destroy notification sources when their apps exit.
// The app exiting would normally result in a tray icon being removed,
// so it should be ok to destroy the source associated with a tray icon
// here too, however we just let that happen through the code path
// associated with the tray icon being removed.
if (!this._isTrayIcon && this.app.get_state() == Shell.AppState.STOPPED)
this.destroy();
},
openApp: function() { openApp: function() {
if (this.app == null) if (this.app == null)
return; return;
@ -491,5 +506,13 @@ Source.prototype = {
let mostRecentWindow = windows[0]; let mostRecentWindow = windows[0];
Main.activateWindow(mostRecentWindow); Main.activateWindow(mostRecentWindow);
} }
},
destroy: function() {
if (this.app && this._appStateChangedId) {
this.app.disconnect(this._appStateChangedId);
this._appStateChangedId = 0;
}
MessageTray.Source.prototype.destroy.call(this);
} }
}; };