From e0e2492e0073881708e3031f31673080d0ddaf80 Mon Sep 17 00:00:00 2001
From: Christopher Michael <cpmichael1@comcast.net>
Date: Fri, 20 Jul 2007 08:27:59 +0000
Subject: [PATCH] When using "fill available space", take into account if the
 border is on the current desk or not. This fixes bug #113.

Fix minor formatting issue in e_border.c


SVN revision: 30915
---
 src/bin/e_border.c   | 5 +----
 src/bin/e_maximize.c | 3 +--
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/src/bin/e_border.c b/src/bin/e_border.c
index 81e295aca..0262e49d1 100644
--- a/src/bin/e_border.c
+++ b/src/bin/e_border.c
@@ -611,10 +611,7 @@ e_border_zone_set(E_Border *bd, E_Zone *zone)
    bd->zone = zone;
 
    if (bd->desk->zone != bd->zone)
-     {
-	e_border_desk_set(bd, e_desk_current_get(bd->zone));
-     }
-
+     e_border_desk_set(bd, e_desk_current_get(bd->zone));
 
    ev = calloc(1, sizeof(E_Event_Border_Zone_Set));
    ev->border = bd;
diff --git a/src/bin/e_maximize.c b/src/bin/e_maximize.c
index 4bd013c1e..37e196e73 100644
--- a/src/bin/e_maximize.c
+++ b/src/bin/e_maximize.c
@@ -160,8 +160,7 @@ e_maximize_border_border_fill(E_Border *bd, int *x1, int *y1, int *x2, int *y2,
    bl = e_container_border_list_first(bd->zone->container);
    while ((bd2 = e_container_border_list_next(bl)))
      {
-	if ((bd2->zone != bd->zone) ||
-	    (bd == bd2))
+	if ((bd2->zone != bd->zone) || (bd == bd2) || (bd2->desk != bd->desk))
 	  continue;
 	OBSTACLE(bd2->x, bd2->y, bd2->x + bd2->w, bd2->y + bd2->h);
      }