From fdde0e64902972183a5dd1fa59f0bb35a2d4a4cc Mon Sep 17 00:00:00 2001
From: Viktor Kojouharov <vkojouharov@gmail.com>
Date: Fri, 21 Jul 2006 00:46:40 +0000
Subject: [PATCH] zone != desk. it was always about per desk deskshows, not per
 zone.

SVN revision: 24088
---
 src/bin/e_actions.c   | 16 +++++++++-------
 src/bin/e_config.c    |  2 +-
 src/bin/e_desk.h      |  1 +
 src/bin/e_int_menus.c |  2 +-
 src/bin/e_zone.h      |  1 -
 5 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/src/bin/e_actions.c b/src/bin/e_actions.c
index b11c744d9..5c64d2abe 100644
--- a/src/bin/e_actions.c
+++ b/src/bin/e_actions.c
@@ -1428,22 +1428,24 @@ ACT_FN_GO(edit_mode_toggle)
 /***************************************************************************/
 
 /***************************************************************************/
-ACT_FN_GO(zone_deskshow_toggle)
+ACT_FN_GO(desk_deskshow_toggle)
 {
    E_Border *bd;
    E_Border_List *bl;
    E_Zone *zone;
+   E_Desk *desk;
 
    zone = _e_actions_zone_get(obj);
    if (!zone) zone = e_util_zone_current_get(e_manager_current_get());
    if (zone)
      {
+	desk = e_desk_current_get(zone);
 	bl = e_container_border_list_first(zone->container);
 	while ((bd = e_container_border_list_next(bl))) 
 	  {
-	     if (bd->desk == e_desk_current_get(bd->zone))
+	     if (bd->desk == desk)
 	       {
-		  if (zone->deskshow_toggle)
+		  if (desk->deskshow_toggle)
 		    {
 		       if (bd->deskshow) e_border_uniconify(bd);
 		       bd->deskshow = 0;
@@ -1458,7 +1460,7 @@ ACT_FN_GO(zone_deskshow_toggle)
 		    }
 	       }
 	  }
-	zone->deskshow_toggle = zone->deskshow_toggle ? 0 : 1;
+	desk->deskshow_toggle = desk->deskshow_toggle ? 0 : 1;
 	e_container_border_list_free(bl);
      }
 }
@@ -1717,10 +1719,10 @@ e_actions_init(void)
    e_register_action_predef_name(_("Desktop"), _("Flip Desktop By..."),
 				 "desk_flip_by", NULL, EDIT_RESTRICT_ACTION, 0);
 
-   /* zone_deskshow_toggle */
-   ACT_GO(zone_deskshow_toggle);
+   /* desk_deskshow_toggle */
+   ACT_GO(desk_deskshow_toggle);
    e_register_action_predef_name(_("Desktop"), _("Show The Desktop"),
-				 "zone_deskshow_toggle", NULL, 
+				 "desk_deskshow_toggle", NULL, 
 				 EDIT_RESTRICT_ACTION | EDIT_RESTRICT_PARAMS, 0);
    
    /* desk_linear_flip_to */
diff --git a/src/bin/e_config.c b/src/bin/e_config.c
index 06772a0bb..1dcfa5352 100644
--- a/src/bin/e_config.c
+++ b/src/bin/e_config.c
@@ -869,7 +869,7 @@ e_config_init(void)
 		    "desk_lock", NULL);
 	CFG_KEYBIND(E_BINDING_CONTEXT_ANY, "d",
 		    E_BINDING_MODIFIER_CTRL | E_BINDING_MODIFIER_ALT, 0,
-		    "zone_deskshow_toggle", NULL);
+		    "desk_deskshow_toggle", NULL);
 	CFG_KEYBIND(E_BINDING_CONTEXT_ANY, "Left",
 		    E_BINDING_MODIFIER_CTRL | E_BINDING_MODIFIER_SHIFT, 0,
 		    "screen_send_by", "-1");
diff --git a/src/bin/e_desk.h b/src/bin/e_desk.h
index 96c267e41..d79b67c40 100644
--- a/src/bin/e_desk.h
+++ b/src/bin/e_desk.h
@@ -21,6 +21,7 @@ struct _E_Desk
    const char          *name;
    int                  x, y;
    char                 visible : 1;
+   unsigned int         deskshow_toggle : 1;
 
    Evas_Object         *bg_object;
 };
diff --git a/src/bin/e_int_menus.c b/src/bin/e_int_menus.c
index 985f91c0f..c42276fdc 100644
--- a/src/bin/e_int_menus.c
+++ b/src/bin/e_int_menus.c
@@ -380,7 +380,7 @@ _e_int_menus_main_showhide(void *data, E_Menu *m, E_Menu_Item *mi)
 {
    E_Action *act;
    
-   act = e_action_find("zone_deskshow_toggle");
+   act = e_action_find("desk_deskshow_toggle");
    if (act) act->func.go(E_OBJECT(m->zone), NULL);
 }
 
diff --git a/src/bin/e_zone.h b/src/bin/e_zone.h
index 238b3f04f..d70d566ce 100644
--- a/src/bin/e_zone.h
+++ b/src/bin/e_zone.h
@@ -26,7 +26,6 @@ struct _E_Zone
    unsigned int         num;
    E_Container         *container;
    int                  fullscreen;
-   unsigned int         deskshow_toggle : 1;
 
    Evas_Object         *bg_object;
    Evas_Object         *bg_event_object;