Bump version to 3.2.2.1

Updated NEWS
notificationDaemon: fix order of arguments to _lookupSource()
2012-01-20 00:20:17 -05:00 · 2012-01-20 00:11:05 -05:00 · 2012-01-20 00:09:40 -05:00
3 changed files with 11 additions and 4 deletions
--- a/7
+++ b/7
@ -1,3 +1,10 @@
+3.2.2.1
+=======
+* Fix several regressions with tray icons introduced in 3.2.2 [Owen; #664138]
+
+Contributors:
+ Owen Taylor
+
 3.2.2
 =====
 * Fix crash when searching in the shell caused by .desktop files
--- a/configure.ac
+++ b/configure.ac
@ -1,5 +1,5 @@
 AC_PREREQ(2.63)
-AC_INIT([gnome-shell],[3.2.2],[https://bugzilla.gnome.org/enter_bug.cgi?product=gnome-shell],[gnome-shell])
+AC_INIT([gnome-shell],[3.2.2.1],[https://bugzilla.gnome.org/enter_bug.cgi?product=gnome-shell],[gnome-shell])

 AC_CONFIG_HEADERS([config.h])
 AC_CONFIG_SRCDIR([src/shell-global.c])
--- a/js/ui/notificationDaemon.js
+++ b/js/ui/notificationDaemon.js
@ -480,7 +480,7 @@ NotificationDaemon.prototype = {
    },

    _onTrayIconRemoved: function(o, icon) {
-        let source = this._lookupSource(icon.pid, null, true);
+        let source = this._lookupSource(null, icon.pid, true);
        if (source)
            source.destroy();
    }
@ -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 = {