config_GetConfigDir -> config_GetUserConfDir

diff --git a/include/vlc_configuration.h b/include/vlc_configuration.h
index 0a28c6912a60e69a9edf23f60426485b8b035b31..076d02cff88c71b07fdcdf538bb1b188ae490309 100644 (file)
--- a/include/vlc_configuration.h
+++ b/include/vlc_configuration.h
@@ -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 ) );
 

diff --git a/modules/misc/lua/vlc.c b/modules/misc/lua/vlc.c
index 1e81acd2886b42b27b5ca4dda80d2a646dc7288c..bb13e365eddad4afa362aee3f5feb63d758a18fa 100644 (file)
--- a/modules/misc/lua/vlc.c
+++ b/modules/misc/lua/vlc.c
@@ -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;

diff --git a/src/config/core.c b/src/config/core.c
index 611a852d745c257ac8c4b1dcab46bf3cf4c09c78..7a81888950120c2902c12a6cae8345c1f5822d95 100644 (file)
--- a/src/config/core.c
+++ b/src/config/core.c
@@ -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");
 }

diff --git a/src/libvlc-common.c b/src/libvlc-common.c
index 2a77a79c11f72d68a5fb51a49e8b582b886112cf..d7bea3b9ce05ee316b85a1ef8efd2f4ba76ea695 100644 (file)
--- a/src/libvlc-common.c
+++ b/src/libvlc-common.c
@@ -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 );

diff --git a/src/libvlc.sym b/src/libvlc.sym
index 5208e63bc4482031bb861306c7d0f92e5c474b25..964f2432567fa47ab96b33c7a05d56d5ee0d3555 100644 (file)
--- a/src/libvlc.sym
+++ b/src/libvlc.sym
@@ -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