diff options
| author | Michael Drake <tlsa@netsurf-browser.org> | 2011-08-24 12:31:27 +0000 |
|---|---|---|
| committer | Michael Drake <tlsa@netsurf-browser.org> | 2011-08-24 12:31:27 +0000 |
| commit | 48917cbb824218bedce1c09b9a361a4c5450d357 (patch) | |
| tree | 3ee07f43551c2a582efa109931ff15cb4580760c /gtk/scaffolding.c | |
| parent | 63c07ee28d890c4afd83233bb055d482b92162c9 (diff) | |
| download | netsurf-48917cbb824218bedce1c09b9a361a4c5450d357.tar.gz netsurf-48917cbb824218bedce1c09b9a361a4c5450d357.tar.bz2 | |
GTK changes for core search update (r12646).
svn path=/trunk/netsurf/; revision=12647
Diffstat (limited to 'gtk/scaffolding.c')
| -rw-r--r-- | gtk/scaffolding.c | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/gtk/scaffolding.c b/gtk/scaffolding.c index 81a96a70a..f6f1283d5 100644 --- a/gtk/scaffolding.c +++ b/gtk/scaffolding.c @@ -1297,8 +1297,8 @@ MULTIHANDLER(reload) return TRUE; /* clear potential search effects */ - if (bw->search_context != NULL) - search_destroy_context(bw->search_context); + browser_window_search_destroy_context(bw); + nsgtk_search_set_forward_state(true, bw); nsgtk_search_set_back_state(true, bw); @@ -1316,8 +1316,8 @@ MULTIHANDLER(back) return TRUE; /* clear potential search effects */ - if (bw->search_context != NULL) - search_destroy_context(bw->search_context); + browser_window_search_destroy_context(bw); + nsgtk_search_set_forward_state(true, bw); nsgtk_search_set_back_state(true, bw); @@ -1336,8 +1336,8 @@ MULTIHANDLER(forward) return TRUE; /* clear potential search effects */ - if (bw->search_context != NULL) - search_destroy_context(bw->search_context); + browser_window_search_destroy_context(bw); + nsgtk_search_set_forward_state(true, bw); nsgtk_search_set_back_state(true, bw); @@ -2223,8 +2223,8 @@ void nsgtk_scaffolding_toggle_search_bar_visibility(nsgtk_scaffolding *g) gui_window_get_browser_window(g->top_level); g_object_get(G_OBJECT(g->search->bar), "visible", &vis, NULL); if (vis) { - 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, bw); nsgtk_search_set_back_state(true, bw); gtk_widget_hide(GTK_WIDGET(g->search->bar)); @@ -2251,8 +2251,7 @@ void nsgtk_scaffolding_set_top_level (struct gui_window *gw) nsgtk_window_update_back_forward(nsgtk_get_scaffold(gw)); /* clear effects of potential searches */ - if (bw->search_context != NULL) - search_destroy_context(bw->search_context); + browser_window_search_destroy_context(bw); nsgtk_search_set_forward_state(true, bw); nsgtk_search_set_back_state(true, bw); |