[EGIT] [core/enlightenment] master 01/04: disable netwm sync on x11 clients in wayland compositors

[Mike Blumenkrantz]

discomfitor pushed a commit to branch master.

http://git.enlightenment.org/core/enlightenment.git/commit/?id=c9d5053998d10f2ee97f7db031b2d2b24729f642

commit c9d5053998d10f2ee97f7db031b2d2b24729f642
Author: Mike Blumenkrantz <zm...@osg.samsung.com>
Date:   Thu Jul 9 19:32:51 2015 -0400

    disable netwm sync on x11 clients in wayland compositors
    
    this has no effect
---
 src/bin/e_comp_x.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/bin/e_comp_x.c b/src/bin/e_comp_x.c
index e528287..f6c88df 100644
--- a/src/bin/e_comp_x.c
+++ b/src/bin/e_comp_x.c
@@ -591,7 +591,7 @@ _e_comp_x_post_client_idler_cb(void *d EINA_UNUSED)
           {
              if (ec->post_resize)
                {
-                  if (ec->netwm.sync.request)
+                  if (ec->netwm.sync.request && (e_comp->comp_type == 
E_PIXMAP_TYPE_X))
                     {
                        //INF("NETWM SYNC: %p", ec);
                        ec->netwm.sync.wait++;
@@ -2247,7 +2247,7 @@ _e_comp_x_mouse_move(void *d EINA_UNUSED, int t 
EINA_UNUSED, Ecore_Event_Mouse_M
      }
    E_COMP_X_PIXMAP_CHECK ECORE_CALLBACK_RENEW;
    if (_e_comp_x_client_data_get(ec)->deleted || 
e_client_util_ignored_get(ec)) return ECORE_CALLBACK_RENEW;
-   if (e_client_util_resizing_get(ec) &&
+   if (e_client_util_resizing_get(ec) && (e_comp->comp_type == 
E_PIXMAP_TYPE_X) &&
        ec->netwm.sync.request &&
        _e_comp_x_client_data_get(ec)->alarm
       )
@@ -4480,7 +4480,7 @@ static void
 _e_comp_x_hook_client_resize_begin(void *d EINA_UNUSED, E_Client *ec)
 {
    E_COMP_X_PIXMAP_CHECK;
-   if (!ec->netwm.sync.request) return;
+   if ((!ec->netwm.sync.request) || (e_comp->comp_type != E_PIXMAP_TYPE_X)) 
return;
    _e_comp_x_client_data_get(ec)->alarm = 
ecore_x_sync_alarm_new(_e_comp_x_client_data_get(ec)->sync_counter);
    eina_hash_add(alarm_hash, &_e_comp_x_client_data_get(ec)->alarm, ec);
    ec->netwm.sync.alarm = ec->netwm.sync.serial = 1;

--