1 files changed, 42 insertions, 2 deletions
diff --git a/src/bookmarks/bookmarksmanager.cpp b/src/bookmarks/bookmarksmanager.cpp
index 792baaeb..bba9dd77 100644
--- a/src/bookmarks/bookmarksmanager.cpp
+++ b/src/bookmarks/bookmarksmanager.cpp
@@ -388,13 +388,15 @@ BookmarkProvider::~BookmarkProvider()
 
 void BookmarkProvider::setupBookmarkBar(BookmarkToolBar *toolbar)
 {
+    if (m_bookmarkToolBars.contains(toolbar))
+        return;
+
     kDebug() << "new bookmark bar...";
-    
+
     m_bookmarkToolBars.append(toolbar);
     toolbar->setContextMenuPolicy(Qt::CustomContextMenu);
     connect(toolbar, SIGNAL(customContextMenuRequested(const QPoint &)), this, SLOT(contextMenu(const QPoint &)));
     
-    slotBookmarksChanged("", "");
     kDebug() << "new bookmark bar... DONE!";
 }
 
@@ -591,3 +593,41 @@ void BookmarkProvider::slotPanelChanged()
             panel->startLoadFoldedState();
     }
 }
+
+
+KBookmark BookmarkProvider::bookmarkForUrl(const KUrl &url)
+{
+    KBookmark found;
+
+    KBookmarkGroup root = rootGroup();
+    if (root.isNull())
+    {
+        return found;
+    }
+
+    return bookmarkForUrl(root, url);
+}
+
+
+KBookmark BookmarkProvider::bookmarkForUrl(const KBookmark &bookmark, const KUrl &url)
+{
+    KBookmark found;
+
+    if (bookmark.isGroup())
+    {
+        KBookmarkGroup group = bookmark.toGroup();
+        KBookmark bookmark = group.first();
+
+        while (!bookmark.isNull() && found.isNull())
+        {
+            found = bookmarkForUrl(bookmark, url);
+            bookmark = group.next(bookmark);
+        }
+    }
+    else if (!bookmark.isSeparator() && bookmark.url() == url)
+    {
+        found = bookmark;
+    }
+
+    return found;
+}