aniani/profanity
1
0
Fork 0
mirror of https://github.com/profanity-im/profanity.git synced 2024-12-04 14:46:46 -05:00
Code

Merge branch 'master' into osx-functional

Browse Source
This commit is contained in:
James Booth 2016-05-15 02:17:22 +01:00
commit e568247c63
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/command/commands.c
View File

@ -5880,7 +5880,11 @@ cmd_tray(ProfWin *window, const char *const command, gchar **args)
char *err_msg = NULL; char *err_msg = NULL;
gboolean res = strtoi_range(args[1], &intval, 1, 10, &err_msg); gboolean res = strtoi_range(args[1], &intval, 1, 10, &err_msg);
if (res) { if (res) {
cons_show("Tray timer set to %d seconds.", intval); if (intval == 1) {
cons_show("Tray timer set to 1 second.");
} else {
cons_show("Tray timer set to %d seconds.", intval);
}
prefs_set_tray_timer(intval); prefs_set_tray_timer(intval);
if (prefs_get_boolean(PREF_TRAY)) { if (prefs_get_boolean(PREF_TRAY)) {
tray_set_timer(intval); tray_set_timer(intval);

6
src/ui/console.c
View File

@ -1195,7 +1195,11 @@ cons_tray_setting(void)
cons_show("Tray icon read (/tray) : OFF"); cons_show("Tray icon read (/tray) : OFF");
int seconds = prefs_get_tray_timer(); int seconds = prefs_get_tray_timer();
cons_show("Tray timer (/tray) : %d seconds", seconds); if (seconds == 1) {
cons_show("Tray timer (/tray) : 1 second");
} else {
cons_show("Tray timer (/tray) : %d seconds", seconds);
}
} }
void void