diff options
| author | cedlemo <cedlemo@gmx.com> | 2017-01-21 11:09:21 +0100 |
|---|---|---|
| committer | Michael Catanzaro <mcatanzaro@gnome.org> | 2017-01-25 21:28:56 -0600 |
| commit | 2829c4330285ddc50243aaabb3ab89971c540af9 (patch) | |
| tree | 1fb95d9952024a5a97f05134bb13c420e24e2f7b /embed/ephy-embed-utils.c | |
| parent | d351dc87b39252a5bd7bddb950855fb807f9b342 (diff) | |
| download | epiphany-2829c4330285ddc50243aaabb3ab89971c540af9.tar.gz | |
Implement search engine manager
https://bugzilla.gnome.org/show_bug.cgi?id=776738
Diffstat (limited to 'embed/ephy-embed-utils.c')
| -rw-r--r-- | embed/ephy-embed-utils.c | 25 |
1 files changed, 15 insertions, 10 deletions
diff --git a/embed/ephy-embed-utils.c b/embed/ephy-embed-utils.c index 90dcd9572..81bb4b9a1 100644 --- a/embed/ephy-embed-utils.c +++ b/embed/ephy-embed-utils.c @@ -29,10 +29,10 @@ #include "ephy-string.h" #include "ephy-view-source-handler.h" -#include <string.h> +#include <JavaScriptCore/JavaScript.h> #include <glib/gi18n.h> #include <libsoup/soup.h> -#include <JavaScriptCore/JavaScript.h> +#include <string.h> static GRegex *non_search_regex; static GRegex *domain_regex; @@ -230,15 +230,20 @@ ephy_embed_utils_normalize_address (const char *address) char * ephy_embed_utils_autosearch_address (const char *search_key) { - char *query_param, *url_search; + char *query_param; + const char *url_search; + char *default_name; char *effective_address; + EphyEmbedShell *shell; + EphySearchEngineManager *search_engine_manager; - url_search = g_settings_get_string (EPHY_SETTINGS_MAIN, - EPHY_PREFS_KEYWORD_SEARCH_URL); - if (url_search == NULL || url_search[0] == '\0') { - g_free (url_search); - url_search = g_strdup (_("https://duckduckgo.com/?q=%s&t=epiphany")); - } + shell = ephy_embed_shell_get_default (); + search_engine_manager = ephy_embed_shell_get_search_engine_manager (shell); + default_name = ephy_search_engine_manager_get_default_engine (search_engine_manager); + url_search = ephy_search_engine_manager_get_url (search_engine_manager, default_name); + + if (url_search == NULL || url_search[0] == '\0') + url_search = _("https://duckduckgo.com/?q=%s&t=epiphany"); query_param = soup_form_encode ("q", search_key, NULL); #pragma GCC diagnostic push @@ -248,7 +253,7 @@ ephy_embed_utils_autosearch_address (const char *search_key) effective_address = g_strdup_printf (url_search, query_param + 2); #pragma GCC diagnostic pop g_free (query_param); - g_free (url_search); + g_free (default_name); return effective_address; } |