kuuko pushed a commit to branch master. http://git.enlightenment.org/enlightenment/modules/forecasts.git/commit/?id=68902013a41458b9d121f1e065a778d84f69a096
commit 68902013a41458b9d121f1e065a778d84f69a096 Author: Kai Huuhko <[email protected]> Date: Sun Mar 15 22:26:46 2015 +0200 Follow changes in E 0.19.99 development --- src/e_mod_config.c | 4 +--- src/e_mod_main.c | 9 ++++----- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/src/e_mod_config.c b/src/e_mod_config.c index fc954c3..c5fb58d 100644 --- a/src/e_mod_config.c +++ b/src/e_mod_config.c @@ -24,7 +24,6 @@ _config_forecasts_module(Config_Item *ci) { E_Config_Dialog *cfd; E_Config_Dialog_View *v; - E_Comp *comp; char buf[4096]; v = E_NEW(E_Config_Dialog_View, 1); @@ -37,9 +36,8 @@ _config_forecasts_module(Config_Item *ci) snprintf(buf, sizeof(buf), "%s/module.edj", e_module_dir_get(forecasts_config->module)); - comp = e_util_comp_current_get(); cfd = - e_config_dialog_new(comp, D_("Forecasts Settings"), "Forecasts", "_e_modules_forecasts_config_dialog", buf, 0, v, ci); + e_config_dialog_new(NULL, D_("Forecasts Settings"), "Forecasts", "_e_modules_forecasts_config_dialog", buf, 0, v, ci); forecasts_config->config_dialog = cfd; } diff --git a/src/e_mod_main.c b/src/e_mod_main.c index 0e7fcd9..f2ddadb 100644 --- a/src/e_mod_main.c +++ b/src/e_mod_main.c @@ -306,8 +306,7 @@ _forecasts_cb_mouse_down(void *data, Evas *e, Evas_Object *obj, e_gadcon_canvas_zone_geometry_get(inst->gcc->gadcon, &x, &y, &w, &h); e_menu_activate_mouse(m, - e_util_zone_current_get(e_manager_current_get - ()), x + ev->output.x, + e_zone_current_get(), x + ev->output.x, y + ev->output.y, 1, 1, E_MENU_POP_DIRECTION_DOWN, ev->timestamp); evas_event_feed_mouse_up(inst->gcc->gadcon->evas, ev->button, @@ -1005,7 +1004,7 @@ _forecasts_popup_content_create(Instance *inst) inst->popup = e_gadcon_popup_new(inst->gcc, E_COMP_OBJECT_TYPE_POPUP); - evas = e_comp_get(inst->gcc)->evas; + evas = e_comp->evas; o = e_widget_list_add(evas, 0, 0); snprintf(buf, sizeof(buf), D_("%s: Current Conditions"), inst->location); of = e_widget_frametable_add(evas, buf, 0); @@ -1014,7 +1013,7 @@ _forecasts_popup_content_create(Instance *inst) ob = e_widget_label_add(evas, buf); e_widget_frametable_object_append(of, ob, 0, row, 2, 1, 0, 0, 1, 0); - oi = _forecasts_popup_icon_create(e_comp_get(inst->gcc)->evas, + oi = _forecasts_popup_icon_create(e_comp->evas, inst->condition.code); edje_object_size_max_get(oi, &w, &h); DEBUG("Icon size %dx%d", w, h); @@ -1097,7 +1096,7 @@ _forecasts_popup_content_create(Instance *inst) e_widget_frametable_object_append(of, ob, 1, row, 1, 1, 1, 0, 1, 0); ob = e_widget_image_add_from_object(evas, - _forecasts_popup_icon_create(e_comp_get(inst->gcc)->evas, + _forecasts_popup_icon_create(e_comp->evas, inst->forecast[i].code), 0, 0); e_widget_frametable_object_append(of, ob, 2, row, 1, 2, 1, 1, 0, 0); --
