From 8fc8d8d24f82f4587684ab8f19d88746085fb0fc Mon Sep 17 00:00:00 2001
From: Christopher Michael <cpmichael1@comcast.net>
Date: Thu, 14 Jan 2010 00:20:32 +0000
Subject: [PATCH] Fix missing corner case for layout placement. Change variable
 name in policy settings.

SVN revision: 45099
---
 src/modules/illume2/e_mod_policy_settings.c  | 11 ++++++-----
 src/modules/illume2/policies/illume/layout.c |  7 +++++--
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/src/modules/illume2/e_mod_policy_settings.c b/src/modules/illume2/e_mod_policy_settings.c
index d3ce29836..1adc0fd7a 100644
--- a/src/modules/illume2/e_mod_policy_settings.c
+++ b/src/modules/illume2/e_mod_policy_settings.c
@@ -9,7 +9,7 @@ static void _il_config_policy_settings_changed(void *data, Evas_Object *obj, voi
 static int _il_config_policy_settings_change_timeout(void *data);
 
 /* local variables */
-Ecore_Timer *_ps_change_timer = NULL;
+Ecore_Timer *_policy_change_timer = NULL;
 Evas_Object *otop, *oleft;
 
 void 
@@ -42,7 +42,8 @@ _il_config_policy_settings_create(E_Config_Dialog *cfd)
 static void 
 _il_config_policy_settings_free(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata) 
 {
-   if (_ps_change_timer) ecore_timer_del(_ps_change_timer);
+   if (_policy_change_timer) ecore_timer_del(_policy_change_timer);
+   _policy_change_timer = NULL;
 }
 
 static Evas_Object *
@@ -88,8 +89,8 @@ _il_config_policy_settings_changed(void *data, Evas_Object *obj, void *event)
    e_widget_disabled_set(otop, !il_cfg->policy.mode.dual);
    e_widget_disabled_set(oleft, !il_cfg->policy.mode.dual);
 
-   if (_ps_change_timer) ecore_timer_del(_ps_change_timer);
-   _ps_change_timer = 
+   if (_policy_change_timer) ecore_timer_del(_policy_change_timer);
+   _policy_change_timer = 
      ecore_timer_add(0.5, _il_config_policy_settings_change_timeout, data);
 }
 
@@ -100,7 +101,7 @@ _il_config_policy_settings_change_timeout(void *data)
    Ecore_X_Illume_Mode mode;
 
    e_config_save_queue();
-   _ps_change_timer = NULL;
+   _policy_change_timer = NULL;
 
    if (il_cfg->policy.mode.dual) 
      {
diff --git a/src/modules/illume2/policies/illume/layout.c b/src/modules/illume2/policies/illume/layout.c
index 16023fa7a..d047cef90 100644
--- a/src/modules/illume2/policies/illume/layout.c
+++ b/src/modules/illume2/policies/illume/layout.c
@@ -95,14 +95,12 @@ _layout_zone_layout(E_Zone *zone)
    Eina_List *l;
    E_Border *bd;
 
-//   printf("Layout Zone: %d\n", zone->id);
    cfg_zone = e_illume_zone_config_get(zone->id);
    EINA_LIST_FOREACH(e_border_client_list(), l, bd) 
      {
         int mh;
 
         if ((bd->zone != zone) || (bd->new_client) || (!bd->visible)) continue;
-//        printf("\tBorder: %s\n", bd->client.icccm.name);
         if (e_illume_border_is_top_shelf(bd)) 
           {
              e_illume_border_min_get(bd, NULL, &mh);
@@ -449,6 +447,11 @@ _zone_layout_dual_top_custom(E_Border *bd)
                                  bh = ah;
                                  by = ay;
                               }
+                            else 
+                              {
+                                 bh = zh;
+                                 by = zy;
+                              }
                          }
                     }
                   else if (bb)