trunk updates

This commit is contained in:
scott%scott-macgregor.org 2003-04-25 22:30:02 +00:00
parent 76c4556089
commit 21dc295e01
3 changed files with 5 additions and 2 deletions

View File

@ -1477,6 +1477,8 @@ function IsEmptyTrashEnabled()
{
var folderURI = GetSelectedFolderURI();
var server = GetServer(folderURI);
if (!server)
return false;
return (server.canEmptyTrashOnExit?IsMailFolderSelected():false);
}
@ -1484,7 +1486,7 @@ function IsCompactFolderEnabled()
{
var folderURI = GetSelectedFolderURI();
var server = GetServer(folderURI);
if (!(server.canCompactFoldersOnServer))
if (!(server && server.canCompactFoldersOnServer))
return false;
var folderTree = GetFolderTree();

View File

@ -71,7 +71,7 @@ Rights Reserved.
<!ENTITY showAbToolbarCmd.accesskey "o">
<!ENTITY showCardPane.label "Card Summary Pane">
<!ENTITY showCardPane.accesskey "C">
<!ENTITY showCardPane.accesskey "a">
<!ENTITY menu_ShowNameAs.label "Show Name As">
<!ENTITY menu_ShowNameAs.accesskey "n">

View File

@ -59,6 +59,7 @@ chrome\US.jar
chrome\pippki.jar
chrome\pipnss.jar
chrome\chrome.rdf
chrome\overlayinfo\messenger\content\overlays.rdf
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
; Default Profile Settings