From 495517c6838b67bf9a18246f3b0fe85109a9fa3b Mon Sep 17 00:00:00 2001
From: Andrea Diamantini <adjam7@gmail.com>
Date: Mon, 5 Mar 2012 22:36:53 +0100
Subject: Fix toolbars rekonfig...

BUG:295245
---
 src/mainwindow.cpp | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'src')

diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index 0421136f..e954e7d3 100644
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -170,8 +170,6 @@ MainWindow::MainWindow()
     // no more status bar..
     setStatusBar(0);
 
-    setupBookmarksAndToolsShortcuts();
-
     // setting popup notification
     connect(rApp, SIGNAL(focusChanged(QWidget*,QWidget*)), m_popup, SLOT(hide()));
     m_popup->setAutoFillBackground(true);
@@ -249,6 +247,8 @@ void MainWindow::setupToolbars()
 
 void MainWindow::postLaunch()
 {
+    setupBookmarksAndToolsShortcuts();
+    
     // this just to fix reopening rekonq after fullscreen close
     KToolBar *mainBar = toolBar("mainToolBar");
     mainBar->show();  
@@ -1538,7 +1538,10 @@ void MainWindow::setupBookmarksAndToolsShortcuts()
 
         // HACK: set button widget in rekonq menu
         m_rekonqMenu->setButtonWidget(toolsButton);
+        return;
     }
+    
+    kWarning() << "oh oh, something went wrong with rekonq tools button...";
 }
 
 
-- 
cgit v1.2.1