Enlightenment CVS committal
Author : englebass
Project : e_modules
Module : mail
Dir : e_modules/mail
Modified Files:
e_mod_main.c e_mod_main.h
Log Message:
Revert gadcon menu change.
===================================================================
RCS file: /cvs/e/e_modules/mail/e_mod_main.c,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -3 -r1.54 -r1.55
--- e_mod_main.c 25 Nov 2007 05:21:55 -0000 1.54
+++ e_mod_main.c 2 Dec 2007 16:21:22 -0000 1.55
@@ -221,7 +221,7 @@
if (!inst)
return;
- if ((ev->button == 3) && (!inst->gcc->menu))
+ if ((ev->button == 3) && (!mail_config->menu))
{
E_Menu *mn, *sn;
E_Menu_Item *mi;
@@ -229,6 +229,8 @@
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))
{
@@ -274,7 +276,7 @@
e_util_zone_current_get (e_manager_current_get
()), x + ev->output.x,
y + ev->output.y, 1, 1,
- E_MENU_POP_DIRECTION_AUTO, ev->timestamp);
+ E_MENU_POP_DIRECTION_DOWN, ev->timestamp);
evas_event_feed_mouse_up (inst->gcc->gadcon->evas, ev->button,
EVAS_BUTTON_NONE, ev->timestamp, NULL);
}
@@ -343,6 +345,15 @@
}
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;
@@ -484,6 +495,12 @@
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;
===================================================================
RCS file: /cvs/e/e_modules/mail/e_mod_main.h,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -3 -r1.17 -r1.18
--- e_mod_main.h 25 Nov 2007 05:21:55 -0000 1.17
+++ e_mod_main.h 2 Dec 2007 16:21:24 -0000 1.18
@@ -43,6 +43,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
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
