Fix mail module for gadcon menu breakage.

SVN revision: 32873
This commit is contained in:
Christopher Michael 2007-11-25 05:21:55 +00:00
parent 2db18086bd
commit bed154abbf
2 changed files with 2 additions and 20 deletions

View File

@ -221,7 +221,7 @@ _mail_cb_mouse_down (void *data, Evas * e, Evas_Object * obj,
if (!inst) if (!inst)
return; return;
if ((ev->button == 3) && (!mail_config->menu)) if ((ev->button == 3) && (!inst->gcc->menu))
{ {
E_Menu *mn, *sn; E_Menu *mn, *sn;
E_Menu_Item *mi; E_Menu_Item *mi;
@ -229,8 +229,6 @@ _mail_cb_mouse_down (void *data, Evas * e, Evas_Object * obj,
char buf[1024]; char buf[1024];
mn = e_menu_new (); 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)) if ((inst->ci->boxes) && (evas_list_count (inst->ci->boxes) > 0))
{ {
@ -276,7 +274,7 @@ _mail_cb_mouse_down (void *data, Evas * e, Evas_Object * obj,
e_util_zone_current_get (e_manager_current_get e_util_zone_current_get (e_manager_current_get
()), x + ev->output.x, ()), x + ev->output.x,
y + ev->output.y, 1, 1, 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_event_feed_mouse_up (inst->gcc->gadcon->evas, ev->button,
EVAS_BUTTON_NONE, ev->timestamp, NULL); EVAS_BUTTON_NONE, ev->timestamp, NULL);
} }
@ -344,15 +342,6 @@ _mail_cb_mouse_out (void *data, Evas * e, Evas_Object * obj, void *event_info)
} }
} }
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 static void
_mail_menu_cb_configure (void *data, E_Menu * m, E_Menu_Item * mi) _mail_menu_cb_configure (void *data, E_Menu * m, E_Menu_Item * mi)
{ {
@ -495,12 +484,6 @@ e_modapi_shutdown (E_Module * m)
if (mail_config->config_dialog) if (mail_config->config_dialog)
e_object_del (E_OBJECT (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) while (mail_config->items)
{ {
Config_Item *ci; Config_Item *ci;

View File

@ -43,7 +43,6 @@ struct _Config
{ {
E_Module *module; E_Module *module;
E_Config_Dialog *config_dialog; E_Config_Dialog *config_dialog;
E_Menu *menu;
Evas_List *instances; Evas_List *instances;
Evas_List *items; Evas_List *items;
}; };