From 21793068008662cfdf2ea4b29ba2535f2cb85dd1 Mon Sep 17 00:00:00 2001
From: Mike Blumenkrantz <michael.blumenkrantz@gmail.com>
Date: Fri, 20 Jul 2012 09:37:15 +0000
Subject: [PATCH] fix some cases where zone/shelf handling was wrong and would
 lead to shelves being shown when they shouldn't ticket #862

SVN revision: 74225
---
 src/bin/e_desk.c  | 2 +-
 src/bin/e_shelf.c | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/bin/e_desk.c b/src/bin/e_desk.c
index 89b5d1134..79eca6fd4 100644
--- a/src/bin/e_desk.c
+++ b/src/bin/e_desk.c
@@ -314,7 +314,7 @@ e_desk_show(E_Desk *desk)
         cf_es = es->cfg;
         if (!cf_es) continue;
 
-        zone = e_util_zone_current_get(e_manager_current_get());
+        zone = desk->zone;
         if (cf_es->zone != (int)zone->num) continue;
 
         EINA_LIST_FOREACH(es->cfg->desk_list, ll, sd)
diff --git a/src/bin/e_shelf.c b/src/bin/e_shelf.c
index 56b842d01..483031d57 100644
--- a/src/bin/e_shelf.c
+++ b/src/bin/e_shelf.c
@@ -2070,6 +2070,8 @@ _e_shelf_on_current_desk(E_Shelf *es, E_Event_Zone_Edge *ev)
    int on_current_desk = 0;
    int on_all_desks = 1;
 
+
+   if (ev->zone != es->zone) return EINA_FALSE;
    EINA_LIST_FOREACH(es->cfg->desk_list, ll, sd)
      {
         if (!sd) continue;