Enlightenment CVS committal
Author : devilhorns
Project : e_modules
Module : mail
Dir : e_modules/mail
Modified Files:
e_mod_main.h e_mod_main.c
Log Message:
Fix mail module for gadcon menu breakage.
===================================================================
RCS file: /cvs/e/e_modules/mail/e_mod_main.h,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -3 -r1.16 -r1.17
--- e_mod_main.h 31 Oct 2007 13:57:13 -0000 1.16
+++ e_mod_main.h 25 Nov 2007 05:21:55 -0000 1.17
@@ -43,7 +43,6 @@
{
E_Module *module;
E_Config_Dialog *config_dialog;
- E_Menu *menu;
Evas_List *instances;
Evas_List *items;
};
===================================================================
RCS file: /cvs/e/e_modules/mail/e_mod_main.c,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -3 -r1.53 -r1.54
--- e_mod_main.c 12 Nov 2007 04:15:51 -0000 1.53
+++ e_mod_main.c 25 Nov 2007 05:21:55 -0000 1.54
@@ -221,7 +221,7 @@
if (!inst)
return;
- if ((ev->button == 3) && (!mail_config->menu))
+ if ((ev->button == 3) && (!inst->gcc->menu))
{
E_Menu *mn, *sn;
E_Menu_Item *mi;
@@ -229,8 +229,6 @@
char buf[1024];
mn = e_menu_new ();
- e_menu_post_deactivate_callback_set (mn, _mail_menu_cb_post, inst);
- mail_config->menu = mn;
if ((inst->ci->boxes) && (evas_list_count (inst->ci->boxes) > 0))
{
@@ -276,7 +274,7 @@
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);
}
@@ -345,15 +343,6 @@
}
static void
-_mail_menu_cb_post (void *data, E_Menu * m)
-{
- if (!mail_config->menu)
- return;
- e_object_del (E_OBJECT (mail_config->menu));
- mail_config->menu = NULL;
-}
-
-static void
_mail_menu_cb_configure (void *data, E_Menu * m, E_Menu_Item * mi)
{
Instance *inst = data;
@@ -495,12 +484,6 @@
if (mail_config->config_dialog)
e_object_del (E_OBJECT (mail_config->config_dialog));
- if (mail_config->menu)
- {
- e_menu_post_deactivate_callback_set (mail_config->menu, NULL, NULL);
- e_object_del (E_OBJECT (mail_config->menu));
- mail_config->menu = NULL;
- }
while (mail_config->items)
{
Config_Item *ci;
-------------------------------------------------------------------------
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
