summaryrefslogtreecommitdiff
path: root/gtk/search.c
diff options
context:
space:
mode:
authorMichael Drake <tlsa@netsurf-browser.org>2011-08-24 12:31:27 +0000
committerMichael Drake <tlsa@netsurf-browser.org>2011-08-24 12:31:27 +0000
commit48917cbb824218bedce1c09b9a361a4c5450d357 (patch)
tree3ee07f43551c2a582efa109931ff15cb4580760c /gtk/search.c
parent63c07ee28d890c4afd83233bb055d482b92162c9 (diff)
downloadnetsurf-48917cbb824218bedce1c09b9a361a4c5450d357.tar.gz
netsurf-48917cbb824218bedce1c09b9a361a4c5450d357.tar.bz2
GTK changes for core search update (r12646).
svn path=/trunk/netsurf/; revision=12647
Diffstat (limited to 'gtk/search.c')
-rw-r--r--gtk/search.c22
1 files changed, 14 insertions, 8 deletions
diff --git a/gtk/search.c b/gtk/search.c
index b4127eefb..47857ef29 100644
--- a/gtk/search.c
+++ b/gtk/search.c
@@ -70,8 +70,9 @@ gboolean nsgtk_search_forward_button_clicked(GtkWidget *widget, gpointer data)
(gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(
nsgtk_scaffolding_search(g)->checkAll)) ?
SEARCH_FLAG_SHOWALL : 0);
- if (search_verify_new(bw, &nsgtk_search_callbacks, (void *)bw))
- search_step(bw->search_context, flags, gtk_entry_get_text(
+ if (browser_window_search_verify_new(bw, &nsgtk_search_callbacks,
+ (void *)bw))
+ browser_window_search_step(bw, flags, gtk_entry_get_text(
nsgtk_scaffolding_search(g)->entry));
return TRUE;
}
@@ -91,8 +92,9 @@ gboolean nsgtk_search_back_button_clicked(GtkWidget *widget, gpointer data)
(gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(
nsgtk_scaffolding_search(g)->checkAll)) ?
SEARCH_FLAG_SHOWALL : 0);
- if (search_verify_new(bw, &nsgtk_search_callbacks, (void *)bw))
- search_step(bw->search_context, flags, gtk_entry_get_text(
+ if (browser_window_search_verify_new(bw, &nsgtk_search_callbacks,
+ (void *)bw))
+ browser_window_search_step(bw, flags, gtk_entry_get_text(
nsgtk_scaffolding_search(g)->entry));
return TRUE;
}
@@ -131,8 +133,10 @@ gboolean nsgtk_search_entry_changed(GtkWidget *widget, gpointer data)
nsgtk_scaffolding *g = (nsgtk_scaffolding *)data;
struct browser_window *bw = gui_window_get_browser_window(
nsgtk_scaffolding_top_level(g));
- if ((bw != NULL) && (bw->search_context != NULL))
- search_destroy_context(bw->search_context);
+
+ if (bw != NULL)
+ browser_window_search_destroy_context(bw);
+
nsgtk_search_set_forward_state(true, (void *)bw);
nsgtk_search_set_back_state(true, (void *)bw);
return TRUE;
@@ -153,8 +157,10 @@ gboolean nsgtk_search_entry_activate(GtkWidget *widget, gpointer data)
(gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(
nsgtk_scaffolding_search(g)->checkAll)) ?
SEARCH_FLAG_SHOWALL : 0);
- if (search_verify_new(bw, &nsgtk_search_callbacks, (void *)bw))
- search_step(bw->search_context, flags, gtk_entry_get_text(
+
+ if (browser_window_search_verify_new(bw, &nsgtk_search_callbacks,
+ (void *)bw))
+ browser_window_search_step(bw, flags, gtk_entry_get_text(
nsgtk_scaffolding_search(g)->entry));
return FALSE;
}