[vlc-devel] commit: config_GetConfigDir -> config_GetUserConfDir ( Rémi Denis-Courmont )

[git version control]

vlc | branch: master | Rémi Denis-Courmont <rem at videolan.org> | Mon May  5 23:33:25 2008 +0300| [cb47bc073cab2871d737f99d649e8a5ae8dfe9ed]

config_GetConfigDir -> config_GetUserConfDir

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=cb47bc073cab2871d737f99d649e8a5ae8dfe9ed
---

 include/vlc_configuration.h |    2 +-
 modules/misc/lua/vlc.c      |    2 +-
 src/config/core.c           |    2 +-
 src/libvlc-common.c         |    2 +-
 src/libvlc.sym              |    2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/include/vlc_configuration.h b/include/vlc_configuration.h
index 0a28c69..076d02c 100644
--- 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 1e81acd..bb13e36 100644
--- 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 611a852..7a81888 100644
--- 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 2a77a79..d7bea3b 100644
--- 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 5208e63..964f243 100644
--- 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