Checking in stuff I have for widgetglue.js (to know that I'm checkin into the right branch :) )

mailnews/base/resources/content/widgetglue.js

@@ -29,6 +29,7 @@
 
 //NOTE: gMessengerBundle must be defined and set or this Overlay won't work
 
+/* not used
 function ConvertDOMListToResourceArray(nodeList)
 {
     var result = Components.classes["@mozilla.org/supports-array;1"].createInstance(Components.interfaces.nsISupportsArray);
@@ -39,36 +40,24 @@ function ConvertDOMListToResourceArray(nodeList)
 
     return result;
 }
+*/
 
 function GetSelectedFolderURI()
 {
+  dump('In GetSelectedFolderURI\n');
   var uri = null;
-	var selectedFolder = null;
-	try {
-		var folderTree = GetFolderTree(); 
-		var selectedFolderList = folderTree.selectedItems;
+  
+  var folderOutliner = GetFolderOutliner();
+  var startRange = {value: 0};
+  var endRange = {value: 0};
+  folderOutliner.outlinerBoxObject.selection.getRangeAt(0, startRange, endRange);
 	
   //  you can only select one folder / server to add new folder / subscribe to
-		if (selectedFolderList.length == 1) {
-			selectedFolder = selectedFolderList[0];
-		}
-		else {
-			//dump("number of selected folder was " + selectedFolderList.length + "\n");
-		}
-	}
-	catch (ex) {
-		// dump("failed to get the selected folder\n");
-		uri = null;
-	}
-
-	try {
-       		if (selectedFolder) {
-			uri = selectedFolder.getAttribute('id');
-			// dump("folder to preselect: " + preselectedURI + "\n");
-		}
-	}
-	catch (ex) {
-		uri = null;
+  if (startRange.value >= 0 && startRange.value == endRange.value)
+  {
+    var resource = GetFolderResource(startRange.value);
+    if (resource)
+      uri = resource.Value;
   }
   
   return uri;
@@ -78,9 +67,9 @@ function GetSelectedFolderURI()
 function MsgRenameFolder() 
 {
 	var preselectedURI = GetSelectedFolderURI();
-	var folderTree = GetFolderTree();
+	var folderOutliner = GetFolderOutliner();
 
-	var name = GetFolderNameFromUri(preselectedURI, folderTree);
+	var name = GetFolderNameFromUri(preselectedURI, folderOutliner);
 
 	dump("preselectedURI = " + preselectedURI + "\n");
 	var dialog = window.openDialog(
@@ -94,8 +83,8 @@ function MsgRenameFolder()
 function RenameFolder(name,uri)
 {
     dump("uri,name = " + uri + "," + name + "\n");
-    var folderTree = GetFolderTree();
-    if (folderTree)
+    var folderOutliner = GetFolderOutliner();
+    if (folderOutliner)
     {
 	if (uri && (uri != "") && name && (name != "")) {
                 var selectedFolder = GetResourceFromUri(uri);
@@ -111,14 +100,14 @@ function RenameFolder(name,uri)
 
                 ClearThreadPane();
                 ClearMessagePane();
-                folderTree.clearItemSelection();
+                folderOutliner.outlinerBoxObject.selection.clearSelection();
         }
         else {
                 dump("no name or nothing selected\n");
         }   
     }
     else {
-	dump("no folder tree\n");
+	dump("no folder outliner\n");
     }
 }
 
@@ -228,9 +217,9 @@ function MsgCompactFolder(isAll)
 function MsgFolderProperties() 
 {
 	var preselectedURI = GetSelectedFolderURI();
-	var folderTree = GetFolderTree();
+	var folderOutliner = GetFolderOutliner();
 
-	var name = GetFolderNameFromUri(preselectedURI, folderTree);
+	var name = GetFolderNameFromUri(preselectedURI, folderOutliner);
 
 	dump("preselectedURI = " + preselectedURI + "\n");
 	var windowTitle = gMessengerBundle.getString("folderProperties");
@@ -308,8 +297,8 @@ function LastToClose()
 function MsgSetFolderCharset() 
 {
   var preselectedURI = GetSelectedFolderURI();
-  var folderTree = GetFolderTree();
-  var name = GetFolderNameFromUri(preselectedURI, folderTree);
+  var folderOutliner = GetFolderOutliner();
+  var name = GetFolderNameFromUri(preselectedURI, folderOutliner);
   var windowTitle = gMessengerBundle.getString("folderProperties");
   var dialog = window.openDialog(
                       "chrome://messenger/content/imapFolderProps.xul",