Fix up ripples from urldb change.

4 files changed, 21 insertions, 17 deletions

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));

diff --git a/atari/login.c b/atari/login.c
index 2dc766f56..ddcfeba43 100755
--- a/atari/login.c
+++ b/atari/login.c
@@ -42,7 +42,7 @@
 
 extern void * h_gem_rsrc;
 
-bool login_form_do( char * url, char * realm, char ** out )
+bool login_form_do( nsurl * url, char * realm, char ** out )
 {
 	OBJECT *tree, *newtree;
 	WINDOW * form;
@@ -51,19 +51,21 @@ bool login_form_do( char * url, char * realm, char ** out )
 	bool bres = false;
 	int res = 0;
 	const char * auth;
-	char * host;
-	assert( url_host( url, &host) == URL_FUNC_OK );	
+	lwc_string * host = nsurl_get_component(url, NSURL_HOST);
+	assert(host != NULL);	
 
 	if( realm == NULL ){
 		realm = (char*)"Secure Area";
 	}
 
-	int len = strlen(realm) + strlen(host) + 4;
+	int len = strlen(realm) + lwc_string_length(host) + 4;
 	char * title = malloc( len );
 	strncpy(title, realm, len );
 	strncpy(title, ": ", len-strlen(realm) );
-	strncat(title, host, len-strlen(realm)+2 );
-  	
+	strncat(title, lwc_string_data(host), len-strlen(realm)+2 );
+
+	lwc_string_unref(host);
+
 	auth = urldb_get_auth_details(url, realm);
 	user[0] = 0;
 	pass[0] = 0;
diff --git a/atari/login.h b/atari/login.h
index 52a4832c9..345f91df3 100755
--- a/atari/login.h
+++ b/atari/login.h
@@ -19,6 +19,8 @@
 #ifndef NS_LOGIN_H_INCLUDED

 #define NS_LOGIN_H_INCLUDED

 

-bool login_form_do( char * host, char * realm, char **cbpw );

+#include "utils/nsurl.h"

+

+bool login_form_do( nsurl * host, char * realm, char **cbpw );

 

 #endif 

diff --git a/atari/thumbnail.c b/atari/thumbnail.c
index ff1c09eed..4783103bd 100755
--- a/atari/thumbnail.c
+++ b/atari/thumbnail.c
@@ -19,7 +19,7 @@
 #include "desktop/thumbnail.h"
 
 bool thumbnail_create(struct hlcache_handle *content, struct bitmap *bitmap,
-	const char *url)
+	nsurl *url)
 {
     return false;
 }