Patches in bugzilla

[Nelson Benítez <gnel cenobioracing com>]

Hi,
I've put two patches in bugzilla, one for a crash in gnomevfs-ls[1] and 
another to fix the "can not pass a @ in the user portion of an URI" [2]. 
I've put both patches in this email but better see the comments in the 
bugzilla pages as I've created a ftp account for people to test.


[1] http://bugzilla.gnome.org/show_bug.cgi?id=308231
[2] http://bugzilla.gnome.org/show_bug.cgi?id=89106

--- gnome-vfs/libgnomevfs/gnome-vfs-uri.c	2005-07-13 23:23:17.000000000 +0000
+++ gnome-vfs/libgnomevfs/gnome-vfs-uri.c	2005-07-13 23:31:07.000000000 +0000
@@ -344,7 +344,17 @@
 		*port_return = 0;
 		*password_return = NULL;
 		ret = NULL;
-	}
+	} else {
+		gchar *tmp;
+		tmp = g_strdup (*user_return);
+		g_free (*user_return);
+		*user_return = gnome_vfs_unescape_string(tmp,NULL);
+		g_free(tmp);
+		tmp = g_strdup (*password_return);
+		g_free (*password_return);
+		*password_return = gnome_vfs_unescape_string(tmp,NULL);
+		g_free(tmp);
+ 	}
 
 	return ret;
 }

--- gnome-vfs/modules/ftp-method.c	2005-07-13 23:24:16.000000000 +0000
+++ gnome-vfs/modules/ftp-method.c	2005-07-13 23:29:22.000000000 +0000
@@ -2357,13 +2357,16 @@
 
 	dirlist_str = NULL;
 	server_type = NULL;
+	cached_dirlist = NULL;
 	cancellation = get_cancellation (context);
 
 	
 	G_LOCK (connection_pools);
 	pool = ftp_connection_pool_lookup (uri);
-	cached_dirlist = g_hash_table_lookup (pool->cached_dirlists,
-					      uri->text);
+	if (uri->text != NULL) {
+		cached_dirlist = g_hash_table_lookup (pool->cached_dirlists,
+							uri->text);
+	}
 	if (cached_dirlist != NULL) {
 		gettimeofday (&tv, NULL);