From 5c049a00fd9c799ea332436267ba1b85bc08fa1e Mon Sep 17 00:00:00 2001
From: megabigbug <megabigbug@arrakis.(none)>
Date: Sun, 15 Aug 2010 08:37:16 +0200
Subject: wait signal

---
 src/application.cpp | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

(limited to 'src/application.cpp')

diff --git a/src/application.cpp b/src/application.cpp
index 8a24014d..231b45b7 100644
--- a/src/application.cpp
+++ b/src/application.cpp
@@ -42,6 +42,7 @@
 #include "urlbar.h"
 #include "sessionmanager.h"
 #include "adblockmanager.h"
+#include "search/opensearchmanager.h"
 #include "webview.h"
 #include "filterurljob.h"
 #include "tabbar.h"
@@ -64,6 +65,7 @@ QWeakPointer<HistoryManager> Application::s_historyManager;
 QWeakPointer<BookmarkProvider> Application::s_bookmarkProvider;
 QWeakPointer<SessionManager> Application::s_sessionManager;
 QWeakPointer<AdBlockManager> Application::s_adblockManager;
+QWeakPointer<OpenSearchManager> Application::s_opensearchManager;
 
 
 Application::Application()
@@ -98,6 +100,9 @@ Application::~Application()
 
     delete s_adblockManager.data();
     s_adblockManager.clear();
+    
+    delete s_opensearchManager.data();
+    s_opensearchManager.clear();
 }
 
 
@@ -315,6 +320,16 @@ SessionManager *Application::sessionManager()
 }
 
 
+OpenSearchManager *Application::opensearchManager()
+{
+    if (s_opensearchManager.isNull())
+    {
+        s_opensearchManager = new OpenSearchManager(instance());
+    }
+    return s_opensearchManager.data();
+}
+
+
 KIcon Application::icon(const KUrl &url)
 {
     // avoid infinite loop at startup
-- 
cgit v1.2.1


From 20879867364e31cdd8e80d0f732cf03b140e28ea Mon Sep 17 00:00:00 2001
From: megabigbug <megabigbug@arrakis.(none)>
Date: Sun, 15 Aug 2010 16:19:10 +0200
Subject: working opensearch suggestions

---
 src/application.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'src/application.cpp')

diff --git a/src/application.cpp b/src/application.cpp
index 231b45b7..bfe67f45 100644
--- a/src/application.cpp
+++ b/src/application.cpp
@@ -42,7 +42,7 @@
 #include "urlbar.h"
 #include "sessionmanager.h"
 #include "adblockmanager.h"
-#include "search/opensearchmanager.h"
+#include "opensearchmanager.h"
 #include "webview.h"
 #include "filterurljob.h"
 #include "tabbar.h"
@@ -325,6 +325,7 @@ OpenSearchManager *Application::opensearchManager()
     if (s_opensearchManager.isNull())
     {
         s_opensearchManager = new OpenSearchManager(instance());
+        s_opensearchManager.data()->setSearchProvider("google"); //TODO: use other suggestion engines
     }
     return s_opensearchManager.data();
 }
-- 
cgit v1.2.1