From 4adcb4277f40748973c8e38bc31ae99c6bb58eee Mon Sep 17 00:00:00 2001 From: Michael Drake Date: Wed, 24 Aug 2011 12:32:51 +0000 Subject: Atari changes for core search update (r12646). Note: untested. svn path=/trunk/netsurf/; revision=12649 --- atari/search.c | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) (limited to 'atari') diff --git a/atari/search.c b/atari/search.c index 668d7c76d..c3bc493bf 100644 --- a/atari/search.c +++ b/atari/search.c @@ -187,11 +187,8 @@ static void __CDECL evnt_bt_srch_click( WINDOW *win, int index, int unused, void search_flags_t flags = 0; ObjcChange( OC_FORM, win, index, ~SELECTED , TRUE); - if( s->bw->search_context == NULL || form_changed(win) ){ - if( s->bw->search_context != NULL ) { - search_destroy_context(s->bw->search_context); - s->bw->search_context = NULL; - } + if( form_changed(win) ){ + browser_window_search_destroy_context(s->bw); apply_form( win, &s->state ); } else { /* get search direction manually: */ @@ -200,8 +197,8 @@ static void __CDECL evnt_bt_srch_click( WINDOW *win, int index, int unused, void else s->state.flags &= (~SEARCH_FLAG_FORWARDS); } - if( search_verify_new(s->bw, &nsatari_search_callbacks, s) ){ - search_step(s->bw->search_context, s->state.flags, ObjcString( obj, SEARCH_TB_SRCH, NULL ) ); + if( browser_window_search_verify_new(s->bw, &nsatari_search_callbacks, s) ){ + browser_window_search_step(s->bw, s->state.flags, ObjcString( obj, SEARCH_TB_SRCH, NULL ) ); } } @@ -270,4 +267,4 @@ SEARCH_FORM_SESSION open_browser_search( struct gui_window * gw ) return( current ); -} \ No newline at end of file +} -- cgit v1.2.3