[Pkg-mozext-commits] [firetray] 96/399: * acutally incude *.gif during build * fix typo * updateUnreadMsgCount() does nothing if NOTIFICATION_DISABLED
David Prévot
taffit at alioth.debian.org
Tue Oct 29 18:23:21 UTC 2013
This is an automated email from the git hooks/post-receive script.
taffit pushed a commit to branch dfsg-clean
in repository firetray.
commit 5e25025de3ccc927f18d5be0df40543182ad073f
Author: foudfou <foudil.newbie+git at gmail.com>
Date: Tue Nov 22 19:35:40 2011 +0100
* acutally incude *.gif during build
* fix typo
* updateUnreadMsgCount() does nothing if NOTIFICATION_DISABLED
---
src/Makefile | 1 +
src/chrome/locale/en-US/options.dtd | 2 +-
src/modules/FiretrayMessaging.jsm | 6 ++++--
3 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/src/Makefile b/src/Makefile
index 73af63f..a31fafa 100755
--- a/src/Makefile
+++ b/src/Makefile
@@ -76,6 +76,7 @@ chrome_sources := $(chrome_sources_js) \
$(wildcard $(chrome_source_root)/content/*.css) \
$(wildcard $(chrome_source_root)/skin/*.css) \
$(wildcard $(chrome_source_root)/skin/*.png) \
+ $(wildcard $(chrome_source_root)/skin/*.gif) \
$(wildcard $(chrome_source_root)/locale/*/*.dtd) \
$(wildcard $(chrome_source_root)/locale/*/*.properties)
diff --git a/src/chrome/locale/en-US/options.dtd b/src/chrome/locale/en-US/options.dtd
index b108b5d..b443162 100644
--- a/src/chrome/locale/en-US/options.dtd
+++ b/src/chrome/locale/en-US/options.dtd
@@ -31,7 +31,7 @@
<!ENTITY unread_count_folder_exceptions.label "Excluded special folders">
<!ENTITY unread_count_folder_exceptions.tooltip "Excluded special folders for unread message count">
-<!ENTITY excluded_folders_list.tooltip "Use CTRL + left click to select/deslect folders for unread message count">
+<!ENTITY excluded_folders_list.tooltip "Use CTRL + left click to select/deselect folders for unread message count">
<!ENTITY unread_count_account_exceptions.label "Included accounts">
<!ENTITY unread_count_account_exceptions.tooltip "Included accounts for unread message count">
diff --git a/src/modules/FiretrayMessaging.jsm b/src/modules/FiretrayMessaging.jsm
index f48898a..ea79e5b 100644
--- a/src/modules/FiretrayMessaging.jsm
+++ b/src/modules/FiretrayMessaging.jsm
@@ -78,10 +78,13 @@ firetray.Messaging = {
/**
* computes total unread message count
- * TODO: check news accounts shouldn't be considered
*/
updateUnreadMsgCount: function() {
LOG("unreadMsgCount");
+ let prefMailNotification = firetray.Utils.prefService.getIntPref("mail_notification");
+ if (prefMailNotification === NOTIFICATION_DISABLED)
+ return;
+
let mailAccounts = firetray.Utils.getObjPref('mail_accounts');
let serverTypes = mailAccounts["serverTypes"];
let excludedAccounts = mailAccounts["excludedAccounts"];
@@ -119,7 +122,6 @@ firetray.Messaging = {
firetray.Handler.setTooltipDefault();
} else if (this._unreadMsgCount > 0) {
- let prefMailNotification = firetray.Utils.prefService.getIntPref("mail_notification");
switch (prefMailNotification) {
case NOTIFICATION_UNREAD_MESSAGE_COUNT:
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-mozext/firetray.git
More information about the Pkg-mozext-commits
mailing list