From d5a1b30ab4b9b34d99162062528be02547ea9801 Mon Sep 17 00:00:00 2001 From: Mike Blumenkrantz Date: Fri, 4 Aug 2017 16:23:39 -0400 Subject: [PATCH] add gadget site as param for gadget wizard callbacks it's important to be able to track this lifetime in order to cancel the wizard if the site is deleted --- src/bin/e_gadget.c | 2 +- src/bin/e_gadget.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/bin/e_gadget.c b/src/bin/e_gadget.c index 8b4696eea..f54e0899c 100644 --- a/src/bin/e_gadget.c +++ b/src/bin/e_gadget.c @@ -435,7 +435,7 @@ _gadget_object_create(E_Gadget_Config *zgc) { if (t->wizard) { - zgc->cfg_object = t->wizard(_gadget_wizard_end, zgc); + zgc->cfg_object = t->wizard(_gadget_wizard_end, zgc, zgc->site->layout); if (!zgc->cfg_object) { added = 1; diff --git a/src/bin/e_gadget.h b/src/bin/e_gadget.h index 00f862208..f126b93f4 100644 --- a/src/bin/e_gadget.h +++ b/src/bin/e_gadget.h @@ -116,7 +116,7 @@ typedef enum typedef Evas_Object *(*E_Gadget_Create_Cb)(Evas_Object *parent, int *id, E_Gadget_Site_Orient orient); typedef Evas_Object *(*E_Gadget_Configure_Cb)(Evas_Object *gadget); typedef void (*E_Gadget_Wizard_End_Cb)(void *data, int id); -typedef Evas_Object *(*E_Gadget_Wizard_Cb)(E_Gadget_Wizard_End_Cb cb, void *data); +typedef Evas_Object *(*E_Gadget_Wizard_Cb)(E_Gadget_Wizard_End_Cb cb, void *data, Evas_Object *site); typedef void (*E_Gadget_Style_Cb)(Evas_Object *owner, Eina_Stringshare *name, Evas_Object *g); EINTERN void e_gadget_init(void);