From d484b7313e7bea07acad5e9785dbbbb2d7f03076 Mon Sep 17 00:00:00 2001
From: Yoann Laissus <yoann.laissus@gmail.com>
Date: Sat, 12 Jun 2010 11:57:03 +0200
Subject: Fix the add bookmark action of the WebView context menu BUG: 241503

---
 src/bookmarks/bookmarksmanager.cpp | 30 +++++++++++-------------------
 src/bookmarks/bookmarksmanager.h   |  4 +---
 2 files changed, 12 insertions(+), 22 deletions(-)

diff --git a/src/bookmarks/bookmarksmanager.cpp b/src/bookmarks/bookmarksmanager.cpp
index 396d5bdc..4b4e127a 100644
--- a/src/bookmarks/bookmarksmanager.cpp
+++ b/src/bookmarks/bookmarksmanager.cpp
@@ -142,9 +142,6 @@ BookmarkMenu::BookmarkMenu(KBookmarkManager *manager,
                            KActionCollection* actionCollection)
         : KBookmarkMenu(manager, owner, menu, actionCollection)
 {
-    KAction *a = KStandardAction::addBookmark(this, SLOT(slotAddBookmark()), this);
-    actionCollection->addAction(QL1S("rekonq_add_bookmark"), a);
-
     refill();
 }
 
@@ -174,22 +171,6 @@ KMenu * BookmarkMenu::contextMenu(QAction *act)
 }
 
 
-void BookmarkMenu::slotAddBookmark()
-{
-    KAction *action = qobject_cast<KAction *>(sender());
-    if (action && !action->data().isNull())
-    {
-        KBookmarkGroup parentBookmark = manager()->findByAddress(parentAddress()).toGroup();
-        /// TODO Add bookmark Icon
-        parentBookmark.addBookmark(owner()->currentTitle(), action->data().toUrl());
-        manager()->emitChanged();
-        return;
-    }
-
-    KBookmarkMenu::slotAddBookmark();
-}
-
-
 QAction * BookmarkMenu::actionForBookmark(const KBookmark &bookmark)
 {
     if (bookmark.isGroup())
@@ -303,6 +284,9 @@ BookmarkProvider::BookmarkProvider(QObject *parent)
     m_owner = new BookmarkOwner(this);
     connect(m_owner, SIGNAL(openUrl(const KUrl&, const Rekonq::OpenType &)), this, SIGNAL(openUrl(const KUrl&, const Rekonq::OpenType &)));
 
+    KAction *a = KStandardAction::addBookmark(this, SLOT(slotAddBookmark()), this);
+    m_actionCollection->addAction(QL1S("rekonq_add_bookmark"), a);
+
     kDebug() << "Loading Bookmarks Manager... DONE!";
 }
 
@@ -491,3 +475,11 @@ QString BookmarkProvider::titleForBookmarkUrl(const KBookmark &bookmark, QString
 
     return title;
 }
+
+
+void BookmarkProvider::slotAddBookmark()
+{
+    KBookmarkGroup parentBookmark = rootGroup();
+    parentBookmark.addBookmark(bookmarkOwner()->currentTitle(), bookmarkOwner()->currentUrl());
+    bookmarkManager()->emitChanged();
+}
diff --git a/src/bookmarks/bookmarksmanager.h b/src/bookmarks/bookmarksmanager.h
index 67e54be2..4be3a94b 100644
--- a/src/bookmarks/bookmarksmanager.h
+++ b/src/bookmarks/bookmarksmanager.h
@@ -160,9 +160,6 @@ protected:
     virtual void refill();
     virtual QAction* actionForBookmark(const KBookmark &bookmark);
 
-protected slots:
-    void slotAddBookmark();
-
 private:
     void addOpenFolderInTabs();
 
@@ -265,6 +262,7 @@ public slots:
 
 private slots:
     void triggerBookmarkMenu();
+    void slotAddBookmark();
     
 private:
     void fillBookmarkBar(KToolBar *toolBar);
-- 
cgit v1.2.1