[gnome-shell/gnome-3-2] notificationDaemon: fix problem with cherry-pick to gnome-3-2
- From: Owen Taylor <otaylor src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-shell/gnome-3-2] notificationDaemon: fix problem with cherry-pick to gnome-3-2
- Date: Fri, 20 Jan 2012 05:23:47 +0000 (UTC)
commit 7ff63a26b76e5e56ef6c26a9b6dbfff8de49f498
Author: Owen W. Taylor <otaylor fishsoup net>
Date: Thu Jan 19 12:19:07 2012 -0500
notificationDaemon: fix problem with cherry-pick to gnome-3-2
When backporting 7e654ab3ca
(notificationDaemon: group sources based on a combination of pid and title)
to old-style classes, the new trayIcon argument needed to be added to the
actual constructor.
https://bugzilla.gnome.org/show_bug.cgi?id=664138
js/ui/notificationDaemon.js | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/js/ui/notificationDaemon.js b/js/ui/notificationDaemon.js
index c691efe..111f6b4 100644
--- a/js/ui/notificationDaemon.js
+++ b/js/ui/notificationDaemon.js
@@ -488,8 +488,8 @@ NotificationDaemon.prototype = {
DBus.conformExport(NotificationDaemon.prototype, NotificationDaemonIface);
-function Source(title, pid, sender) {
- this._init(title, pid, sender);
+function Source(title, pid, sender, trayIcon) {
+ this._init(title, pid, sender, trayIcon);
}
Source.prototype = {
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]