Merge lp:~nijaba/libnotify-mozilla/inbox-only into lp:libnotify-mozilla/0.1

[Nick Barcet]

Add preference to only notify when inbox receives new mail. (Fix bug #713699)

Add preference to only notify when inbox receives new mail. (bug #713699)

[Ruben Verweij (ruben-verweij)]

Thank you very much for this fix! I will release it in a new version.

review: Approve

=== modified file 'content/options.xul'
--- content/options.xul	2010-09-04 18:29:19 +0000
+++ content/options.xul	2011-02-05 16:11:58 +0000
@@ -48,6 +48,7 @@
     <preference id="pref_indicator" name="extensions.tbindicator.showIndicator" type="bool"/>
     <preference id="pref_news" name="extensions.tbindicator.showNews" type="bool"/>
     <preference id="pref_rss" name="extensions.tbindicator.showRSS" type="bool"/>
+    <preference id="pref_inbox" name="extensions.tbindicator.onlyInbox" type="bool"/>
   </preferences>
  
 <hbox align="center">
@@ -81,6 +82,13 @@
     </vbox>
     <checkbox preference="pref_rss" id="rss"/>
   </hbox>
+  <hbox align="center">
+    <vbox align="center">
+    <label control="inbox" value="Display notifications only for Inbox: "/>
+    </vbox>
+    <checkbox preference="pref_inbox" id="inbox"/>
+  </hbox>
+
 <hbox align="center">
    <button label="Send test notification" oncommand="sendNotification('Test Notification', 'From Thunderbird Indicator', 'notification-message-email', 'email.arrived');"/>
   </hbox>

=== modified file 'content/overlay.js'
--- content/overlay.js	2010-10-16 13:21:04 +0000
+++ content/overlay.js	2011-02-05 16:11:58 +0000
@@ -82,6 +82,9 @@
                 if(!this.prefs.prefHasUserValue("showRSS")) {
                         this.prefs.setBoolPref("showRSS", false);
                 }
+                if(!this.prefs.prefHasUserValue("onlyInbox")) {
+                        this.prefs.setBoolPref("onlyInbox", false);
+                }
                 
                 this.initIndicators();
         },
@@ -147,7 +150,13 @@
 
                 // Also return true if the folder is checked for new messages, otherwise return false
                 if ((aFolder.flags & FLR_FLAG_CHECK_NEW) == FLR_FLAG_CHECK_NEW){
-                        return true;
+                        var onlyInbox = this.prefs.getBoolPref("onlyInbox");
+                        if (onlyInbox) {
+                                //don't warn for anything but Inbox
+                                return false;
+                        } else {
+                                return true;
+                        }
                 }else{
                         return false;
                 }