From ae1c295495659fb01874ae6af4d0b89a0a2424dc Mon Sep 17 00:00:00 2001
From: Andrea Diamantini <adjam7@gmail.com>
Date: Mon, 23 Apr 2012 00:34:19 +0200
Subject: Fix opensearch add shortcut handling

(at least on every site tested, but opensearch.org itself. Broken?)

BUG: 296707
---
 src/urlbar/urlbar.cpp            |  3 +--
 src/urlbar/webshortcutwidget.cpp |  9 ++++-----
 src/urlbar/webshortcutwidget.h   | 14 ++++++++++++--
 3 files changed, 17 insertions(+), 9 deletions(-)

(limited to 'src/urlbar')

diff --git a/src/urlbar/urlbar.cpp b/src/urlbar/urlbar.cpp
index b796224b..1a8410a3 100644
--- a/src/urlbar/urlbar.cpp
+++ b/src/urlbar/urlbar.cpp
@@ -136,8 +136,7 @@ UrlBar::UrlBar(QWidget *parent)
     connect(_tab->view(), SIGNAL(iconChanged()), this, SLOT(refreshFavicon()));
 
     // search icon
-    connect(rApp->opensearchManager(), SIGNAL(openSearchEngineAdded(QString,QString,QString)),
-            this, SLOT(updateRightIcons()));
+    connect(rApp->opensearchManager(), SIGNAL(openSearchEngineAdded(QString)), this, SLOT(updateRightIcons()));
 
     // bookmark icon
     connect(rApp->bookmarkManager(), SIGNAL(bookmarksUpdated()), this, SLOT(updateRightIcons()));
diff --git a/src/urlbar/webshortcutwidget.cpp b/src/urlbar/webshortcutwidget.cpp
index 409d0b32..c6dc3b79 100644
--- a/src/urlbar/webshortcutwidget.cpp
+++ b/src/urlbar/webshortcutwidget.cpp
@@ -4,6 +4,7 @@
 *
 * Copyright (C) 2009 by Fredy Yanardi <fyanardi@gmail.com>
 * Copyright (C) 2010-2011 by  Lionel Chauvin <megabigbug@yahoo.fr>
+* Copyright (C) 2012 by Andrea Diamantini <adjam7 at gmail dot com>
 *
 *
 * This program is free software; you can redistribute it and/or
@@ -27,7 +28,7 @@
 
 // Self Includes
 #include "webshortcutwidget.h"
-#include "rekonq_defines.h"
+#include "webshortcutwidget.moc"
 
 // KDE Includes
 #include <KGlobalSettings>
@@ -113,6 +114,8 @@ void WebShortcutWidget::show(const KUrl &url, const QString &openSearchName, con
 void WebShortcutWidget::accept()
 {
     emit webShortcutSet(m_url, m_nameLineEdit->text(), m_wsLineEdit->text());
+
+    // close widget (and destroy it)
     close();
 }
 
@@ -158,7 +161,3 @@ void WebShortcutWidget::shortcutsChanged(const QString& newShorthands)
         }
     }
 }
-
-#include "webshortcutwidget.moc"
-
-
diff --git a/src/urlbar/webshortcutwidget.h b/src/urlbar/webshortcutwidget.h
index bc072f47..d1291714 100644
--- a/src/urlbar/webshortcutwidget.h
+++ b/src/urlbar/webshortcutwidget.h
@@ -4,6 +4,7 @@
 *
 * Copyright (C) 2009 by Fredy Yanardi <fyanardi@gmail.com>
 * Copyright (C) 2010-2011 by  Lionel Chauvin <megabigbug@yahoo.fr>
+* Copyright (C) 2012 by Andrea Diamantini <adjam7 at gmail dot com>
 *
 *
 * This program is free software; you can redistribute it and/or
@@ -28,15 +29,24 @@
 #ifndef WEBSHORTCUTWIDGET_H
 #define WEBSHORTCUTWIDGET_H
 
-#include <QMenu>
+
+// Rekonq Includes
+#include "rekonq_defines.h"
+
+// KDE Includes
 #include <KUrl>
 #include <KService>
 
+// Qt Includes
+#include <QMenu>
+
+// Forward Declarations
 class QLabel;
 class QLineEdit;
 class QPushButton;
 
-class WebShortcutWidget : public QMenu
+
+class REKONQ_TESTS_EXPORT WebShortcutWidget : public QMenu
 {
     Q_OBJECT
 public:
-- 
cgit v1.2.1