diff options
author | Michael Drake <tlsa@netsurf-browser.org> | 2011-09-05 13:28:17 +0000 |
---|---|---|
committer | Michael Drake <tlsa@netsurf-browser.org> | 2011-09-05 13:28:17 +0000 |
commit | 34fe2531f28b0871a77f629de8c3ee54fb5ad065 (patch) | |
tree | c654d5d88a89dd2602a14bd56b9eeab1ddd7f33a /gtk/search.c | |
parent | ce1ba5e351891c60f21106851965dee3eee78853 (diff) | |
download | netsurf-34fe2531f28b0871a77f629de8c3ee54fb5ad065.tar.gz netsurf-34fe2531f28b0871a77f629de8c3ee54fb5ad065.tar.bz2 |
Remove gui_window_get_browser_window from core. Remove unused implementations from front ends. Rename the GTK front end implementation to nsgtk_get_browser_window and change the GTK front end to use that.
svn path=/trunk/netsurf/; revision=12737
Diffstat (limited to 'gtk/search.c')
-rw-r--r-- | gtk/search.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/gtk/search.c b/gtk/search.c index 47857ef29..66acf3be8 100644 --- a/gtk/search.c +++ b/gtk/search.c @@ -60,7 +60,7 @@ static struct search_callbacks nsgtk_search_callbacks = { gboolean nsgtk_search_forward_button_clicked(GtkWidget *widget, gpointer data) { struct gtk_scaffolding *g = (struct gtk_scaffolding *)data; - struct browser_window *bw = gui_window_get_browser_window( + struct browser_window *bw = nsgtk_get_browser_window( nsgtk_scaffolding_top_level(g)); nsgtk_search_init(g); search_flags_t flags = SEARCH_FLAG_FORWARDS | @@ -82,7 +82,7 @@ gboolean nsgtk_search_forward_button_clicked(GtkWidget *widget, gpointer data) gboolean nsgtk_search_back_button_clicked(GtkWidget *widget, gpointer data) { struct gtk_scaffolding *g = (struct gtk_scaffolding *)data; - struct browser_window *bw = gui_window_get_browser_window( + struct browser_window *bw = nsgtk_get_browser_window( nsgtk_scaffolding_top_level(g)); nsgtk_search_init(g); search_flags_t flags = 0 |(gtk_toggle_button_get_active( @@ -105,10 +105,10 @@ void nsgtk_search_init(struct gtk_scaffolding *g) { hlcache_handle *c; - assert(gui_window_get_browser_window(nsgtk_scaffolding_top_level(g)) + assert(nsgtk_get_browser_window(nsgtk_scaffolding_top_level(g)) != NULL); - c = gui_window_get_browser_window(nsgtk_scaffolding_top_level(g))-> + c = nsgtk_get_browser_window(nsgtk_scaffolding_top_level(g))-> current_content; if ((!c) || (content_get_type(c) != CONTENT_HTML && @@ -131,7 +131,7 @@ gboolean nsgtk_search_close_button_clicked(GtkWidget *widget, gpointer data) gboolean nsgtk_search_entry_changed(GtkWidget *widget, gpointer data) { nsgtk_scaffolding *g = (nsgtk_scaffolding *)data; - struct browser_window *bw = gui_window_get_browser_window( + struct browser_window *bw = nsgtk_get_browser_window( nsgtk_scaffolding_top_level(g)); if (bw != NULL) @@ -147,7 +147,7 @@ gboolean nsgtk_search_entry_changed(GtkWidget *widget, gpointer data) gboolean nsgtk_search_entry_activate(GtkWidget *widget, gpointer data) { nsgtk_scaffolding *g = (nsgtk_scaffolding *)data; - struct browser_window *bw = gui_window_get_browser_window( + struct browser_window *bw = nsgtk_get_browser_window( nsgtk_scaffolding_top_level(g)); nsgtk_search_init(g); search_flags_t flags = SEARCH_FLAG_FORWARDS | @@ -183,7 +183,7 @@ gboolean nsgtk_websearch_activate(GtkWidget *widget, gpointer data) { struct gtk_scaffolding *g = (struct gtk_scaffolding *)data; temp_open_background = 0; - search_web_new_window(gui_window_get_browser_window( + search_web_new_window(nsgtk_get_browser_window( nsgtk_scaffolding_top_level(g)), (char *)gtk_entry_get_text(GTK_ENTRY( nsgtk_scaffolding_websearch(g)))); |