Enlightenment CVS committal Author : englebass Project : e_modules Module : net
Dir : e_modules/net/src Modified Files: e_mod_main.c e_mod_net.c Log Message: Revert gadcon menu change. =================================================================== RCS file: /cvs/e/e_modules/net/src/e_mod_main.c,v retrieving revision 1.11 retrieving revision 1.12 diff -u -3 -r1.11 -r1.12 --- e_mod_main.c 25 Nov 2007 05:43:29 -0000 1.11 +++ e_mod_main.c 2 Dec 2007 16:30:34 -0000 1.12 @@ -52,6 +52,12 @@ _gc_unregister(); if (cfg->cfd) e_object_del(E_OBJECT(cfg->cfd)); + if (cfg->menu) + { + e_menu_post_deactivate_callback_set(cfg->menu, NULL, NULL); + e_object_del(E_OBJECT(cfg->menu)); + cfg->menu = NULL; + } while (cfg->items) { =================================================================== RCS file: /cvs/e/e_modules/net/src/e_mod_net.c,v retrieving revision 1.18 retrieving revision 1.19 diff -u -3 -r1.18 -r1.19 --- e_mod_net.c 25 Nov 2007 05:43:29 -0000 1.18 +++ e_mod_net.c 2 Dec 2007 16:30:34 -0000 1.19 @@ -14,6 +14,7 @@ #endif static void _bytes_to_string(bytes_t bytes, char *string, int size); +static void _cb_post(void *data, E_Menu *m); static void _cb_configure(void *data, E_Menu *m, E_Menu_Item *mi); #ifdef __FreeBSD__ @@ -151,15 +152,17 @@ if (x) ecore_exe_free(x); } } - else if ((ev->button == 1) && (!inst->gcc->menu)) + else if ((ev->button == 1) && (!cfg->menu)) e_gadcon_popup_toggle_pinned(inst->popup); - else if ((ev->button == 3) && (!inst->gcc->menu)) + else if ((ev->button == 3) && (!cfg->menu)) { E_Menu *mn; E_Menu_Item *mi; int x, y; mn = e_menu_new(); + e_menu_post_deactivate_callback_set(mn, _cb_post, inst); + cfg->menu = mn; mi = e_menu_item_new(mn); e_menu_item_label_set(mi, D_("Configuration")); @@ -234,6 +237,15 @@ snprintf(string, size, "%lu KB", (bytes / 1024)); else snprintf(string, size, "%lu B", bytes); +} + +static void +_cb_post(void *data, E_Menu *m) +{ + if (!cfg->menu) return; + e_menu_post_deactivate_callback_set(cfg->menu, NULL, NULL); + e_object_del(E_OBJECT(cfg->menu)); + cfg->menu = NULL; } static void ------------------------------------------------------------------------- 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