diff options
| author | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2006-03-27 11:39:27 +0000 |
|---|---|---|
| committer | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2006-03-27 11:39:27 +0000 |
| commit | b5743fcfdaca9d4e7c6778e9622b6f18756c9636 (patch) | |
| tree | 112934f13020532ee130e7669284f68a03de415b /Gui/mplayer | |
| parent | 171de9cf5f7df128635205270363b68f6b1348ef (diff) | |
| download | mpv-b5743fcfdaca9d4e7c6778e9622b6f18756c9636.tar.bz2 mpv-b5743fcfdaca9d4e7c6778e9622b6f18756c9636.tar.xz | |
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
Diffstat (limited to 'Gui/mplayer')
| -rw-r--r-- | Gui/mplayer/gtk/sb.c | 7 | ||||
| -rw-r--r-- | Gui/mplayer/gtk/sb.h | 2 | ||||
| -rw-r--r-- | Gui/mplayer/widgets.c | 5 |
3 files changed, 13 insertions, 1 deletions
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 ) ); |