From 55b8337d6ef215c0db757d30edb51880b28b5890 Mon Sep 17 00:00:00 2001
From: Carsten Haitzler <raster@rasterman.com>
Date: Wed, 15 Feb 2012 15:33:54 +0000
Subject: [PATCH] and fix up some more zone id/num disagreements.

SVN revision: 67988
---
 src/bin/e_int_menus.c                         | 2 +-
 src/bin/e_shelf.c                             | 2 +-
 src/modules/conf_shelves/e_int_config_shelf.c | 1 +
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/bin/e_int_menus.c b/src/bin/e_int_menus.c
index c746fd576..3a12648dc 100644
--- a/src/bin/e_int_menus.c
+++ b/src/bin/e_int_menus.c
@@ -1514,7 +1514,7 @@ _e_int_menus_shelves_add_cb(void *data __UNUSED__, E_Menu *m __UNUSED__, E_Menu_
    cs = E_NEW(E_Config_Shelf, 1);
    cs->name = eina_stringshare_add("shelf");
    cs->container = con->num;
-   cs->zone = zone->id;
+   cs->zone = zone->num;
    cs->popup = 1;
    cs->layer = 200;
    cs->orient = E_GADCON_ORIENT_CORNER_BR;
diff --git a/src/bin/e_shelf.c b/src/bin/e_shelf.c
index 2e77db997..d3e3a1793 100644
--- a/src/bin/e_shelf.c
+++ b/src/bin/e_shelf.c
@@ -75,7 +75,7 @@ e_shelf_config_update(void)
 	E_Zone *zone;
 
 	if (cf_es->id <= 0) cf_es->id = id + 1;
-	zone = e_util_container_zone_id_get(cf_es->container, cf_es->zone);
+	zone = e_util_container_zone_number_get(cf_es->container, cf_es->zone);
 	if (zone)
 	  e_shelf_config_new(zone, cf_es);
 	id = cf_es->id;
diff --git a/src/modules/conf_shelves/e_int_config_shelf.c b/src/modules/conf_shelves/e_int_config_shelf.c
index ebb9bca92..95fef6e3e 100644
--- a/src/modules/conf_shelves/e_int_config_shelf.c
+++ b/src/modules/conf_shelves/e_int_config_shelf.c
@@ -226,6 +226,7 @@ _cb_add(void *data, void *data2 __UNUSED__)
    cfg->name = eina_stringshare_add("shelf");
    cfg->container = con->num;
    cfg->zone = zone->num;
+   printf("zone = %i\n", cfg->zone);
    cfg->popup = 1;
    cfg->layer = 200;
    cfg->orient = E_GADCON_ORIENT_CORNER_BR;