gvfs r1511 - in trunk: . client daemon

[otte svn gnome org]

Author: otte
Date: Mon Mar  3 16:32:32 2008
New Revision: 1511
URL: http://svn.gnome.org/viewvc/gvfs?rev=1511&view=rev

Log:
2008-03-03  Benjamin Otte  <otte gnome org>

	* client/gvfsuriutils.c: (g_vfs_decode_uri):
	revert yesterday's commit. It broke the obex and gphoto backends. We
	now parse hostnames different for internet hosts.
	* daemon/ftp.mount.in:
	Parse hostnames different.



Modified:
   trunk/ChangeLog
   trunk/client/gvfsuriutils.c
   trunk/daemon/ftp.mount.in

Modified: trunk/client/gvfsuriutils.c
==============================================================================
--- trunk/client/gvfsuriutils.c	(original)
+++ trunk/client/gvfsuriutils.c	Mon Mar  3 16:32:32 2008
@@ -181,25 +181,23 @@
 	      return NULL;
 	    }
 	  port_start = memchr (host_end, ':', authority_end - host_start);
-	  host_start++;
         }
       else
         {
 	  port_start = memchr (host_start, ':', authority_end - host_start);
-	  host_end = port_start ? port_start : authority_end;
 	}
 
       if (port_start)
 	{
-	  decoded->port = atoi(port_start + 1);
-	  if (decoded->port <= 0)
-	    {
-	      g_vfs_decoded_uri_free (decoded);
-	      return NULL;
-	    }
+	  host_end = port_start++;
+
+	  decoded->port = atoi(port_start);
 	}
       else
-	decoded->port = -1;
+	{
+	  host_end = authority_end;
+	  decoded->port = -1;
+	}
 
       decoded->host = g_strndup (host_start, host_end - host_start);
 

Modified: trunk/daemon/ftp.mount.in
==============================================================================
--- trunk/daemon/ftp.mount.in	(original)
+++ trunk/daemon/ftp.mount.in	Mon Mar  3 16:32:32 2008
@@ -2,3 +2,6 @@
 Type=ftp
 Exec= libexecdir@/gvfsd-ftp
 AutoMount=false
+Scheme=ftp
+DefaultPort=21
+HostnameIsInetAddress=true