enlightenment
/
enlightenment-module-mem
7
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix recent menu api break 

SVN revision: 52059
This commit is contained in:
Miculcy Brian 2010-09-09 14:49:52 +00:00
parent 44dc5d4d46
commit 5a832213d4
2 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/e_mod_config.c
View File

@ -40,7 +40,7 @@ _config_mem_module (Config_Item * ci)
snprintf (buf, sizeof (buf), "%s/e-module-mem.edj", snprintf (buf, sizeof (buf), "%s/e-module-mem.edj",
e_module_dir_get (mem_config->module)); e_module_dir_get (mem_config->module));
con = e_container_current_get (e_manager_current_get ()); con = e_container_current_get (e_manager_current_get ());
cfd = e_config_dialog_new (con, D_ ("Mem Configuration"), "Mem", cfd = e_config_dialog_new (con, D_ ("Mem Settings"), "Mem",
"_e_modules_mem_config_dialog", buf, 0, v, ci); "_e_modules_mem_config_dialog", buf, 0, v, ci);
mem_config->config_dialog = cfd; mem_config->config_dialog = cfd;
} }

21
src/e_mod_main.c
View File

@ -153,25 +153,24 @@ _mem_cb_mouse_down (void *data, Evas * e, Evas_Object * obj, void *event_info)
ev = event_info; ev = event_info;
if ((ev->button == 3) && (!mem_config->menu)) if ((ev->button == 3) && (!mem_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, _mem_menu_cb_post, inst); e_menu_post_deactivate_callback_set (ma, _mem_menu_cb_post, inst);
mem_config->menu = mn; mem_config->menu = ma;
mi = e_menu_item_new (mn); mg = e_menu_new ();
e_menu_item_label_set (mi, D_ ("Configuration"));
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_util_menu_item_theme_icon_set(mi, "preferences-system");
e_menu_item_callback_set (mi, _mem_menu_cb_configure, inst); e_menu_item_callback_set (mi, _mem_menu_cb_configure, inst);
mi = e_menu_item_new (mn); e_gadcon_client_util_menu_items_append (inst->gcc, ma, mg, 0);
e_menu_item_separator_set (mi, 1);
e_gadcon_client_util_menu_items_append (inst->gcc, mn, 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,