vtorri
/
enlightenment
forked from enlightenment/enlightenment
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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.


SVN revision: 32845
This commit is contained in:
Christopher Michael 2007-11-23 11:49:27 +00:00
parent 6056177e48
commit e24160a744
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/bin/e_gadcon.c
View File

@ -540,7 +540,7 @@ e_gadcon_edit_begin(E_Gadcon *gc)
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_edit_end(E_Gadcon *gc)
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 @@ e_gadcon_client_edit_begin(E_Gadcon_Client *gcc)
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 @@ e_gadcon_client_edit_end(E_Gadcon_Client *gcc)
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