From b632afa5464c0d1ffdd442e85e93e5e92ec39918 Mon Sep 17 00:00:00 2001
From: Mike Blumenkrantz <zmike@osg.samsung.com>
Date: Mon, 27 Apr 2015 14:32:19 -0400
Subject: [PATCH] more accurately determine whether a mouse grab is active in
 some parts of e

---
 src/bin/e_actions.c           | 6 +++---
 src/bin/e_fm.c                | 2 +-
 src/bin/e_zone.c              | 2 +-
 src/modules/ibar/e_mod_main.c | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/bin/e_actions.c b/src/bin/e_actions.c
index 671ef655b..1f62c54b2 100644
--- a/src/bin/e_actions.c
+++ b/src/bin/e_actions.c
@@ -1804,7 +1804,7 @@ ACT_FN_GO(menu_show, )
    E_Zone *zone;
 
    /* menu is active - abort */
-   if (e_menu_grab_window_get()) return;
+   if (e_comp_util_kbd_grabbed() || e_comp_util_mouse_grabbed()) return;
    zone = _e_actions_zone_get(obj);
    if (zone)
      {
@@ -1833,7 +1833,7 @@ ACT_FN_GO_MOUSE(menu_show, )
    E_Zone *zone;
 
    /* menu is active - abort */
-   if (e_menu_grab_window_get()) return;
+   if (e_comp_util_kbd_grabbed() || e_comp_util_mouse_grabbed()) return;
    zone = _e_actions_zone_get(obj);
    if (zone)
      {
@@ -1863,7 +1863,7 @@ ACT_FN_GO_KEY(menu_show, , EINA_UNUSED)
    E_Zone *zone;
 
    /* menu is active - abort */
-   if (e_menu_grab_window_get()) return;
+   if (e_comp_util_kbd_grabbed() || e_comp_util_mouse_grabbed()) return;
    zone = _e_actions_zone_get(obj);
    if (zone)
      {
diff --git a/src/bin/e_fm.c b/src/bin/e_fm.c
index f92a6b297..469def7ff 100644
--- a/src/bin/e_fm.c
+++ b/src/bin/e_fm.c
@@ -7517,7 +7517,7 @@ _e_fm2_cb_icon_mouse_in(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_U
    ev = event_info;
 
    if (ev->event_flags & EVAS_EVENT_FLAG_ON_HOLD) return;
-   if (e_menu_grab_window_get()) return;
+   if (e_comp_util_mouse_grabbed()) return;
    evas_object_smart_callback_call(ic->sd->obj, "icon_mouse_in", &ic->info);
 }
 
diff --git a/src/bin/e_zone.c b/src/bin/e_zone.c
index a756dc650..34367ce95 100644
--- a/src/bin/e_zone.c
+++ b/src/bin/e_zone.c
@@ -1501,7 +1501,7 @@ _e_zone_cb_bg_mouse_down(void *data,
    E_Zone *zone;
 
    zone = data;
-   if (e_menu_grab_window_get()) return;
+   if (e_comp_util_mouse_grabbed()) return;
 
    if (!zone->cur_mouse_action)
      {
diff --git a/src/modules/ibar/e_mod_main.c b/src/modules/ibar/e_mod_main.c
index 51f63dd98..313e25924 100644
--- a/src/modules/ibar/e_mod_main.c
+++ b/src/modules/ibar/e_mod_main.c
@@ -1254,7 +1254,7 @@ _ibar_icon_menu_mouse_out(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA
 {
    IBar_Icon *ic = data;
 
-   if (e_menu_grab_window_get()) return;
+   if (e_comp_util_mouse_grabbed()) return;
    if (ic->hide_timer)
      ecore_timer_reset(ic->hide_timer);
    else