Merge branch 'tizen_3.0' into tizen 55/111555/1 accepted/tizen/common/20170123.182126 accepted/tizen/ivi/20170123.113555 accepted/tizen/mobile/20170123.113254 accepted/tizen/tv/20170123.113306 accepted/tizen/wearable/20170123.113540 submit/tizen/20170122.013620
authorJihoon Kim <jihoon48.kim@samsung.com>
Sun, 22 Jan 2017 01:29:37 +0000 (10:29 +0900)
committerJihoon Kim <jihoon48.kim@samsung.com>
Sun, 22 Jan 2017 01:29:37 +0000 (10:29 +0900)
Change-Id: Ibe90ac6f7e3339ee2ed25b61d3ddb15a13845c6a

1  2 
packaging/e-mod-tizen-wl-textinput.spec
src/e_mod_input_panel.c
src/e_mod_main.c
src/e_mod_main.h

Simple merge
index 1828c94b423b8577698685c5ff88676b1fd07f51,daef5046ed8ced620afb10090db7e90d9a41ec4b..fb0c5613fb7e6756c075124588e309e4a6d992a6
@@@ -1134,11 -1093,12 +1136,11 @@@ _e_text_input_cb_activate(struct wl_cli
          input_method->context = context;
  
          if (context->resource)
-           wl_input_method_send_activate(input_method->resource, context->resource, text_input->id);
+           wl_input_method_send_activate(input_method->resource, context->resource, text_input->id, EINA_TRUE);
       }
  
 -#ifdef _TV
 -   set_soft_keyboard_mode();
 -#endif
 +   if (_TV)
 +     set_soft_keyboard_mode();
  
     if (text_input->resource)
       wl_text_input_send_enter(text_input->resource, surface);
Simple merge