Merge remote-tracking branch 'incertia/time'

Conflicts: src/config/preferences.c
2015-07-01 20:16:09 +01:00
parent d5f79c7b35 837f8b1f10
commit 106e909fbd
6 changed files with 82 additions and 90 deletions
--- a/src/config/preferences.c
+++ b/src/config/preferences.c
@@ -725,9 +725,9 @@ _get_default_string(preference_t pref)
        case PREF_ROSTER_BY:
            return "presence";
        case PREF_TIME:
-            return "seconds";
+            return "%H:%M:%S";
        case PREF_TIME_STATUSBAR:
-            return "minutes";
+            return "%H:%M";
        case PREF_PGP_LOG:
            return "redact";
        default: