Enlightenment CVS committal
Author : englebass
Project : e_modules
Module : wlan
Dir : e_modules/wlan
Modified Files:
e_mod_main.c e_mod_main.h
Log Message:
Revert gadcon menu change.
===================================================================
RCS file: /cvs/e/e_modules/wlan/e_mod_main.c,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -3 -r1.43 -r1.44
--- e_mod_main.c 25 Nov 2007 05:58:43 -0000 1.43
+++ e_mod_main.c 2 Dec 2007 16:41:11 -0000 1.44
@@ -36,6 +36,7 @@
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);
@@ -150,13 +151,15 @@
inst = data;
ev = event_info;
- if ((ev->button == 3) && (!inst->gcc->menu))
+ if ((ev->button == 3) && (!wlan_config->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"));
@@ -179,6 +182,15 @@
}
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;
@@ -320,6 +332,12 @@
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.14
retrieving revision 1.15
diff -u -3 -r1.14 -r1.15
--- e_mod_main.h 25 Nov 2007 05:58:43 -0000 1.14
+++ e_mod_main.h 2 Dec 2007 16:41:11 -0000 1.15
@@ -10,6 +10,7 @@
{
E_Module *module;
E_Config_Dialog *config_dialog;
+ E_Menu *menu;
Evas_List *instances;
Evas_List *items;
};
-------------------------------------------------------------------------
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
[email protected]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
