summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Drake <tlsa@netsurf-browser.org>2011-08-24 12:33:15 +0000
committerMichael Drake <tlsa@netsurf-browser.org>2011-08-24 12:33:15 +0000
commitf3deebaa8edb37a7d8798f3ff6b0d64c2ad2053b (patch)
tree8f1c0e4e8b780d82b37e506a0a3b54af0fa3c4f9
parent4adcb4277f40748973c8e38bc31ae99c6bb58eee (diff)
downloadnetsurf-f3deebaa8edb37a7d8798f3ff6b0d64c2ad2053b.tar.gz
netsurf-f3deebaa8edb37a7d8798f3ff6b0d64c2ad2053b.tar.bz2
Amiga changes for core search update (r12646). Note: untested.
svn path=/trunk/netsurf/; revision=12650
-rwxr-xr-xamiga/search.c40
1 files changed, 14 insertions, 26 deletions
diff --git a/amiga/search.c b/amiga/search.c
index 5eb732210..9ac7c5a07 100755
--- a/amiga/search.c
+++ b/amiga/search.c
@@ -100,23 +100,15 @@ static struct search_callbacks ami_search_callbacks = {
*/
void ami_search_open(struct gui_window *gwin)
{
- struct hlcache_handle *c = gwin->shared->bw->current_content;
-
- /* only handle html/textplain contents */
- if ((!c) || (content_get_type(c) != CONTENT_HTML &&
- content_get_type(c) != CONTENT_TEXTPLAIN))
+ if (browser_window_search_create_context(gwin->shared->bw,
+ &ami_search_callbacks, NULL) == false)
return;
- if (gwin->shared->bw->search_context == NULL)
- search_create_context(gwin->shared->bw,
- &ami_search_callbacks, NULL);
search_insert = true;
if(fwin)
{
- if(fwin->gwin->shared->bw->search_context != NULL)
- search_destroy_context(fwin->gwin->shared->bw->
- search_context);
+ browser_window_search_destroy_context(fwin->gwin->shared->bw);
ami_search_set_forward_state(true, NULL);
ami_search_set_back_state(true, NULL);
fwin->gwin->shared->searchwin = NULL;
@@ -200,8 +192,7 @@ void ami_search_open(struct gui_window *gwin)
void ami_search_close(void)
{
- if (fwin->gwin->shared->bw->search_context != NULL)
- search_destroy_context(fwin->gwin->shared->bw->search_context);
+ browser_window_search_destroy_context(fwin->gwin->shared->bw);
ami_search_set_forward_state(true, NULL);
ami_search_set_back_state(true, NULL);
fwin->gwin->shared->searchwin = NULL;
@@ -229,10 +220,11 @@ BOOL ami_search_event(void)
search_insert = true;
flags = SEARCH_FLAG_FORWARDS |
ami_search_flags();
- if (search_verify_new(
+ if (browser_window_search_verify_new(
fwin->gwin->shared->bw,
&ami_search_callbacks, NULL))
- search_step(fwin->gwin->shared->bw->search_context,
+ browser_window_search_step(
+ fwin->gwin->shared->bw,
flags,
ami_search_string());
ActivateWindow(fwin->gwin->shared->win);
@@ -242,23 +234,19 @@ BOOL ami_search_event(void)
search_insert = true;
flags = ~SEARCH_FLAG_FORWARDS &
ami_search_flags();
- if (search_verify_new(
+ if (browser_window_search_verify_new(
fwin->gwin->shared->bw,
&ami_search_callbacks, NULL))
- search_step(fwin->gwin->shared->bw->search_context,
- flags,
- ami_search_string());
+ browser_window_search_step(
+ fwin->gwin->shared->bw,
+ flags,
+ ami_search_string());
ActivateWindow(fwin->gwin->shared->win);
break;
case GID_SEARCHSTRING:
- if (fwin->gwin->shared->
- bw->search_context
- != NULL)
- search_destroy_context(
- fwin->gwin->
- shared->bw->
- search_context);
+ browser_window_search_destroy_context(
+ fwin->gwin->shared->bw);
ami_search_set_forward_state(
true, NULL);
ami_search_set_back_state(