From 72a150cb607e524c1dd8003e22835a8acadf456c Mon Sep 17 00:00:00 2001
From: "sspitzer%netscape.com" <sspitzer%netscape.com>
Date: Mon, 8 Oct 2001 20:05:00 +0000
Subject: [PATCH] fix for #103681 (no status messages when doing pop). back out
 my bad fix for #102978.  we set the msg window on the folder datasource and
 we've got a folder datasource per msg window.  by moving this from js to xul,
 it made it so we'd set the msg window on one folder ds, and we'd be using the
 other one.

r/sr=bienvenu
---
 mailnews/base/resources/content/folderPane.xul        | 3 +--
 mailnews/base/resources/content/msgMail3PaneWindow.js | 9 +++++++++
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/mailnews/base/resources/content/folderPane.xul b/mailnews/base/resources/content/folderPane.xul
index b04c6f68d910..0a7c82ac0848 100644
--- a/mailnews/base/resources/content/folderPane.xul
+++ b/mailnews/base/resources/content/folderPane.xul
@@ -37,8 +37,7 @@
             flex="1"
             seltype="single">
     <outlinerbody flex="1"
-                  datasources="rdf:msgaccountmanager rdf:mailnewsfolders"
-                  ref="msgaccounts:/"
+                  datasources="rdf:null"
                   statedatasource="rdf:mailnewsfolders"
                   ondraggesture="return BeginDragFolderOutliner(event);"
                   onselect="FolderPaneSelectionChange();">
diff --git a/mailnews/base/resources/content/msgMail3PaneWindow.js b/mailnews/base/resources/content/msgMail3PaneWindow.js
index 2bbbc5974a7b..6af09d1d5232 100644
--- a/mailnews/base/resources/content/msgMail3PaneWindow.js
+++ b/mailnews/base/resources/content/msgMail3PaneWindow.js
@@ -718,7 +718,16 @@ function OnLoadFolderPane()
 
     SortFolderPane("folderNameCol");
 
+    //Add folderDataSource and accountManagerDataSource to folderPane
+    accountManagerDataSource = accountManagerDataSource.QueryInterface(Components.interfaces.nsIRDFDataSource);
+    folderDataSource = folderDataSource.QueryInterface(Components.interfaces.nsIRDFDataSource);
+    var database = GetFolderDatasource();
+
+    database.AddDataSource(accountManagerDataSource);
+    database.AddDataSource(folderDataSource);
     var folderOutliner = GetFolderOutliner();
+    folderOutliner.outlinerBoxObject.outlinerBody.setAttribute("ref", "msgaccounts:/");
+
     var folderOutlinerBuilder = folderOutliner.outlinerBoxObject.outlinerBody.builder.QueryInterface(Components.interfaces.nsIXULOutlinerBuilder);
     folderOutlinerBuilder.addObserver(folderObserver);
     folderOutliner.addEventListener("click",FolderPaneOnClick,true);