[vlc-commits] commit: Revert "Skins: "file" shortcut for skins access_demux (& decode URI )" ( Jean-Philippe André )

[git at videolan.org]

vlc | branch: master | Jean-Philippe André <jpeg at videolan.org> | Wed Jun  2 00:05:56 2010 +0800| [8328b699e5031e17902d902be28755ff0ea44431] | committer: Jean-Philippe André 

Revert "Skins: "file" shortcut for skins access_demux (& decode URI)"

This reverts commit 117c94235c96a5927592398ec13f8ce3d8a58a36.

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=8328b699e5031e17902d902be28755ff0ea44431
---

 modules/gui/skins2/src/skin_main.cpp    |    1 -
 modules/gui/skins2/src/theme_loader.cpp |    8 +-------
 2 files changed, 1 insertions(+), 8 deletions(-)

diff --git a/modules/gui/skins2/src/skin_main.cpp b/modules/gui/skins2/src/skin_main.cpp
index 5a8b533..4d9ea1c 100644
--- a/modules/gui/skins2/src/skin_main.cpp
+++ b/modules/gui/skins2/src/skin_main.cpp
@@ -594,6 +594,5 @@ vlc_module_begin ()
         set_capability( "access_demux", 5 )
         set_callbacks( DemuxOpen, NULL )
         add_shortcut( "skins" )
-        add_shortcut( "file" )
 
 vlc_module_end ()
diff --git a/modules/gui/skins2/src/theme_loader.cpp b/modules/gui/skins2/src/theme_loader.cpp
index 1c79688..0d9cfd5 100644
--- a/modules/gui/skins2/src/theme_loader.cpp
+++ b/modules/gui/skins2/src/theme_loader.cpp
@@ -30,8 +30,6 @@
 #include "../src/vlcproc.hpp"
 #include "../src/window_manager.hpp"
 
-#include <vlc_url.h>
-
 #ifdef HAVE_FCNTL_H
 #   include <fcntl.h>
 #endif
@@ -73,12 +71,8 @@ int makedir( const char *newdir );
 #define ZIP_BUFFER_SIZE 4096
 
 
-bool ThemeLoader::load( const string &fullFileName )
+bool ThemeLoader::load( const string &fileName )
 {
-    char *decodedName = decode_URI_duplicate( fullFileName.c_str() );
-    string fileName = decodedName ? string(decodedName) : fullFileName;
-    free( decodedName );
-
     string path = getFilePath( fileName );
 
     //Before all, let's see if the file is present