Rename the default GUI skins directory from 'Skin' to 'skins', keeping

backwards compatibility.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17975 b3059339-0415-0410-9bf9-f77b7e298cf2

7 files changed, 34 insertions, 5 deletions

diff --git a/Gui/app.c b/Gui/app.c
index 5c3e3ef8e9..58b4a7667c 100644
--- a/Gui/app.c
+++ b/Gui/app.c
@@ -74,8 +74,11 @@ extern char *get_path(char *);
 
 listItems   appMPlayer;
 
+/* FIXME: Eventually remove the obsolete directory names. */
 char      * skinDirInHome=NULL;
+char      * skinDirInHome_obsolete=NULL;
 char      * skinMPlayerDir=NULL;
+char      * skinMPlayerDir_obsolete=NULL;
 char      * skinName = NULL;
 
 void appClearItem( wItem * item )
diff --git a/Gui/app.h b/Gui/app.h
index 5a237d9400..fd5a638e48 100644
--- a/Gui/app.h
+++ b/Gui/app.h
@@ -171,7 +171,9 @@ typedef struct
 extern listItems   appMPlayer;
 
 extern char      * skinDirInHome;
+extern char      * skinDirInHome_obsolete;
 extern char      * skinMPlayerDir;
+extern char      * skinMPlayerDir_obsolete;
 extern char      * skinName;
 
 extern void appInitStruct( listItems * item );
diff --git a/Gui/interface.c b/Gui/interface.c
index 3e03e2a1ca..5b785683ab 100644
--- a/Gui/interface.c
+++ b/Gui/interface.c
@@ -215,10 +215,14 @@ void guiInit( void )
 // --- initialize X 
  wsXInit( (void *)mDisplay );
 // --- load skin
- skinDirInHome=get_path("Skin");
- skinMPlayerDir=MPLAYER_DATADIR "/Skin";
+ skinDirInHome=get_path("skins");
+ skinDirInHome_obsolete=get_path("Skin");
+ skinMPlayerDir=MPLAYER_DATADIR "/skins";
+ skinMPlayerDir_obsolete=MPLAYER_DATADIR "/Skin";
  mp_msg( MSGT_GPLAYER,MSGL_V,"SKIN dir 1: '%s'\n",skinDirInHome);
+ mp_msg( MSGT_GPLAYER,MSGL_V,"SKIN dir 1 (obsolete): '%s'\n",skinDirInHome_obsolete);
  mp_msg( MSGT_GPLAYER,MSGL_V,"SKIN dir 2: '%s'\n",skinMPlayerDir);
+ mp_msg( MSGT_GPLAYER,MSGL_V,"SKIN dir 2 (obsolete): '%s'\n",skinMPlayerDir_obsolete);
  if ( !skinName ) skinName=strdup( "default" );
  i = skinRead( skinName );
  if ((i == -1) && strcmp(skinName,"default"))
diff --git a/Gui/mplayer/gtk/sb.c b/Gui/mplayer/gtk/sb.c
index 3ee89b340c..2293239504 100644
--- a/Gui/mplayer/gtk/sb.c
+++ b/Gui/mplayer/gtk/sb.c
@@ -18,8 +18,11 @@
 
 GtkWidget * SkinList = NULL;
 char      * sbSelectedSkin=NULL;
+/* FIXME: Eventually remove the obsolete directory names. */
 char      * sbMPlayerDirInHome=NULL;
+char      * sbMPlayerDirInHome_obsolete=NULL;
 char      * sbMPlayerPrefixDir=NULL;
+char      * sbMPlayerPrefixDir_obsolete=NULL;
 
 char * gtkOldSkin;
 static char * prev;
@@ -173,8 +176,12 @@ GtkWidget * create_SkinBrowser( void )
  gtk_signal_connect( GTK_OBJECT( Ok ),"clicked",GTK_SIGNAL_FUNC( prButton ),(void *)1 );
  gtk_signal_connect( GTK_OBJECT( Cancel ),"clicked",GTK_SIGNAL_FUNC( prButton ),(void *)0 );
 
