If syscon module is not loaded (since it's broken right now), then we don't

need an additional separator at the bottom of the menu.



SVN revision: 37858
This commit is contained in:
Christopher Michael 2008-11-29 18:47:29 +00:00
parent 1ca0649d7d
commit 8010e152c1
1 changed files with 17 additions and 6 deletions

View File

@ -75,6 +75,7 @@ e_int_menus_main_new(void)
E_Menu_Item *mi; E_Menu_Item *mi;
Main_Data *dat; Main_Data *dat;
Eina_List *l = NULL; Eina_List *l = NULL;
int separator = 0;
dat = calloc(1, sizeof(Main_Data)); dat = calloc(1, sizeof(Main_Data));
m = e_menu_new(); m = e_menu_new();
@ -209,14 +210,25 @@ e_int_menus_main_new(void)
l = evas_hash_find(_e_int_menus_augmentation, "main/9"); l = evas_hash_find(_e_int_menus_augmentation, "main/9");
if (l) _e_int_menus_augmentation_add(m, l); if (l) _e_int_menus_augmentation_add(m, l);
l = evas_hash_find(_e_int_menus_augmentation, "main/10");
if (l)
{
separator = 1;
mi = e_menu_item_new(m); mi = e_menu_item_new(m);
e_menu_item_separator_set(mi, 1); e_menu_item_separator_set(mi, 1);
_e_int_menus_augmentation_add(m, l);
l = evas_hash_find(_e_int_menus_augmentation, "main/10"); }
if (l) _e_int_menus_augmentation_add(m, l);
l = evas_hash_find(_e_int_menus_augmentation, "main/11"); l = evas_hash_find(_e_int_menus_augmentation, "main/11");
if (l) _e_int_menus_augmentation_add(m, l); if (l)
{
if (!separator)
{
mi = e_menu_item_new(m);
e_menu_item_separator_set(mi, 1);
}
_e_int_menus_augmentation_add(m, l);
}
return m; return m;
} }
@ -749,7 +761,6 @@ _e_int_menus_config_pre_cb(void *data, E_Menu *m)
{ {
mi = e_menu_item_new(m); mi = e_menu_item_new(m);
e_menu_item_separator_set(mi, 1); e_menu_item_separator_set(mi, 1);
_e_int_menus_augmentation_add(m, l); _e_int_menus_augmentation_add(m, l);
} }