94968. r/sr=mscott. fix the folder-picker to not show bogus folders.

This commit is contained in:
naving%netscape.com 2001-10-26 22:08:21 +00:00
Родитель 23bce44dd6
Коммит 7c1966ad79
3 изменённых файлов: 8 добавлений и 3 удалений

Просмотреть файл

@ -55,7 +55,10 @@ function GetMsgFolderFromResource(folderResource)
return null; return null;
var msgFolder = folderResource.QueryInterface(Components.interfaces.nsIMsgFolder); var msgFolder = folderResource.QueryInterface(Components.interfaces.nsIMsgFolder);
if (msgFolder && (msgFolder.parent || msgFolder.isServer))
return msgFolder; return msgFolder;
else
return null;
} }
function GetMsgFolderFromURI(folderURI) function GetMsgFolderFromURI(folderURI)

Просмотреть файл

@ -25,6 +25,7 @@ function GetMsgFolderFromUri(uri)
try { try {
var resource = GetResourceFromUri(uri); var resource = GetResourceFromUri(uri);
var msgfolder = resource.QueryInterface(Components.interfaces.nsIMsgFolder); var msgfolder = resource.QueryInterface(Components.interfaces.nsIMsgFolder);
if (msgfolder && (msgfolder.parent || msgfolder.isServer))
return msgfolder; return msgfolder;
} }
catch (ex) { catch (ex) {

Просмотреть файл

@ -2346,6 +2346,7 @@ function GetMsgFolderFromUri(uri)
RDF = RDF.QueryInterface(Components.interfaces.nsIRDFService); RDF = RDF.QueryInterface(Components.interfaces.nsIRDFService);
var resource = RDF.GetResource(uri); var resource = RDF.GetResource(uri);
var msgfolder = resource.QueryInterface(Components.interfaces.nsIMsgFolder); var msgfolder = resource.QueryInterface(Components.interfaces.nsIMsgFolder);
if (msgfolder && ( msgfolder.parent || msgfolder.isServer))
return msgfolder; return msgfolder;
}//try }//try
catch (ex) { }//catch catch (ex) { }//catch