From 37086c655dc938555007c77cdb05c462c2825a6a Mon Sep 17 00:00:00 2001 From: davemds Date: Fri, 17 Jan 2014 23:05:07 +0100 Subject: [PATCH] Update to new e19 api --- src/e_mod_config.c | 4 ++-- src/e_mod_main.c | 8 ++++---- src/e_mod_main.h | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/e_mod_config.c b/src/e_mod_config.c index c4cc912..f5d0aa6 100644 --- a/src/e_mod_config.c +++ b/src/e_mod_config.c @@ -31,7 +31,7 @@ static int _basic_apply(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata); /* External Functions */ E_Config_Dialog * -e_int_config_places_module(E_Container *con, const char *params) +e_int_config_places_module(E_Comp *comp, const char *params) { E_Config_Dialog *cfd = NULL; E_Config_Dialog_View *v = NULL; @@ -52,7 +52,7 @@ e_int_config_places_module(E_Container *con, const char *params) snprintf(buf, sizeof(buf), "%s/e-module-places.edj", places_conf->module->dir); /* create new config dialog */ - cfd = e_config_dialog_new(con, D_("Places Settings"), "Places", + cfd = e_config_dialog_new(comp, D_("Places Settings"), "Places", "fileman/places", buf, 0, v, NULL); places_conf->cfd = cfd; return cfd; diff --git a/src/e_mod_main.c b/src/e_mod_main.c index 8b2886b..f4c138e 100644 --- a/src/e_mod_main.c +++ b/src/e_mod_main.c @@ -477,15 +477,15 @@ _places_popup_new(Instance *inst) return; // create the popup - popup = e_gadcon_popup_new(inst->gcc); + popup = e_gadcon_popup_new(inst->gcc, EINA_FALSE); if (places_conf->autoclose_popup) - e_popup_autoclose(popup->win, NULL, NULL, NULL); + e_comp_object_util_autoclose(popup->comp_object, NULL, NULL, NULL); e_object_data_set(E_OBJECT(popup), inst); E_OBJECT_DEL_SET(popup, _places_popup_del_cb); inst->popup = popup; // build and fill the main edje object - inst->o_main = places_main_obj_create(popup->win->evas); + inst->o_main = places_main_obj_create(e_comp_get(popup)->evas); evas_object_event_callback_add(inst->o_main, EVAS_CALLBACK_MOUSE_DOWN, _places_cb_mouse_down, inst); places_fill_box(inst->o_main, EINA_FALSE); @@ -576,5 +576,5 @@ _places_cb_menu_configure(void *data, E_Menu *mn, E_Menu_Item *mi) { if (!places_conf) return; if (places_conf->cfd) return; - e_int_config_places_module(mn->zone->container, NULL); + e_int_config_places_module(mn->zone->comp, NULL); } diff --git a/src/e_mod_main.h b/src/e_mod_main.h index 62132d6..b78b560 100644 --- a/src/e_mod_main.h +++ b/src/e_mod_main.h @@ -69,7 +69,7 @@ EAPI void *e_modapi_init(E_Module *m); EAPI int e_modapi_shutdown(E_Module *m); EAPI int e_modapi_save(E_Module *m); -E_Config_Dialog *e_int_config_places_module(E_Container *con, const char *params); +E_Config_Dialog *e_int_config_places_module(E_Comp *comp, const char *params); void places_menu_augmentation(void); void places_popups_close(void);