diff options
| author | Vincent Sanders <vince@kyllikki.org> | 2014-05-25 00:57:48 +0100 |
|---|---|---|
| committer | Vincent Sanders <vince@kyllikki.org> | 2014-05-25 01:01:59 +0100 |
| commit | a6d3ceae0ee7cee85020a70b716586425a042900 (patch) | |
| tree | 1177195f3f3ab1b38d7beb2ec5e412bc2170e4c2 /gtk/dialogs | |
| parent | fb5af8a1b612e210384a1a6a4f8d5ee5fafef054 (diff) | |
| download | netsurf-a6d3ceae0ee7cee85020a70b716586425a042900.tar.gz netsurf-a6d3ceae0ee7cee85020a70b716586425a042900.tar.bz2 | |
Completely re-write web search provider handling
Diffstat (limited to 'gtk/dialogs')
| -rw-r--r-- | gtk/dialogs/preferences.c | 26 |
1 files changed, 3 insertions, 23 deletions
diff --git a/gtk/dialogs/preferences.c b/gtk/dialogs/preferences.c index d36d0c68b..f5d92e361 100644 --- a/gtk/dialogs/preferences.c +++ b/gtk/dialogs/preferences.c @@ -18,6 +18,7 @@ #include <stdint.h> #include <math.h> +#include <string.h> #include "utils/utils.h" #include "utils/messages.h" @@ -923,8 +924,6 @@ TOGGLEBUTTON_SIGNALS(checkUrlSearch, search_url_bar) G_MODULE_EXPORT void nsgtk_preferences_comboSearch_changed(GtkComboBox *widget, struct ppref *priv) { - nsgtk_scaffolding *current = scaf_list; - char *name; int provider; provider = gtk_combo_box_get_active(widget); @@ -932,27 +931,8 @@ nsgtk_preferences_comboSearch_changed(GtkComboBox *widget, struct ppref *priv) /* set the option */ nsoption_set_int(search_provider, provider); - /* refresh web search prefs from file */ - search_web_provider_details(provider); - - /* retrieve ico */ - search_web_retrieve_ico(false); - - /* callback may handle changing gui */ - gui_set_search_ico(search_web_ico()); - - /* set entry */ - name = search_web_provider_name(); - if (name != NULL) { - char content[strlen(name) + SLEN("Search ") + 1]; - - sprintf(content, "Search %s", name); - free(name); - while (current) { - nsgtk_scaffolding_set_websearch(current, content); - current = nsgtk_scaffolding_iterate(current); - } - } + /* set search provider */ + search_web_select_provider(provider); } G_MODULE_EXPORT void |