davemds pushed a commit to branch master. http://git.enlightenment.org/enlightenment/modules/places.git/commit/?id=94f551fb12212712edf7f3145f986d7db68e168f
commit 94f551fb12212712edf7f3145f986d7db68e168f Author: Dave Andreoli <[email protected]> Date: Sat Jan 10 22:22:39 2015 +0100 Fix the config dialog to not crash Fucking e_comp changes under the hood --- src/e_mod_config.c | 4 ++-- src/e_mod_main.c | 4 ++-- src/e_mod_main.h | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/e_mod_config.c b/src/e_mod_config.c index f5d0aa6..5448728 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_Comp *comp, const char *params) +e_int_config_places_module(Evas_Object *parent, const char *params) { E_Config_Dialog *cfd = NULL; E_Config_Dialog_View *v = NULL; @@ -52,7 +52,7 @@ e_int_config_places_module(E_Comp *comp, 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(comp, D_("Places Settings"), "Places", + cfd = e_config_dialog_new(parent, 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 b58b1f2..b622b95 100644 --- a/src/e_mod_main.c +++ b/src/e_mod_main.c @@ -533,7 +533,7 @@ _places_cb_mouse_down(void *data, Evas *evas, Evas_Object *obj, void *event) mi = e_menu_item_new(m); e_menu_item_label_set(mi, D_("Settings")); e_util_menu_item_theme_icon_set(mi, "preferences-system"); - e_menu_item_callback_set(mi, _places_cb_menu_configure, NULL); + e_menu_item_callback_set(mi, _places_cb_menu_configure, obj); /* Each Gadget Client has a utility menu from the Container */ m = e_gadcon_client_util_menu_items_append(inst->gcc, m, 0); @@ -568,5 +568,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->comp, NULL); + e_int_config_places_module(data, NULL); } diff --git a/src/e_mod_main.h b/src/e_mod_main.h index 8720d8e..a463abf 100644 --- a/src/e_mod_main.h +++ b/src/e_mod_main.h @@ -70,7 +70,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_Comp *comp, const char *params); +E_Config_Dialog *e_int_config_places_module(Evas_Object *parent, const char *params); void places_menu_augmentation(void); void places_popups_close(void); --
