diff options
Diffstat (limited to 'gtk')
-rw-r--r-- | gtk/scaffolding.c | 10 | ||||
-rw-r--r-- | gtk/search.c | 28 |
2 files changed, 15 insertions, 23 deletions
diff --git a/gtk/scaffolding.c b/gtk/scaffolding.c index 4097837a9..8f1f4447e 100644 --- a/gtk/scaffolding.c +++ b/gtk/scaffolding.c @@ -1423,7 +1423,7 @@ MULTIHANDLER(reload) return TRUE; /* clear potential search effects */ - browser_window_search_destroy_context(bw); + browser_window_search_clear(bw); nsgtk_search_set_forward_state(true, bw); nsgtk_search_set_back_state(true, bw); @@ -1442,7 +1442,7 @@ MULTIHANDLER(back) return TRUE; /* clear potential search effects */ - browser_window_search_destroy_context(bw); + browser_window_search_clear(bw); nsgtk_search_set_forward_state(true, bw); nsgtk_search_set_back_state(true, bw); @@ -1462,7 +1462,7 @@ MULTIHANDLER(forward) return TRUE; /* clear potential search effects */ - browser_window_search_destroy_context(bw); + browser_window_search_clear(bw); nsgtk_search_set_forward_state(true, bw); nsgtk_search_set_back_state(true, bw); @@ -2431,7 +2431,7 @@ void nsgtk_scaffolding_toggle_search_bar_visibility(nsgtk_scaffolding *g) g_object_get(G_OBJECT(g->search->bar), "visible", &vis, NULL); if (vis) { if (bw != NULL) - browser_window_search_destroy_context(bw); + browser_window_search_clear(bw); nsgtk_search_set_forward_state(true, bw); nsgtk_search_set_back_state(true, bw); gtk_widget_hide(GTK_WIDGET(g->search->bar)); @@ -2468,7 +2468,7 @@ void nsgtk_scaffolding_set_top_level(struct gui_window *gw) nsgtk_window_update_back_forward(sc); /* clear effects of potential searches */ - browser_window_search_destroy_context(bw); + browser_window_search_clear(bw); nsgtk_search_set_forward_state(true, bw); nsgtk_search_set_back_state(true, bw); diff --git a/gtk/search.c b/gtk/search.c index 37b7397c4..3d6bba05d 100644 --- a/gtk/search.c +++ b/gtk/search.c @@ -70,10 +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 (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)); + + browser_window_search(bw, &nsgtk_search_callbacks, (void *)bw, flags, + gtk_entry_get_text(nsgtk_scaffolding_search(g)->entry)); return TRUE; } @@ -94,10 +93,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 (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)); + + browser_window_search(bw, &nsgtk_search_callbacks, (void *)bw, flags, + gtk_entry_get_text(nsgtk_scaffolding_search(g)->entry)); return TRUE; } @@ -120,8 +118,6 @@ gboolean nsgtk_search_entry_changed(GtkWidget *widget, gpointer data) assert(bw != NULL); - browser_window_search_destroy_context(bw); - nsgtk_search_set_forward_state(true, (void *)bw); nsgtk_search_set_back_state(true, (void *)bw); @@ -133,10 +129,8 @@ gboolean nsgtk_search_entry_changed(GtkWidget *widget, gpointer data) nsgtk_scaffolding_search(g)->checkAll)) ? SEARCH_FLAG_SHOWALL : 0); - 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)); + browser_window_search(bw, &nsgtk_search_callbacks, (void *)bw, flags, + gtk_entry_get_text(nsgtk_scaffolding_search(g)->entry)); return TRUE; } @@ -158,10 +152,8 @@ gboolean nsgtk_search_entry_activate(GtkWidget *widget, gpointer data) nsgtk_scaffolding_search(g)->checkAll)) ? SEARCH_FLAG_SHOWALL : 0); - 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)); + browser_window_search(bw, &nsgtk_search_callbacks, (void *)bw, flags, + gtk_entry_get_text(nsgtk_scaffolding_search(g)->entry)); return FALSE; } |