Bug 561172 – gnome-open fails on local URIs with anchors

2009-03-03  Alexander Larsson  <alexl@redhat.com>

	Bug 561172 – gnome-open fails on local URIs with anchors

        * programs/gvfs-open.c:
	Don't pass file:// uris with anchor as filename


svn path=/trunk/; revision=2283

2 files changed, 17 insertions, 1 deletions

diff --git a/ChangeLog b/ChangeLog
index 9be0dc2e..b4db7ac3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
 2009-03-03  Alexander Larsson  <alexl@redhat.com>
 
+	Bug 561172 – gnome-open fails on local URIs with anchors
+
+        * programs/gvfs-open.c:
+	Don't pass file:// uris with anchor as filename
+
+2009-03-03  Alexander Larsson  <alexl@redhat.com>
+
         * client/gdaemonfileinputstream.c:
         * client/gdaemonfileoutputstream.c:
 	Make argument const char * as per the glib change.
diff --git a/programs/gvfs-open.c b/programs/gvfs-open.c
index 26efa5f0..1f734b8c 100644
--- a/programs/gvfs-open.c
+++ b/programs/gvfs-open.c
@@ -38,6 +38,15 @@ static GOptionEntry entries[] = {
   {NULL}
 };
 
+static gboolean
+is_file_uri_with_anchor (char *str)
+{
+  if (g_ascii_strncasecmp (str, "file:", 5) == 0 &&
+      strchr (str, '#') != NULL)
+    return TRUE;
+  return FALSE;
+}
+
 static void
 open (GFile *file, char *arg_string)
 {
@@ -59,7 +68,7 @@ open (GFile *file, char *arg_string)
       return;
     }
 
-  if (g_file_is_native (file))
+  if (g_file_is_native (file) && !is_file_uri_with_anchor (arg_string))
     {
       /* For normal files, pass in the canonicalized GFile as path */
       l.data = file;