* skins2: expect the .wsz extension for winamp2 skins, instead of .zip

diff --git a/modules/gui/skins2/src/dialogs.cpp b/modules/gui/skins2/src/dialogs.cpp
index f058815481bb72c4eef00d1dd6a5433b4eebbaad..7ba6829120cadcbfccf43831539641745d0d016a 100644 (file)
--- a/modules/gui/skins2/src/dialogs.cpp
+++ b/modules/gui/skins2/src/dialogs.cpp
@@ -221,7 +221,7 @@ void Dialogs::showFileGeneric( const string &rTitle, const string &rExtensions,
 void Dialogs::showChangeSkin()
 {
     showFileGeneric( _("Open a skin file"),
-                     _("Skin files (*.vlt;*.zip)|*.vlt;*.zip|Skin files (*.xml)|*.xml"),
+                     _("Skin files (*.vlt;*.wsz)|*.vlt;*.wsz|Skin files (*.xml)|*.xml"),
                      showChangeSkinCB, kOPEN );
 }
 

diff --git a/modules/gui/skins2/src/skin_main.cpp b/modules/gui/skins2/src/skin_main.cpp
index 91801ef391a0852e65a1eeb194006224b3285582..d4aca6a307c60d6def0e5933c938ad3608e747ed 100644 (file)
--- a/modules/gui/skins2/src/skin_main.cpp
+++ b/modules/gui/skins2/src/skin_main.cpp
@@ -277,10 +277,10 @@ static int DemuxOpen( vlc_object_t *p_this )
     p_demux->pf_demux   = Demux;
     p_demux->pf_control = DemuxControl;
 
-    // Test that we have a valid .vlt file, based on the extension
+    // Test that we have a valid .vlt or .wsz file, based on the extension
     // TODO: an actual check of the contents would be better...
     if( ( ext = strchr( p_demux->psz_path, '.' ) ) == NULL ||
-        strcasecmp( ext, ".vlt" ) )
+        ( strcasecmp( ext, ".vlt" ) && strcasecmp( ext, ".wsz" ) ) )
     {
         return VLC_EGENERIC;
     }

diff --git a/modules/gui/skins2/src/theme_repository.cpp b/modules/gui/skins2/src/theme_repository.cpp
index 947eadb85fb9cc7bc8a7d5e3753fbd925bba7eee..4455fa3cad37bf13273d89ba20b4eb854123a640 100644 (file)
--- a/modules/gui/skins2/src/theme_repository.cpp
+++ b/modules/gui/skins2/src/theme_repository.cpp
@@ -125,7 +125,7 @@ void ThemeRepository::parseDirectory( const string &rDir )
         {
             extension = name.substr( name.size() - 4, 4 );
         }
-        if( extension == ".vlt" || extension == ".zip" )
+        if( extension == ".vlt" || extension == ".wsz" )
         {
             string path = rDir + sep + name;
             msg_Dbg( getIntf(), "found skin %s", path.c_str() );