Enlightenment CVS committal
Author : devilhorns
Project : e_modules
Module : calendar
Dir : e_modules/calendar
Modified Files:
e_mod_main.h e_mod_main.c
Log Message:
Fixes for gadcon menu breakage.
===================================================================
RCS file: /cvs/e/e_modules/calendar/e_mod_main.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- e_mod_main.h 20 Nov 2007 11:19:51 -0000 1.3
+++ e_mod_main.h 25 Nov 2007 05:05:58 -0000 1.4
@@ -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/calendar/e_mod_main.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -3 -r1.12 -r1.13
--- e_mod_main.c 20 Nov 2007 11:08:10 -0000 1.12
+++ e_mod_main.c 25 Nov 2007 05:05:58 -0000 1.13
@@ -38,7 +38,6 @@
static void _cb_mouse_in(void *data, Evas *e, Evas_Object *obj, void
*event_info);
static void _cb_mouse_out(void *data, Evas *e, Evas_Object *obj, void
*event_info);
static void _cb_mouse_down(void *data, Evas *e, Evas_Object *obj, void
*event_info);
-static void _menu_cb_post(void *data, E_Menu *m);
static int days_in_month[2][12] =
{
@@ -55,7 +54,8 @@
static const E_Gadcon_Client_Class _gc_class =
{
GADCON_CLIENT_CLASS_VERSION, "calendar",
- {_gc_init, _gc_shutdown, _gc_orient, _gc_label, _gc_icon, _gc_id_new,
NULL}
+ {_gc_init, _gc_shutdown, _gc_orient, _gc_label, _gc_icon, _gc_id_new,
NULL},
+ E_GADCON_CLIENT_STYLE_PLAIN
};
static E_Gadcon_Client *
@@ -353,15 +353,12 @@
{
e_gadcon_popup_toggle_pinned(inst->popup);
}
- if ((ev->button == 3) && (!calendar_conf->menu))
+ if ((ev->button == 3) && (!inst->gcc->menu))
{
E_Menu *mn;
int cx, cy, cw, ch;
mn = e_menu_new();
- calendar_conf->menu = mn;
-
- e_menu_post_deactivate_callback_set(mn, _menu_cb_post, inst);
e_gadcon_client_util_menu_items_append(inst->gcc, mn, 0);
e_gadcon_canvas_zone_geometry_get(inst->gcc->gadcon, &cx, &cy, &cw,
&ch);
@@ -372,14 +369,6 @@
evas_event_feed_mouse_up(inst->gcc->gadcon->evas, ev->button,
EVAS_BUTTON_NONE, ev->timestamp, NULL);
}
-}
-
-static void
-_menu_cb_post(void *data, E_Menu *m)
-{
- if (!calendar_conf->menu) return;
- e_object_del(E_OBJECT(calendar_conf->menu));
- calendar_conf->menu = NULL;
}
EAPI E_Module_Api e_modapi =
-------------------------------------------------------------------------
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
