diff options
| author | Andrea Diamantini <adjam7@gmail.com> | 2010-11-07 22:33:11 +0100 |
|---|---|---|
| committer | Andrea Diamantini <adjam7@gmail.com> | 2010-11-07 22:33:11 +0100 |
| commit | 4bb3ca9452cb165d8ca8da5e3fc5bcfe1b9cfd1a (patch) | |
| tree | 151d078b89a94ea10142c0979db8306119ad6865 /src/bookmarks/bookmarkstoolbar.cpp | |
| parent | Let suggestions work also without search engines ones. (diff) | |
| parent | Bug when a bookmark contains a '&' fixed in some cases (diff) | |
| download | rekonq-4bb3ca9452cb165d8ca8da5e3fc5bcfe1b9cfd1a.tar.xz | |
Merge branch 'master' of git.kde.org:rekonq
Diffstat (limited to 'src/bookmarks/bookmarkstoolbar.cpp')
| -rw-r--r-- | src/bookmarks/bookmarkstoolbar.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/bookmarks/bookmarkstoolbar.cpp b/src/bookmarks/bookmarkstoolbar.cpp index 4449d926..ae5c9d6e 100644 --- a/src/bookmarks/bookmarkstoolbar.cpp +++ b/src/bookmarks/bookmarkstoolbar.cpp @@ -139,7 +139,7 @@ void BookmarkMenu::addOpenFolderInTabs() if (!bookmark.isNull()) { - parentMenu()->addAction(Application::bookmarkProvider()->bookmarkOwner()->action(group, BookmarkOwner::OPEN_FOLDER)); + parentMenu()->addAction(Application::bookmarkProvider()->bookmarkOwner()->createAction(group, BookmarkOwner::OPEN_FOLDER)); } } } @@ -169,6 +169,7 @@ BookmarkToolBar::BookmarkToolBar(KToolBar *toolBar, QObject *parent) connect(Application::bookmarkProvider()->bookmarkManager(), SIGNAL(changed(QString, QString)), this, SLOT(hideMenu())); toolBar->setAcceptDrops(true); toolBar->installEventFilter(this); + toolBar->setShortcutEnabled(false); if (toolBar->isVisible()) { |