e_service_softkey: make an internal header

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

Change-Id: I1ced8746ce94d07121daeeafeed675565765f01f

diff --git a/src/bin/e_policy_wl.c b/src/bin/e_policy_wl.c
index f6f1058..c29c445 100644 (file)
--- a/src/bin/e_policy_wl.c
+++ b/src/bin/e_policy_wl.c
@@ -8,7 +8,7 @@
 #include "services/e_service_indicator_intern.h"
 #include "services/e_service_cbhm_intern.h"
 #include "services/e_service_scrsaver_intern.h"
-#include "services/e_service_softkey.h"
+#include "services/e_service_softkey_intern.h"
 #include "services/e_service_launcher_intern.h"
 #include "services/e_service_taskbar.h"
 #include "services/e_service_kvm_intern.h"

diff --git a/src/bin/services/e_service_softkey.c b/src/bin/services/e_service_softkey.c
index 2b1a27f..c824d37 100644 (file)
--- a/src/bin/services/e_service_softkey.c
+++ b/src/bin/services/e_service_softkey.c
@@ -1,9 +1,11 @@
 #include "e.h"
-#include <tzsh_server.h>
-#include "services/e_service_softkey.h"
+#include "services/e_service_softkey_intern.h"
 #include "services/e_service_gesture.h"
 #include "services/e_service_region_intern.h"
 #include "e_policy_intern.h"
+#include "e_policy_private_data.h"
+
+#include <tzsh_server.h>
 
 #define SOFTKEY_SERVICE_SHOW(softkey_service)                 \
 do                                            \

diff --git a/src/bin/services/e_service_softkey.h b/src/bin/services/e_service_softkey.h
index 6847d52..dc63f61 100644 (file)
--- a/src/bin/services/e_service_softkey.h
+++ b/src/bin/services/e_service_softkey.h
@@ -1,8 +1,6 @@
 #ifndef E_SERVICE_SOFTKEY_H
 #define E_SERVICE_SOFTKEY_H
 
-#include "e_policy_private_data.h"
-
 typedef struct _E_Service_Softkey E_Service_Softkey;
 typedef struct _E_Service_Softkey_Funcs E_Service_Softkey_Funcs;
 
@@ -50,26 +48,6 @@ E_API void                e_service_softkey_del(E_Service_Softkey *softkey);
 E_API Eina_Bool           e_service_softkey_wl_resource_set(E_Service_Softkey *softkey, struct wl_resource *wl_res);
 E_API struct wl_resource *e_service_softkey_wl_resource_get(E_Service_Softkey *softkey);
 
-EINTERN void              e_service_softkey_client_set(E_Client *ec);
-EINTERN void              e_service_softkey_client_unset(E_Client *ec);
-
-EINTERN void              e_service_softkey_show(E_Service_Softkey *softkey);
-EINTERN void              e_service_softkey_hide(E_Service_Softkey *softkey);
-
-EINTERN void              e_service_softkey_visible_set(E_Service_Softkey *softkey, int visible);
-EINTERN int               e_service_softkey_visible_get(E_Service_Softkey *softkey);
-EINTERN void              e_service_softkey_expand_set(E_Service_Softkey *softkey, E_Policy_Softkey_Expand expand);
-EINTERN Eina_Bool         e_service_softkey_expand_get(E_Service_Softkey *softkey, E_Policy_Softkey_Expand *expand);
-EINTERN void              e_service_softkey_opacity_set(E_Service_Softkey *softkey, E_Policy_Softkey_Opacity opacity);
-EINTERN Eina_Bool         e_service_softkey_opacity_get(E_Service_Softkey *softkey, E_Policy_Softkey_Opacity *opacity);
-
-EINTERN void              e_service_softkey_client_remove_handler_add(void);
-EINTERN void              e_service_softkey_client_remove_handler_del(void);
-EINTERN void              e_service_softkey_restore_visible_request(E_Service_Softkey *softkey_srv);
-EINTERN void              e_service_softkey_store_visible_request(E_Client *ec, Eina_Bool visible);
-
-EINTERN Eina_Bool         e_service_softkey_handler_region_set(E_Client *ec, int angle, Eina_Tiler *tiler);
-
 E_API E_Service_Softkey  *e_service_softkey_get(E_Zone *zone);
 
 #endif

diff --git a/src/bin/services/e_service_softkey_intern.h b/src/bin/services/e_service_softkey_intern.h
new file mode 100644 (file)
index 0000000..d9a8bda
--- /dev/null
+++ b/src/bin/services/e_service_softkey_intern.h
@@ -0,0 +1,26 @@
+#ifndef E_SERVICE_SOFTKEY_INTERN_H
+#define E_SERVICE_SOFTKEY_INTERN_H
+
+#include "services/e_service_softkey.h"
+
+EINTERN void              e_service_softkey_client_set(E_Client *ec);
+EINTERN void              e_service_softkey_client_unset(E_Client *ec);
+
+EINTERN void              e_service_softkey_show(E_Service_Softkey *softkey);
+EINTERN void              e_service_softkey_hide(E_Service_Softkey *softkey);
+
+EINTERN void              e_service_softkey_visible_set(E_Service_Softkey *softkey, int visible);
+EINTERN int               e_service_softkey_visible_get(E_Service_Softkey *softkey);
+EINTERN void              e_service_softkey_expand_set(E_Service_Softkey *softkey, E_Policy_Softkey_Expand expand);
+EINTERN Eina_Bool         e_service_softkey_expand_get(E_Service_Softkey *softkey, E_Policy_Softkey_Expand *expand);
+EINTERN void              e_service_softkey_opacity_set(E_Service_Softkey *softkey, E_Policy_Softkey_Opacity opacity);
+EINTERN Eina_Bool         e_service_softkey_opacity_get(E_Service_Softkey *softkey, E_Policy_Softkey_Opacity *opacity);
+
+EINTERN void              e_service_softkey_client_remove_handler_add(void);
+EINTERN void              e_service_softkey_client_remove_handler_del(void);
+EINTERN void              e_service_softkey_restore_visible_request(E_Service_Softkey *softkey_srv);
+EINTERN void              e_service_softkey_store_visible_request(E_Client *ec, Eina_Bool visible);
+
+EINTERN Eina_Bool         e_service_softkey_handler_region_set(E_Client *ec, int angle, Eina_Tiler *tiler);
+
+#endif