Mercurial > mplayer.hg

diff Gui/mplayer/gtk/sb.c @ 17974:9a5a62f480e6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Rename the default GUI skins directory from 'Skin' to 'skins', keeping backwards compatibility.
author diego
date Mon, 27 Mar 2006 11:39:27 +0000
parents 0e1471d9da74
children 2ee39341b7a6
line wrap: on
line diff
--- a/Gui/mplayer/gtk/sb.c	Mon Mar 27 10:32:52 2006 +0000
+++ b/Gui/mplayer/gtk/sb.c	Mon Mar 27 11:39:27 2006 +0000
@@ -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 @@
  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,"/*" ); }