summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrea Diamantini <adjam7@gmail.com>2009-10-12 17:19:44 +0200
committerAndrea Diamantini <adjam7@gmail.com>2009-10-12 17:19:44 +0200
commit614d48172c1cecb58745f72dcb3c406c0c9a2669 (patch)
treeb7fe119903b88feae3de7463b556f9a8d80ac51a
parentuser check on resend form data (diff)
downloadrekonq-614d48172c1cecb58745f72dcb3c406c0c9a2669.tar.xz
fixing (hopefully, mostly depends on KDE code) problem with toolbars moving
after a crash and so on.
-rw-r--r--src/bookmarks.cpp2
-rw-r--r--src/mainwindow.cpp4
2 files changed, 3 insertions, 3 deletions
diff --git a/src/bookmarks.cpp b/src/bookmarks.cpp
index c08784e9..815b2f56 100644
--- a/src/bookmarks.cpp
+++ b/src/bookmarks.cpp
@@ -219,7 +219,7 @@ void BookmarkProvider::slotBookmarksChanged(const QString &group, const QString
if (toolBarGroup.isNull())
return;
- m_bookmarkToolBar->clear();
+ m_bookmarkToolBar->clear(); // FIXME CRASH
KBookmark bookmark = toolBarGroup.first();
while (!bookmark.isNull())
diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index 59b69a32..7601e80e 100644
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -95,8 +95,8 @@ MainWindow::MainWindow()
, m_findBar(new FindBar(this))
, m_sidePanel(0)
, m_historyBackMenu(0)
- , m_mainBar( new KToolBar( QString("MainToolBar"), this, Qt::TopToolBarArea, true, true, true) )
- , m_bmBar( new KToolBar( QString("BookmarkToolBar"), this, Qt::TopToolBarArea, true, true, true) )
+ , m_mainBar( new KToolBar( QString("MainToolBar"), this, Qt::TopToolBarArea, true, false, false) )
+ , m_bmBar( new KToolBar( QString("BookmarkToolBar"), this, Qt::TopToolBarArea, true, false, false) )
, m_ac( new KActionCollection(this) )
{
// enable window size "auto-save"