[gnome-shell/gnome-3-4] notificationDaemon.js: convert the hints dict at the beginning of the function



commit 406db1902c7d32da8b9bfb50dd7779071d571e4f
Author: Guillaume Desmottes <guillaume desmottes collabora co uk>
Date:   Thu May 31 11:28:41 2012 +0200

    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

 js/ui/notificationDaemon.js |   14 +++++++-------
 1 files changed, 7 insertions(+), 7 deletions(-)
---
diff --git a/js/ui/notificationDaemon.js b/js/ui/notificationDaemon.js
index f474fbe..c6a941f 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
 



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]