Enlightenment CVS committal
Author : devilhorns
Project : e_modules
Module : wlan
Dir : e_modules/wlan
Modified Files:
e_mod_main.c e_mod_main.h
Log Message:
Fix for gadcon menu breakage.
===================================================================
RCS file: /cvs/e/e_modules/wlan/e_mod_main.c,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -3 -r1.42 -r1.43
--- e_mod_main.c 12 Nov 2007 04:15:53 -0000 1.42
+++ e_mod_main.c 25 Nov 2007 05:58:43 -0000 1.43
@@ -36,7 +36,6 @@
static void _wlan_cb_mouse_out (void *data, Evas * e, Evas_Object * obj,
void *event_info);
static void _wlan_menu_cb_configure (void *data, E_Menu * m, E_Menu_Item * mi);
-static void _wlan_menu_cb_post (void *data, E_Menu * m);
static Config_Item *_wlan_config_item_get (const char *id);
static Wlan *_wlan_new (Evas * evas);
static void _wlan_free (Wlan * wlan);
@@ -151,15 +150,13 @@
inst = data;
ev = event_info;
- if ((ev->button == 3) && (!wlan_config->menu))
+ if ((ev->button == 3) && (!inst->gcc->menu))
{
E_Menu *mn;
E_Menu_Item *mi;
int x, y, w, h;
mn = e_menu_new ();
- e_menu_post_deactivate_callback_set (mn, _wlan_menu_cb_post, inst);
- wlan_config->menu = mn;
mi = e_menu_item_new (mn);
e_menu_item_label_set (mi, D_ ("Configuration"));
@@ -182,15 +179,6 @@
}
static void
-_wlan_menu_cb_post (void *data, E_Menu * m)
-{
- if (!wlan_config->menu)
- return;
- e_object_del (E_OBJECT (wlan_config->menu));
- wlan_config->menu = NULL;
-}
-
-static void
_wlan_menu_cb_configure (void *data, E_Menu * m, E_Menu_Item * mi)
{
Instance *inst;
@@ -332,12 +320,6 @@
if (wlan_config->config_dialog)
e_object_del (E_OBJECT (wlan_config->config_dialog));
- if (wlan_config->menu)
- {
- e_menu_post_deactivate_callback_set (wlan_config->menu, NULL, NULL);
- e_object_del (E_OBJECT (wlan_config->menu));
- wlan_config->menu = NULL;
- }
while (wlan_config->items)
{
Config_Item *ci;
===================================================================
RCS file: /cvs/e/e_modules/wlan/e_mod_main.h,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -3 -r1.13 -r1.14
--- e_mod_main.h 31 Oct 2007 14:52:46 -0000 1.13
+++ e_mod_main.h 25 Nov 2007 05:58:43 -0000 1.14
@@ -10,7 +10,6 @@
{
E_Module *module;
E_Config_Dialog *config_dialog;
- E_Menu *menu;
Evas_List *instances;
Evas_List *items;
};
-------------------------------------------------------------------------
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
