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. --- atari/gui.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'atari/gui.c') diff --git a/atari/gui.c b/atari/gui.c index b780985dc..0b76d39ba 100755 --- a/atari/gui.c +++ b/atari/gui.c @@ -743,12 +743,12 @@ void gui_launch_url(const char *url) LOG(("launch file: %s\n", url)); } -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) { bool bres; char * out = NULL; - bres = login_form_do( (char*)url, (char*)realm, &out ); + bres = login_form_do( url, (char*)realm, &out ); if( bres ) { LOG(("url: %s, realm: %s, auth: %s\n", url, realm, out )); urldb_set_auth_details(url, realm, out ); @@ -760,7 +760,7 @@ void gui_401login_open(const char *url, const char *realm, cb(bres, cbpw); } -void gui_cert_verify(const char *url, const struct ssl_cert_info *certs, +void gui_cert_verify(nsurl *url, const struct ssl_cert_info *certs, unsigned long num, nserror (*cb)(bool proceed, void *pw), void *cbpw) { @@ -951,15 +951,15 @@ static void gui_init(int argc, char** argv) LOG(("Enabling core select menu")); nsoption_set_bool(core_select_menu, true); - + LOG(("Loading url.db from: %s", nsoption_charp(url_file) )); if( strlen(nsoption_charp(url_file)) ){ urldb_load(nsoption_charp(url_file)); - } - - if (nsoption_charp(cookie_file) == NULL ){ - nsoption_set_charp(cookie_file, (char*)"cookies"); - } + } + + if (nsoption_charp(cookie_file) == NULL ){ + nsoption_set_charp(cookie_file, (char*)"cookies"); + } LOG(("Loading cookies from: %s", nsoption_charp(cookie_file) )); if( strlen(nsoption_charp(cookie_file)) ){ urldb_load_cookies(nsoption_charp(cookie_file)); -- cgit v1.2.3