From 28a2d36221d2dd3f0df925a7b6e9f4e32b2da312 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 | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/src/e_mod_main.c b/src/e_mod_main.c index e2644fd..e88c835 100644 --- a/src/e_mod_main.c +++ b/src/e_mod_main.c @@ -233,25 +233,22 @@ _button_cb_mouse_down(void *data, Evas *e, Evas_Object *obj, void *event_info) ev = event_info; if ((ev->button == 3) && (!moon_config->menu)) { - E_Menu *ma, *mg; + E_Menu *m; E_Menu_Item *mi; int cx, cy, cw, ch; - ma = e_menu_new(); - e_menu_post_deactivate_callback_set(ma, _menu_cb_post, inst); - moon_config->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, _moon_inst_cb_menu_configure, obj); - 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, _menu_cb_post, inst); + moon_config->menu = m; e_gadcon_canvas_zone_geometry_get(inst->gcc->gadcon, &cx, &cy, &cw, &ch); - e_menu_activate_mouse(ma, + e_menu_activate_mouse(m, e_util_zone_current_get(e_manager_current_get()), cx + ev->output.x, cy + ev->output.y, 1, 1, E_MENU_POP_DIRECTION_DOWN, ev->timestamp);