aboutsummaryrefslogtreecommitdiffstats
path: root/embed/ephy-web-view.c
diff options
context:
space:
mode:
authorCarl van Tonder <carl@supervacuo.com>2009-12-09 00:14:52 +0800
committerXan Lopez <xan@gnome.org>2009-12-09 00:59:28 +0800
commitffe63b2868201600e3c0bf9f203de387c3616c40 (patch)
treede4ced06de2a2875d58fc2fef23cf52dc6260437 /embed/ephy-web-view.c
parent1acaa540531f9ed3b33f87e10f0817b8c8ffd988 (diff)
downloadgsoc2013-epiphany-ffe63b2868201600e3c0bf9f203de387c3616c40.tar
gsoc2013-epiphany-ffe63b2868201600e3c0bf9f203de387c3616c40.tar.gz
gsoc2013-epiphany-ffe63b2868201600e3c0bf9f203de387c3616c40.tar.bz2
gsoc2013-epiphany-ffe63b2868201600e3c0bf9f203de387c3616c40.tar.lz
gsoc2013-epiphany-ffe63b2868201600e3c0bf9f203de387c3616c40.tar.xz
gsoc2013-epiphany-ffe63b2868201600e3c0bf9f203de387c3616c40.tar.zst
gsoc2013-epiphany-ffe63b2868201600e3c0bf9f203de387c3616c40.zip
Add gconf key to control the search engine used in auto-search
Defaults to Google, like it used to. Bug #604087 Signed-off-by: Xan Lopez <xan@gnome.org>
Diffstat (limited to 'embed/ephy-web-view.c')
-rw-r--r--embed/ephy-web-view.c16
1 files changed, 14 insertions, 2 deletions
diff --git a/embed/ephy-web-view.c b/embed/ephy-web-view.c
index 09172b423..a0a7c3a33 100644
--- a/embed/ephy-web-view.c
+++ b/embed/ephy-web-view.c
@@ -36,6 +36,7 @@
#include "ephy-embed-single.h"
#include "ephy-embed-type-builtins.h"
#include "ephy-embed-utils.h"
+#include "ephy-prefs.h"
#include "ephy-marshal.h"
#include "ephy-permission-manager.h"
#include "ephy-favicon-cache.h"
@@ -1128,10 +1129,21 @@ normalize_or_autosearch_url (EphyWebView *view, const char *url)
if (soup_uri == NULL &&
priv->non_search_regex &&
!g_regex_match (priv->non_search_regex, url, 0, NULL)) {
- char *query_param = soup_form_encode ("q", url, NULL);
+ char *query_param, *url_search;
+
+ url_search = eel_gconf_get_string (CONF_URL_SEARCH);
+
+ if (url_search == NULL || url_search[0] == '\0') {
+ g_free (url_search);
+
+ url_search = g_strdup (_("http://www.google.com/search?q=%s&ie=UTF-8&oe=UTF-8"));
+ }
+
+ query_param = soup_form_encode ("q", url, NULL);
/* + 2 here is getting rid of 'q=' */
- effective_url = g_strdup_printf (_("http://www.google.com/search?q=%s&ie=UTF-8&oe=UTF-8"), query_param + 2);
+ effective_url = g_strdup_printf (url_search, query_param + 2);
g_free (query_param);
+ g_free (url_search);
} else
effective_url = ephy_embed_utils_normalize_address (url);