From 5f75193054a8d760ae7f611519ca733b408bedd0 Mon Sep 17 00:00:00 2001 From: Mike Blumenkrantz Date: Fri, 1 Sep 2017 13:40:12 -0400 Subject: [PATCH] always set gadget ids when creating new non-demo gadgets ensure gadgets aren't pruned on edit end --- src/modules/pager/gadget/pager.c | 3 ++- src/modules/start/start.c | 3 ++- src/modules/xkbswitch/gadget/xkbswitch.c | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/modules/pager/gadget/pager.c b/src/modules/pager/gadget/pager.c index 555fc6fce..69363195f 100644 --- a/src/modules/pager/gadget/pager.c +++ b/src/modules/pager/gadget/pager.c @@ -2959,12 +2959,13 @@ pager_del(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *e } EINTERN Evas_Object * -pager_create(Evas_Object *parent, int *id EINA_UNUSED, E_Gadget_Site_Orient orient EINA_UNUSED) +pager_create(Evas_Object *parent, int *id, E_Gadget_Site_Orient orient EINA_UNUSED) { Pager *p; Evas_Object *o; Instance *inst; + if (*id == 0) *id = 1; inst = E_NEW(Instance, 1); p = _pager_new(evas_object_evas_get(parent), EINA_FALSE); p->inst = inst; diff --git a/src/modules/start/start.c b/src/modules/start/start.c index 950941741..68109c4b7 100644 --- a/src/modules/start/start.c +++ b/src/modules/start/start.c @@ -195,12 +195,13 @@ _gadget_created(void *data, Evas_Object *obj, void *event_info) } EINTERN Evas_Object * -start_create(Evas_Object *parent, int *id EINA_UNUSED, E_Gadget_Site_Orient orient) +start_create(Evas_Object *parent, int *id, E_Gadget_Site_Orient orient) { Evas_Object *o; Instance *inst; if (e_gadget_site_is_desklock(parent)) return NULL; + if (*id == 0) *id = 1; inst = E_NEW(Instance, 1); o = elm_layout_add(parent); diff --git a/src/modules/xkbswitch/gadget/xkbswitch.c b/src/modules/xkbswitch/gadget/xkbswitch.c index f4a196699..70ee9c0aa 100644 --- a/src/modules/xkbswitch/gadget/xkbswitch.c +++ b/src/modules/xkbswitch/gadget/xkbswitch.c @@ -275,10 +275,11 @@ xkbg_del(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *ev } EINTERN Evas_Object * -xkbg_gadget_create(Evas_Object *parent, int *id EINA_UNUSED, E_Gadget_Site_Orient orient) +xkbg_gadget_create(Evas_Object *parent, int *id, E_Gadget_Site_Orient orient) { Instance *inst; + if (*id == 0) *id = 1; inst = E_NEW(Instance, 1); inst->o_main = elm_box_add(parent); inst->orient = orient;