Delete evas_objects when window gets deleted.

Change window TYPE.



SVN revision: 43970
This commit is contained in:
Christopher Michael 2009-11-25 08:21:55 +00:00
parent b21740b865
commit 8de4615f22
3 changed files with 11 additions and 5 deletions

View File

@ -12,8 +12,11 @@ EAPI void *
e_modapi_init(E_Module *m)
{
if (!il_ind_config_init(m)) return NULL;
e_mod_win_init();
iwin = e_mod_win_new();
return m;
}

View File

@ -1,7 +1,7 @@
#ifndef E_MOD_MAIN_H
#define E_MOD_MAIN_H
#define IL_IND_WIN_TYPE 0xE1b0786
#define IL_IND_WIN_TYPE 0xE1b0886
typedef struct _Il_Ind_Win Il_Ind_Win;

View File

@ -60,7 +60,7 @@ e_mod_win_new(void)
e_win_borderless_set(iwin->win, 1);
iwin->win->data = iwin;
e_win_title_set(iwin->win, _("Illume Indicator"));
e_win_name_class_set(iwin->win, "E", "Illume-Indicator");
e_win_name_class_set(iwin->win, "Illume-Indicator", "Illume-Indicator");
evas = e_win_evas_get(iwin->win);
@ -118,9 +118,6 @@ e_mod_win_new(void)
static void
_il_ind_win_cb_free(Il_Ind_Win *iwin)
{
e_object_del(E_OBJECT(iwin->gadcon));
iwin->gadcon = NULL;
if (iwin->menu)
{
e_menu_post_deactivate_callback_set(iwin->menu, NULL, NULL);
@ -128,6 +125,12 @@ _il_ind_win_cb_free(Il_Ind_Win *iwin)
iwin->menu = NULL;
}
if (iwin->o_event) evas_object_del(iwin->o_event);
if (iwin->o_base) evas_object_del(iwin->o_base);
e_object_del(E_OBJECT(iwin->gadcon));
iwin->gadcon = NULL;
e_object_del(E_OBJECT(iwin->win));
E_FREE(iwin);
}