Enlightenment CVS committal Author : englebass Project : e_modules Module : moon
Dir : e_modules/moon/src Modified Files: e_mod_main.c e_mod_main.h Log Message: Revert gadcon menu change. =================================================================== RCS file: /cvs/e/e_modules/moon/src/e_mod_main.c,v retrieving revision 1.15 retrieving revision 1.16 diff -u -3 -r1.15 -r1.16 --- e_mod_main.c 25 Nov 2007 05:40:33 -0000 1.15 +++ e_mod_main.c 2 Dec 2007 16:27:33 -0000 1.16 @@ -53,6 +53,7 @@ }; static void _button_cb_mouse_down(void *data, Evas *e, Evas_Object *obj, void *event_info); +static void _menu_cb_post(void *data, E_Menu *m); static void _moon_inst_cb_menu_configure(void *data, E_Menu *m, E_Menu_Item *mi); static void _moon_timer_init(); @@ -233,13 +234,15 @@ inst = data; ev = event_info; - if ((ev->button == 3) && (!inst->gcc->menu)) + if ((ev->button == 3) && (!moon_config->menu)) { E_Menu *mn; 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; mi = e_menu_item_new(mn); e_menu_item_label_set(mi, D_("Configuration")); e_util_menu_item_edje_icon_set(mi, "enlightenment/configuration"); @@ -258,11 +261,20 @@ } static void +_menu_cb_post(void *data, E_Menu *m) +{ + if (!moon_config->menu) return; + e_object_del(E_OBJECT(moon_config->menu)); + moon_config->menu = NULL; +} + +static void _moon_inst_cb_menu_configure(void *data, E_Menu *m, E_Menu_Item *mi) { Evas_Object *o; o = data; + if (!moon_config->menu) return; if (moon_config->config_dialog) return; moon_config_dialog_show(o); } =================================================================== RCS file: /cvs/e/e_modules/moon/src/e_mod_main.h,v retrieving revision 1.5 retrieving revision 1.6 diff -u -3 -r1.5 -r1.6 --- e_mod_main.h 25 Nov 2007 05:40:33 -0000 1.5 +++ e_mod_main.h 2 Dec 2007 16:27:33 -0000 1.6 @@ -25,6 +25,7 @@ Evas_List *faces; E_Config_Dialog *config_dialog; + E_Menu *menu; }; EAPI extern E_Module_Api e_modapi; ------------------------------------------------------------------------- SF.Net email is sponsored by: The Future of Linux Business White Paper from Novell. From the desktop to the data center, Linux is going mainstream. Let it simplify your IT future. http://altfarm.mediaplex.com/ad/ck/8857-50307-18918-4 _______________________________________________ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs