Enlightenment CVS committal
Author : devilhorns
Project : e_modules
Module : net
Dir : e_modules/net/src
Modified Files:
e_mod_config.h e_mod_main.c e_mod_net.c
Log Message:
Fix for gadcon menu breakage.
===================================================================
RCS file: /cvs/e/e_modules/net/src/e_mod_config.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -3 -r1.7 -r1.8
--- e_mod_config.h 16 Sep 2007 01:48:35 -0000 1.7
+++ e_mod_config.h 25 Nov 2007 05:43:29 -0000 1.8
@@ -8,7 +8,6 @@
{
E_Module *mod;
E_Config_Dialog *cfd;
- E_Menu *menu;
Evas_List *instances;
Evas_List *items;
};
===================================================================
RCS file: /cvs/e/e_modules/net/src/e_mod_main.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -3 -r1.10 -r1.11
--- e_mod_main.c 12 Nov 2007 04:15:52 -0000 1.10
+++ e_mod_main.c 25 Nov 2007 05:43:29 -0000 1.11
@@ -52,12 +52,6 @@
_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.17
retrieving revision 1.18
diff -u -3 -r1.17 -r1.18
--- e_mod_net.c 16 Sep 2007 01:46:50 -0000 1.17
+++ e_mod_net.c 25 Nov 2007 05:43:29 -0000 1.18
@@ -14,7 +14,6 @@
#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__
@@ -152,17 +151,15 @@
if (x) ecore_exe_free(x);
}
}
- else if ((ev->button == 1) && (!cfg->menu))
+ else if ((ev->button == 1) && (!inst->gcc->menu))
e_gadcon_popup_toggle_pinned(inst->popup);
- else if ((ev->button == 3) && (!cfg->menu))
+ else if ((ev->button == 3) && (!inst->gcc->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"));
@@ -237,15 +234,6 @@
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
-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2005.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
