Bug 265388 @mozilla.org/rdf/datasource;1 are rdf datasources and must be used as services

r=neil sr=bienvenu


git-svn-id: svn://10.0.0.236/trunk@164492 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
timeless%mozdev.org
2004-10-27 05:15:46 +00:00
parent fa4796e50c
commit a6f36871b8
6 changed files with 6 additions and 6 deletions

View File

@@ -185,7 +185,7 @@ function CreateMailWindowGlobals()
//Create datasources
accountManagerDataSource = Components.classes[accountManagerDSContractID].createInstance();
folderDataSource = Components.classes[folderDSContractID].createInstance();
folderDataSource = Components.classes[folderDSContractID].getService();
accountCentralBox = document.getElementById("accountCentralBox");
gSearchBox = document.getElementById("searchBox");

View File

@@ -1432,7 +1432,7 @@ function ComposeLoad()
}
try {
sAccountManagerDataSource = Components.classes["@mozilla.org/rdf/datasource;1?name=msgaccountmanager"].createInstance(Components.interfaces.nsIRDFDataSource);
sAccountManagerDataSource = Components.classes["@mozilla.org/rdf/datasource;1?name=msgaccountmanager"].getService(Components.interfaces.nsIRDFDataSource);
sRDF = Components.classes['@mozilla.org/rdf/rdf-service;1'].getService(Components.interfaces.nsIRDFService);
sNameProperty = sRDF.GetResource("http://home.netscape.com/NC-rdf#Name?sort=true");
}

View File

@@ -204,7 +204,7 @@ function CreateMailWindowGlobals()
//Create datasources
accountManagerDataSource = Components.classes[accountManagerDSContractID].createInstance();
folderDataSource = Components.classes[folderDSContractID].createInstance();
folderDataSource = Components.classes[folderDSContractID].getService();
messagesBox = document.getElementById("messagesBox");
accountCentralBox = document.getElementById("accountCentralBox");

View File

@@ -46,7 +46,7 @@ var accountManager = Components.classes["@mozilla.org/messenger/account-manager;
// we need the account manager datasource for when trying
// to figure out which account is next in the folder pane.
var gAccountManagerDataSource = Components.classes["@mozilla.org/rdf/datasource;1?name=msgaccountmanager"].createInstance().QueryInterface(Components.interfaces.nsIRDFDataSource);
var gAccountManagerDataSource = Components.classes["@mozilla.org/rdf/datasource;1?name=msgaccountmanager"].getService(Components.interfaces.nsIRDFDataSource);
// we can't compare the name to determine the order in the folder pane
// we need to compare the value of the sort resource,

View File

@@ -594,7 +594,7 @@ function setupSearchListener()
function GetFolderDatasource()
{
if (!gFolderDatasource)
gFolderDatasource = Components.classes[folderDSContractID].createInstance(Components.interfaces.nsIRDFDataSource);
gFolderDatasource = Components.classes[folderDSContractID].getService(Components.interfaces.nsIRDFDataSource);
return gFolderDatasource;
}

View File

@@ -1424,7 +1424,7 @@ function ComposeLoad()
}
try {
sAccountManagerDataSource = Components.classes["@mozilla.org/rdf/datasource;1?name=msgaccountmanager"].createInstance(Components.interfaces.nsIRDFDataSource);
sAccountManagerDataSource = Components.classes["@mozilla.org/rdf/datasource;1?name=msgaccountmanager"].getService(Components.interfaces.nsIRDFDataSource);
sRDF = Components.classes['@mozilla.org/rdf/rdf-service;1'].getService(Components.interfaces.nsIRDFService);
sNameProperty = sRDF.GetResource("http://home.netscape.com/NC-rdf#Name?sort=true");
}