Enlightenment CVS committal
Author : devilhorns
Project : e_modules
Module : mem
Dir : e_modules/mem
Modified Files:
e_mod_main.h e_mod_main.c
Log Message:
Fix for gadcon menu breakage.
===================================================================
RCS file: /cvs/e/e_modules/mem/e_mod_main.h,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -3 -r1.14 -r1.15
--- e_mod_main.h 31 Oct 2007 14:09:38 -0000 1.14
+++ e_mod_main.h 25 Nov 2007 05:37:36 -0000 1.15
@@ -10,7 +10,6 @@
{
E_Module *module;
E_Config_Dialog *config_dialog;
- E_Menu *menu;
Evas_List *instances;
Evas_List *items;
};
===================================================================
RCS file: /cvs/e/e_modules/mem/e_mod_main.c,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -3 -r1.48 -r1.49
--- e_mod_main.c 12 Nov 2007 04:15:52 -0000 1.48
+++ e_mod_main.c 25 Nov 2007 05:37:36 -0000 1.49
@@ -36,7 +36,6 @@
static void _mem_cb_mouse_out (void *data, Evas * e, Evas_Object * obj,
void *event_info);
static void _mem_menu_cb_configure (void *data, E_Menu * m, E_Menu_Item * mi);
-static void _mem_menu_cb_post (void *data, E_Menu * m);
static Config_Item *_mem_config_item_get (const char *id);
static Mem *_mem_new (Evas * evas);
static void _mem_free (Mem * mem);
@@ -137,8 +136,7 @@
ecore_timer_del (inst->check_timer);
mem_config->instances = evas_list_remove (mem_config->instances, inst);
_mem_free (inst->mem);
- free (inst);
- inst = NULL;
+ E_FREE(inst);
}
static void
@@ -149,15 +147,13 @@
inst = data;
ev = event_info;
- if ((ev->button == 3) && (!mem_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, _mem_menu_cb_post, inst);
- mem_config->menu = mn;
mi = e_menu_item_new (mn);
e_menu_item_label_set (mi, D_ ("Configuration"));
@@ -173,22 +169,13 @@
e_util_zone_current_get (e_manager_current_get
()), x + ev->output.x,
y + ev->output.y, 1, 1,
- E_MENU_POP_DIRECTION_DOWN, ev->timestamp);
+ E_MENU_POP_DIRECTION_AUTO, ev->timestamp);
evas_event_feed_mouse_up (inst->gcc->gadcon->evas, ev->button,
EVAS_BUTTON_NONE, ev->timestamp, NULL);
}
}
static void
-_mem_menu_cb_post (void *data, E_Menu * m)
-{
- if (!mem_config->menu)
- return;
- e_object_del (E_OBJECT (mem_config->menu));
- mem_config->menu = NULL;
-}
-
-static void
_mem_menu_cb_configure (void *data, E_Menu * m, E_Menu_Item * mi)
{
Instance *inst;
@@ -335,12 +322,6 @@
if (mem_config->config_dialog)
e_object_del (E_OBJECT (mem_config->config_dialog));
- if (mem_config->menu)
- {
- e_menu_post_deactivate_callback_set (mem_config->menu, NULL, NULL);
- e_object_del (E_OBJECT (mem_config->menu));
- mem_config->menu = NULL;
- }
while (mem_config->items)
{
Config_Item *ci;
@@ -350,11 +331,9 @@
evas_list_remove_list (mem_config->items, mem_config->items);
if (ci->id)
evas_stringshare_del (ci->id);
- free (ci);
- ci = NULL;
+ E_FREE(ci);
}
- free (mem_config);
- mem_config = NULL;
+ E_FREE(mem_config);
E_CONFIG_DD_FREE (conf_item_edd);
E_CONFIG_DD_FREE (conf_edd);
return 1;
@@ -390,8 +369,7 @@
_mem_free (Mem * m)
{
evas_object_del (m->mem_obj);
- free (m);
- m = NULL;
+ E_FREE(m);
}
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
