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

fix recent menu api break 

SVN revision: 52066
This commit is contained in:
Miculcy Brian 2010-09-09 14:50:27 +00:00
parent 32e588dfda
commit b2000416d3
2 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/e_mod_config.c
View File

@ -48,7 +48,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 Configuration"), "Places", cfd = e_config_dialog_new(con, 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;

18
src/e_mod_main.c
View File

@ -414,26 +414,30 @@ _places_cb_mouse_down(void *data, Evas *evas, Evas_Object *obj, void *event)
ev = event; ev = event;
if ((ev->button == 3) && (!inst->menu)) if ((ev->button == 3) && (!inst->menu))
{ {
E_Menu *ma, *mg;
/* grab current zone */ /* grab current zone */
zone = e_util_zone_current_get(e_manager_current_get()); zone = e_util_zone_current_get(e_manager_current_get());
/* create popup menu */ /* create popup menu */
inst->menu = e_menu_new(); ma = e_menu_new();
e_menu_post_deactivate_callback_set(inst->menu, _places_cb_menu_post, e_menu_post_deactivate_callback_set(ma, _places_cb_menu_post, inst);
inst); inst->menu = ma;
mi = e_menu_item_new(inst->menu); mg = e_menu_new();
e_menu_item_label_set(mi, D_("Configuration"));
mi = e_menu_item_new(mg);
e_menu_item_label_set(mi, D_("Settings"));
e_util_menu_item_theme_icon_set(mi, "preferences-system"); 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, NULL);
/* Each Gadget Client has a utility menu from the Container */ /* Each Gadget Client has a utility menu from the Container */
e_gadcon_client_util_menu_items_append(inst->gcc, inst->menu, 0); e_gadcon_client_util_menu_items_append(inst->gcc, ma, mg, 0);
e_gadcon_canvas_zone_geometry_get(inst->gcc->gadcon, &x, &y, e_gadcon_canvas_zone_geometry_get(inst->gcc->gadcon, &x, &y,
NULL, NULL); NULL, NULL);
/* show the menu relative to gadgets position */ /* show the menu relative to gadgets position */
e_menu_activate_mouse(inst->menu, zone, (x + ev->output.x), e_menu_activate_mouse(ma, zone, (x + ev->output.x),
(y + ev->output.y), 1, 1, (y + ev->output.y), 1, 1,
E_MENU_POP_DIRECTION_AUTO, ev->timestamp); E_MENU_POP_DIRECTION_AUTO, ev->timestamp);
evas_event_feed_mouse_up(inst->gcc->gadcon->evas, ev->button, evas_event_feed_mouse_up(inst->gcc->gadcon->evas, ev->button,