enlightenment
/
enlightenment-module-places
8
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix the config dialog to not crash 

Fucking e_comp changes under the hood
This commit is contained in:
Davide Andreoli 2015-01-10 22:22:39 +01:00
parent 2ef240acc4
commit 94f551fb12
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/e_mod_config.c
View File

@ -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;

4
src/e_mod_main.c
View File

@ -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);
}

2
src/e_mod_main.h
View File

@ -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);