From 38183b668f54646cb88182ee8b05f90164b7f9d7 Mon Sep 17 00:00:00 2001 From: Miculcy Brian Date: Thu, 9 Sep 2010 14:49:57 +0000 Subject: [PATCH] fix recent menu api break SVN revision: 52060 --- src/e_mod_config.c | 2 +- src/e_mod_main.c | 17 ++++++++++------- 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/src/e_mod_config.c b/src/e_mod_config.c index 0efbfd3..f6576f2 100644 --- a/src/e_mod_config.c +++ b/src/e_mod_config.c @@ -94,7 +94,7 @@ moon_config_dialog_show(Evas_Object *o) con = e_container_current_get(e_manager_current_get()); snprintf(buf, sizeof(buf), "%s/e-module-moon.edj", e_module_dir_get(module)); - cfd = e_config_dialog_new(con, D_("Moon Configuration"), "Moon", "_e_modules_moon_config_dialog", buf, 0, v, o); + cfd = e_config_dialog_new(con, D_("Moon Settings"), "Moon", "_e_modules_moon_config_dialog", buf, 0, v, o); moon_config->config_dialog = cfd; } } diff --git a/src/e_mod_main.c b/src/e_mod_main.c index 50bb1bc..e2644fd 100644 --- a/src/e_mod_main.c +++ b/src/e_mod_main.c @@ -233,22 +233,25 @@ _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 *mn; + E_Menu *ma, *mg; E_Menu_Item *mi; int cx, cy, cw, ch; - mn = e_menu_new(); - e_menu_post_deactivate_callback_set(mn, _menu_cb_post, inst); - moon_config->menu = mn; + ma = e_menu_new(); + e_menu_post_deactivate_callback_set(ma, _menu_cb_post, inst); + moon_config->menu = ma; - mi = e_menu_item_new(mn); e_menu_item_label_set(mi, D_("Configuration")); + mg = e_menu_new(); + + 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_menu_item_callback_set(mi, _moon_inst_cb_menu_configure, obj); - 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, &cx, &cy, &cw, &ch); - e_menu_activate_mouse(mn, + e_menu_activate_mouse(ma, 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);