[svn r545] fixed parse trunk
authorrenatofilho
Thu Apr 12 22:34:28 2007 +0100 (2007-04-12)
branchtrunk
changeset 540d6f9b0417346
parent 539 c67cec9e6073
child 541 0bf798c3f17e
[svn r545] fixed parse
gmyth-stream/libgnomevfs2/modules/gmythstream-method.c
     1.1 --- a/gmyth-stream/libgnomevfs2/modules/gmythstream-method.c	Thu Apr 12 22:16:55 2007 +0100
     1.2 +++ b/gmyth-stream/libgnomevfs2/modules/gmythstream-method.c	Thu Apr 12 22:34:28 2007 +0100
     1.3 @@ -176,7 +176,6 @@
     1.4  
     1.5  	file = gnome_vfs_unescape_string (uri_str, "");
     1.6  	c = file;
     1.7 -	//skip "/"
     1.8  	entry = g_string_new ("");
     1.9  	c = c + 1;
    1.10  	do {
    1.11 @@ -184,14 +183,14 @@
    1.12  			open = !open;
    1.13  		}
    1.14  
    1.15 -		if (((*c == '?') || (c + 1 == '\0')) && !open) {
    1.16 +		if (((*c == '?') || (c[1] == '\0')) && !open) {
    1.17 +			if (*c != '?')
    1.18 +				g_string_append_c (entry, *c);
    1.19 +
    1.20  			args = g_slist_append (args, g_strdup (entry->str));
    1.21  			entry = g_string_assign (entry, "");
    1.22  		} else {
    1.23 -			if (*c == '#')
    1.24 -				g_string_append (entry, "//");
    1.25 -			else
    1.26 -				g_string_append_c (entry, *c);
    1.27 +			g_string_append_c (entry, *c);
    1.28  		}
    1.29  		c = c + 1;
    1.30  	} while (*c != '\0');
    1.31 @@ -202,6 +201,7 @@
    1.32      {
    1.33  		gchar *arg = (gchar *) walk->data;
    1.34          prop = g_strsplit(arg, "=", 2);
    1.35 +		g_debug ("arg = %s", arg);
    1.36  
    1.37          if (g_strv_length (prop) == 2) {
    1.38  			if (strcmp (prop[0], "file") == 0) {
    1.39 @@ -246,6 +246,8 @@
    1.40      gmsHandle *handle = gmsHandle_new(uri);
    1.41      UriArgs *args;
    1.42  
    1.43 +    args = _uri_parse_args (uri);
    1.44 +
    1.45      if (!gmyth_stream_client_connect (handle->stream,
    1.46                                        gnome_vfs_uri_get_host_name  (uri),
    1.47                                        gnome_vfs_uri_get_host_port  (uri))) {