[totem-pl-parser] Bug 583762 – Should support opening DVD .iso via nautilus or via Movie->Open

[Bastien Nocera <hadess src gnome org>]

commit f4f1da23b7172a83d79234c516a2b7347caaf187
Author: Bastien Nocera <hadess hadess net>
Date:   Tue Jun 30 14:28:13 2009 +0100

    Bug 583762 â?? Should support opening DVD .iso via nautilus or via Movie->Open
    
    2009-06-30  Bastien Nocera  <hadess hadess net>
    
    	* plparse/totem-disc.c (cd_cache_local_file_to_archive):
    	Fix mounting and detection of ISO mounts (they need double
    	escaping, god knows...) (Closes: #583762)

 ChangeLog            |    6 ++++++
 plparse/totem-disc.c |    8 +++++---
 2 files changed, 11 insertions(+), 3 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index a5103f2..369ae20 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2009-06-30  Bastien Nocera  <hadess hadess net>
+
+	* plparse/totem-disc.c (cd_cache_local_file_to_archive):
+	Fix mounting and detection of ISO mounts (they need double
+	escaping, god knows...) (Closes: #583762)
+
 2009-06-22  Philip Withnall  <philip tecnocode co uk>
 
 	* plparse/totem-pl-parser.c: Added examples of async parsing, and
diff --git a/plparse/totem-disc.c b/plparse/totem-disc.c
index 722c1f5..dc63625 100644
--- a/plparse/totem-disc.c
+++ b/plparse/totem-disc.c
@@ -265,13 +265,15 @@ cd_cache_has_content_type (CdCache *cache, const char *content_type)
 static char *
 cd_cache_local_file_to_archive (const char *filename)
 {
-  char *escaped, *retval, *uri;
+  char *escaped, *escaped2, *retval, *uri;
 
   uri = g_filename_to_uri (filename, NULL, NULL);
   escaped = g_uri_escape_string (uri, NULL, FALSE);
-  g_free (uri);
-  retval = g_strdup_printf ("archive://%s", escaped);
+  escaped2 = g_uri_escape_string (escaped, NULL, FALSE);
   g_free (escaped);
+  g_free (uri);
+  retval = g_strdup_printf ("archive://%s/", escaped2);
+  g_free (escaped2);
 
   return retval;
 }