From 2fd22edf9160f2777a32f7227b29d6593f5391f5 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_main.c | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/src/e_mod_main.c b/src/e_mod_main.c index 15c21b0..001cd94 100644 --- a/src/e_mod_main.c +++ b/src/e_mod_main.c @@ -474,30 +474,28 @@ _diskio_cb_mouse_down(void *data, Evas *evas, Evas_Object *obj, void *event) if ((ev->button == 3) && (!inst->menu)) { - E_Menu *ma, *mg; + E_Menu *m; /* grab current zone */ zone = e_util_zone_current_get(e_manager_current_get()); /* create popup menu */ - ma = e_menu_new(); - e_menu_post_deactivate_callback_set(ma, _diskio_cb_menu_post, inst); - inst->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, _diskio_cb_menu_configure, inst); /* Each Gadget Client has a utility menu from the Container */ - 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_menu_post_deactivate_callback_set(m, _diskio_cb_menu_post, inst); + inst->menu = m; + e_gadcon_canvas_zone_geometry_get(inst->gcc->gadcon, &x, &y, NULL, NULL); /* show the menu relative to gadgets position */ - e_menu_activate_mouse(ma, zone, (x + ev->output.x), + e_menu_activate_mouse(m, zone, (x + ev->output.x), (y + ev->output.y), 1, 1, E_MENU_POP_DIRECTION_AUTO, ev->timestamp); evas_event_feed_mouse_up(inst->gcc->gadcon->evas, ev->button,