[gnome-shell/wip/gtk-notification: 33/40] notificationDaemon: Move nextNotificationId inside the daemon class
- From: Jasper St. Pierre <jstpierre src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-shell/wip/gtk-notification: 33/40] notificationDaemon: Move nextNotificationId inside the daemon class
- Date: Mon, 21 Oct 2013 17:17:53 +0000 (UTC)
commit 27a86a4756ed3313582b7f9b0151a7272385989a
Author: Jasper St. Pierre <jstpierre mecheye net>
Date: Sun Oct 13 23:42:59 2013 -0400
notificationDaemon: Move nextNotificationId inside the daemon class
This won't be used by the new notification daemon.
https://bugzilla.gnome.org/show_bug.cgi?id=710137
js/ui/notificationDaemon.js | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
---
diff --git a/js/ui/notificationDaemon.js b/js/ui/notificationDaemon.js
index 3e47dc7..eecaee9 100644
--- a/js/ui/notificationDaemon.js
+++ b/js/ui/notificationDaemon.js
@@ -15,8 +15,6 @@ const MessageTray = imports.ui.messageTray;
const Params = imports.misc.params;
const Util = imports.misc.util;
-let nextNotificationId = 1;
-
// Should really be defined in Gio.js
const BusIface = <interface name="org.freedesktop.DBus">
<method name="GetConnectionUnixProcessID">
@@ -115,6 +113,8 @@ const NotificationDaemon = new Lang.Class({
this._notifications = {};
this._busProxy = new Bus();
+ this._nextNotificationId = 1;
+
this._trayManager = new Shell.TrayManager();
this._trayIconAddedId = this._trayManager.connect('tray-icon-added', Lang.bind(this,
this._onTrayIconAdded));
this._trayIconRemovedId = this._trayManager.connect('tray-icon-removed', Lang.bind(this,
this._onTrayIconRemoved));
@@ -252,7 +252,7 @@ const NotificationDaemon = new Lang.Class({
hints['category'] == 'presence.offline')) {
// Ignore replacesId since we already sent back a
// NotificationClosed for that id.
- id = nextNotificationId++;
+ id = this._nextNotificationId++;
Mainloop.idle_add(Lang.bind(this,
function () {
this._emitNotificationClosed(id,
NotificationClosedReason.DISMISSED);
@@ -296,7 +296,7 @@ const NotificationDaemon = new Lang.Class({
ndata.notification = this._notifications[replacesId].notification;
} else {
replacesId = 0;
- ndata.id = id = nextNotificationId++;
+ ndata.id = id = this._nextNotificationId++;
}
this._notifications[id] = ndata;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]