From b2b6d198f7c478112452974536b69f117a42c9a1 Mon Sep 17 00:00:00 2001
From: nowrep <nowrep@gmail.com>
Date: Tue, 4 Feb 2014 00:25:09 +0100
Subject: [PATCH] [SearchEngines] Fixed issue with default engine when more
 engines have same name

---
 CHANGELOG                                  | 1 +
 src/lib/opensearch/searchenginesdialog.cpp | 4 ++--
 src/lib/opensearch/searchenginesmanager.h  | 3 ++-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index dc1c5edfe..f846f0d7f 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,7 @@
 Version 1.7.0
     * development version
     * added support for window.onload event
+    * added support for external.AddSearchProvider js function
 
 Version 1.6.1
     * released 26 January 2014
diff --git a/src/lib/opensearch/searchenginesdialog.cpp b/src/lib/opensearch/searchenginesdialog.cpp
index 19439f5fe..1e8a98032 100644
--- a/src/lib/opensearch/searchenginesdialog.cpp
+++ b/src/lib/opensearch/searchenginesdialog.cpp
@@ -215,12 +215,12 @@ void SearchEnginesDialog::moveDown()
 void SearchEnginesDialog::reloadEngines()
 {
     ui->treeWidget->clear();
-    const QString defaultEngineName = mApp->searchEnginesManager()->defaultEngine().name;
+    const SearchEngine defaultEngine = mApp->searchEnginesManager()->defaultEngine();
 
     foreach (const SearchEngine &en, m_manager->allEngines()) {
         QTreeWidgetItem* item = new QTreeWidgetItem();
         setEngine(item, en);
-        changeItemToDefault(item, en.name == defaultEngineName);
+        changeItemToDefault(item, en == defaultEngine);
         item->setIcon(0, en.icon);
         item->setText(1, en.shortcut);
 
diff --git a/src/lib/opensearch/searchenginesmanager.h b/src/lib/opensearch/searchenginesmanager.h
index 47efc6236..403fb7835 100644
--- a/src/lib/opensearch/searchenginesmanager.h
+++ b/src/lib/opensearch/searchenginesmanager.h
@@ -50,7 +50,8 @@ public:
         bool operator==(const Engine &other) const {
             return (this->name == other.name &&
                     this->url == other.url &&
-                    this->suggestionsUrl == other.suggestionsUrl);
+                    this->suggestionsUrl == other.suggestionsUrl &&
+                    this->shortcut == other.shortcut);
         }
     };