forked from enlightenment/enlightenment
delete submenus of main menu afterwards. this fixes the issue with borders
not getting unreffed SVN revision: 39494
This commit is contained in:
parent
2a2aa35801
commit
2422e04b20
|
@ -128,7 +128,6 @@ e_int_menus_main_new(void)
|
||||||
e_menu_item_submenu_set(mi, subm);
|
e_menu_item_submenu_set(mi, subm);
|
||||||
|
|
||||||
subm = e_int_menus_clients_new();
|
subm = e_int_menus_clients_new();
|
||||||
e_object_data_set(E_OBJECT(subm), dat);
|
|
||||||
dat->clients = subm;
|
dat->clients = subm;
|
||||||
mi = e_menu_item_new(m);
|
mi = e_menu_item_new(m);
|
||||||
e_menu_item_label_set(mi, _("Windows"));
|
e_menu_item_label_set(mi, _("Windows"));
|
||||||
|
@ -401,6 +400,13 @@ _e_int_menus_main_del_hook(void *obj)
|
||||||
|
|
||||||
m = obj;
|
m = obj;
|
||||||
dat = e_object_data_get(E_OBJECT(obj));
|
dat = e_object_data_get(E_OBJECT(obj));
|
||||||
|
e_object_del(E_OBJECT(dat->apps));
|
||||||
|
e_object_del(E_OBJECT(dat->all_apps));
|
||||||
|
e_object_del(E_OBJECT(dat->desktops));
|
||||||
|
e_object_del(E_OBJECT(dat->clients));
|
||||||
|
e_object_del(E_OBJECT(dat->enlightenment));
|
||||||
|
e_object_del(E_OBJECT(dat->config));
|
||||||
|
|
||||||
free(dat);
|
free(dat);
|
||||||
_e_int_menus_augmentation_del(m, eina_hash_find(_e_int_menus_augmentation, "main/0"));
|
_e_int_menus_augmentation_del(m, eina_hash_find(_e_int_menus_augmentation, "main/0"));
|
||||||
_e_int_menus_augmentation_del(m, eina_hash_find(_e_int_menus_augmentation, "main/1"));
|
_e_int_menus_augmentation_del(m, eina_hash_find(_e_int_menus_augmentation, "main/1"));
|
||||||
|
@ -414,6 +420,7 @@ _e_int_menus_main_del_hook(void *obj)
|
||||||
_e_int_menus_augmentation_del(m, eina_hash_find(_e_int_menus_augmentation, "main/9"));
|
_e_int_menus_augmentation_del(m, eina_hash_find(_e_int_menus_augmentation, "main/9"));
|
||||||
_e_int_menus_augmentation_del(m, eina_hash_find(_e_int_menus_augmentation, "main/10"));
|
_e_int_menus_augmentation_del(m, eina_hash_find(_e_int_menus_augmentation, "main/10"));
|
||||||
_e_int_menus_augmentation_del(m, eina_hash_find(_e_int_menus_augmentation, "main/11"));
|
_e_int_menus_augmentation_del(m, eina_hash_find(_e_int_menus_augmentation, "main/11"));
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static void
|
static void
|
||||||
|
@ -1188,7 +1195,6 @@ _e_int_menus_clients_icon_cb(void *data, E_Menu *m, E_Menu_Item *mi)
|
||||||
|
|
||||||
bd = data;
|
bd = data;
|
||||||
E_OBJECT_CHECK(bd);
|
E_OBJECT_CHECK(bd);
|
||||||
|
|
||||||
o = e_icon_add(m->evas);
|
o = e_icon_add(m->evas);
|
||||||
e_icon_object_set(o, e_border_icon_add(bd, m->evas));
|
e_icon_object_set(o, e_border_icon_add(bd, m->evas));
|
||||||
mi->icon_object = o;
|
mi->icon_object = o;
|
||||||
|
|
Loading…
Reference in New Issue