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

config_GetConfigDir -> config_GetUserConfDir

parent d6a7e489
......@@ -215,7 +215,7 @@ VLC_EXPORT( void, __config_ResetAll, ( vlc_object_t * ) );
VLC_EXPORT( module_config_t *, config_FindConfig,( vlc_object_t *, const char * ) );
VLC_EXPORT(const char *, config_GetDataDir, ( void ));
VLC_EXPORT(char *, config_GetConfigDir, ( void ) );
VLC_EXPORT(char *, config_GetUserConfDir, ( void ) );
VLC_EXPORT(char *, config_GetUserDataDir, ( void ) );
VLC_EXPORT(char *, config_GetCacheDir, ( void ) );
......
......@@ -164,7 +164,7 @@ int vlclua_homedir( lua_State *L )
}
int vlclua_configdir( lua_State *L )
{
char *dir = config_GetConfigDir();
char *dir = config_GetUserConfDir();
lua_pushstring( L, dir );
free( dir );
return 1;
......
......@@ -714,7 +714,7 @@ out:
/**
* Get the user's VLC configuration directory
*/
char *config_GetConfigDir( void )
char *config_GetUserConfDir( void )
{
return config_GetFooDir ("CONFIG", ".config");
}
......
......@@ -296,7 +296,7 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc,
/* Set the config file stuff */
p_libvlc->psz_homedir = config_GetHomeDir();
priv->psz_configdir = config_GetConfigDir();
priv->psz_configdir = config_GetUserConfDir();
priv->psz_datadir = config_GetUserDataDir();
priv->psz_cachedir = config_GetCacheDir();
priv->psz_configfile = config_GetCustomConfigFile( p_libvlc );
......
......@@ -51,12 +51,12 @@ __config_ChainParse
__config_ExistIntf
config_FindConfig
config_GetCacheDir
config_GetConfigDir
config_GetDataDir
__config_GetFloat
__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