Enlightenment CVS committal
Author : devilhorns
Project : e_modules
Module : screenshot
Dir : e_modules/screenshot
Modified Files:
e_mod_main.h e_mod_main.c
Log Message:
Fix screenshot menu for recent gadcon_menu_items_append mess.
===================================================================
RCS file: /cvs/e/e_modules/screenshot/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:28:10 -0000 1.21
+++ e_mod_main.h 25 Nov 2007 04:55:52 -0000 1.22
@@ -10,7 +10,6 @@
{
E_Module *module;
E_Config_Dialog *config_dialog;
- E_Menu *menu;
Evas_List *instances;
Evas_List *items;
Ecore_Event_Handler *exe_exit_handler;
===================================================================
RCS file: /cvs/e/e_modules/screenshot/e_mod_main.c,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -3 -r1.78 -r1.79
--- e_mod_main.c 12 Nov 2007 07:58:34 -0000 1.78
+++ e_mod_main.c 25 Nov 2007 04:55:52 -0000 1.79
@@ -45,7 +45,6 @@
static void _ss_cb_mouse_down (void *data, Evas * e, Evas_Object * obj,
void *event_info);
static void _ss_menu_cb_configure (void *data, E_Menu * m, E_Menu_Item * mi);
-static void _ss_menu_cb_post (void *data, E_Menu * m);
static Config_Item *_ss_config_item_get (const char *id);
static Screenshot *_ss_new (Evas * evas);
static void _ss_free (Screenshot * ss);
@@ -162,15 +161,13 @@
inst = data;
ev = event_info;
- if ((ev->button == 3) && (!ss_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, _ss_menu_cb_post, inst);
- ss_config->menu = mn;
mi = e_menu_item_new (mn);
e_menu_item_label_set (mi, D_ ("Configuration"));
@@ -186,7 +183,7 @@
e_util_zone_current_get (e_manager_current_get
()), x + ev->output.x,
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_BUTTON_NONE, ev->timestamp, NULL);
}
@@ -195,15 +192,6 @@
}
static void
-_ss_menu_cb_post (void *data, E_Menu * m)
-{
- if (!ss_config->menu)
- return;
- e_object_del (E_OBJECT (ss_config->menu));
- ss_config->menu = NULL;
-}
-
-static void
_ss_menu_cb_configure (void *data, E_Menu * m, E_Menu_Item * mi)
{
Instance *inst;
@@ -392,12 +380,6 @@
if (ss_config->config_dialog)
e_object_del (E_OBJECT (ss_config->config_dialog));
- if (ss_config->menu)
- {
- e_menu_post_deactivate_callback_set (ss_config->menu, NULL, NULL);
- e_object_del (E_OBJECT (ss_config->menu));
- ss_config->menu = NULL;
- }
while (ss_config->items)
{
@@ -414,11 +396,9 @@
evas_stringshare_del (ci->app);
ss_config->items =
evas_list_remove_list (ss_config->items, ss_config->items);
- free (ci);
- ci = NULL;
+ E_FREE(ci);
}
- free (ss_config);
- ss_config = NULL;
+ E_FREE(ss_config);
E_CONFIG_DD_FREE (conf_item_edd);
E_CONFIG_DD_FREE (conf_edd);
return 1;
-------------------------------------------------------------------------
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
