Ticket #9926: 0001-Address-bar-searches-now-use-configured-search-strin.patch

File 0001-Address-bar-searches-now-use-configured-search-strin.patch, 1.9 KB (added by kevin, 11 years ago)

Changes kDefaultSearchPageURL to accept a query; result is used when searching via address bar.

  • src/apps/webpositive/BrowserWindow.cpp 

    From 2a76253265415f352ad7b80f8b7e837e3e89306c Mon Sep 17 00:00:00 2001
From: Kevin Harris <kevin@studiotectorum.com>
Date: Fri, 16 Aug 2013 14:53:01 -0500
Subject: [PATCH] Address bar searches now use configured search string with
 %s replacement.

---
 src/apps/webpositive/BrowserWindow.cpp |   13 ++++---------
 src/apps/webpositive/SettingsKeys.cpp  |    2 +-
 2 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/src/apps/webpositive/BrowserWindow.cpp b/src/apps/webpositive/BrowserWindow.cpp
index b833da0..235efe4 100644
    a b BrowserWindow::_VisitURL(const BString& url)  
    22612261void
    22622262BrowserWindow::_VisitSearchEngine(const BString& search)
    22632263{
    2264     // TODO: Google Code-In Task to make default search
    2265     //          engine modifiable from Settings? :)
    2266 
    2267     BString engine = "http://www.google.com/search?q=";
    2268     engine += _EncodeURIComponent(search);
    2269         // We have to take care of some of the escaping before
    2270         // we hand over the string to WebKit, if we want queries
    2271         // like "4+3" to not be searched as "4 3".
    2272 
     2264    BString engine = "";
     2265    engine.SetToFormat(fSearchPageURL,
     2266        _EncodeURIComponent(search).String());
     2267   
    22732268    _VisitURL(engine);
    22742269}
    22752270

  • src/apps/webpositive/SettingsKeys.cpp 

    diff --git a/src/apps/webpositive/SettingsKeys.cpp b/src/apps/webpositive/SettingsKeys.cpp
index 7d106d1..c724682 100644
    a b const char* kSettingsKeySearchPageURL = "search page url";  
    2323const char* kDefaultDownloadPath = "/boot/home/Desktop/";
    2424const char* kDefaultStartPageURL
    2525    = "file:///boot/home/config/settings/WebPositive/LoaderPages/Welcome";
    26 const char* kDefaultSearchPageURL = "http://www.google.com";
     26const char* kDefaultSearchPageURL = "http://www.google.com/search?q=%s";
    2727
    2828const char* kSettingsKeyUseProxy = "use http proxy";
    2929const char* kSettingsKeyProxyAddress = "http proxy address";