diff options
author | Cedric Bail <cedric@osg.samsung.com> | 2018-02-22 14:57:36 -0800 |
---|---|---|
committer | Cedric Bail <cedric@osg.samsung.com> | 2018-02-22 14:57:36 -0800 |
commit | b575c416769bcab0eabaf7a68cc8129f81199606 (patch) | |
tree | 39a8181606b38d8e86739385e1b4195532199179 /src/lib | |
parent | 16f604f4690e09eff4cdd6169ef936d99dbf58c4 (diff) |
eina: make eina_vpath_interface_user_set an internal API.
Diffstat (limited to 'src/lib')
-rw-r--r-- | src/lib/efreet/efreet.c | 2 | ||||
-rw-r--r-- | src/lib/eina/eina_internal.h | 27 | ||||
-rw-r--r-- | src/lib/eina/eina_vpath.c | 1 | ||||
-rw-r--r-- | 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 @@ | |||
10 | #include <Ecore.h> | 10 | #include <Ecore.h> |
11 | #include <Ecore_File.h> | 11 | #include <Ecore_File.h> |
12 | 12 | ||
13 | #include "eina_internal.h" | ||
14 | |||
13 | /* define macros and variable for using the eina logging system */ | 15 | /* define macros and variable for using the eina logging system */ |
14 | #define EFREET_MODULE_LOG_DOM /* no logging in this file */ | 16 | #define EFREET_MODULE_LOG_DOM /* no logging in this file */ |
15 | 17 | ||
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 @@ | |||
41 | # endif | 41 | # endif |
42 | #endif | 42 | #endif |
43 | 43 | ||
44 | typedef struct _Eina_Vpath_Interface_User Eina_Vpath_Interface_User; | ||
45 | |||
46 | struct _Eina_Vpath_Interface_User | ||
47 | { | ||
48 | const char *desktop; | ||
49 | const char *documents; | ||
50 | const char *downloads; | ||
51 | const char *music; | ||
52 | const char *pictures; | ||
53 | const char *pub; | ||
54 | const char *templates; | ||
55 | const char *videos; | ||
56 | const char *data; | ||
57 | const char *config; | ||
58 | const char *cache; | ||
59 | const char *run; | ||
60 | }; | ||
61 | |||
44 | /** | 62 | /** |
45 | * @brief Cancels all pending promise/futures. | 63 | * @brief Cancels all pending promise/futures. |
46 | * | 64 | * |
@@ -50,6 +68,15 @@ | |||
50 | */ | 68 | */ |
51 | EAPI void __eina_promise_cancel_all(void); | 69 | EAPI void __eina_promise_cancel_all(void); |
52 | 70 | ||
71 | /** | ||
72 | * Create the desktop specific vpaths | ||
73 | * | ||
74 | * The virtual paths will be named usr.<field-name-of-struct> | ||
75 | * | ||
76 | * If you do NOT call this api the virtual paths for usr.* will be unset. | ||
77 | */ | ||
78 | EAPI void eina_vpath_interface_user_set(Eina_Vpath_Interface_User *user); | ||
79 | |||
53 | #undef EAPI | 80 | #undef EAPI |
54 | #define EAPI | 81 | #define EAPI |
55 | 82 | ||
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 @@ | |||
1 | #include <Eina.h> | 1 | #include <Eina.h> |
2 | 2 | ||
3 | #include "eina_internal.h" | ||
3 | #include "eina_private.h" | 4 | #include "eina_private.h" |
4 | 5 | ||
5 | static Eina_Hash *vpath_data = NULL; | 6 | 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 @@ | |||
20 | */ | 20 | */ |
21 | typedef const char* Eina_Vpath; | 21 | typedef const char* Eina_Vpath; |
22 | 22 | ||
23 | |||
24 | typedef struct | ||
25 | { | ||
26 | const char *desktop; | ||
27 | const char *documents; | ||
28 | const char *downloads; | ||
29 | const char *music; | ||
30 | const char *pictures; | ||
31 | const char *pub; | ||
32 | const char *templates; | ||
33 | const char *videos; | ||
34 | const char *data; | ||
35 | const char *config; | ||
36 | const char *cache; | ||
37 | const char *run; | ||
38 | } Eina_Vpath_Interface_User; | ||
39 | |||
40 | /** | 23 | /** |
41 | * Make the app specific paths accessable as virtual path | 24 | * Make the app specific paths accessable as virtual path |
42 | * | 25 | * |
@@ -54,15 +37,6 @@ typedef struct | |||
54 | */ | 37 | */ |
55 | EAPI void eina_vpath_interface_app_set(const char *app_name, Eina_Prefix *p); | 38 | EAPI void eina_vpath_interface_app_set(const char *app_name, Eina_Prefix *p); |
56 | 39 | ||
57 | /** | ||
58 | * Create the desktop specific vpaths | ||
59 | * | ||
60 | * The virtual paths will be named usr.<field-name-of-struct> | ||
61 | * | ||
62 | * If you do NOT call this api the virtual paths for usr.* will be unset. | ||
63 | */ | ||
64 | EAPI void eina_vpath_interface_user_set(Eina_Vpath_Interface_User *user); | ||
65 | |||
66 | /* | 40 | /* |
67 | * Translate a virtual path into a normal path. | 41 | * Translate a virtual path into a normal path. |
68 | * | 42 | * |