e_devicemgr: initialize e_devicemgr_input at e_main

Change-Id: I12b96cdeff737c153f0357f5e2c24c97cb094ac4

diff --git a/src/bin/e_main.c b/src/bin/e_main.c
index 83aee3061637dd7534cfb2fc5fdc557cc94ef487..4bfd3ee219bdf26713848a3d085bb9fef71aba45 100644 (file)
--- a/src/bin/e_main.c
+++ b/src/bin/e_main.c
@@ -37,6 +37,7 @@
 #include "e_comp_screen_intern.h"
 #include "e_service_virtual_touch_intern.h"
 #include "e_server_intern.h"
+#include "e_devicemgr_input_intern.h"
 
 #include <Eio.h>
 
@@ -657,6 +658,15 @@ main(int argc, char **argv)
    TSE("E_Devicemgr Init Done");
    _e_main_shutdown_push(e_devicemgr_shutdown);
 
+   TSB("E_Devicemgr_Input Init");
+   if (!e_devicemgr_input_init())
+     {
+        e_error_message_show(_("Enlightenment cannot set up its device_manager_input system.\n"));
+        goto failed;
+     }
+   TSE("E_Devicemgr_Input Init Done");
+   _e_main_shutdown_push(e_devicemgr_input_shutdown);
+
    TSB("E_Keyrouter Init");
    if (!e_keyrouter_init())
      {

diff --git a/src/bin/inputmgr/e_devicemgr.c b/src/bin/inputmgr/e_devicemgr.c
index d099fc8b3edc4e3be79b81b5ac78ad0b2063d2d6..5067b1d6501a82f7a140be1cedbb604a246c3fa4 100644 (file)
--- a/src/bin/inputmgr/e_devicemgr.c
+++ b/src/bin/inputmgr/e_devicemgr.c
@@ -1,5 +1,4 @@
 #include "e_devicemgr_intern.h"
-#include "e_devicemgr_input_intern.h"
 #include "e_devicemgr_conf_intern.h"
 #include "e_server_intern.h"
 #include "e_comp_intern.h"
@@ -14,7 +13,6 @@ EINTERN int
 e_devicemgr_init(void)
 {
    E_Devicemgr_Config_Data *dconfig = NULL;
-   Eina_Bool res = EINA_FALSE;
 
    EINA_SAFETY_ON_NULL_GOTO(e_comp_get(), failed);
 
@@ -33,14 +31,8 @@ e_devicemgr_init(void)
 
    g_rec_mutex_init(&e_devicemgr->device_list_mutex);
 
-   res = e_devicemgr_input_init();
-   EINA_SAFETY_ON_FALSE_GOTO(res, input_failed);
-
    return EINA_TRUE;
 
-input_failed:
-   e_devicemgr_input_shutdown();
-
 failed:
    if (e_devicemgr)
      {

diff --git a/src/bin/inputmgr/e_devicemgr_input.c b/src/bin/inputmgr/e_devicemgr_input.c
index 0b8da8e84349c6ad070308f2817fb8009f49630e..7e79c5168141023331b2550222a00ad1d3d36bc3 100644 (file)
--- a/src/bin/inputmgr/e_devicemgr_input.c
+++ b/src/bin/inputmgr/e_devicemgr_input.c
@@ -538,7 +538,7 @@ e_devicemgr_input_init(void)
    return EINA_TRUE;
 }
 
-void
+int
 e_devicemgr_input_shutdown(void)
 {
    Ecore_Event_Handler *h = NULL;
@@ -559,4 +559,6 @@ e_devicemgr_input_shutdown(void)
 
    if (e_devicemgr->multi)
      free(e_devicemgr->multi);
+
+   return EINA_TRUE;
 }

diff --git a/src/bin/inputmgr/e_devicemgr_input_intern.h b/src/bin/inputmgr/e_devicemgr_input_intern.h
index 0f4f978957d9f56e7393229904fb75a2b257ca6f..01aa8d9d67753054d4d3259f65f2a48f2f264849 100644 (file)
--- a/src/bin/inputmgr/e_devicemgr_input_intern.h
+++ b/src/bin/inputmgr/e_devicemgr_input_intern.h
@@ -7,7 +7,7 @@
 #define DETENT_DEVICE_NAME "tizen_detent"
 
 EINTERN Eina_Bool e_devicemgr_input_init(void);
-EINTERN void      e_devicemgr_input_shutdown(void);
+EINTERN int       e_devicemgr_input_shutdown(void);
 
 EINTERN int e_devicemgr_input_pointer_warp(struct wl_client *client, struct wl_resource *resource, struct wl_resource *surface, wl_fixed_t x, wl_fixed_t y);