From 0609b26165cda7672b9416d94dbc161751fd6ac6 Mon Sep 17 00:00:00 2001
From: Andrea Diamantini <adjam7@gmail.com>
Date: Sat, 12 Sep 2009 23:09:08 +0200
Subject: notification system made default and no more "unsettable"

---
 src/mainwindow.cpp | 21 ++++-----------------
 src/rekonq.kcfg    |  3 ---
 2 files changed, 4 insertions(+), 20 deletions(-)

(limited to 'src')

diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index 8e7a1040..da51ac2a 100644
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -188,6 +188,10 @@ void MainWindow::setupToolbar()
 
 void MainWindow::postLaunch()
 {
+    // notification system
+    connect(m_view, SIGNAL(showStatusBarMessage(const QString&, Rekonq::Notify)), this, SLOT(notifyMessage(const QString&, Rekonq::Notify)));
+    connect(m_view, SIGNAL(linkHovered(const QString&)), this, SLOT(notifyMessage(const QString&)));
+
     // --------- connect signals and slots
     connect(m_view, SIGNAL(setCurrentTitle(const QString &)), this, SLOT(slotUpdateWindowTitle(const QString &)));
     connect(m_view, SIGNAL(printRequested(QWebFrame *)), this, SLOT(printRequested(QWebFrame *)));
@@ -424,23 +428,6 @@ void MainWindow::slotUpdateConfiguration()
     // ============== General ==================
     mainView()->showTabBar();
 
-    // "status bar" messages (new notifyMessage system)
-    if(ReKonfig::showUrlsPopup())
-    {
-        connect(m_view, SIGNAL(showStatusBarMessage(const QString&, Rekonq::Notify)),
-                    this, SLOT(notifyMessage(const QString&, Rekonq::Notify)));
-        connect(m_view, SIGNAL(linkHovered(const QString&)),
-                    this, SLOT(notifyMessage(const QString&)));
-    }
-    else
-    {
-        disconnect(m_view, SIGNAL(showStatusBarMessage(const QString&, Rekonq::Notify)),
-                    this, SLOT(notifyMessage(const QString&, Rekonq::Notify)));
-        disconnect(m_view, SIGNAL(linkHovered(const QString&)),
-                    this, SLOT(notifyMessage(const QString&)));
-    }
-
-
     // =========== Fonts ==============
     QWebSettings *defaultSettings = QWebSettings::globalSettings();
 
diff --git a/src/rekonq.kcfg b/src/rekonq.kcfg
index 2ac9b331..56f0b18c 100644
--- a/src/rekonq.kcfg
+++ b/src/rekonq.kcfg
@@ -32,9 +32,6 @@
     <entry name="openTabsBack" type="Bool">
         <default>false</default>
     </entry>
-    <entry name="showUrlsPopup" type="Bool">
-        <default>true</default>
-    </entry>
   </group>
 
 <!-- Fonts Settings -->
-- 
cgit v1.2.1