e_xdg_shell_v6: make an internal header

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

Change-Id: Ic1f1a3b60ebcad75b6301b39b95a63dfa4652d92

diff --git a/src/bin/Makefile.mk b/src/bin/Makefile.mk
index 912fa8f..4d92c2a 100644 (file)
--- a/src/bin/Makefile.mk
+++ b/src/bin/Makefile.mk
@@ -132,7 +132,6 @@ src/bin/e_keyrouter_private.h \
 src/bin/e_gesture.h \
 src/bin/e_input.h \
 src/bin/e_dbus_conn.h \
-src/bin/e_xdg_shell_v6.h \
 src/bin/e_devicemgr.h \
 src/bin/e_devicemgr_private.h \
 src/bin/e_msg.h        \

diff --git a/src/bin/e_comp_wl_shell.c b/src/bin/e_comp_wl_shell.c
index c19b5cb..7d9501a 100644 (file)
--- a/src/bin/e_comp_wl_shell.c
+++ b/src/bin/e_comp_wl_shell.c
@@ -2,6 +2,8 @@
 #include "e_client_intern.h"
 #include "e_actions_intern.h"
 #include "e_bindings_intern.h"
+#include "e_xdg_shell_v6_intern.h"
+
 #include <xdg-shell-unstable-v5-server-protocol.h>
 #include <xdg-shell-unstable-v6-server-protocol.h>
 #include <tizen-extension-server-protocol.h>

diff --git a/src/bin/e_eom.c b/src/bin/e_eom.c
index aef9eca..a6ee374 100644 (file)
--- a/src/bin/e_eom.c
+++ b/src/bin/e_eom.c
@@ -4,6 +4,8 @@
 
 #include "e.h"
 #include "e_client_intern.h"
+#include "e_xdg_shell_v6_intern.h"
+
 #include <xdg-shell-unstable-v5-server-protocol.h>
 #include <eom-server-protocol.h>
 #include <eom.h>

diff --git a/src/bin/e_includes.h b/src/bin/e_includes.h
index 7cce41f..3bdc1d3 100644 (file)
--- a/src/bin/e_includes.h
+++ b/src/bin/e_includes.h
@@ -73,7 +73,6 @@
 #include "e_gesture.h"
 #include "e_input.h"
 #include "e_dbus_conn.h"
-#include "e_xdg_shell_v6.h"
 #include "e_devicemgr.h"
 #include "e_video_debug.h"
 #include "e_client_video.h"

diff --git a/src/bin/e_xdg_shell_v6.c b/src/bin/e_xdg_shell_v6.c
index 35e58fb..090aa9e 100644 (file)
--- a/src/bin/e_xdg_shell_v6.c
+++ b/src/bin/e_xdg_shell_v6.c
@@ -1,4 +1,5 @@
 #include "e.h"
+#include "e_xdg_shell_v6_intern.h"
 
 #include <libds/surface.h>
 #include <libds/types/ds_xdg_shell_v6.h>

diff --git a/src/bin/e_xdg_shell_v6.h b/src/bin/e_xdg_shell_v6_intern.h
similarity index 61%
rename from src/bin/e_xdg_shell_v6.h
rename to src/bin/e_xdg_shell_v6_intern.h
index d835cad..b318a7a 100644 (file)
--- a/src/bin/e_xdg_shell_v6.h
+++ b/src/bin/e_xdg_shell_v6_intern.h
@@ -1,10 +1,7 @@
-#ifdef E_TYPEDEFS
-#else
-# ifndef E_XDG_SHELL_V6_H
-#  define E_XDG_SHELL_V6_H
+#ifndef E_XDG_SHELL_V6_INTERN_H
+#define E_XDG_SHELL_V6_INTERN_H
 
 EINTERN Eina_Bool e_xdg_shell_v6_init(void);
 EINTERN E_Client *e_xdg_shell_v6_xdg_surface_ec_get(struct wl_resource *resource);
 
-# endif
 #endif