Index: apps/screens.c =================================================================== --- apps/screens.c (revision 29302) +++ apps/screens.c (working copy) @@ -805,7 +805,7 @@ talk_ids(false, (selected_item < 2) ? LANG_RUNNING_TIME : LANG_TOP_TIME, TALK_ID((selected_item < 2) ? global_status.runtime - : global_status.topruntime, UNIT_TIME_EXACT)); + : global_status.topruntime, UNIT_TIME)); return 0; } Index: apps/menus/main_menu.c =================================================================== --- apps/menus/main_menu.c (revision 29302) +++ apps/menus/main_menu.c (working copy) @@ -303,7 +303,7 @@ { talk_id(LANG_BATTERY_TIME, false); talk_value(battery_level(), UNIT_PERCENT, true); - talk_value(battery_time() *60, UNIT_TIME_EXACT, true); + talk_value(battery_time() *60, UNIT_TIME, true); } else talk_id(VOICE_BLANK, false); break; Index: apps/talk.c =================================================================== --- apps/talk.c (revision 29302) +++ apps/talk.c (working copy) @@ -1015,7 +1015,7 @@ /* Say time duration/interval. Input is time in seconds, say hours,minutes,seconds. */ -static int talk_time_unit(long secs, bool exact, bool enqueue) +static int talk_time_unit(long secs, bool enqueue) { int hours, mins; if (!enqueue) @@ -1026,11 +1026,9 @@ } if((mins = secs/60)) { secs %= 60; - if(exact || !hours) - talk_value(mins, UNIT_MIN, true); - else talk_number(mins, true); /* don't say "minutes" */ + talk_value(mins, UNIT_MIN, true); } - if((exact && secs) || (!hours && !mins)) + if((secs) || (!hours && !mins)) talk_value(secs, UNIT_SEC, true); else if(!hours && secs) talk_number(secs, true); @@ -1110,8 +1108,8 @@ #endif /* special case for time duration */ - if (unit == UNIT_TIME || unit == UNIT_TIME_EXACT) - return talk_time_unit(n, unit == UNIT_TIME_EXACT, enqueue); + if (unit == UNIT_TIME) + return talk_time_unit(n, enqueue); if (unit < 0 || unit >= UNIT_LAST) unit_id = -1; Index: apps/talk.h =================================================================== --- apps/talk.h (revision 29302) +++ apps/talk.h (working copy) @@ -50,8 +50,7 @@ UNIT_MB, /* Megabytes */ UNIT_KBIT, /* kilobits per sec */ UNIT_PM_TICK, /* peak meter units per tick */ - UNIT_TIME_EXACT,/* time duration/interval in seconds, says hours,mins,secs*/ - UNIT_TIME, /* as above but less verbose */ + UNIT_TIME, /* time duration/interval in seconds, says hours,mins,secs */ UNIT_LAST /* END MARKER */ };