[EGIT] [core/enlightenment] master 01/02: ibox/ibar/tasks iconify effect - don't do it if target is not on same screen

[Carsten Haitzler]

raster pushed a commit to branch master.

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

commit 61aa61651ca005ae403ae1b577ac69438d320f25
Author: Carsten Haitzler (Rasterman) <ras...@rasterman.com>
Date:   Thu Jan 30 07:45:02 2014 +0900

    ibox/ibar/tasks iconify effect - don't do it if target is not on same screen
---
 src/modules/ibar/e_mod_main.c  | 2 +-
 src/modules/ibox/e_mod_main.c  | 1 +
 src/modules/tasks/e_mod_main.c | 1 +
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/modules/ibar/e_mod_main.c b/src/modules/ibar/e_mod_main.c
index c9138ed..661c937 100644
--- a/src/modules/ibar/e_mod_main.c
+++ b/src/modules/ibar/e_mod_main.c
@@ -235,7 +235,7 @@ _ibar_cb_iconify_provider(void *data, Evas_Object *obj, 
const char *signal EINA_
    E_Client *ec;
 
    ec = e_comp_object_client_get(obj);
-
+   if (ec->zone != inst->gcc->gadcon->zone) return EINA_FALSE;
    ic = eina_hash_find(inst->ibar->icon_hash, _desktop_name_get(ec->exe_inst ? 
ec->exe_inst->desktop : ec->desktop));
    if (!ic) return EINA_FALSE;
    ec->layer_block = 1;
diff --git a/src/modules/ibox/e_mod_main.c b/src/modules/ibox/e_mod_main.c
index e1168b8..93ae22b 100644
--- a/src/modules/ibox/e_mod_main.c
+++ b/src/modules/ibox/e_mod_main.c
@@ -138,6 +138,7 @@ _ibox_cb_iconify_provider(void *data, Evas_Object *obj, 
const char *signal)
    E_Client *ec;
 
    ec = e_comp_object_client_get(obj);
+   if (ec->zone != inst->gcc->gadcon->zone) return EINA_FALSE;
    if (!strcmp(signal, "e,action,uniconify"))
      {
         EINA_LIST_FOREACH(inst->ibox->icons, l, ic)
diff --git a/src/modules/tasks/e_mod_main.c b/src/modules/tasks/e_mod_main.c
index 83a411e..2f613eb 100644
--- a/src/modules/tasks/e_mod_main.c
+++ b/src/modules/tasks/e_mod_main.c
@@ -347,6 +347,7 @@ _tasks_cb_iconify_provider(void *data, Evas_Object *obj, 
const char *signal)
    E_Client *ec;
 
    ec = e_comp_object_client_get(obj);
+   if (ec->zone != tasks->gcc->gadcon->zone) return EINA_FALSE;
    EINA_LIST_FOREACH(tasks->items, l, item)
      {
         if (item->client == ec)

--