enlightenment
/
enlightenment-module-net
8
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix for gadcon menu breakage. 

SVN revision: 32875
This commit is contained in:
Christopher Michael 2007-11-25 05:43:29 +00:00
parent cbe3d30c9b
commit 1edcdab1a7
3 changed files with 2 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/e_mod_config.h
View File

@ -8,7 +8,6 @@ struct _Config
{ {
E_Module *mod; E_Module *mod;
E_Config_Dialog *cfd; E_Config_Dialog *cfd;
E_Menu *menu;
Evas_List *instances; Evas_List *instances;
Evas_List *items; Evas_List *items;
}; };

6
src/e_mod_main.c
View File

@ -52,12 +52,6 @@ e_modapi_shutdown(E_Module *m)
_gc_unregister(); _gc_unregister();
if (cfg->cfd) e_object_del(E_OBJECT(cfg->cfd)); if (cfg->cfd) e_object_del(E_OBJECT(cfg->cfd));
if (cfg->menu)
{
e_menu_post_deactivate_callback_set(cfg->menu, NULL, NULL);
e_object_del(E_OBJECT(cfg->menu));
cfg->menu = NULL;
}
while (cfg->items) while (cfg->items)
{ {

16
src/e_mod_net.c
View File

@ -14,7 +14,6 @@
#endif #endif
static void _bytes_to_string(bytes_t bytes, char *string, int size); static void _bytes_to_string(bytes_t bytes, char *string, int size);
static void _cb_post(void *data, E_Menu *m);
static void _cb_configure(void *data, E_Menu *m, E_Menu_Item *mi); static void _cb_configure(void *data, E_Menu *m, E_Menu_Item *mi);
#ifdef __FreeBSD__ #ifdef __FreeBSD__
@ -152,17 +151,15 @@ _cb_mouse_down(void *data, Evas *evas, Evas_Object *obj, void *event)
if (x) ecore_exe_free(x); if (x) ecore_exe_free(x);
} }
} }
else if ((ev->button == 1) && (!cfg->menu)) else if ((ev->button == 1) && (!inst->gcc->menu))
e_gadcon_popup_toggle_pinned(inst->popup); e_gadcon_popup_toggle_pinned(inst->popup);
else if ((ev->button == 3) && (!cfg->menu)) else if ((ev->button == 3) && (!inst->gcc->menu))
{ {
E_Menu *mn; E_Menu *mn;
E_Menu_Item *mi; E_Menu_Item *mi;
int x, y; int x, y;
mn = e_menu_new(); mn = e_menu_new();
e_menu_post_deactivate_callback_set(mn, _cb_post, inst);
cfg->menu = mn;
mi = e_menu_item_new(mn); mi = e_menu_item_new(mn);
e_menu_item_label_set(mi, D_("Configuration")); e_menu_item_label_set(mi, D_("Configuration"));
@ -239,15 +236,6 @@ _bytes_to_string(bytes_t bytes, char *string, int size)
snprintf(string, size, "%lu B", bytes); snprintf(string, size, "%lu B", bytes);
} }
static void
_cb_post(void *data, E_Menu *m)
{
if (!cfg->menu) return;
e_menu_post_deactivate_callback_set(cfg->menu, NULL, NULL);
e_object_del(E_OBJECT(cfg->menu));
cfg->menu = NULL;
}
static void static void
_cb_configure(void *data, E_Menu *m, E_Menu_Item *mi) _cb_configure(void *data, E_Menu *m, E_Menu_Item *mi)
{ {