From 5bcdaf6a0ff05a6b42236a3ff053c3b50e8f6591 Mon Sep 17 00:00:00 2001
From: "bernd.mielke%snafu.de"
 <bernd.mielke%snafu.de@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Sat, 6 Apr 2002 19:01:46 +0000
Subject: [PATCH] select new bookmark after creation bug 44813, patch by Pete
 Zha r=bz sr=blake a=asa

git-svn-id: svn://10.0.0.236/trunk@118388 18797224-902f-48f8-a5cc-f745e15eee43
---
 .../xpfe/components/bookmarks/resources/addBookmark.js    | 5 ++++-
 mozilla/xpfe/components/bookmarks/resources/bookmarks.xml | 8 +++++++-
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/mozilla/xpfe/components/bookmarks/resources/addBookmark.js b/mozilla/xpfe/components/bookmarks/resources/addBookmark.js
index 13f61fd7015..908ec7c45f7 100644
--- a/mozilla/xpfe/components/bookmarks/resources/addBookmark.js
+++ b/mozilla/xpfe/components/bookmarks/resources/addBookmark.js
@@ -253,7 +253,10 @@ function onOK()
       }
     } else {
       url = getNormalizedURL(gFld_URL.value);
-      kBMS.createBookmarkWithDetails(gFld_Name.value, url, gBookmarkCharset, rFolder, -1);
+      var newBookmark = kBMS.createBookmarkWithDetails(gFld_Name.value, url, gBookmarkCharset, rFolder, -1);
+      if (window.arguments[4] == "newBookmark") {
+        window.arguments[5].newBookmark = newBookmark;
+      }
     }
   }
 }
diff --git a/mozilla/xpfe/components/bookmarks/resources/bookmarks.xml b/mozilla/xpfe/components/bookmarks/resources/bookmarks.xml
index 7887950bf04..428f44b0e1d 100644
--- a/mozilla/xpfe/components/bookmarks/resources/bookmarks.xml
+++ b/mozilla/xpfe/components/bookmarks/resources/bookmarks.xml
@@ -1589,8 +1589,14 @@
             parentURI = this.rdf.GetResource("NC:BookmarksRoot").Value;
           else
             parentURI = this.treeBuilder.getResourceAtIndex(parentIndex).Value;
+            
+          var rv = { newBookmark: null };
           openDialog("chrome://communicator/content/bookmarks/addBookmark.xul", "", 
-                     "centerscreen,chrome,modal=yes,dialog=yes,resizable=no", null, null, parentURI, null, "newBookmark");
+                     "centerscreen,chrome,modal=yes,dialog=yes,resizable=no", null, null, parentURI, null, "newBookmark", rv);
+          if (rv.newBookmark) {
+            var ind = this.treeBuilder.getIndexOfResource(rv.newBookmark);
+            this.treeBoxObject.selection.select(ind);
+          }
         ]]></body>
       </method>
       <method name="fileBookmark">