summaryrefslogtreecommitdiff
path: root/render/html_redraw.c
diff options
context:
space:
mode:
authorJohn Mark Bell <jmb@netsurf-browser.org>2009-12-17 23:55:02 +0000
committerJohn Mark Bell <jmb@netsurf-browser.org>2009-12-17 23:55:02 +0000
commit355799ce0bbb078237dfc1ae9874bbc5342acbc4 (patch)
tree7ca980c01c0d4d1d55a3b7b15418c95c5618afae /render/html_redraw.c
parent4346b2b62b940182575e6612e46234355afa083c (diff)
downloadnetsurf-355799ce0bbb078237dfc1ae9874bbc5342acbc4.tar.gz
netsurf-355799ce0bbb078237dfc1ae9874bbc5342acbc4.tar.bz2
Merge branches/MarkieB/gtkmain to trunk.
svn path=/trunk/netsurf/; revision=9729
Diffstat (limited to 'render/html_redraw.c')
-rw-r--r--render/html_redraw.c9
1 files changed, 6 insertions, 3 deletions
diff --git a/render/html_redraw.c b/render/html_redraw.c
index becf99fe4..2a5154035 100644
--- a/render/html_redraw.c
+++ b/render/html_redraw.c
@@ -41,6 +41,7 @@
#include "desktop/textinput.h"
#include "desktop/options.h"
#include "desktop/print.h"
+#include "desktop/search.h"
#include "desktop/scroll.h"
#include "image/bitmap.h"
#include "render/box.h"
@@ -880,12 +881,14 @@ bool text_redraw(const char *utf8_text, size_t utf8_len,
}
/* what about the current search operation, if any? */
- if (!highlighted && search_current_window ==
- current_redraw_browser->window &&
+ if (!highlighted && (current_redraw_browser->search_context
+ != NULL) &&
gui_search_term_highlighted(
current_redraw_browser->window,
offset, offset + len,
- &start_idx, &end_idx)) {
+ &start_idx, &end_idx,
+ current_redraw_browser->
+ search_context)) {
highlighted = true;
}