gvfs r1912 - in trunk: . client

[hadess svn gnome org]

Author: hadess
Date: Wed Aug 27 13:38:28 2008
New Revision: 1912
URL: http://svn.gnome.org/viewvc/gvfs?rev=1912&view=rev

Log:
2008-08-27  Bastien Nocera  <hadess hadess net>

	* client/gdaemonvfs.c (get_mountspec_from_uri),
	(_g_daemon_vfs_get_uri_for_mountspec): Don't drop
	query and fragment portions of the URI when decoding
	it and the URI scheme isn't handled by any backends
	(Closes: #549553)



Modified:
   trunk/ChangeLog
   trunk/client/gdaemonvfs.c

Modified: trunk/client/gdaemonvfs.c
==============================================================================
--- trunk/client/gdaemonvfs.c	(original)
+++ trunk/client/gdaemonvfs.c	Wed Aug 27 13:38:28 2008
@@ -185,7 +185,7 @@
   if (scheme == NULL)
     return FALSE;
 
-  /* convert the scheme to lower case since g_uri_prase_scheme
+  /* convert the scheme to lower case since g_uri_parse_scheme
    * doesn't do that and we compare with g_str_equal */
   str_tolower_inplace (scheme);
   
@@ -256,6 +256,11 @@
 	      g_mount_spec_set (spec, "port", port);
 	      g_free (port);
 	    }
+
+	  if (decoded->query && *decoded->query)
+	    g_mount_spec_set (spec, "query", decoded->query);
+	  if (decoded->fragment && *decoded->fragment)
+	    g_mount_spec_set (spec, "fragment", decoded->fragment);
 	  
 	  path = g_strdup (decoded->path);
 	  
@@ -499,6 +504,9 @@
 	decoded.path = "/";
       else
 	decoded.path = path;
+
+      decoded.query = (char *)g_mount_spec_get (spec, "query");
+      decoded.fragment = (char *)g_mount_spec_get (spec, "fragment");
       
       uri = g_vfs_encode_uri (&decoded, FALSE);