diff options
Diffstat (limited to 'plugins/newmail_notifier')
| -rw-r--r-- | plugins/newmail_notifier/config.inc.php.dist | 6 | ||||
| -rw-r--r-- | plugins/newmail_notifier/newmail_notifier.js | 9 |
2 files changed, 9 insertions, 6 deletions
diff --git a/plugins/newmail_notifier/config.inc.php.dist b/plugins/newmail_notifier/config.inc.php.dist index 067fe19f1..cdb563c40 100644 --- a/plugins/newmail_notifier/config.inc.php.dist +++ b/plugins/newmail_notifier/config.inc.php.dist @@ -1,12 +1,12 @@ <?php // Enables basic notification -$rcmail_config['newmail_notifier_basic'] = false; +$config['newmail_notifier_basic'] = false; // Enables sound notification -$rcmail_config['newmail_notifier_sound'] = false; +$config['newmail_notifier_sound'] = false; // Enables desktop notification -$rcmail_config['newmail_notifier_desktop'] = false; +$config['newmail_notifier_desktop'] = false; ?> diff --git a/plugins/newmail_notifier/newmail_notifier.js b/plugins/newmail_notifier/newmail_notifier.js index c398424b6..b00f33d10 100644 --- a/plugins/newmail_notifier/newmail_notifier.js +++ b/plugins/newmail_notifier/newmail_notifier.js @@ -30,9 +30,9 @@ function newmail_notifier_run(prop) function newmail_notifier_stop(prop) { // revert original favicon - if (rcmail.env.favicon_href && (!prop || prop.action != 'check-recent')) { + if (rcmail.env.favicon_href && rcmail.env.favicon_changed && (!prop || prop.action != 'check-recent')) { $('<link rel="shortcut icon" href="'+rcmail.env.favicon_href+'"/>').replaceAll('link[rel="shortcut icon"]'); - rcmail.env.favicon_href = null; + rcmail.env.favicon_changed = 0; } // Remove IE icon overlay if we're pinned to Taskbar @@ -54,7 +54,10 @@ function newmail_notifier_basic() var link = $('<link rel="shortcut icon" href="plugins/newmail_notifier/favicon.ico"/>'), oldlink = $('link[rel="shortcut icon"]', w.document); - rcmail.env.favicon_href = oldlink.attr('href'); + if (!rcmail.env.favicon_href) + rcmail.env.favicon_href = oldlink.attr('href'); + + rcmail.env.favicon_changed = 1; link.replaceAll(oldlink); // Add IE icon overlay if we're pinned to Taskbar |