Commit 09bd8efc authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont
Browse files

Remove config_GetUserConfDir

parent 821f7242
......@@ -214,14 +214,15 @@ VLC_EXPORT( int, __config_SaveConfigFile, ( vlc_object_t *, const char * ) );
VLC_EXPORT( void, __config_ResetAll, ( vlc_object_t * ) );
VLC_EXPORT( module_config_t *, config_FindConfig,( vlc_object_t *, const char * ) LIBVLC_USED );
VLC_EXPORT(const char *, config_GetDataDir, ( void ) LIBVLC_USED);
VLC_EXPORT(const char *, config_GetConfDir, ( void ) LIBVLC_USED);
VLC_EXPORT(char *, config_GetUserConfDir, ( void ) LIBVLC_USED);
VLC_EXPORT(char *, config_GetUserDataDir, ( void ) LIBVLC_USED);
typedef enum vlc_userdir {
/* User's home */
VLC_HOME_DIR,
/* VLC configuration directory */
VLC_CONFIG_DIR,
} vlc_userdir_t;
VLC_EXPORT(char *, config_GetUserDir, ( vlc_userdir_t ) LIBVLC_USED);
......
......@@ -134,7 +134,7 @@ static int vlclua_homedir( lua_State *L )
static int vlclua_configdir( lua_State *L )
{
char *dir = config_GetUserConfDir();
char *dir = config_GetUserDir( VLC_CONFIG_DIR );
lua_pushstring( L, dir );
free( dir );
return 1;
......
......@@ -248,14 +248,6 @@ static char *config_GetAppDir (const char *xdg_name, const char *xdg_default)
return psz_dir;
}
/**
* Get the user's VLC configuration directory
*/
char *config_GetUserConfDir( void )
{
return config_GetAppDir ("CONFIG", ".config");
}
/**
* Get the user's VLC data directory
* (used for stuff like the skins, custom lua modules, ...)
......@@ -286,7 +278,12 @@ char *config_GetCacheDir( void )
char *config_GetUserDir (vlc_userdir_t type)
{
char *home = config_GetHomeDir ();
(void)type;
return home;
switch (type)
{
case VLC_HOME_DIR:
return config_GetHomeDir ();
case VLC_CONFIG_DIR:
return config_GetAppDir ("CONFIG", ".config");
}
assert (0);
}
......@@ -59,7 +59,7 @@ static char *config_GetConfigFile( vlc_object_t *obj )
char *psz_file = config_GetPsz( obj, "config" );
if( psz_file == NULL )
{
char *psz_dir = config_GetUserConfDir();
char *psz_dir = config_GetUserDir( VLC_CONFIG_DIR );
if( asprintf( &psz_file, "%s" DIR_SEP CONFIG_FILE, psz_dir ) == -1 )
psz_file = NULL;
......@@ -385,8 +385,8 @@ config_Write (FILE *file, const char *desc, const char *type,
static int config_PrepareDir (vlc_object_t *obj)
{
char *psz_configdir = config_GetUserConfDir ();
if (psz_configdir == NULL) /* XXX: This should never happen */
char *psz_configdir = config_GetUserDir (VLC_CONFIG_DIR);
if (psz_configdir == NULL)
return -1;
int ret = config_CreateDir (obj, psz_configdir);
......
......@@ -58,7 +58,6 @@ config_GetUserDir
__config_GetInt
__config_GetPsz
__config_GetType
config_GetUserConfDir
config_GetUserDataDir
__config_PutFloat
__config_PutInt
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment