cedric pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=b575c416769bcab0eabaf7a68cc8129f81199606
commit b575c416769bcab0eabaf7a68cc8129f81199606 Author: Cedric Bail <ced...@osg.samsung.com> Date: Thu Feb 22 14:57:36 2018 -0800 eina: make eina_vpath_interface_user_set an internal API. --- src/lib/efreet/efreet.c | 2 ++ src/lib/eina/eina_internal.h | 27 +++++++++++++++++++++++++++ src/lib/eina/eina_vpath.c | 1 + src/lib/eina/eina_vpath.h | 26 -------------------------- 4 files changed, 30 insertions(+), 26 deletions(-) diff --git a/src/lib/efreet/efreet.c b/src/lib/efreet/efreet.c index 1acbdbd8d7..eb29b55f72 100644 --- a/src/lib/efreet/efreet.c +++ b/src/lib/efreet/efreet.c @@ -10,6 +10,8 @@ #include <Ecore.h> #include <Ecore_File.h> +#include "eina_internal.h" + /* define macros and variable for using the eina logging system */ #define EFREET_MODULE_LOG_DOM /* no logging in this file */ diff --git a/src/lib/eina/eina_internal.h b/src/lib/eina/eina_internal.h index b5bdbad414..79ec98a7bd 100644 --- a/src/lib/eina/eina_internal.h +++ b/src/lib/eina/eina_internal.h @@ -41,6 +41,24 @@ # endif #endif +typedef struct _Eina_Vpath_Interface_User Eina_Vpath_Interface_User; + +struct _Eina_Vpath_Interface_User +{ + const char *desktop; + const char *documents; + const char *downloads; + const char *music; + const char *pictures; + const char *pub; + const char *templates; + const char *videos; + const char *data; + const char *config; + const char *cache; + const char *run; +}; + /** * @brief Cancels all pending promise/futures. * @@ -50,6 +68,15 @@ */ EAPI void __eina_promise_cancel_all(void); +/** + * Create the desktop specific vpaths + * + * The virtual paths will be named usr.<field-name-of-struct> + * + * If you do NOT call this api the virtual paths for usr.* will be unset. + */ +EAPI void eina_vpath_interface_user_set(Eina_Vpath_Interface_User *user); + #undef EAPI #define EAPI diff --git a/src/lib/eina/eina_vpath.c b/src/lib/eina/eina_vpath.c index e744265955..cb9ff972bb 100644 --- a/src/lib/eina/eina_vpath.c +++ b/src/lib/eina/eina_vpath.c @@ -1,5 +1,6 @@ #include <Eina.h> +#include "eina_internal.h" #include "eina_private.h" static Eina_Hash *vpath_data = NULL; diff --git a/src/lib/eina/eina_vpath.h b/src/lib/eina/eina_vpath.h index 40adffeca1..c279018cf1 100644 --- a/src/lib/eina/eina_vpath.h +++ b/src/lib/eina/eina_vpath.h @@ -20,23 +20,6 @@ */ typedef const char* Eina_Vpath; - -typedef struct -{ - const char *desktop; - const char *documents; - const char *downloads; - const char *music; - const char *pictures; - const char *pub; - const char *templates; - const char *videos; - const char *data; - const char *config; - const char *cache; - const char *run; -} Eina_Vpath_Interface_User; - /** * Make the app specific paths accessable as virtual path * @@ -54,15 +37,6 @@ typedef struct */ EAPI void eina_vpath_interface_app_set(const char *app_name, Eina_Prefix *p); -/** - * Create the desktop specific vpaths - * - * The virtual paths will be named usr.<field-name-of-struct> - * - * If you do NOT call this api the virtual paths for usr.* will be unset. - */ -EAPI void eina_vpath_interface_user_set(Eina_Vpath_Interface_User *user); - /* * Translate a virtual path into a normal path. * --