Enlightenment CVS committal
Author : devilhorns
Project : e_modules
Module : mixer
Dir : e_modules/mixer
Modified Files:
e_mod_main.h e_mod_main.c
Log Message:
Fix for gadcon menu breakage.
===================================================================
RCS file: /cvs/e/e_modules/mixer/e_mod_main.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -3 -r1.11 -r1.12
--- e_mod_main.h 31 Oct 2007 14:11:55 -0000 1.11
+++ e_mod_main.h 25 Nov 2007 05:37:18 -0000 1.12
@@ -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/mixer/e_mod_main.c,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -3 -r1.70 -r1.71
--- e_mod_main.c 20 Nov 2007 03:35:49 -0000 1.70
+++ e_mod_main.c 25 Nov 2007 05:37:18 -0000 1.71
@@ -33,7 +33,6 @@
static void _mixer_mute_toggle (Mixer *mixer, Config_Item
*ci, int channel_id);
static Config_Item *_mixer_config_item_get (void *data, const char *id);
-static void _mixer_menu_cb_post (void *data, E_Menu *m);
static void _mixer_menu_cb_configure (void *data, E_Menu *m,
E_Menu_Item *mi);
static void _mixer_cb_mouse_down (void *data, Evas *e, Evas_Object
*obj, void *event_info);
static void _mixer_cb_mouse_wheel (void *data, Evas *e, Evas_Object
*obj, void *event_info);
@@ -255,7 +254,7 @@
if (!inst) return;
ev = event_info;
- if ((ev->button == 3) && (!mixer_config->menu))
+ if ((ev->button == 3) && (!inst->gcc->menu))
{
E_Menu *mn;
E_Menu_Item *mi;
@@ -265,8 +264,6 @@
zone = e_util_zone_current_get(e_manager_current_get());
mn = e_menu_new();
- e_menu_post_deactivate_callback_set(mn, _mixer_menu_cb_post, inst);
- mixer_config->menu = mn;
mi = e_menu_item_new(mn);
e_menu_item_label_set(mi, D_("Configuration"));
@@ -317,14 +314,6 @@
}
static void
-_mixer_menu_cb_post(void *data, E_Menu *m)
-{
- if (!mixer_config->menu) return;
- e_object_del(E_OBJECT(mixer_config->menu));
- mixer_config->menu = NULL;
-}
-
-static void
_mixer_menu_cb_configure(void *data, E_Menu *m, E_Menu_Item *mi)
{
Instance *inst;
@@ -555,13 +544,6 @@
if (mixer_config->config_dialog)
e_object_del(E_OBJECT(mixer_config->config_dialog));
-
- if (mixer_config->menu)
- {
- e_menu_post_deactivate_callback_set(mixer_config->menu, NULL, NULL);
- e_object_del(E_OBJECT(mixer_config->menu));
- mixer_config->menu = NULL;
- }
while (mixer_config->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
