From e9060ce771f76d470bd925b20677756ad917a4d5 Mon Sep 17 00:00:00 2001
From: Mike Blumenkrantz <zmike@osg.samsung.com>
Date: Thu, 2 Jul 2015 14:57:42 -0400
Subject: [PATCH] unset x11 focus grabs on clients only if there is an xwindow
 present

fix T2539
---
 src/bin/e_comp_x.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/bin/e_comp_x.c b/src/bin/e_comp_x.c
index 38dbb8376..35f1bd7ed 100644
--- a/src/bin/e_comp_x.c
+++ b/src/bin/e_comp_x.c
@@ -4246,12 +4246,12 @@ static void
 _e_comp_x_hook_client_focus_set(void *d EINA_UNUSED, E_Client *ec)
 {
    focus_time = ecore_x_current_time_get();
-   _e_comp_x_focus_setdown(ec);
    if (!e_client_has_xwindow(ec))
      {
         e_grabinput_focus(e_comp->ee_win, E_FOCUS_METHOD_PASSIVE);
         return;
      }
+   _e_comp_x_focus_setdown(ec);
 
    if ((ec->icccm.take_focus) && (ec->icccm.accepts_focus))
      {