From 3b2587d064524c14bc18969f15365509e5f7b684 Mon Sep 17 00:00:00 2001 From: Mike Blumenkrantz Date: Tue, 31 Jul 2012 09:48:02 +0000 Subject: [PATCH] only delete gadcon stuff from a shelf if it isn't a dummy SVN revision: 74633 --- src/bin/e_shelf.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/bin/e_shelf.c b/src/bin/e_shelf.c index 2899ae9e6..e471df40d 100644 --- a/src/bin/e_shelf.c +++ b/src/bin/e_shelf.c @@ -935,12 +935,9 @@ _e_shelf_free(E_Shelf *es) if (!es->dummy) _e_shelf_bindings_del(es); - e_gadcon_location_unregister(es->gadcon->location); - e_gadcon_location_free(es->gadcon->location); e_zone_useful_geometry_dirty(es->zone); E_FREE_LIST(es->handlers, ecore_event_handler_del); - e_object_del(E_OBJECT(es->gadcon)); if (es->hide_timer) { ecore_timer_del(es->hide_timer); @@ -972,6 +969,12 @@ _e_shelf_free(E_Shelf *es) evas_object_event_callback_del_full(es->o_base, EVAS_CALLBACK_RESIZE, (Evas_Object_Event_Cb)_e_shelf_cb_dummy_moveresize, es); } + else + { + e_gadcon_location_unregister(es->gadcon->location); + e_gadcon_location_free(es->gadcon->location); + e_object_del(E_OBJECT(es->gadcon)); + } if (es->config_dialog) e_object_del(E_OBJECT(es->config_dialog)); eina_stringshare_del(es->name); eina_stringshare_del(es->style);