fix recent menu api break

SVN revision: 52054
This commit is contained in:
Miculcy Brian 2010-09-09 14:49:27 +00:00
parent 2887f01913
commit 6ba6922f59
1 changed files with 10 additions and 8 deletions

View File

@ -287,25 +287,27 @@ _forecasts_cb_mouse_down(void *data, Evas * e, Evas_Object * obj,
ev = event_info; ev = event_info;
if ((ev->button == 3) && (!forecasts_config->menu)) if ((ev->button == 3) && (!forecasts_config->menu))
{ {
E_Menu *mn; E_Menu *ma, *mg;
E_Menu_Item *mi; E_Menu_Item *mi;
int x, y, w, h; int x, y, w, h;
mn = e_menu_new(); ma = e_menu_new();
e_menu_post_deactivate_callback_set(mn, _forecasts_menu_cb_post, inst); e_menu_post_deactivate_callback_set(ma, _forecasts_menu_cb_post, inst);
forecasts_config->menu = mn; forecasts_config->menu = ma;
mi = e_menu_item_new(mn); mg = e_menu_new();
mi = e_menu_item_new(mg);
e_menu_item_label_set(mi, D_("Settings")); 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, _forecasts_menu_cb_configure, inst); e_menu_item_callback_set(mi, _forecasts_menu_cb_configure, inst);
mi = e_menu_item_new(mn); mi = e_menu_item_new(mg);
e_menu_item_separator_set(mi, 1); e_menu_item_separator_set(mi, 1);
e_gadcon_client_util_menu_items_append(inst->gcc, mn, 0); e_gadcon_client_util_menu_items_append(inst->gcc, ma, mg, 0);
e_gadcon_canvas_zone_geometry_get(inst->gcc->gadcon, &x, &y, &w, &h); e_gadcon_canvas_zone_geometry_get(inst->gcc->gadcon, &x, &y, &w, &h);
e_menu_activate_mouse(mn, e_menu_activate_mouse(ma,
e_util_zone_current_get(e_manager_current_get e_util_zone_current_get(e_manager_current_get
()), x + ev->output.x, ()), x + ev->output.x,
y + ev->output.y, 1, 1, y + ev->output.y, 1, 1,