r35239 - in /desktop/unstable/gnome-shell/debian: changelog patches/26-fix-empathy-popup-regression.patch patches/series

[bigon at users.alioth.debian.org]

Author: bigon
Date: Fri Jun  1 09:43:24 2012
New Revision: 35239

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=35239
Log:
d/p/26-fix-empathy-popup-regression.patch: Fix Empathy popup regression
(taken from upstream)

Added:
    desktop/unstable/gnome-shell/debian/patches/26-fix-empathy-popup-regression.patch
Modified:
    desktop/unstable/gnome-shell/debian/changelog
    desktop/unstable/gnome-shell/debian/patches/series

Modified: desktop/unstable/gnome-shell/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-shell/debian/changelog?rev=35239&op=diff
==============================================================================
--- desktop/unstable/gnome-shell/debian/changelog [utf-8] (original)
+++ desktop/unstable/gnome-shell/debian/changelog [utf-8] Fri Jun  1 09:43:24 2012
@@ -1,3 +1,10 @@
+gnome-shell (3.4.1-6) UNRELEASED; urgency=low
+
+  * d/p/26-fix-empathy-popup-regression.patch: Fix Empathy popup regression
+    (taken from upstream)
+
+ -- Laurent Bigonville <bigon at debian.org>  Fri, 01 Jun 2012 11:39:55 +0200
+
 gnome-shell (3.4.1-5) unstable; urgency=low
 
   * Disabling the screen recorder on arm{el,hf} was not sufficient to make it

Added: desktop/unstable/gnome-shell/debian/patches/26-fix-empathy-popup-regression.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-shell/debian/patches/26-fix-empathy-popup-regression.patch?rev=35239&op=file
==============================================================================
--- desktop/unstable/gnome-shell/debian/patches/26-fix-empathy-popup-regression.patch (added)
+++ desktop/unstable/gnome-shell/debian/patches/26-fix-empathy-popup-regression.patch [utf-8] Fri Jun  1 09:43:24 2012
@@ -1,0 +1,46 @@
+From 934e5aacab3a99cf205d5c3e67deeaf8b29875af Mon Sep 17 00:00:00 2001
+From: Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
+Date: Thu, 31 May 2012 09:28:41 +0000
+Subject: notificationDaemon.js: convert the hints dict at the beginning of the function
+
+It's used right away to discard some Empathy notifications.
+
+This regression has been introduced during the 3.4 cycle when 'hints' has been
+turned to a GVariant.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=675370
+---
+diff --git a/js/ui/notificationDaemon.js b/js/ui/notificationDaemon.js
+index 96f1ec9..cf89733 100644
+--- a/js/ui/notificationDaemon.js
++++ b/js/ui/notificationDaemon.js
+@@ -221,6 +221,13 @@ const NotificationDaemon = new Lang.Class({
+         let [appName, replacesId, icon, summary, body, actions, hints, timeout] = params;
+         let id;
+ 
++        for (let hint in hints) {
++            // unpack the variants
++            hints[hint] = hints[hint].deep_unpack();
++        }
++
++        hints = Params.parse(hints, { urgency: Urgency.NORMAL }, true);
++
+         // Filter out chat, presence, calls and invitation notifications from
+         // Empathy, since we handle that information from telepathyClient.js
+         if (appName == 'Empathy' && (hints['category'] == 'im.received' ||
+@@ -249,13 +256,6 @@ const NotificationDaemon = new Lang.Class({
+             }
+         }
+ 
+-        for (let hint in hints) {
+-            // unpack the variants
+-            hints[hint] = hints[hint].deep_unpack();
+-        }
+-
+-        hints = Params.parse(hints, { urgency: Urgency.NORMAL }, true);
+-
+         // Be compatible with the various hints for image data and image path
+         // 'image-data' and 'image-path' are the latest name of these hints, introduced in 1.2
+ 
+--
+cgit v0.9.0.2

Modified: desktop/unstable/gnome-shell/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-shell/debian/patches/series?rev=35239&op=diff
==============================================================================
--- desktop/unstable/gnome-shell/debian/patches/series [utf-8] (original)
+++ desktop/unstable/gnome-shell/debian/patches/series [utf-8] Fri Jun  1 09:43:24 2012
@@ -5,3 +5,4 @@
 21_revert_evolution_gsettings.patch
 22-remove-online-accounts-from-user-menu.patch
 25-close-the-recorder-instead-of-pausing-it.patch
+26-fix-multiple-popup-regression.patch