okra pushed a commit to branch master. http://git.enlightenment.org/core/enlightenment.git/commit/?id=501ea95e2c3ca29338135713ae1f6be9f4380161
commit 501ea95e2c3ca29338135713ae1f6be9f4380161 Author: Stephen 'Okra' Houston <[email protected]> Date: Thu Jan 5 15:36:27 2017 -0600 E gadgets: Prepare for sysinfo to arrive. --- src/modules/Makefile.mk | 3 +++ src/modules/battery/e_mod_udev.c | 2 +- src/modules/pager/gadget/pager.c | 3 ++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/modules/Makefile.mk b/src/modules/Makefile.mk index fc7ace3..057f081 100644 --- a/src/modules/Makefile.mk +++ b/src/modules/Makefile.mk @@ -131,5 +131,8 @@ include src/modules/Makefile_policy_mobile.mk include src/modules/Makefile_geolocation.mk +include src/modules/Makefile_sysinfo.mk + include src/modules/Makefile_wireless.mk + include src/modules/Makefile_time.mk diff --git a/src/modules/battery/e_mod_udev.c b/src/modules/battery/e_mod_udev.c index 9d7b6e9..018b5ff 100644 --- a/src/modules/battery/e_mod_udev.c +++ b/src/modules/battery/e_mod_udev.c @@ -219,7 +219,7 @@ _battery_udev_battery_update(const char *syspath, Battery *bat) if (!bat->got_prop) /* only need to get these once */ { GET_STR(bat, technology, POWER_SUPPLY_TECHNOLOGY); - GET_STR(bat, model, POWER_SUPPLY_MODEL_NAME); + GET_STR(bat, model, POWER_SUPPLY_MODEL_NAME); GET_STR(bat, vendor, POWER_SUPPLY_MANUFACTURER); GET_NUM(bat, design_charge, POWER_SUPPLY_ENERGY_FULL_DESIGN); if (eina_dbleq(bat->design_charge, 0)) diff --git a/src/modules/pager/gadget/pager.c b/src/modules/pager/gadget/pager.c index b270329..d7cf771 100644 --- a/src/modules/pager/gadget/pager.c +++ b/src/modules/pager/gadget/pager.c @@ -238,7 +238,8 @@ _pager_gadget_destroyed_cb(void *data, Evas_Object *obj EINA_UNUSED, void *event { Instance *inst = data; - inst->destroyed = EINA_TRUE; + if (inst) + inst->destroyed = EINA_TRUE; } static void --
