From 652da596a2322f74fbd832c0d87f708dd7412a78 Mon Sep 17 00:00:00 2001
From: Christopher Michael <cpmichael1@comcast.net>
Date: Mon, 21 Dec 2009 03:54:41 +0000
Subject: [PATCH] Create kbd on current zone. Formatting.

SVN revision: 44619
---
 src/modules/illume2/e_mod_layout.c        | 9 ++++-----
 src/modules/illume2/e_mod_layout_illume.c | 3 ++-
 src/modules/illume2/e_mod_main.c          | 5 ++++-
 3 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/src/modules/illume2/e_mod_layout.c b/src/modules/illume2/e_mod_layout.c
index b79ac4c40..0efd6190f 100644
--- a/src/modules/illume2/e_mod_layout.c
+++ b/src/modules/illume2/e_mod_layout.c
@@ -624,9 +624,10 @@ _e_mod_layout_cb_hook_post_border_assign(void *data, void *data2)
 
    bd->placed = 1;
    bd->client.e.state.centered = 0;
+
+   /* 
    if (!((bd->need_fullscreen) || (bd->fullscreen)))
      {
-/*        
         bd->x = zx; bd->y = zy; bd->w = zw; bd->h = zh;
         bd->client.w = bd->w; bd->client.h = bd->h;
         if ((pbx != bd->x) || (pby != bd->y)  ||
@@ -636,11 +637,9 @@ _e_mod_layout_cb_hook_post_border_assign(void *data, void *data2)
              bd->changes.pos = 1;
              bd->changes.size = 1;
           }
- */
      }
    else
      {
-/*        
         bd->x = zx; bd->y = zy; bd->w = zw; bd->h = zh;
         bd->client.w = bd->w; bd->client.h = bd->h;
         if ((pbx != bd->x) || (pby != bd->y) || 
@@ -660,9 +659,9 @@ _e_mod_layout_cb_hook_post_border_assign(void *data, void *data2)
              bd->changes.pos = 1;
              bd->changes.size = 1;
           }
- */
      }
-   if (bd->remember)
+    */
+    if (bd->remember)
      {
         e_remember_unuse(bd->remember);
         bd->remember = NULL;
diff --git a/src/modules/illume2/e_mod_layout_illume.c b/src/modules/illume2/e_mod_layout_illume.c
index b68ad1606..bfc819828 100644
--- a/src/modules/illume2/e_mod_layout_illume.c
+++ b/src/modules/illume2/e_mod_layout_illume.c
@@ -364,7 +364,8 @@ _zone_layout_dual(E_Border *bd)
         else
           _zone_layout_dual_top_custom(bd);
      }
-   else if (il_cfg->policy.mode.side == 1) _zone_layout_dual_left(bd);
+   else if (il_cfg->policy.mode.side == 1) 
+     _zone_layout_dual_left(bd);
 }
 
 static void 
diff --git a/src/modules/illume2/e_mod_main.c b/src/modules/illume2/e_mod_main.c
index d0c5a5dc6..a41a98159 100644
--- a/src/modules/illume2/e_mod_main.c
+++ b/src/modules/illume2/e_mod_main.c
@@ -18,6 +18,8 @@ EAPI E_Module_Api e_modapi = { E_MODULE_API_VERSION, "Illume2" };
 EAPI void *
 e_modapi_init(E_Module *m) 
 {
+   E_Container *con;
+
    /* init the config subsystem */
    if (!il_config_init(m)) return NULL;
 
@@ -32,8 +34,9 @@ e_modapi_init(E_Module *m)
    e_mod_layout_init(m);
 
    /* create a new keyboard */
+   con = e_container_current_get(e_manager_current_get());
    kbd = 
-     e_kbd_new(e_util_container_zone_number_get(0, 0), m->dir, m->dir, m->dir);
+     e_kbd_new(e_zone_current_get(con), m->dir, m->dir, m->dir);
 
    /* show the keyboard if needed */
    e_kbd_show(kbd);