e_comp_wl_shell: make an internal header

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

Change-Id: I4aed227cc54b979d192c54965d46038e463e2d90

diff --git a/src/bin/Makefile.mk b/src/bin/Makefile.mk
index 79b291f..201abb7 100644 (file)
--- a/src/bin/Makefile.mk
+++ b/src/bin/Makefile.mk
@@ -94,7 +94,6 @@ src/bin/video/e_client_video.h \
 src/bin/video/e_zone_video.h \
 src/bin/video/e_video_debug.h \
 src/bin/e_comp_wl_viewport.h \
-src/bin/e_comp_wl_shell.h \
 src/bin/e_comp_wl_capture.h \
 src/bin/services/e_service_gesture.h \
 src/bin/services/e_service_lockscreen.h \

diff --git a/src/bin/e_comp_wl.c b/src/bin/e_comp_wl.c
index c6312b1..75119fc 100644 (file)
--- a/src/bin/e_comp_wl.c
+++ b/src/bin/e_comp_wl.c
@@ -17,6 +17,7 @@
 #include "e_comp_wl_renderer_intern.h"
 #include "e_comp_wl_rsm_intern.h"
 #include "e_comp_wl_screenshooter_intern.h"
+#include "e_comp_wl_shell_intern.h"
 
 #include <tizen-extension-server-protocol.h>
 #include <relative-pointer-unstable-v1-server-protocol.h>

diff --git a/src/bin/e_comp_wl_shell.c b/src/bin/e_comp_wl_shell.c
index cfb2657..8043a3a 100644 (file)
--- a/src/bin/e_comp_wl_shell.c
+++ b/src/bin/e_comp_wl_shell.c
@@ -5,6 +5,7 @@
 #include "e_xdg_shell_v6_intern.h"
 #include "e_comp_wl_intern.h"
 #include "e_comp_wl_rsm_intern.h"
+#include "e_comp_wl_shell_intern.h"
 
 #include <xdg-shell-unstable-v5-server-protocol.h>
 #include <xdg-shell-unstable-v6-server-protocol.h>

diff --git a/src/bin/e_comp_wl_shell.h b/src/bin/e_comp_wl_shell_intern.h
similarity index 94%
rename from src/bin/e_comp_wl_shell.h
rename to src/bin/e_comp_wl_shell_intern.h
index 06fc7dd..c65fcf1 100644 (file)
--- a/src/bin/e_comp_wl_shell.h
+++ b/src/bin/e_comp_wl_shell_intern.h
@@ -1,7 +1,5 @@
-#ifdef E_TYPEDEFS
-#else
-# ifndef E_COMP_WL_SHELL_H
-#  define E_COMP_WL_SHELL_H
+#ifndef E_COMP_WL_SHELL_INTERN_H
+#define E_COMP_WL_SHELL_INTERN_H
 
 typedef struct
 {
@@ -30,7 +28,4 @@ EINTERN Eina_Bool e_shell_e_client_interactive_resize(E_Client *ec, struct wl_re
 EINTERN void      e_shell_e_client_pong(E_Client *ec);
 EINTERN void      e_shell_e_client_destroy(E_Client *ec);
 
-
-
-# endif
 #endif

diff --git a/src/bin/e_includes.h b/src/bin/e_includes.h
index 5b8fa28..d7deec5 100644 (file)
--- a/src/bin/e_includes.h
+++ b/src/bin/e_includes.h
@@ -53,7 +53,6 @@
 #include "e_comp_wl_tbm.h"
 #include "e_comp_wl_rsm.h"
 #include "e_comp_wl_viewport.h"
-#include "e_comp_wl_shell.h"
 #include "e_policy.h"
 #include "e_policy_conformant.h"
 #include "e_policy_visibility.h"

diff --git a/src/bin/e_xdg_shell_v6.c b/src/bin/e_xdg_shell_v6.c
index 5c5a9dc..02664ab 100644 (file)
--- a/src/bin/e_xdg_shell_v6.c
+++ b/src/bin/e_xdg_shell_v6.c
@@ -1,6 +1,7 @@
 #include "e.h"
 #include "e_xdg_shell_v6_intern.h"
 #include "e_comp_wl_intern.h"
+#include "e_comp_wl_shell_intern.h"
 
 #include <libds/surface.h>
 #include <libds/types/ds_xdg_shell_v6.h>