[Pkg-e-commits] [SCM] Enlightenment 17 branch, upstream-vcs, updated. a8698069ec4eec9c2a189198fa5eec9854b168ac

[englebass]

The following commit has been merged in the upstream-vcs branch:
commit 9956cbb194f94cf01c75529da971a6ea83267674
Author: englebass <englebass>
Date:   Mon Mar 24 12:48:33 2008 +0000

    Check if the gadcon has a shelf set.

diff --git a/src/bin/e_dnd.c b/src/bin/e_dnd.c
index 8e3e5b1..6007e76 100644
--- a/src/bin/e_dnd.c
+++ b/src/bin/e_dnd.c
@@ -613,17 +613,19 @@ _e_drag_win_matches(E_Drop_Handler *h, Ecore_X_Window win)
 static void
 _e_drag_win_show(E_Drop_Handler *h)
 {
+   E_Shelf *shelf;
+
    if (h->obj)
      {
 	switch (h->obj->type)
 	  {
 	   case E_GADCON_TYPE:
-	     /* FIXME: this is wrong - it ASSUMES the holder is a shelf */
-//	     e_shelf_toggle(e_gadcon_shelf_get((E_Gadcon *)(h->obj)), 1);
+	     shelf = e_gadcon_shelf_get((E_Gadcon *)(h->obj));
+	     if (shelf) e_shelf_toggle(shelf, 1);
 	     break;
 	   case E_GADCON_CLIENT_TYPE:
-	     /* FIXME: this is wrong - it ASSUMES the holder is a shelf */
-//	     e_shelf_toggle(e_gadcon_shelf_get(((E_Gadcon_Client *)(h->obj))->gadcon), 1);
+	     shelf = e_gadcon_shelf_get(((E_Gadcon_Client *)(h->obj))->gadcon);
+	     if (shelf) e_shelf_toggle(shelf, 1);
 	     break;
 	     /* FIXME: add more types as needed */
 	   default:

-- 
Enlightenment 17