From 548b9cfcfa111cc43c75cce5f7bdd1be93ea8d76 Mon Sep 17 00:00:00 2001 From: "jminta%gmail.com" Date: Wed, 18 Jun 2008 02:49:32 +0000 Subject: [PATCH] Bug 439373 Remove front-end users of nsIMsgRDFDatasource, r=mkmelin git-svn-id: svn://10.0.0.236/trunk@252424 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/mail/base/content/commandglue.js | 1 - mozilla/mail/base/content/mailWindow.js | 24 ------------------- .../mail/base/content/msgMail3PaneWindow.js | 2 -- 3 files changed, 27 deletions(-) diff --git a/mozilla/mail/base/content/commandglue.js b/mozilla/mail/base/content/commandglue.js index 55cafb82050..8698051753d 100644 --- a/mozilla/mail/base/content/commandglue.js +++ b/mozilla/mail/base/content/commandglue.js @@ -1160,7 +1160,6 @@ var gSearchSession; var nsIMsgFolder = Components.interfaces.nsIMsgFolder; var nsIMsgWindow = Components.interfaces.nsIMsgWindow; -var nsIMsgRDFDataSource = Components.interfaces.nsIMsgRDFDataSource; var nsMsgSearchScope = Components.interfaces.nsMsgSearchScope; var gFolderDatasource; diff --git a/mozilla/mail/base/content/mailWindow.js b/mozilla/mail/base/content/mailWindow.js index d0113d0bdcc..2c398cb4adf 100644 --- a/mozilla/mail/base/content/mailWindow.js +++ b/mozilla/mail/base/content/mailWindow.js @@ -94,18 +94,6 @@ function OnMailWindowUnload() mailSession.RemoveMsgWindow(msgWindow); messenger.setWindow(null, null); - var msgDS; - var viewDataSources = [accountManagerDataSource, folderDataSource, - unreadFolderDataSource, favoriteFoldersDataSource, - recentFoldersDataSource]; - - for (index in viewDataSources) - { - msgDS = viewDataSources[index].QueryInterface(Components.interfaces.nsIMsgRDFDataSource); - msgDS.window = null; - msgDS = null; - } - msgWindow.closeWindow(); } @@ -186,18 +174,6 @@ function AddDataSources() { accountManagerDataSource = accountManagerDataSource.QueryInterface(Components.interfaces.nsIRDFDataSource); folderDataSource = folderDataSource.QueryInterface(Components.interfaces.nsIRDFDataSource); - - //Add statusFeedback - - var msgDS; - var viewDataSources = [accountManagerDataSource, folderDataSource, - unreadFolderDataSource, favoriteFoldersDataSource, - recentFoldersDataSource]; - for (index in viewDataSources) - { - msgDS = viewDataSources[index].QueryInterface(Components.interfaces.nsIMsgRDFDataSource); - msgDS.window = msgWindow; - } } // We're going to implement our status feedback for the mail window in JS now. diff --git a/mozilla/mail/base/content/msgMail3PaneWindow.js b/mozilla/mail/base/content/msgMail3PaneWindow.js index 3ff4885cba1..393e3ca81aa 100644 --- a/mozilla/mail/base/content/msgMail3PaneWindow.js +++ b/mozilla/mail/base/content/msgMail3PaneWindow.js @@ -1071,8 +1071,6 @@ function loadFolderViewForTree(aNewFolderView, aFolderTree) for (index in dataSourcesToAdd) { database.AddDataSource(dataSourcesToAdd[index]); - var msgDS = dataSourcesToAdd[index].QueryInterface(Components.interfaces.nsIMsgRDFDataSource); - msgDS.window = msgWindow; } aFolderTree.setAttribute('ref', folderViews[aNewFolderView].ref);