From 62f7d684dd28bc07e2b350ce6d2cd627291c905c Mon Sep 17 00:00:00 2001 From: Stephen 'Okra' Houston Date: Wed, 11 Jan 2017 22:06:38 -0600 Subject: Enlightenment: Sysinfo Gadget - Properly mark popup as deleted. --- src/modules/sysinfo/memusage/memusage.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) (limited to 'src/modules/sysinfo/memusage/memusage.c') diff --git a/src/modules/sysinfo/memusage/memusage.c b/src/modules/sysinfo/memusage/memusage.c index 827917ff68..c8b1008db9 100644 --- a/src/modules/sysinfo/memusage/memusage.c +++ b/src/modules/sysinfo/memusage/memusage.c @@ -36,9 +36,18 @@ _memusage_configure_cb(Evas_Object *g) } static void -_memusage_popup_dismissed(void *data EINA_UNUSED, Evas_Object *obj, void *event_info EINA_UNUSED) +_memusage_popup_dismissed(void *data, Evas_Object *obj, void *event_info EINA_UNUSED) { + Instance *inst = data; E_FREE_FUNC(obj, evas_object_del); + inst->cfg->memusage.popup = NULL; +} + +static void +_memusage_popup_deleted(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED) +{ + Instance *inst = data; + inst->cfg->memusage.popup = NULL; } static void @@ -60,7 +69,8 @@ _memusage_mouse_down_cb(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_U } popup = elm_ctxpopup_add(e_comp->elm); elm_object_style_set(popup, "noblock"); - evas_object_smart_callback_add(popup, "dismissed", _memusage_popup_dismissed, NULL); + evas_object_smart_callback_add(popup, "dismissed", _memusage_popup_dismissed, inst); + evas_object_event_callback_add(popup, EVAS_CALLBACK_DEL, _memusage_popup_deleted, inst); snprintf(text, sizeof(text), "%s: %d%%
%s: %d%%", _("Total Memory Usage"), inst->cfg->memusage.real, _("Total Swap Usage"), inst->cfg->memusage.swap); -- cgit v1.2.1