[vlc-commits] skins2: remove a leftover call to FromLocale()

[Erwan Tulou]

vlc/vlc-2.2 | branch: master | Erwan Tulou <erwan10 at videolan.org> | Fri Jun 12 11:32:06 2015 +0200| [40710288890bf92d107fb2f6924e25c308737549] | committer: Erwan Tulou

skins2: remove a leftover call to FromLocale()

- on Windows, the ressource paths are already UTF8 encoded. bug fixed
- on Linux, the function is a noop
- on OS2, config_GetDataDir() may need a fix (two paths, the former returns
locale, the latter UTF8)

(cherry picked from commit 58eb9328ed1daa2701c040dc9f076f08dca9b396)
Signed-off-by: Erwan Tulou <erwan10 at videolan.org>

> http://git.videolan.org/gitweb.cgi/vlc/vlc-2.2.git/?a=commit;h=40710288890bf92d107fb2f6924e25c308737549
---

 modules/gui/skins2/src/theme_repository.cpp |    5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/modules/gui/skins2/src/theme_repository.cpp b/modules/gui/skins2/src/theme_repository.cpp
index 7e14ddb..ab1ef17 100644
--- a/modules/gui/skins2/src/theme_repository.cpp
+++ b/modules/gui/skins2/src/theme_repository.cpp
@@ -135,17 +135,14 @@ ThemeRepository::~ThemeRepository()
 }
 
 
-void ThemeRepository::parseDirectory( const string &rDir_locale )
+void ThemeRepository::parseDirectory( const string &rDir )
 {
     const char *pszDirContent;
     // Path separator
     const string &sep = OSFactory::instance( getIntf() )->getDirSeparator();
 
     // Open the dir
-    // FIXME: parseDirectory should be invoked with UTF-8 input instead!!
-    string rDir = sFromLocale( rDir_locale );
     DIR *pDir = vlc_opendir( rDir.c_str() );
-
     if( pDir == NULL )
     {
         // An error occurred