Browse Source

* Fix test for new menu items that come before the last successful item.

It's ok to jump up the menu to run such new items. Closes: #444462
* Fix NEVERDEFAULT test. Closes: #277743

r49533
tags/1.22
Joey Hess 14 years ago
parent
commit
4d47eabaf9
2 changed files with 15 additions and 3 deletions
  1. +9
    -0
      debian/changelog
  2. +6
    -3
      main-menu.c

+ 9
- 0
debian/changelog View File

@@ -1,3 +1,12 @@
main-menu (1.22) UNRELEASED; urgency=low

[ Joey Hess ]
* Fix test for new menu items that come before the last successful item.
It's ok to jump up the menu to run such new items. Closes: #444462
* Fix NEVERDEFAULT test. Closes: #277743

-- Joey Hess <joeyh@debian.org> Fri, 28 Sep 2007 21:12:56 -0400

main-menu (1.21) unstable; urgency=low

[ Colin Watson ]


+ 6
- 3
main-menu.c View File

@@ -139,12 +139,15 @@ get_default_menu_item(di_slist *list)
//di_log(DI_LOG_LEVEL_DEBUG, "not menu item; or not installed");
continue;
}
if ((p->installer_menu_item < last_successful_item &&
!di_hash_table_lookup(seen_items, &p->p.key)) &&
p->installer_menu_item < NEVERDEFAULT) {
if (p->installer_menu_item >= NEVERDEFAULT) {
//di_log(DI_LOG_LEVEL_DEBUG, "not in range to be default");
continue;
}
if (p->installer_menu_item < last_successful_item &&
di_hash_table_lookup(seen_items, &p->p.key)) {
//di_log(DI_LOG_LEVEL_DEBUG, "menu item is before last_successful_item, and is not new");
continue;
}
/* If menutest says this item should be default, make it so */
if (!isdefault(p)) {
//di_log(DI_LOG_LEVEL_DEBUG, "isdefalt says no");


Loading…
Cancel
Save