Enlightenment CVS committal

Author  : englebass
Project : e_modules
Module  : weather

Dir     : e_modules/weather


Modified Files:
        e_mod_main.c e_mod_main.h 


Log Message:
Revert gadcon menu change.

===================================================================
RCS file: /cvs/e/e_modules/weather/e_mod_main.c,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -3 -r1.61 -r1.62
--- e_mod_main.c        25 Nov 2007 05:52:45 -0000      1.61
+++ e_mod_main.c        2 Dec 2007 16:39:35 -0000       1.62
@@ -64,6 +64,7 @@
                                    void *event_info);
 static void _weather_menu_cb_configure (void *data, E_Menu * m,
                                        E_Menu_Item * mi);
+static void _weather_menu_cb_post (void *data, E_Menu * m);
 static int _weather_cb_check (void *data);
 static Config_Item *_weather_config_item_get (const char *id);
 static Weather *_weather_new (Evas * evas);
@@ -207,13 +208,15 @@
 
   inst = data;
   ev = event_info;
-  if ((ev->button == 3) && (!inst->gcc->menu))
+  if ((ev->button == 3) && (!weather_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, _weather_menu_cb_post, inst);
+      weather_config->menu = mn;
 
       mi = e_menu_item_new (mn);
       e_menu_item_label_set (mi, D_ ("Configuration"));
@@ -236,6 +239,15 @@
 }
 
 static void
+_weather_menu_cb_post (void *data, E_Menu * m)
+{
+  if (!weather_config->menu)
+    return;
+  e_object_del (E_OBJECT (weather_config->menu));
+  weather_config->menu = NULL;
+}
+
+static void
 _weather_menu_cb_configure (void *data, E_Menu * m, E_Menu_Item * mi)
 {
   Instance *inst;
@@ -356,6 +368,12 @@
 
   if (weather_config->config_dialog)
     e_object_del (E_OBJECT (weather_config->config_dialog));
+  if (weather_config->menu)
+    {
+      e_menu_post_deactivate_callback_set (weather_config->menu, NULL, NULL);
+      e_object_del (E_OBJECT (weather_config->menu));
+      weather_config->menu = NULL;
+    }
 
   while (weather_config->items)
     {
===================================================================
RCS file: /cvs/e/e_modules/weather/e_mod_main.h,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -3 -r1.23 -r1.24
--- e_mod_main.h        25 Nov 2007 05:52:45 -0000      1.23
+++ e_mod_main.h        2 Dec 2007 16:39:35 -0000       1.24
@@ -17,6 +17,7 @@
    E_Config_Dialog *config_dialog;
    Evas_List *instances;
    Evas_List *items;
+   E_Menu *menu;
 };
 
 struct _Config_Item



-------------------------------------------------------------------------
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

Reply via email to