+ if ( ( sbMPlayerDirInHome_obsolete=(char *)calloc( 1,strlen( skinDirInHome_obsolete ) + 4 ) ) != NULL )
+  { strcpy( sbMPlayerDirInHome_obsolete,skinDirInHome_obsolete ); strcat( sbMPlayerDirInHome_obsolete,"/*" ); }
  if ( ( sbMPlayerDirInHome=(char *)calloc( 1,strlen( skinDirInHome ) + 4 ) ) != NULL )
   { strcpy( sbMPlayerDirInHome,skinDirInHome ); strcat( sbMPlayerDirInHome,"/*" ); }
+ if ( ( sbMPlayerPrefixDir_obsolete=(char *)calloc( 1,strlen( skinMPlayerDir ) + 4 ) ) != NULL )
+  { strcpy( sbMPlayerPrefixDir_obsolete,skinMPlayerDir ); strcat( sbMPlayerPrefixDir_obsolete,"/*" ); }
  if ( ( sbMPlayerPrefixDir=(char *)calloc( 1,strlen( skinMPlayerDir ) + 4 ) ) != NULL )
   { strcpy( sbMPlayerPrefixDir,skinMPlayerDir ); strcat( sbMPlayerPrefixDir,"/*" ); }
 
diff --git a/Gui/mplayer/gtk/sb.h b/Gui/mplayer/gtk/sb.h
index 5831d5450f..74a28ab5a8 100644
--- a/Gui/mplayer/gtk/sb.h
+++ b/Gui/mplayer/gtk/sb.h
@@ -6,7 +6,9 @@
 extern GtkWidget * SkinList;
 extern char      * sbSelectedSkin;
 extern char      * sbMPlayerDirInHome;
+extern char      * sbMPlayerDirInHome_obsolete;
 extern char      * sbMPlayerPrefixDir;
+extern char      * sbMPlayerPrefixDir_obsolete;
 extern GtkWidget * SkinBrowser;
 
 extern void ShowSkinBrowser( void );
diff --git a/Gui/mplayer/widgets.c b/Gui/mplayer/widgets.c
index 6fbdeb3a01..464399ef3a 100644
--- a/Gui/mplayer/widgets.c
+++ b/Gui/mplayer/widgets.c
@@ -167,7 +167,10 @@ void gtkShow( int type,char * param )
    case evSkinBrowser:
 	ShowSkinBrowser();
 //        gtkClearList( SkinList );
-        if ( gtkFillSkinList( sbMPlayerPrefixDir ) && gtkFillSkinList( sbMPlayerDirInHome ) )
+        if ( gtkFillSkinList( sbMPlayerPrefixDir ) &&
+             gtkFillSkinList( sbMPlayerPrefixDir_obsolete ) &&
+             gtkFillSkinList( sbMPlayerDirInHome ) &&
+             gtkFillSkinList( sbMPlayerDirInHome_obsolete )  )
          {
           gtkSetDefaultToCList( SkinList,param );
 	  gtk_clist_sort( GTK_CLIST( SkinList ) );
diff --git a/Gui/skin/skin.c b/Gui/skin/skin.c
index b7b93073dc..2fd61ffad3 100644
--- a/Gui/skin/skin.c
+++ b/Gui/skin/skin.c
@@ -676,8 +676,16 @@ int skinRead( char * dname )
    setname( skinMPlayerDir,dname );
    if ( ( skinFile = fopen( fn,"rt" ) ) == NULL )
     {
-     mp_msg( MSGT_GPLAYER,MSGL_STATUS,MSGTR_SKIN_SkinFileNotFound,fn );
-     return -1;
+     setname( skinDirInHome_obsolete,dname );
+     if ( ( skinFile = fopen( fn,"rt" ) ) == NULL )
+      {
+       setname( skinMPlayerDir_obsolete,dname );
+       if ( ( skinFile = fopen( fn,"rt" ) ) == NULL )
+        {
+         mp_msg( MSGT_GPLAYER,MSGL_STATUS,MSGTR_SKIN_SkinFileNotFound,fn );
+         return -1;
+        }
+      }
     }
   }