mirror of
https://github.com/moparisthebest/FireTray
synced 2024-12-22 13:58:48 -05:00
* acutally incude *.gif during build
* fix typo * updateUnreadMsgCount() does nothing if NOTIFICATION_DISABLED
This commit is contained in:
parent
f0b8b854d0
commit
5e25025de3
@ -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)
|
||||
|
||||
|
@ -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">
|
||||
|
||||
|
@ -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:
|
||||
|
Loading…
Reference in New Issue
Block a user