[totem] main: Fix handling of local DVD directories



commit 040e19bdf98a3fad439ab20fb7145bf495ac85be
Author: Bastien Nocera <hadess hadess net>
Date:   Tue Apr 10 17:45:32 2012 +0100

    main: Fix handling of local DVD directories
    
    We were hoping that GFile wouldn't touch URIs for which
    it didn't handle the URI scheme. This meant that it was mangling
    (or escaping things it shouldn't) dvd: URIs.
    
    Revert "uri: Simplify _get_full_path() code"
    
    This reverts commit 088cd2cf46f97c1e8a3200b3dfcb20e9f9642ca0.

 src/totem-uri.c |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)
---
diff --git a/src/totem-uri.c b/src/totem-uri.c
index c713eb7..2c93b52 100644
--- a/src/totem-uri.c
+++ b/src/totem-uri.c
@@ -259,10 +259,12 @@ totem_create_full_path (const char *path)
 
 	g_return_val_if_fail (path != NULL, NULL);
 
-	file = g_file_new_for_commandline_arg (path);
-	if (file == NULL)
+	if (strstr (path, "://") != NULL)
+		return NULL;
+	if (totem_is_special_mrl (path) != FALSE)
 		return NULL;
 
+	file = g_file_new_for_commandline_arg (path);
 	retval = g_file_get_uri (file);
 	g_object_unref (file);
 



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]