Update to new e19 api
This commit is contained in:
parent
a4d4309817
commit
37086c655d
|
@ -31,7 +31,7 @@ static int _basic_apply(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata);
|
||||||
|
|
||||||
/* External Functions */
|
/* External Functions */
|
||||||
E_Config_Dialog *
|
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 *cfd = NULL;
|
||||||
E_Config_Dialog_View *v = 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);
|
snprintf(buf, sizeof(buf), "%s/e-module-places.edj", places_conf->module->dir);
|
||||||
|
|
||||||
/* create new config dialog */
|
/* 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);
|
"fileman/places", buf, 0, v, NULL);
|
||||||
places_conf->cfd = cfd;
|
places_conf->cfd = cfd;
|
||||||
return cfd;
|
return cfd;
|
||||||
|
|
|
@ -477,15 +477,15 @@ _places_popup_new(Instance *inst)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
// create the popup
|
// create the popup
|
||||||
popup = e_gadcon_popup_new(inst->gcc);
|
popup = e_gadcon_popup_new(inst->gcc, EINA_FALSE);
|
||||||
if (places_conf->autoclose_popup)
|
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_data_set(E_OBJECT(popup), inst);
|
||||||
E_OBJECT_DEL_SET(popup, _places_popup_del_cb);
|
E_OBJECT_DEL_SET(popup, _places_popup_del_cb);
|
||||||
inst->popup = popup;
|
inst->popup = popup;
|
||||||
|
|
||||||
// build and fill the main edje object
|
// 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,
|
evas_object_event_callback_add(inst->o_main, EVAS_CALLBACK_MOUSE_DOWN,
|
||||||
_places_cb_mouse_down, inst);
|
_places_cb_mouse_down, inst);
|
||||||
places_fill_box(inst->o_main, EINA_FALSE);
|
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) return;
|
||||||
if (places_conf->cfd) return;
|
if (places_conf->cfd) return;
|
||||||
e_int_config_places_module(mn->zone->container, NULL);
|
e_int_config_places_module(mn->zone->comp, NULL);
|
||||||
}
|
}
|
||||||
|
|
|
@ -69,7 +69,7 @@ EAPI void *e_modapi_init(E_Module *m);
|
||||||
EAPI int e_modapi_shutdown(E_Module *m);
|
EAPI int e_modapi_shutdown(E_Module *m);
|
||||||
EAPI int e_modapi_save(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_menu_augmentation(void);
|
||||||
void places_popups_close(void);
|
void places_popups_close(void);
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue