e_user: make an internal header

Move the internal resources and the function declaration
to the internal header.

Change-Id: Ifa999874a2d87753a6d51306f3e52fcddba8ac97

diff --git a/src/bin/Makefile.mk b/src/bin/Makefile.mk
index ce097d0..649a514 100644 (file)
--- a/src/bin/Makefile.mk
+++ b/src/bin/Makefile.mk
@@ -70,7 +70,6 @@ src/bin/e_scale.h \
 src/bin/e_screensaver.h \
 src/bin/e_signals.h \
 src/bin/e_theme.h \
-src/bin/e_user.h \
 src/bin/e_utils.h \
 src/bin/e_zone.h \
 src/bin/e_util_transform.h \

diff --git a/src/bin/e_config.c b/src/bin/e_config.c
index fb9fa6d..1469ce0 100644 (file)
--- a/src/bin/e_config.c
+++ b/src/bin/e_config.c
@@ -1,4 +1,5 @@
 #include "e.h"
+#include "e_user_intern.h"
 
 E_API E_Config *e_config = NULL;
 

diff --git a/src/bin/e_includes.h b/src/bin/e_includes.h
index 8f5ac42..e1495f1 100644 (file)
--- a/src/bin/e_includes.h
+++ b/src/bin/e_includes.h
@@ -1,5 +1,4 @@
 #include "e_object.h"
-#include "e_user.h"
 #include "e_path.h"
 #include "e_error.h"
 #include "e_focus_policy_iface.h"

diff --git a/src/bin/e_main.c b/src/bin/e_main.c
index 6870136..d5e5f92 100644 (file)
--- a/src/bin/e_main.c
+++ b/src/bin/e_main.c
@@ -1,6 +1,7 @@
 #include "e.h"
 #include "e_actions_intern.h"
 #include "e_test_helper_intern.h"
+#include "e_user_intern.h"
 
 #ifdef __linux__
 # include <sys/prctl.h>

diff --git a/src/bin/e_module.c b/src/bin/e_module.c
index e46768f..2950eb0 100644 (file)
--- a/src/bin/e_module.c
+++ b/src/bin/e_module.c
@@ -1,4 +1,5 @@
 #include "e.h"
+#include "e_user_intern.h"
 
 /* TODO List:
  *

diff --git a/src/bin/e_path.c b/src/bin/e_path.c
index 310736b..d22087c 100644 (file)
--- a/src/bin/e_path.c
+++ b/src/bin/e_path.c
@@ -1,4 +1,5 @@
 #include "e.h"
+#include "e_user_intern.h"
 
 /* local subsystem functions */
 static void      _e_path_free(E_Path *ep);

diff --git a/src/bin/e_user.h b/src/bin/e_user_intern.h
similarity index 94%
rename from src/bin/e_user.h
rename to src/bin/e_user_intern.h
index 968ee77..c252a0a 100644 (file)
--- a/src/bin/e_user.h
+++ b/src/bin/e_user_intern.h
@@ -1,7 +1,5 @@
-#ifdef E_TYPEDEFS
-#else
-#ifndef E_USER_H
-#define E_USER_H
+#ifndef E_USER_INTERN_H
+#define E_USER_INTERN_H
 
 EINTERN int       e_user_init(void);
 EINTERN int       e_user_shutdown(void);
@@ -21,4 +19,3 @@ EINTERN size_t      e_user_dir_snprintf(char *dst, size_t size, const char *fmt,
 #define e_user_dir_concat_static(dst, path) e_user_dir_concat_len(dst, sizeof(dst), path,  (sizeof(path) > 0) ? sizeof(path) - 1 : 0)
 
 #endif
-#endif