diff options
author | Michael Drake <tlsa@netsurf-browser.org> | 2012-10-11 11:20:02 +0100 |
---|---|---|
committer | Michael Drake <tlsa@netsurf-browser.org> | 2012-10-11 11:20:02 +0100 |
commit | d9e7d5810678c1470808c3de63f7bde412b3d17b (patch) | |
tree | 68d47410cb177d0125127ac186c2a05127b82097 /amiga | |
parent | 5a5eab9a1ea7bf6dd79420668c2c0df1a3ea88f5 (diff) | |
download | netsurf-d9e7d5810678c1470808c3de63f7bde412b3d17b.tar.gz netsurf-d9e7d5810678c1470808c3de63f7bde412b3d17b.tar.bz2 |
Fix up ripples from urldb change.
Diffstat (limited to 'amiga')
-rwxr-xr-x | amiga/login.c | 18 | ||||
-rw-r--r-- | amiga/sslcert.c | 2 | ||||
-rw-r--r-- | amiga/stringview/urlhistory.c | 8 | ||||
-rwxr-xr-x | amiga/thumbnail.c | 2 |
4 files changed, 16 insertions, 14 deletions
diff --git a/amiga/login.c b/amiga/login.c index 496898113..35115bc2a 100755 --- a/amiga/login.c +++ b/amiga/login.c @@ -48,23 +48,24 @@ struct gui_login_window { Object *objects[GID_LAST]; nserror (*cb)(bool proceed, void *pw); void *cbpw; - char *url; + nsurl *url; char *realm; - char *host; + lwc_string *host; char uname[256]; char pwd[256]; }; -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) { const char *auth; struct gui_login_window *lw = AllocVec(sizeof(struct gui_login_window),MEMF_PRIVATE | MEMF_CLEAR); - char *host; + lwc_string *host = nsurl_get_component(url, NSURL_HOST); + + assert(host != NULL); - url_host(url, &host); lw->host = host; - lw->url = (char *)url; + lw->url = nsurl_ref(url); lw->realm = (char *)realm; lw->cb = cb; lw->cbpw = cbpw; @@ -105,7 +106,7 @@ void gui_401login_open(const char *url, const char *realm, WINDOW_Position, WPOS_CENTERSCREEN, WINDOW_ParentGroup, lw->objects[GID_MAIN] = VGroupObject, LAYOUT_AddChild, StringObject, - STRINGA_TextVal,lw->host, + STRINGA_TextVal,lw->lwc_string_data(host), GA_ReadOnly,TRUE, StringEnd, CHILD_Label, LabelObject, @@ -171,7 +172,8 @@ void ami_401login_close(struct gui_login_window *lw) lw->cb(false, lw->cbpw); DisposeObject(lw->objects[OID_MAIN]); - free(lw->host); + lwc_string_unref(lw->host); + nsurl_unref(lw->url); DelObject(lw->node); } diff --git a/amiga/sslcert.c b/amiga/sslcert.c index 8eede70f2..dcf9a6d7d 100644 --- a/amiga/sslcert.c +++ b/amiga/sslcert.c @@ -20,7 +20,7 @@ #include "amiga/tree.h" #include "amiga/sslcert.h" -void gui_cert_verify(const char *url, +void gui_cert_verify(nsurl *url, const struct ssl_cert_info *certs, unsigned long num, nserror (*cb)(bool proceed, void *pw), void *cbpw) { diff --git a/amiga/stringview/urlhistory.c b/amiga/stringview/urlhistory.c index af9c35b13..ec56987f9 100644 --- a/amiga/stringview/urlhistory.c +++ b/amiga/stringview/urlhistory.c @@ -69,7 +69,7 @@ struct List * URLHistory_GetList( void ) return &PageList; } -static bool URLHistoryFound(const char *url, const struct url_data *data) +static bool URLHistoryFound(nsurl *url, const struct url_data *data) { struct Node *node; @@ -77,16 +77,16 @@ static bool URLHistoryFound(const char *url, const struct url_data *data) if(data->visits <= 0) return true; /* skip this URL if it is already in the list */ - if(URLHistory_FindPage(url)) return true; + if(URLHistory_FindPage(nsurl_access(url))) return true; node = AllocVec( sizeof( struct Node ), MEMF_SHARED|MEMF_CLEAR ); if ( node ) { - STRPTR urladd = (STRPTR) AllocVec( strlen ( url ) + 1, MEMF_SHARED|MEMF_CLEAR ); + STRPTR urladd = (STRPTR) AllocVec( strlen ( nsurl_access(url) ) + 1, MEMF_SHARED|MEMF_CLEAR ); if ( urladd ) { - strcpy(urladd, url); + strcpy(urladd, nsurl_access(url)); node->ln_Name = urladd; AddTail( &PageList, node ); } diff --git a/amiga/thumbnail.c b/amiga/thumbnail.c index 08ab90a95..f1738d29d 100755 --- a/amiga/thumbnail.c +++ b/amiga/thumbnail.c @@ -37,7 +37,7 @@ #include <sys/param.h> bool thumbnail_create(hlcache_handle *content, struct bitmap *bitmap, - const char *url) + nsurl *url) { struct BitScaleArgs bsa; int plot_width; |