[Pkg-mozext-commits] [firetray] 374/399: fix ChatStatusIcon blinking

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to branch dfsg-clean
in repository firetray.

commit 97ef0cb65f1ae2345b3b1ab66cc11d079d2a5a0f
Author: foudfou <foudil.newbie+git at gmail.com>
Date:   Fri May 31 15:43:34 2013 +0200

    fix ChatStatusIcon blinking
---
 src/modules/linux/FiretrayChatStatusIcon.jsm |   13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/modules/linux/FiretrayChatStatusIcon.jsm b/src/modules/linux/FiretrayChatStatusIcon.jsm
index 55dae2e..b582440 100644
--- a/src/modules/linux/FiretrayChatStatusIcon.jsm
+++ b/src/modules/linux/FiretrayChatStatusIcon.jsm
@@ -74,11 +74,6 @@ firetray.ChatStatusIcon = {
   },
 
   setIconImageFromGIcon: function(gicon) {
-    if (firetray.Chat.shouldAcknowledgeConvs.length()) {
-      this.events['icon-changed'] = true;
-      return;
-    }
-
     if (!firetray.ChatStatusIcon.trayIcon || !gicon)
       log.error("Icon missing");
     gtk.gtk_status_icon_set_from_gicon(firetray.ChatStatusIcon.trayIcon, gicon);
@@ -86,6 +81,14 @@ firetray.ChatStatusIcon = {
 
   setIconImage: function(name) {
     this.themedIconNameCurrent = name;
+
+    let blinkStyle = firetray.Utils.prefService.getIntPref("chat_icon_blink_style");
+    if (blinkStyle === FIRETRAY_CHAT_ICON_BLINK_STYLE_FADE &&
+        firetray.Chat.shouldAcknowledgeConvs.length()) {
+      this.events['icon-changed'] = true;
+      return;
+    }
+
     this.setIconImageFromGIcon(this.themedIcons[name]);
   },
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-mozext/firetray.git