From b8c7cf601e09283dfd7238c56fd74e6ea297aecb Mon Sep 17 00:00:00 2001 From: Hannes Janetzek Date: Thu, 17 Mar 2011 17:24:53 +0000 Subject: [PATCH] e-modules: update do e_gadcon_util_cliet_menu_append api changes. allowing to have settings menu in toplevel again SVN revision: 57828 --- src/e_mod_net.c | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/src/e_mod_net.c b/src/e_mod_net.c index 4663eb8..f50978a 100644 --- a/src/e_mod_net.c +++ b/src/e_mod_net.c @@ -153,25 +153,21 @@ _net_cb_mouse_down(void *data, Evas *evas, Evas_Object *obj, void *event) e_gadcon_popup_toggle_pinned(inst->popup); else if ((ev->button == 3) && (!net_cfg->menu)) { - E_Menu *ma, *mg; + E_Menu *m; E_Menu_Item *mi; int x, y; - ma = e_menu_new(); - e_menu_post_deactivate_callback_set(ma, _cb_post, inst); - net_cfg->menu = ma; - - mg = e_menu_new(); - - mi = e_menu_item_new(mg); + m = e_menu_new(); + 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, _cb_configure, inst); - e_gadcon_client_util_menu_items_append(inst->gcc, ma, mg, 0); + m = e_gadcon_client_util_menu_items_append(inst->gcc, m, 0); + e_gadcon_canvas_zone_geometry_get(inst->gcc->gadcon, &x, &y, NULL, NULL); - e_menu_activate_mouse(ma, + e_menu_activate_mouse(m, e_util_zone_current_get(e_manager_current_get()), x + ev->output.x, y + ev->output.y, 1, 1, E_MENU_POP_DIRECTION_DOWN, ev->timestamp);