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

js: Use SOURCE_CONTINUE/SOURCE_REMOVE constants in source functions

Browse Source 
With support for boolean constants in g-i, we can finally use the
more readable constants instead of true/false.

https://bugzilla.gnome.org/show_bug.cgi?id=719567
This commit is contained in:
Florian Müllner
2013-11-29 01:45:39 +01:00
parent fee2a07e08
commit 751a3f0e94
30 changed files with 78 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
js/ui/messageTray.js
View File

@ -1988,23 +1988,23 @@ const MessageTray = new Lang.Class({
this._trayDwellTimeoutId = 0;
if (Main.layoutManager.bottomMonitor.inFullscreen)
return false;
return GLib.SOURCE_REMOVE;
// We don't want to open the tray when a modal dialog
// is up, so we check the modal count for that. When we are in the
// overview we have to take the overview's modal push into account
if (Main.modalCount > (Main.overview.visible ? 1 : 0))
return false;
return GLib.SOURCE_REMOVE;
// If the user interacted with the focus window since we started the tray
// dwell (by clicking or typing), don't activate the message tray
let focusWindow = global.display.focus_window;
let currentUserTime = focusWindow ? focusWindow.user_time : 0;
if (currentUserTime != this._trayDwellUserTime)
return false;
return GLib.SOURCE_REMOVE;
this.openTray();
return false;
return GLib.SOURCE_REMOVE;
},
_onNotificationKeyRelease: function(actor, event) {
@ -2334,7 +2334,7 @@ const MessageTray = new Lang.Class({
this._updateNotificationTimeout(0);
this._updateState();
}
return false;
return GLib.SOURCE_REMOVE;
},
_escapeTray: function() {
@ -2667,7 +2667,7 @@ const MessageTray = new Lang.Class({
this._lastSeenMouseX = x;
this._lastSeenMouseY = y;
return false;
return GLib.SOURCE_REMOVE;
},
_hideNotification: function(animate) {