[MPlayer-cvslog] CVS: main/Gui/skin skin.c,1.29,1.30

[Diego Biurrun CVS]

CVS change done by Diego Biurrun CVS

Update of /cvsroot/mplayer/main/Gui/skin
In directory mail:/var2/tmp/cvs-serv23243/Gui/skin

Modified Files:
	skin.c 
Log Message:
Rename the default GUI skins directory from 'Skin' to 'skins', keeping
backwards compatibility.


Index: skin.c
===================================================================
RCS file: /cvsroot/mplayer/main/Gui/skin/skin.c,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- skin.c	8 Dec 2005 22:12:57 -0000	1.29
+++ skin.c	27 Mar 2006 11:39:27 -0000	1.30
@@ -676,8 +676,16 @@
    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;
+        }
+      }
     }
   }