Merge branch 'master' into osx-functional

src/config/preferences.c

@@ -855,7 +855,7 @@ _get_default_string(preference_t pref)
         case PREF_TIME_STATUSBAR:
             return "%H:%M";
         case PREF_TIME_LASTACTIVITY:
-            return "%d-%m-%y %H:%M:%S";
+            return "%d/%m/%y %H:%M:%S";
         case PREF_PGP_LOG:
             return "redact";
         default:

theme_template

@@ -54,7 +54,13 @@ beep=
 flash=
 splash=
 wrap=
-time=
+time.console=
+time.chat=
+time.muc=
+time.mucconfig=
+time.private=
+time.xmlconsole=
+time.lastactivity=
 time.statusbar=
 privileges=
 presence=

themes/boothj5

@@ -54,7 +54,12 @@ beep=false
 flash=false
 splash=true
 wrap=true
-time=%d-%m-%y %H:%M
+time.console=%H:%M:%S
+time.chat=%d/%m/%y %H:%M:%S
+time.muc=%d/%m/%y %H:%M:%S
+time.mucconfig=off
+time.private=%d/%m/%y %H:%M:%S
+time.xml=%H:%M:%S
 time.statusbar=%H:%M:%S
 time.lastactivity=%d/%m/%y %H:%M:%S
 privileges=true

themes/complex

@@ -3,7 +3,12 @@ beep=false
 flash=false
 splash=true
 wrap=true
-time=%H:%M:%S
+time.console=%d/%m/%y %H:%M:%S
+time.chat=%d/%m/%y %H:%M:%S
+time.muc=%d/%m/%y %H:%M:%S
+time.mucconfig=%d/%m/%y %H:%M:%S
+time.private=%d/%m/%y %H:%M:%S
+time.xmlconsole=%d/%m/%y %H:%M:%S
 time.statusbar=$H:$M:%S
 resource.title=true
 resource.message=true

themes/simple

@@ -3,8 +3,13 @@ beep=false
 flash=false
 splash=true
 wrap=true
-time=%H:%M
-time.statusbar=
+time.console=off
+time.chat=off
+time.muc=off
+time.mucconfig=off
+time.private=off
+time.xmlconsole=off
+time.statusbar=off
 resource.title=false
 resource.message=false
 statuses.console=none