discomfitor pushed a commit to branch master.

http://git.enlightenment.org/apps/terminology.git/commit/?id=7a2d665610a94dd2395e0c016990b571268b6b51

commit 7a2d665610a94dd2395e0c016990b571268b6b51
Author: Mike Blumenkrantz <zm...@samsung.com>
Date:   Mon Dec 30 18:32:22 2013 -0500

    fix teamwork with 1.9
    
    this id encoding only gets applied for wayland-running clients...not sure 
if htis is the best way to detect it but it works
---
 src/bin/termio.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/bin/termio.c b/src/bin/termio.c
index 5a4c416..b2968cd 100644
--- a/src/bin/termio.c
+++ b/src/bin/termio.c
@@ -561,7 +561,8 @@ _update_link(Evas_Object *obj, Termio *sd,
 #if (ELM_VERSION_MAJOR > 1) || (ELM_VERSION_MINOR >= 8)
                        xwin = elm_win_window_id_get(sd->win);
 # if (ELM_VERSION_MAJOR > 1) || (ELM_VERSION_MINOR > 8) // not a typo
-                       xwin = ((uint64_t)xwin << 32) + (uint64_t)getpid();
+                       if 
(strstr(ecore_evas_engine_name_get(ecore_evas_ecore_evas_get(evas_object_evas_get(sd->win))),
 "wayland"))
+                         xwin = ((uint64_t)xwin << 32) + (uint64_t)getpid();
 # endif
 #else
                        xwin = elm_win_xwindow_get(sd->win);
@@ -634,7 +635,8 @@ _remove_links(Termio *sd, Evas_Object *obj)
 #if (ELM_VERSION_MAJOR > 1) || (ELM_VERSION_MINOR >= 8)
                        xwin = elm_win_window_id_get(sd->win);
 # if (ELM_VERSION_MAJOR > 1) || (ELM_VERSION_MINOR > 8) // not a typo
-                       xwin = ((uint64_t)xwin << 32) + (uint64_t)getpid();
+                       if 
(strstr(ecore_evas_engine_name_get(ecore_evas_ecore_evas_get(evas_object_evas_get(sd->win))),
 "wayland"))
+                         xwin = ((uint64_t)xwin << 32) + (uint64_t)getpid();
 # endif
 #else
                        xwin = elm_win_xwindow_get(sd->win);

-- 


Reply via email to