diff options
| author | Yoann Laissus <yoann.laissus@gmail.com> | 2011-05-18 08:31:45 +0200 |
|---|---|---|
| committer | Yoann Laissus <yoann.laissus@gmail.com> | 2011-05-18 08:31:45 +0200 |
| commit | a68121bea99215c1cbaff6a5d4f5e624a1942be1 (patch) | |
| tree | ed45548aea5a25072967ee28111b5961bf79145c /src/bookmarks/bookmarkstoolbar.cpp | |
| parent | connects tabMoved signal of TabBar to tabsChanged signal of MainView, (diff) | |
| parent | Add "comment" bookmark field in the bookmark panel (diff) | |
| download | rekonq-a68121bea99215c1cbaff6a5d4f5e624a1942be1.tar.xz | |
Merge branch 'bkFolder'
Diffstat (limited to 'src/bookmarks/bookmarkstoolbar.cpp')
| -rw-r--r-- | src/bookmarks/bookmarkstoolbar.cpp | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/src/bookmarks/bookmarkstoolbar.cpp b/src/bookmarks/bookmarkstoolbar.cpp index 57d56fff..1f1e38c3 100644 --- a/src/bookmarks/bookmarkstoolbar.cpp +++ b/src/bookmarks/bookmarkstoolbar.cpp @@ -189,13 +189,18 @@ KToolBar* BookmarkToolBar::toolBar() void BookmarkToolBar::contextMenu(const QPoint &point) { KBookmarkActionInterface *action = dynamic_cast<KBookmarkActionInterface*>(toolBar()->actionAt(point)); - KBookmark bookmark; + KBookmark bookmark = rApp->bookmarkProvider()->bookmarkManager()->toolbar(); + bool nullAction = true; if (action) + { bookmark = action->bookmark(); + nullAction = false; + } BookmarksContextMenu menu(bookmark, rApp->bookmarkProvider()->bookmarkManager(), - rApp->bookmarkProvider()->bookmarkOwner()); + rApp->bookmarkProvider()->bookmarkOwner(), + nullAction); menu.exec(toolBar()->mapToGlobal(point)); } |