From: Ji-hoon Lee <dalton.lee@samsung.com>
Date: Fri, 30 Sep 2016 04:15:21 +0000 (+0900)
Subject: Re-enabled transient_for in TV profile
X-Git-Tag: submit/tizen/20161005.100700~3
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=44fa221d9d30011e8eb84cceab093c5f16fc51e3;p=platform%2Fcore%2Fuifw%2Fe-mod-tizen-wl-textinput.git

Re-enabled transient_for in TV profile

Change-Id: I39bd5d18c389501ffafadfb7d98e08ca40eb202b
---

diff --git a/src/e_mod_input_panel.c b/src/e_mod_input_panel.c
index 9610aa3..1a8a454 100644
--- a/src/e_mod_input_panel.c
+++ b/src/e_mod_input_panel.c
@@ -730,7 +730,6 @@ e_input_panel_wait_update_set(Eina_Bool wait_update)
 #endif
 }
 
-#ifndef _TV
 EINTERN void
 e_input_panel_transient_for_set(E_Client *parent)
 {
@@ -783,4 +782,3 @@ e_input_panel_transient_for_set(E_Client *parent)
         EC_CHANGED(child);
      }
 }
-#endif
\ No newline at end of file
diff --git a/src/e_mod_main.c b/src/e_mod_main.c
index 9a753f8..4fc2a11 100644
--- a/src/e_mod_main.c
+++ b/src/e_mod_main.c
@@ -107,14 +107,10 @@ static Eina_Bool g_keyboard_mode_engligh = EINA_TRUE;
 static Ecore_Timer *g_timer_will_hide  = NULL;
 static enum _E_Input_Panel_State g_input_panel_state = E_INPUT_PANEL_STATE_DID_HIDE;
 static E_Client *transient_for_ec = NULL;
-
-#ifndef _TV
 static Eina_List *hooks_ec = NULL;
-#endif
 
 const int WILL_HIDE_TIMER_INTERVAL = 1.0f;
 
-#ifndef _TV
 #undef E_CLIENT_HOOK_APPEND
 #define E_CLIENT_HOOK_APPEND(l, t, cb, d) \
   do                                      \
@@ -125,7 +121,6 @@ const int WILL_HIDE_TIMER_INTERVAL = 1.0f;
        l = eina_list_append(l, _h);       \
     }                                     \
   while (0)
-#endif
 
 static struct _E_Input_Method_Keymap_Info g_keymap_info[] = {
    {"en_US", "evdev", "pc105", "us"},
@@ -1027,10 +1022,8 @@ _e_text_input_cb_activate(struct wl_client *client, struct wl_resource *resource
    EINA_SAFETY_ON_TRUE_GOTO(e_object_is_del(E_OBJECT(ec)), err);
    transient_for_ec = ec;
 
-#ifndef _TV
    e_input_panel_transient_for_set(transient_for_ec);
    WTI_LOG("TRANSIENT_FOR::Application window's E_Client* value : %p\n", transient_for_ec);
-#endif
 
    text_input = wl_resource_get_user_data(resource);
    g_text_input = text_input;
@@ -1228,18 +1221,15 @@ _e_text_input_cb_input_panel_show(struct wl_client *client, struct wl_resource *
    if (text_input->resource)
      wl_text_input_send_input_panel_state(text_input->resource,
                                           WL_TEXT_INPUT_INPUT_PANEL_STATE_SHOW);
-#ifndef _TV
+
    e_input_panel_transient_for_set(transient_for_ec);
-#endif
 }
 
 static void
 _e_text_input_cb_input_panel_hide(struct wl_client *client, struct wl_resource *resource)
 {
    _input_panel_hide(client, resource, EINA_FALSE);
-#ifndef _TV
    e_input_panel_transient_for_set(NULL);
-#endif
 }
 
 static void
@@ -1921,7 +1911,6 @@ _e_text_input_method_context_cb_client_resize(void *data EINA_UNUSED, int type E
    return ECORE_CALLBACK_PASS_ON;
 }
 
-#ifndef _TV
 static void
 _pol_cb_hook_client_del(void *d EINA_UNUSED, E_Client *ec)
 {
@@ -1934,7 +1923,6 @@ _pol_cb_hook_client_del(void *d EINA_UNUSED, E_Client *ec)
         WTI_LOG("TRANSIENT_FOR::Reset transient_for_ec to NULL\n");
      }
 }
-#endif
 
 E_API void *
 e_modapi_init(E_Module *m)
@@ -1969,9 +1957,7 @@ e_modapi_init(E_Module *m)
    if (!eeze_udev_watch_hander)
      goto err;
 
-#ifndef _TV
    E_CLIENT_HOOK_APPEND(hooks_ec, E_CLIENT_HOOK_DEL, _pol_cb_hook_client_del, NULL);
-#endif
 
    return m;
 err:
@@ -1983,9 +1969,7 @@ E_API int
 e_modapi_shutdown(E_Module *m EINA_UNUSED)
 {
    E_FREE_LIST(handlers, ecore_event_handler_del);
-#ifndef _TV
    E_FREE_LIST(hooks_ec, e_client_hook_del);
-#endif
 
    if (g_timer_will_hide)
      {
diff --git a/src/e_mod_main.h b/src/e_mod_main.h
index 2dc93f8..2f1e687 100644
--- a/src/e_mod_main.h
+++ b/src/e_mod_main.h
@@ -8,8 +8,6 @@ void        e_input_panel_shutdown(void);
 void        e_input_panel_visibility_change(Eina_Bool visible);
 Eina_Bool   e_input_panel_client_find(E_Client *ec);
 EINTERN void   e_input_panel_wait_update_set(Eina_Bool wait_update);
-#ifndef _TV
 EINTERN void   e_input_panel_transient_for_set(E_Client *parent);
-#endif
 
 #endif