Enlightenment CVS committal
Author : devilhorns
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
e_gadcon.c
Log Message:
Only call shelf_lock_set if the gadcon is part of a shelf & gadcon->shelf
exists. . This fixes segfaults with trying to edit/move items in the toolbar.
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_gadcon.c,v
retrieving revision 1.90
retrieving revision 1.91
diff -u -3 -r1.90 -r1.91
--- e_gadcon.c 23 Nov 2007 09:38:30 -0000 1.90
+++ e_gadcon.c 23 Nov 2007 11:49:27 -0000 1.91
@@ -540,7 +540,7 @@
E_OBJECT_CHECK(gc);
E_OBJECT_TYPE_CHECK(gc, E_GADCON_TYPE);
e_gadcon_layout_freeze(gc->o_container);
- e_shelf_locked_set(gc->shelf, 1);
+ if (gc->shelf) e_shelf_locked_set(gc->shelf, 1);
gc->editing = 1;
for (l = gc->clients; l; l = l->next)
{
@@ -569,7 +569,7 @@
e_gadcon_client_edit_end(gcc);
}
e_gadcon_layout_thaw(gc->o_container);
- e_shelf_locked_set(gc->shelf, 0);
+ if (gc->shelf) e_shelf_locked_set(gc->shelf, 0);
}
EAPI void
@@ -823,7 +823,7 @@
if (gcc->o_control) return;
- e_shelf_locked_set(gcc->gadcon->shelf, 1);
+ if (gcc->gadcon->shelf) e_shelf_locked_set(gcc->gadcon->shelf, 1);
gcc->gadcon->editing = 1;
gcc->o_control = edje_object_add(gcc->gadcon->evas);
evas_object_layer_set(gcc->o_control, 100);
@@ -945,7 +945,7 @@
if (client->o_control) return;
}
gcc->gadcon->editing = 0;
- e_shelf_locked_set(gcc->gadcon->shelf, 0);
+ if (gcc->gadcon->shelf) e_shelf_locked_set(gcc->gadcon->shelf, 0);
}
EAPI void
-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2005.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
