Delete evas_objects when window gets deleted.
Change window TYPE. SVN revision: 43970
This commit is contained in:
parent
b21740b865
commit
8de4615f22
|
@ -12,8 +12,11 @@ EAPI void *
|
||||||
e_modapi_init(E_Module *m)
|
e_modapi_init(E_Module *m)
|
||||||
{
|
{
|
||||||
if (!il_ind_config_init(m)) return NULL;
|
if (!il_ind_config_init(m)) return NULL;
|
||||||
|
|
||||||
e_mod_win_init();
|
e_mod_win_init();
|
||||||
|
|
||||||
iwin = e_mod_win_new();
|
iwin = e_mod_win_new();
|
||||||
|
|
||||||
return m;
|
return m;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
#ifndef E_MOD_MAIN_H
|
#ifndef E_MOD_MAIN_H
|
||||||
#define 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;
|
typedef struct _Il_Ind_Win Il_Ind_Win;
|
||||||
|
|
||||||
|
|
|
@ -60,7 +60,7 @@ e_mod_win_new(void)
|
||||||
e_win_borderless_set(iwin->win, 1);
|
e_win_borderless_set(iwin->win, 1);
|
||||||
iwin->win->data = iwin;
|
iwin->win->data = iwin;
|
||||||
e_win_title_set(iwin->win, _("Illume Indicator"));
|
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);
|
evas = e_win_evas_get(iwin->win);
|
||||||
|
|
||||||
|
@ -118,9 +118,6 @@ e_mod_win_new(void)
|
||||||
static void
|
static void
|
||||||
_il_ind_win_cb_free(Il_Ind_Win *iwin)
|
_il_ind_win_cb_free(Il_Ind_Win *iwin)
|
||||||
{
|
{
|
||||||
e_object_del(E_OBJECT(iwin->gadcon));
|
|
||||||
iwin->gadcon = NULL;
|
|
||||||
|
|
||||||
if (iwin->menu)
|
if (iwin->menu)
|
||||||
{
|
{
|
||||||
e_menu_post_deactivate_callback_set(iwin->menu, NULL, NULL);
|
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;
|
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_object_del(E_OBJECT(iwin->win));
|
||||||
E_FREE(iwin);
|
E_FREE(iwin);
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue