Enlightenment CVS committal
Author : devilhorns
Project : e_modules
Module : slideshow
Dir : e_modules/slideshow
Modified Files:
e_mod_main.c e_mod_main.h
Log Message:
Fix for gadcon menu breakage.
===================================================================
RCS file: /cvs/e/e_modules/slideshow/e_mod_main.c,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -3 -r1.54 -r1.55
--- e_mod_main.c 12 Nov 2007 04:15:52 -0000 1.54
+++ e_mod_main.c 25 Nov 2007 05:48:33 -0000 1.55
@@ -37,7 +37,6 @@
static void _slide_cb_mouse_down (void *data, Evas *e, Evas_Object
*obj, void *event_info);
static void _slide_menu_cb_configure (void *data, E_Menu *m,
E_Menu_Item *mi);
-static void _slide_menu_cb_post (void *data, E_Menu *m);
static Config_Item *_slide_config_item_get (const char *id);
static Slideshow *_slide_new (Evas *evas);
static void _slide_free (Slideshow *ss);
@@ -170,15 +169,13 @@
inst = data;
ev = event_info;
- if ((ev->button == 3) && (!slide_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, _slide_menu_cb_post, inst);
- slide_config->menu = mn;
mi = e_menu_item_new(mn);
e_menu_item_label_set(mi, D_("Configuration"));
@@ -211,15 +208,6 @@
}
static void
-_slide_menu_cb_post(void *data, E_Menu *m)
-{
- if (!slide_config->menu)
- return;
- e_object_del(E_OBJECT(slide_config->menu));
- slide_config->menu = NULL;
-}
-
-static void
_slide_menu_cb_configure(void *data, E_Menu *m, E_Menu_Item *mi)
{
Instance *inst;
@@ -357,12 +345,6 @@
if (slide_config->config_dialog)
e_object_del(E_OBJECT(slide_config->config_dialog));
- if (slide_config->menu)
- {
- e_menu_post_deactivate_callback_set(slide_config->menu, NULL, NULL);
- e_object_del(E_OBJECT(slide_config->menu));
- slide_config->menu = NULL;
- }
while (slide_config->items)
{
Config_Item *ci;
===================================================================
RCS file: /cvs/e/e_modules/slideshow/e_mod_main.h,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -3 -r1.21 -r1.22
--- e_mod_main.h 31 Oct 2007 14:30:58 -0000 1.21
+++ e_mod_main.h 25 Nov 2007 05:48:33 -0000 1.22
@@ -10,7 +10,6 @@
{
E_Module *module;
E_Config_Dialog *config_dialog;
- E_Menu *menu;
Evas_List *instances;
Evas_List *items;
};
-------------------------------------------------------------------------
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
