[Xfce4-commits] <gigolo:master> Handle WebDAV path parts when parsing URLs

[Enrico Tröger]

Updating branch refs/heads/master
         to 567eadbc5873ba149fbedddf1be8e1016da87907 (commit)
       from ea9a59932bf57c4a9b86d7fe6af762ada5d76a24 (commit)

commit 567eadbc5873ba149fbedddf1be8e1016da87907
Author: Enrico Tröger <enrico at xfce.org>
Date:   Sun Apr 22 00:16:38 2012 +0200

    Handle WebDAV path parts when parsing URLs

 src/bookmark.c |    9 ++++++++-
 1 files changed, 8 insertions(+), 1 deletions(-)

diff --git a/src/bookmark.c b/src/bookmark.c
index ffe18bb..b517845 100644
--- a/src/bookmark.c
+++ b/src/bookmark.c
@@ -106,6 +106,7 @@ gboolean gigolo_bookmark_parse_uri(GigoloBookmark *bookmark, const gchar *uri)
 {
 	gchar *s, *t, *x, *end, *tmp;
 	guint l;
+	gboolean is_uri_dav;
 	GigoloBookmarkPrivate *priv = GIGOLO_BOOKMARK_GET_PRIVATE(bookmark);
 
 	priv->scheme = g_uri_parse_scheme(uri);
@@ -215,7 +216,6 @@ gboolean gigolo_bookmark_parse_uri(GigoloBookmark *bookmark, const gchar *uri)
 		priv->port = (guint) atoi(tmp);
 		g_free(tmp);
 	}
-	/* TODO handle WebDav path parts */
 	if (NZV(end) && *end == '/' && gigolo_str_equal("smb", priv->scheme))
 	{
 		end++; /* skip the slash */
@@ -229,6 +229,13 @@ gboolean gigolo_bookmark_parse_uri(GigoloBookmark *bookmark, const gchar *uri)
 		}
 		priv->share = g_strndup(end, l);
 	}
+	is_uri_dav = gigolo_str_equal("dav", priv->scheme) || gigolo_str_equal("davs", priv->scheme);
+	if (NZV(end) && *end == '/' && is_uri_dav)
+	{
+		end++; /* skip the slash */
+
+		priv->path = g_strdup(end);
+	}
 
 	return TRUE;
 }