From d9e7d5810678c1470808c3de63f7bde412b3d17b Mon Sep 17 00:00:00 2001 From: Michael Drake Date: Thu, 11 Oct 2012 11:20:02 +0100 Subject: Fix up ripples from urldb change. --- monkey/401login.c | 6 +++--- monkey/cert.c | 4 ++-- monkey/thumbnail.c | 6 +++--- 3 files changed, 8 insertions(+), 8 deletions(-) (limited to 'monkey') diff --git a/monkey/401login.c b/monkey/401login.c index a079ef30d..b2bff3182 100644 --- a/monkey/401login.c +++ b/monkey/401login.c @@ -25,7 +25,7 @@ typedef struct monkey401 { struct monkey401 *r_next, *r_prev; uint32_t num; - char *host; /* Ignore */ + lwc_string *host; /* Ignore */ nserror (*cb)(bool,void*); void *pw; } monkey401_t; @@ -33,7 +33,7 @@ typedef struct monkey401 { static monkey401_t *m4_ring = NULL; static uint32_t m4_ctr = 0; -void gui_401login_open(const char *url, const char *realm, +void gui_401login_open(nsurl *url, const char *realm, nserror (*cb)(bool proceed, void *pw), void *cbpw) { monkey401_t *m4t = calloc(sizeof(*m4t), 1); @@ -46,7 +46,7 @@ void gui_401login_open(const char *url, const char *realm, RING_INSERT(m4_ring, m4t); fprintf(stdout, "401LOGIN OPEN M4 %u URL %s REALM %s\n", - m4t->num, url, realm); + m4t->num, nsurl_access(url), realm); } diff --git a/monkey/cert.c b/monkey/cert.c index 265a32678..d7f44d11e 100644 --- a/monkey/cert.c +++ b/monkey/cert.c @@ -34,7 +34,7 @@ static monkey_cert_t *cert_ring = NULL; static uint32_t cert_ctr = 0; void -gui_cert_verify(const char *url, const struct ssl_cert_info *certs, +gui_cert_verify(nsurl *url, const struct ssl_cert_info *certs, unsigned long num, nserror (*cb)(bool proceed, void *pw), void *cbpw) { @@ -48,7 +48,7 @@ gui_cert_verify(const char *url, const struct ssl_cert_info *certs, RING_INSERT(cert_ring, m4t); fprintf(stdout, "SSLCERT VERIFY CERT %u URL %s\n", - m4t->num, url); + m4t->num, nsurl_access(url)); } diff --git a/monkey/thumbnail.c b/monkey/thumbnail.c index 7a237bba6..334889510 100644 --- a/monkey/thumbnail.c +++ b/monkey/thumbnail.c @@ -20,12 +20,12 @@ #include "desktop/thumbnail.h" bool thumbnail_create(hlcache_handle *content, struct bitmap *bitmap, - const char *url) + nsurl *url) { struct gui_window *win = monkey_find_window_by_content(content); if (win == NULL) { - fprintf(stdout, "GENERIC THUMBNAIL URL %s\n", url); + fprintf(stdout, "GENERIC THUMBNAIL URL %s\n", nsurl_access(url)); } - fprintf(stdout, "WINDOW THUMBNAIL WIN %u URL %s\n", win->win_num, url); + fprintf(stdout, "WINDOW THUMBNAIL WIN %u URL %s\n", win->win_num, nsurl_access(url)); return false; } -- cgit v1.2.3