зеркало из https://github.com/mozilla/gecko-dev.git
94968. r/sr=mscott. fix the folder-picker to not show bogus folders.
This commit is contained in:
Родитель
23bce44dd6
Коммит
7c1966ad79
|
@ -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
|
||||||
|
|
Загрузка…
Ссылка в новой задаче