Bug 730236 - Remove "delete from server" filter option for non-POP3 accounts. r=dbienvenu
authoraceman <acelists@atlas.sk>
Mon, 05 Mar 2012 19:59:01 -0500
changeset 11008 36757b575b093434b032b00e785c8de630fe27e0
parent 11007 b3925ea79358874ecfd0348c772cd1a7cfdd65db
child 11009 ef7d32dbdb470dfc1998db3180fb758a810b6e16
push id463
push userbugzilla@standard8.plus.com
push dateTue, 24 Apr 2012 17:34:51 +0000
treeherdercomm-beta@e53588e8f7b0 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersdbienvenu
bugs730236
Bug 730236 - Remove "delete from server" filter option for non-POP3 accounts. r=dbienvenu
mailnews/base/search/content/searchWidgets.xml
--- a/mailnews/base/search/content/searchWidgets.xml
+++ b/mailnews/base/search/content/searchWidgets.xml
@@ -142,17 +142,18 @@
               elements[i].hidden = scope != Components.interfaces.nsMsgSearchScope.newsFilter;
 
             elements = menupopup.getElementsByAttribute("enablefornews", "false");
             for (i = 0; i < elements.length; i++)
               elements[i].hidden = scope == Components.interfaces.nsMsgSearchScope.newsFilter;
 
             elements = menupopup.getElementsByAttribute("enableforpop3", "true");
             for (i = 0; i < elements.length; i++)
-              elements[i].hidden = scope != Components.interfaces.nsMsgSearchScope.offlineMailFilter;
+              elements[i].hidden = !((gFilterList.folder.server.type == "pop3") ||
+                                     (gFilterList.folder.server.type == "none"));
 
             elements = menupopup.getElementsByAttribute("isCustom", "true");
             // Note there might be an additional element here as a placeholder
             // for a missing action, so we iterate over the known actions
             // instead of the elements
             for (i = 0; i < gCustomActions.length; i++)
               elements[i].hidden = !gCustomActions[i]
                                      .isValidForType(gFilterType, scope);