Bug #265481 --> port aviary branch fix for Thunderbird not reloading virtual folder after dismissing the properties dialog.

sr=bienvenu

mail/base/content/widgetglue.js

@@ -208,11 +208,15 @@ function MsgVirtualFolderProperties(aEditExistingVFolder)
                                   msgWindow:msgWindow});
 }
 
-function onEditVirtualFolderPropertiesCallback(aVirtualFolder)
+function onEditVirtualFolderPropertiesCallback(aVirtualFolderURI)
 {
   // we need to reload the folder if it is the currently loaded folder...
+  if (gMsgFolderSelected && aVirtualFolderURI == gMsgFolderSelected.URI)
+  {
+    gMsgFolderSelected = null; // force the folder pane to reload the virtual folder
   FolderPaneSelectionChange();
 }
+}
 
 function MsgFolderProperties() 
 {

mailnews/base/resources/content/virtualFolderProperties.js

@@ -194,7 +194,7 @@ function onOK()
     accountManager.saveVirtualFolders();
 
     if (window.arguments[0].onOKCallback)
-      window.arguments[0].onOKCallback(msgFolder);
+      window.arguments[0].onOKCallback(msgFolder.URI);
       
   } 
   else if (name && uri) // create a new virtual folder

mailnews/base/resources/content/widgetglue.js

@@ -226,10 +226,14 @@ function MsgVirtualFolderProperties(aEditExistingVFolder)
                                   msgWindow:msgWindow});
 }
 
-function onEditVirtualFolderPropertiesCallback(aVirtualFolder)
+function onEditVirtualFolderPropertiesCallback(aVirtualFolderURI)
 {
   // we need to reload the folder if it is the currently loaded folder...
-  FolderPaneSelectionChange();
+  if (gMsgFolderSelected && aVirtualFolderURI == gMsgFolderSelected.URI)
+  {
+    gMsgFolderSelected = null; // force the folder pane to reload the virtual folder
+    FolderPaneSelectionChange();
+  }
 }