* skins2/win32/win32_dragdrop.cpp: Added a missing encoding conversion

 * skins2/parser/interpreter.cpp: playtree.del() is now a synonym of
    playlist.del(), as it is already in use in some skins...
    Same thing for playtree.sort().

diff --git a/modules/gui/skins2/parser/interpreter.cpp b/modules/gui/skins2/parser/interpreter.cpp
index 940b5c6373dc81f17d606330a428d9e309aa64ef..9ad32a57c8429bf81a202cfc1c9067839ddd1cb0 100644 (file)
--- a/modules/gui/skins2/parser/interpreter.cpp
+++ b/modules/gui/skins2/parser/interpreter.cpp
@@ -93,7 +93,10 @@ Interpreter::Interpreter( intf_thread_t *pIntf ): SkinObject( pIntf )
     VarTree &rVarTree = VlcProc::instance( getIntf() )->getPlaytreeVar();
     m_commandMap["playlist.del()"] =
         CmdGenericPtr( new CmdPlaytreeDel( getIntf(), rVarTree ) );
+    m_commandMap["playtree.del()"] =
+        CmdGenericPtr( new CmdPlaytreeDel( getIntf(), rVarTree ) );
     REGISTER_CMD( "playlist.sort()", CmdPlaytreeSort )
+    REGISTER_CMD( "playtree.sort()", CmdPlaytreeSort )
     REGISTER_CMD( "vlc.fullscreen()", CmdFullscreen )
     REGISTER_CMD( "vlc.play()", CmdPlay )
     REGISTER_CMD( "vlc.pause()", CmdPause )

diff --git a/modules/gui/skins2/win32/win32_dragdrop.cpp b/modules/gui/skins2/win32/win32_dragdrop.cpp
index 2eaa7cc816941bf4ff5066f1b364250c70ec2e2f..fb1136d73d464313257e809765ee6c77922f2b3a 100644 (file)
--- a/modules/gui/skins2/win32/win32_dragdrop.cpp
+++ b/modules/gui/skins2/win32/win32_dragdrop.cpp
@@ -158,7 +158,7 @@ void Win32DragDrop::HandleDrop( HDROP HDrop )
         DragQueryFile( HDrop, i, psz_fileName, nameLength );
 
         // Add the file
-        CmdAddItem cmd( getIntf(), psz_fileName, m_playOnDrop );
+        CmdAddItem cmd( getIntf(), sFromLocale( psz_fileName ), m_playOnDrop );
         cmd.execute();
 
         delete[] psz_fileName;