e packages build again - also not much point having an enlightenment-data as

it's built as an arch specific package and it is intrinsically required by e
and cannot work without it nor is the data shared betwene e and other apps
unless e itself is installed too


SVN revision: 22260

1 files changed, 24 insertions, 8 deletions

diff --git a/src/bin/e_resist.c b/src/bin/e_resist.c
index e2c68b36cc..6ad0732a5d 100644
--- a/src/bin/e_resist.c
+++ b/src/bin/e_resist.c
@@ -92,6 +92,17 @@ e_resist_container_border_position(E_Container *con, Evas_List *skiplist,
 	gmc = l->data;
 	OBSTACLE(gmc->x, gmc->y, gmc->w, gmc->h, e_config->gadget_resist);
      }
+   for (l = e_shelf_list(); l; l = l->next)
+     {
+	E_Shelf *es;
+
+	es = l->data;
+	if (es->zone->container == con)
+	  {
+	     OBSTACLE(es->x + es->zone->x, es->y + es->zone->y, es->w, es->h,
+		      e_config->gadget_resist);
+	  }
+     }
    if (rects)
      {
 	_e_resist_rects(rects,
@@ -141,17 +152,22 @@ e_resist_container_gadman_position(E_Container *con, Evas_List *skiplist,
 	  }
 	if (ok)
 	  {
-	     r = E_NEW(E_Resist_Rect, 1);
-
-	     r->x = gmc->x;
-	     r->y = gmc->y;
-	     r->w = gmc->w;
-	     r->h = gmc->h;
-	     r->v1 = e_config->gadget_resist;
-	     rects = evas_list_append(rects, r);
+	     OBSTACLE(gmc->x, gmc->y, gmc->w, gmc->h, e_config->gadget_resist);
 	  }
      }
 
+   for (l = e_shelf_list(); l; l = l->next)
+     {
+	E_Shelf *es;
+
+	es = l->data;
+	if (es->zone->container == con)
+	  {
+	     OBSTACLE(es->x + es->zone->x, es->y + es->zone->y, es->w, es->h,
+		      e_config->gadget_resist);
+	  }
+     }
+   
    if (rects)
      {
 	_e_resist_rects(rects,