diff options
| author | Jihoon Kim <jihoon48.kim@samsung.com> | 2018-01-11 09:23:17 +0900 |
|---|---|---|
| committer | Ji-hoon Lee <dalton.lee@samsung.com> | 2018-03-19 17:50:16 +0900 |
| commit | 7569da998751d88da0db901340f3625f262e53eb (patch) | |
| tree | dbd1a00e2deb67d103c4fecdefae8bf54aa28f1b /ism/modules | |
| parent | 50a8064a9f9e37d05944852b1556f9aefce28ded (diff) | |
| download | isf-7569da998751d88da0db901340f3625f262e53eb.tar.gz isf-7569da998751d88da0db901340f3625f262e53eb.tar.bz2 isf-7569da998751d88da0db901340f3625f262e53eb.zip | |
Add code to connect to wl display
Change-Id: I53ecc97b94f2a061f6cd652a4ac9ecc5ed269dfb
Signed-off-by: Jihoon Kim <jihoon48.kim@samsung.com>
Diffstat (limited to 'ism/modules')
| -rw-r--r-- | ism/modules/panelagent/wayland/wayland_panel_agent_module.cpp | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/ism/modules/panelagent/wayland/wayland_panel_agent_module.cpp b/ism/modules/panelagent/wayland/wayland_panel_agent_module.cpp index f79c4695..612ecabe 100644 --- a/ism/modules/panelagent/wayland/wayland_panel_agent_module.cpp +++ b/ism/modules/panelagent/wayland/wayland_panel_agent_module.cpp @@ -78,7 +78,7 @@ using namespace scim; struct _WSCContextISFImpl { WSCContextISF *parent; - Ecore_Wl2_Window *client_window; + Ecore_Wl2_Window *client_window; Ecore_IMF_Input_Mode input_mode; WideString surrounding_text; WideString preedit_string; @@ -209,7 +209,7 @@ static Ecore_Timer *_resource_check_timer static bool _need_wl_im_init = false; static struct _wl_im *_wl_im_ctx = NULL; -static int _ecore_wl2_init_count = 0; +static int _ecore_wl2_init_count = 0; #define WAYLAND_MODULE_CLIENT_ID (0) #define MAX_PREEDIT_BUFSIZE 4000 @@ -905,15 +905,10 @@ _wsc_setup (struct weescim *wsc) if (!wsc) return false; - Ecore_Wl2_Display *wl2_display = ecore_wl2_connected_display_get (NULL); + Ecore_Wl2_Display *wl2_display = ecore_wl2_display_connect (NULL); if (!wl2_display) { - LOGW ("failed to get wl2_display, try connecting"); - wl2_display = ecore_wl2_display_connect (NULL); - - if (!wl2_display) { - LOGW ("failed to connect"); - return false; - } + LOGW ("failed to connect"); + return false; } if (!(registry = ecore_wl2_display_registry_get (wl2_display))) { |