remove eeze init/shutdown calls from modules
this is unnecessary and was done with mismatched init/shutdowns in some cases
This commit is contained in:
parent
809a3492ae
commit
1fe4555d7b
|
@ -84,10 +84,6 @@ _gc_init(E_Gadcon *gc, const char *name, const char *id, const char *style)
|
|||
inst->warning = NULL;
|
||||
inst->popup_battery = NULL;
|
||||
|
||||
#ifdef HAVE_EEZE
|
||||
eeze_init();
|
||||
#endif
|
||||
|
||||
evas_object_event_callback_add(o, EVAS_CALLBACK_MOUSE_DOWN,
|
||||
_button_cb_mouse_down, inst);
|
||||
battery_config->instances =
|
||||
|
@ -102,10 +98,6 @@ _gc_shutdown(E_Gadcon_Client *gcc)
|
|||
{
|
||||
Instance *inst;
|
||||
|
||||
#ifdef HAVE_EEZE
|
||||
eeze_shutdown();
|
||||
#endif
|
||||
|
||||
inst = gcc->data;
|
||||
if (battery_config)
|
||||
battery_config->instances =
|
||||
|
|
|
@ -545,10 +545,6 @@ _batman_removed_cb(void *data, Evas_Object *obj EINA_UNUSED, void *event_data)
|
|||
_batman_fallback_stop();
|
||||
#endif
|
||||
|
||||
#if defined(HAVE_EEZE)
|
||||
eeze_shutdown();
|
||||
#endif
|
||||
|
||||
evas_object_event_callback_del_full(inst->o_main, EVAS_CALLBACK_DEL, sysinfo_batman_remove, data);
|
||||
|
||||
sysinfo_config->items = eina_list_remove(sysinfo_config->items, inst->cfg);
|
||||
|
@ -576,10 +572,6 @@ sysinfo_batman_remove(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNU
|
|||
(void) inst;
|
||||
_batman_fallback_stop();
|
||||
#endif
|
||||
|
||||
#ifdef HAVE_EEZE
|
||||
eeze_shutdown();
|
||||
#endif
|
||||
}
|
||||
|
||||
static void
|
||||
|
@ -699,10 +691,6 @@ batman_create(Evas_Object *parent, int *id, E_Gadget_Site_Orient orient EINA_UNU
|
|||
evas_object_event_callback_add(inst->o_main, EVAS_CALLBACK_DEL, sysinfo_batman_remove, inst);
|
||||
evas_object_show(inst->o_main);
|
||||
|
||||
#ifdef HAVE_EEZE
|
||||
eeze_init();
|
||||
#endif
|
||||
|
||||
if (inst->cfg->id < 0) return inst->o_main;
|
||||
|
||||
sysinfo_instances =
|
||||
|
|
|
@ -205,10 +205,6 @@ _thermal_removed_cb(void *data, Evas_Object *obj EINA_UNUSED, void *event_data)
|
|||
|
||||
_thermal_face_shutdown(inst);
|
||||
|
||||
#if defined(HAVE_EEZE)
|
||||
eeze_shutdown();
|
||||
#endif
|
||||
|
||||
evas_object_event_callback_del_full(inst->o_main, EVAS_CALLBACK_DEL, sysinfo_thermal_remove, data);
|
||||
|
||||
sysinfo_config->items = eina_list_remove(sysinfo_config->items, inst->cfg);
|
||||
|
@ -221,10 +217,6 @@ sysinfo_thermal_remove(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UN
|
|||
Instance *inst = data;
|
||||
|
||||
_thermal_face_shutdown(inst);
|
||||
|
||||
#if defined(HAVE_EEZE)
|
||||
eeze_shutdown();
|
||||
#endif
|
||||
}
|
||||
|
||||
static void
|
||||
|
@ -318,10 +310,6 @@ thermal_create(Evas_Object *parent, int *id, E_Gadget_Site_Orient orient EINA_UN
|
|||
evas_object_event_callback_add(inst->o_main, EVAS_CALLBACK_DEL, sysinfo_thermal_remove, inst);
|
||||
evas_object_show(inst->o_main);
|
||||
|
||||
#if defined(HAVE_EEZE)
|
||||
eeze_init();
|
||||
#endif
|
||||
|
||||
if (inst->cfg->id < 0) return inst->o_main;
|
||||
sysinfo_instances =
|
||||
eina_list_append(sysinfo_instances, inst);
|
||||
|
|
|
@ -170,9 +170,6 @@ _gc_init(E_Gadcon *gc, const char *name, const char *id, const char *style)
|
|||
inst->o_temp = o;
|
||||
inst->module = temperature_config->module;
|
||||
inst->have_temp = EINA_FALSE;
|
||||
#ifdef HAVE_EEEZ_UDEV
|
||||
eeze_init();
|
||||
#endif
|
||||
temperature_face_update_config(inst);
|
||||
|
||||
evas_object_event_callback_add(o, EVAS_CALLBACK_MOUSE_DOWN,
|
||||
|
@ -187,9 +184,6 @@ _gc_shutdown(E_Gadcon_Client *gcc)
|
|||
|
||||
inst = gcc->data;
|
||||
|
||||
#ifdef HAVE_EEEZ_UDEV
|
||||
eeze_shutdown();
|
||||
#endif
|
||||
if (inst->o_temp) evas_object_del(inst->o_temp);
|
||||
inst->o_temp = NULL;
|
||||
if (inst->config_dialog) e_object_del(E_OBJECT(inst->config_dialog));
|
||||
|
|
Loading…
Reference in New Issue