e_foreign: move all in e_foreign_private.h to e_foreign_intern.h

Move all of the definitions and internal signatures to e_foreign_intern.h.

Change-Id: I1164c1cdd97e3e4f9e3040a4aedada30dd8bb41f

diff --git a/src/bin/e_foreign.c b/src/bin/e_foreign.c
index fd652b3..965a887 100644 (file)
--- a/src/bin/e_foreign.c
+++ b/src/bin/e_foreign.c
@@ -1,7 +1,8 @@
+#include "e.h"
 #include "e_foreign_intern.h"
-#include "e_foreign_private.h"
 
 #include <uuid.h>
+#include <wtz-foreign-server-protocol.h>
 
 #define WTZ_FOREIGN_VERSION         1
 #define WTZ_EXPORTED_SHELL_VERSION  1

diff --git a/src/bin/e_foreign_intern.h b/src/bin/e_foreign_intern.h
index 41f5db3..7b3f7c7 100644 (file)
--- a/src/bin/e_foreign_intern.h
+++ b/src/bin/e_foreign_intern.h
@@ -1,10 +1,38 @@
 #ifndef E_FOREIGN_INTERN_H
 #define E_FOREIGN_INTERN_H
 
+#if 0
 #include "e.h"
 #include <wayland-server.h>
 #include <Eina.h>
+#endif
+
+#ifdef FERR
+# undef FERR
+#endif
+#define FERR(fmt, ec, arg...)   ELOGF("FOREIGN <ERR>", fmt, ec, ##arg)
+
+#ifdef FINF
+# undef FINF
+#endif
+#define FINF(fmt, ec, arg...)   ELOGF("FOREIGN <INF>", fmt, ec, ##arg)
+
+#ifdef FDBG
+# undef FDBG
+#endif
+#define FDBG(fmt, arg...)   DBG("FOREIGN| "fmt, ##arg)
+
+typedef struct _E_Foreign_Handle    E_Foreign_Handle;
 
 EINTERN Eina_Bool e_foreign_global_init(struct wl_display *display);
 
+EINTERN E_Foreign_Handle   *e_foreign_handle_create(void);
+EINTERN void                e_foreign_handle_destroy(E_Foreign_Handle *handle);
+EINTERN const char         *e_foreign_handle_string_get(E_Foreign_Handle *handle);
+
+EINTERN Eina_Bool           e_foreign_shell_init(void);
+EINTERN void                e_foreign_shell_shutdown(void);
+EINTERN Eina_Bool           e_foreign_shell_export(struct wl_resource *exporter, struct wl_resource *resource, struct wl_resource *surface);
+EINTERN Eina_Bool           e_foreign_shell_import(struct wl_resource *importer, struct wl_resource *resource, struct wl_resource *surface, const char *handle);
+
 #endif

diff --git a/src/bin/e_foreign_private.h b/src/bin/e_foreign_private.h
deleted file mode 100644 (file)
index e9418c1..0000000
--- a/src/bin/e_foreign_private.h
+++ /dev/null
@@ -1,34 +0,0 @@
-#ifndef E_FOREIGN_PRIVATE_H
-# define E_FOREIGN_PRIVATE_H
-
-#include "e.h"
-#include <wayland-server.h>
-#include <wtz-foreign-server-protocol.h>
-
-#ifdef FERR
-# undef FERR
-#endif
-#define FERR(fmt, ec, arg...)   ELOGF("FOREIGN <ERR>", fmt, ec, ##arg)
-
-#ifdef FINF
-# undef FINF
-#endif
-#define FINF(fmt, ec, arg...)   ELOGF("FOREIGN <INF>", fmt, ec, ##arg)
-
-#ifdef FDBG
-# undef FDBG
-#endif
-#define FDBG(fmt, arg...)   DBG("FOREIGN| "fmt, ##arg)
-
-typedef struct _E_Foreign_Handle    E_Foreign_Handle;
-
-EINTERN E_Foreign_Handle   *e_foreign_handle_create(void);
-EINTERN void                e_foreign_handle_destroy(E_Foreign_Handle *handle);
-EINTERN const char         *e_foreign_handle_string_get(E_Foreign_Handle *handle);
-
-EINTERN Eina_Bool           e_foreign_shell_init(void);
-EINTERN void                e_foreign_shell_shutdown(void);
-EINTERN Eina_Bool           e_foreign_shell_export(struct wl_resource *exporter, struct wl_resource *resource, struct wl_resource *surface);
-EINTERN Eina_Bool           e_foreign_shell_import(struct wl_resource *importer, struct wl_resource *resource, struct wl_resource *surface, const char *handle);
-
-#endif

diff --git a/src/bin/e_foreign_shell.c b/src/bin/e_foreign_shell.c
index 59a5a64..3312567 100644 (file)
--- a/src/bin/e_foreign_shell.c
+++ b/src/bin/e_foreign_shell.c
@@ -1,8 +1,11 @@
-#include "e_foreign_private.h"
+#include "e.h"
+#include "e_foreign_intern.h"
 #include "e_comp_wl_intern.h"
 #include "e_comp_wl_subsurface_intern.h"
 #include "e_pixmap_intern.h"
 
+#include <wtz-foreign-server-protocol.h>
+
 #define ESINF(obj, fmt, x...) \
    FINF("EShell:%p| "fmt, es->ec, obj, ##x)