Commit 8328b699 authored by Jean-Philippe André's avatar Jean-Philippe André

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

This reverts commit 117c9423.
parent e83ac1de
...@@ -594,6 +594,5 @@ vlc_module_begin () ...@@ -594,6 +594,5 @@ vlc_module_begin ()
set_capability( "access_demux", 5 ) set_capability( "access_demux", 5 )
set_callbacks( DemuxOpen, NULL ) set_callbacks( DemuxOpen, NULL )
add_shortcut( "skins" ) add_shortcut( "skins" )
add_shortcut( "file" )
vlc_module_end () vlc_module_end ()
...@@ -30,8 +30,6 @@ ...@@ -30,8 +30,6 @@
#include "../src/vlcproc.hpp" #include "../src/vlcproc.hpp"
#include "../src/window_manager.hpp" #include "../src/window_manager.hpp"
#include <vlc_url.h>
#ifdef HAVE_FCNTL_H #ifdef HAVE_FCNTL_H
# include <fcntl.h> # include <fcntl.h>
#endif #endif
...@@ -73,12 +71,8 @@ int makedir( const char *newdir ); ...@@ -73,12 +71,8 @@ int makedir( const char *newdir );
#define ZIP_BUFFER_SIZE 4096 #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 ); string path = getFilePath( fileName );
//Before all, let's see if the file is present //Before all, let's see if the file is present
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment