mirrors/netsurf
1
0
Fork 0
mirror of https://github.com/netsurf-browser/netsurf synced 2024-11-27 08:50:02 +03:00
Code Issues Packages Projects Releases Wiki Activity

Remove search init function.

Browse Source 
svn path=/trunk/netsurf/; revision=13391
This commit is contained in:
Michael Drake 2012-01-06 23:42:22 +00:00
parent 24b7ae1bf4
commit 31f221e84f
1 changed files with 9 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
gtk/search.c
View File

@ -42,7 +42,6 @@
#include "utils/messages.h"
#include "utils/utils.h"
static void nsgtk_search_init(struct gtk_scaffolding *g);
static void nsgtk_search_set_status(bool found, void *p);
static void nsgtk_search_set_hourglass(bool active, void *p);
static void nsgtk_search_add_recent(const char *string, void *p);
@ -62,7 +61,9 @@ gboolean nsgtk_search_forward_button_clicked(GtkWidget *widget, gpointer data)
struct gtk_scaffolding *g = (struct gtk_scaffolding *)data;
struct browser_window *bw = nsgtk_get_browser_window(
nsgtk_scaffolding_top_level(g));
nsgtk_search_init(g);
assert(bw);
search_flags_t flags = SEARCH_FLAG_FORWARDS |
(gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(
nsgtk_scaffolding_search(g)->caseSens)) ?
@ -84,7 +85,9 @@ gboolean nsgtk_search_back_button_clicked(GtkWidget *widget, gpointer data)
struct gtk_scaffolding *g = (struct gtk_scaffolding *)data;
struct browser_window *bw = nsgtk_get_browser_window(
nsgtk_scaffolding_top_level(g));
nsgtk_search_init(g);
assert(bw);
search_flags_t flags = 0 |(gtk_toggle_button_get_active(
GTK_TOGGLE_BUTTON(
nsgtk_scaffolding_search(g)->caseSens)) ?
@ -99,24 +102,6 @@ gboolean nsgtk_search_back_button_clicked(GtkWidget *widget, gpointer data)
return TRUE;
}
/** preparatory code when the search bar is made visible initially */
void nsgtk_search_init(struct gtk_scaffolding *g)
{
hlcache_handle *c;
assert(nsgtk_get_browser_window(nsgtk_scaffolding_top_level(g))
!= NULL);
c = nsgtk_get_browser_window(nsgtk_scaffolding_top_level(g))->
current_content;
if ((!c) || (content_get_type(c) != CONTENT_HTML &&
content_get_type(c) != CONTENT_TEXTPLAIN))
return;
}
/** connected to the search close button */
gboolean nsgtk_search_close_button_clicked(GtkWidget *widget, gpointer data)
@ -163,7 +148,9 @@ gboolean nsgtk_search_entry_activate(GtkWidget *widget, gpointer data)
nsgtk_scaffolding *g = (nsgtk_scaffolding *)data;
struct browser_window *bw = nsgtk_get_browser_window(
nsgtk_scaffolding_top_level(g));
nsgtk_search_init(g);
assert(bw);
search_flags_t flags = SEARCH_FLAG_FORWARDS |
(gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(
nsgtk_scaffolding_search(g)->caseSens)) ?