summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--gtk/gtk_gui.c7
-rw-r--r--render/html_redraw.c6
2 files changed, 7 insertions, 6 deletions
diff --git a/gtk/gtk_gui.c b/gtk/gtk_gui.c
index b5eaf767b..56fc29b77 100644
--- a/gtk/gtk_gui.c
+++ b/gtk/gtk_gui.c
@@ -56,11 +56,11 @@ void gui_init(int argc, char** argv)
options_read(buf);
if (!option_cookie_file) {
- snprintf(buf, sizeof buf, "%s/.netsurf/Cookies");
+ snprintf(buf, sizeof buf, "%s/.netsurf/Cookies", home);
option_cookie_file = strdup(buf);
}
if (!option_cookie_jar) {
- snprintf(buf, sizeof buf, "%s/.netsurf/Cookies");
+ snprintf(buf, sizeof buf, "%s/.netsurf/Cookies", home);
option_cookie_jar = strdup(buf);
}
if (!option_cookie_file || !option_cookie_jar)
@@ -189,7 +189,8 @@ void gui_launch_url(const char *url)
}
-bool gui_search_term_highlighted(struct gui_window *g, struct box *box,
+bool gui_search_term_highlighted(struct gui_window *g,
+ unsigned start_offset, unsigned end_offset,
unsigned *start_idx, unsigned *end_idx)
{
return false;
diff --git a/render/html_redraw.c b/render/html_redraw.c
index 820a56213..594ccdf61 100644
--- a/render/html_redraw.c
+++ b/render/html_redraw.c
@@ -36,7 +36,7 @@ static bool html_redraw_text_box(struct box *box, int x, int y,
int x0, int y0, int x1, int y1,
float scale, colour current_background_color);
static bool html_redraw_caret(struct caret *caret,
- os_colour current_background_color, float scale);
+ colour current_background_color, float scale);
static bool html_redraw_borders(struct box *box, int x_parent, int y_parent,
int padding_width, int padding_height, float scale);
static bool html_redraw_border_plot(int i, int *p, colour c,
@@ -562,10 +562,10 @@ bool text_redraw(const char *utf8_text, size_t utf8_len,
* \return true iff successful and redraw should proceed
*/
-bool html_redraw_caret(struct caret *c, os_colour current_background_color,
+bool html_redraw_caret(struct caret *c, colour current_background_color,
float scale)
{
- os_colour caret_color = 0x808080; /* todo - choose a proper colour */
+ colour caret_color = 0x808080; /* todo - choose a proper colour */
int xc = c->x, y = c->y;
int h = c->height - 1;
int w = (h + 7) / 8;