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

notificationDaemon: Rename the existing implementation to the FdoNotificationSource

Browse Source 
We'll add a new, simpler private implementation that's used by the new
GNotification API in gio.

https://bugzilla.gnome.org/show_bug.cgi?id=710137
This commit is contained in:
Jasper St. Pierre 2013-10-13 10:44:28 -04:00
parent 27a86a4756
commit 394743efc8
1 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
js/ui/notificationDaemon.js
View File

@ -28,7 +28,7 @@ function Bus() {
return new BusProxy(Gio.DBus.session, 'org.freedesktop.DBus', '/org/freedesktop/DBus'); return new BusProxy(Gio.DBus.session, 'org.freedesktop.DBus', '/org/freedesktop/DBus');
} }
const NotificationDaemonIface = <interface name="org.freedesktop.Notifications"> const FdoNotificationsIface = <interface name="org.freedesktop.Notifications">
<method name="Notify"> <method name="Notify">
<arg type="s" direction="in"/> <arg type="s" direction="in"/>
<arg type="u" direction="in"/> <arg type="u" direction="in"/>
@ -101,11 +101,11 @@ const STANDARD_TRAY_ICON_IMPLEMENTATIONS = {
'ibus-ui-gtk': 'keyboard' 'ibus-ui-gtk': 'keyboard'
}; };
const NotificationDaemon = new Lang.Class({ const FdoNotificationDaemon = new Lang.Class({
Name: 'NotificationDaemon', Name: 'FdoNotificationDaemon',
_init: function() { _init: function() {
this._dbusImpl = Gio.DBusExportedObject.wrapJSObject(NotificationDaemonIface, this); this._dbusImpl = Gio.DBusExportedObject.wrapJSObject(FdoNotificationsIface, this);
this._dbusImpl.export(Gio.DBus.session, '/org/freedesktop/Notifications'); this._dbusImpl.export(Gio.DBus.session, '/org/freedesktop/Notifications');
this._sources = []; this._sources = [];
@ -213,7 +213,7 @@ const NotificationDaemon = new Lang.Class({
} }
} }
let source = new Source(title, pid, sender, trayIcon, ndata ? ndata.hints['desktop-entry'] : null); let source = new FdoNotificationDaemonSource(title, pid, sender, trayIcon, ndata ? ndata.hints['desktop-entry'] : null);
source.setTransient(isForTransientNotification); source.setTransient(isForTransientNotification);
if (!isForTransientNotification) { if (!isForTransientNotification) {
@ -541,8 +541,8 @@ const NotificationDaemon = new Lang.Class({
} }
}); });
const Source = new Lang.Class({ const FdoNotificationDaemonSource = new Lang.Class({
Name: 'NotificationDaemonSource', Name: 'FdoNotificationDaemonSource',
Extends: MessageTray.Source, Extends: MessageTray.Source,
_init: function(title, pid, sender, trayIcon, appId) { _init: function(title, pid, sender, trayIcon, appId) {
@ -709,3 +709,11 @@ const Source = new Lang.Class({
} }
} }
}); });
const NotificationDaemon = new Lang.Class({
Name: 'NotificationDaemon',
_init: function() {
this._fdoNotificationDaemon = new FdoNotificationDaemon();
},
});