# HG changeset patch # User ib # Date 1298904437 0 # Node ID 1481268ccd30d4143bc13dfd85b57d8557abcdf0 # Parent 7104e2b2b6480e0859f792d9e11b6a69d9ba9c9f Move global skin directory variables. The more appropriate place for these variables is interface.c, because this is where they are set after all. Furthermore, their needless explicit initialization has been removed. diff -r 7104e2b2b648 -r 1481268ccd30 gui/app.c --- a/gui/app.c Mon Feb 28 13:42:39 2011 +0000 +++ b/gui/app.c Mon Feb 28 14:47:17 2011 +0000 @@ -23,10 +23,6 @@ listItems appMPlayer; -char *skinDirInHome = NULL; -char *skinMPlayerDir = NULL; -char *skinName = NULL; - static const evName evNames[] = { { evNone, "evNone" }, { evPlay, "evPlay" }, diff -r 7104e2b2b648 -r 1481268ccd30 gui/app.h --- a/gui/app.h Mon Feb 28 13:42:39 2011 +0000 +++ b/gui/app.h Mon Feb 28 14:47:17 2011 +0000 @@ -187,9 +187,6 @@ extern listItems appMPlayer; -extern char *skinDirInHome; -extern char *skinMPlayerDir; - int appFindMessage(unsigned char *); void appInitStruct(listItems *); void btnModify(int, float); diff -r 7104e2b2b648 -r 1481268ccd30 gui/interface.c --- a/gui/interface.c Mon Feb 28 13:42:39 2011 +0000 +++ b/gui/interface.c Mon Feb 28 14:47:17 2011 +0000 @@ -76,6 +76,10 @@ guiInterface_t guiIntfStruct; int guiWinID=-1; +char *skinName; +char *skinDirInHome; +char *skinMPlayerDir; + int gstrcmp( const char * a,const char * b ) { if ( !a && !b ) return 0; diff -r 7104e2b2b648 -r 1481268ccd30 gui/interface.h --- a/gui/interface.h Mon Feb 28 13:42:39 2011 +0000 +++ b/gui/interface.h Mon Feb 28 14:47:17 2011 +0000 @@ -185,6 +185,9 @@ } URLItem; extern char * skinName; +extern char * skinDirInHome; +extern char * skinMPlayerDir; + extern plItem * plList; extern plItem * plCurrent; extern plItem * plLastPlayed;