Changed roster defaults, updated themes

5 files changed, 26 insertions, 9 deletions

diff --git a/src/config/preferences.c b/src/config/preferences.c
index f55895e2..0f5041bf 100644
--- a/src/config/preferences.c
+++ b/src/config/preferences.c
@@ -837,9 +837,6 @@ _get_default_boolean(preference_t pref)
         case PREF_RESOURCE_MESSAGE:
         case PREF_ROSTER:
         case PREF_ROSTER_OFFLINE:
-        case PREF_ROSTER_RESOURCE:
-        case PREF_ROSTER_PRESENCE:
-        case PREF_ROSTER_STATUS:
         case PREF_ROSTER_EMPTY:
         case PREF_ROSTER_COUNT:
         case PREF_ROSTER_PRIORITY:
diff --git a/src/config/theme.c b/src/config/theme.c
index 09d0fa1e..a6649e88 100644
--- a/src/config/theme.c
+++ b/src/config/theme.c
@@ -458,8 +458,13 @@ _load_preferences(void)
     _set_boolean_preference("roster", PREF_ROSTER);
     _set_boolean_preference("roster.offline", PREF_ROSTER_OFFLINE);
     _set_boolean_preference("roster.resource", PREF_ROSTER_RESOURCE);
+    _set_boolean_preference("roster.presence", PREF_ROSTER_PRESENCE);
+    _set_boolean_preference("roster.status", PREF_ROSTER_STATUS);
     _set_boolean_preference("roster.empty", PREF_ROSTER_EMPTY);
     _set_string_preference("roster.by", PREF_ROSTER_BY);
+    _set_string_preference("roster.order", PREF_ROSTER_ORDER);
+    _set_boolean_preference("roster.count", PREF_ROSTER_COUNT);
+    _set_boolean_preference("roster.priority", PREF_ROSTER_PRIORITY);
     if (g_key_file_has_key(theme, "ui", "roster.size", NULL)) {
         gint roster_size = g_key_file_get_integer(theme, "ui", "roster.size", NULL);
         prefs_set_roster_size(roster_size);
diff --git a/themes/boothj5 b/themes/boothj5
index b6dbe5b9..0b40fab5 100644
--- a/themes/boothj5
+++ b/themes/boothj5
@@ -73,10 +73,15 @@ statuses.chat=all
 statuses.muc=all
 roster=true
 roster.offline=true
-roster.resource=false
-roster.by=presence
-roster.size=25
+roster.resource=true
+roster.presence=true
+roster.status=true
 roster.empty=true
+roster.by=group
+roster.order=presence
+roster.count=true
+roster.priority=true
+roster.size=25
 occupants=true
 occupants.size=15
 occupants.jid=false
diff --git a/themes/complex b/themes/complex
index 61af29b1..c1abfc81 100644
--- a/themes/complex
+++ b/themes/complex
@@ -21,9 +21,14 @@ occupants.jid=true
 roster=true
 roster.offline=true
 roster.resource=true
+roster.presence=true
+roster.status=true
+roster.empty=true
 roster.by=presence
+roster.order=presence
+roster.count=true
+roster.priority=true
 roster.size=25
-roster.empty=true
 privileges=true
 presence=true
 intype=true
diff --git a/themes/simple b/themes/simple
index 32a4b20f..a31c9c01 100644
--- a/themes/simple
+++ b/themes/simple
@@ -20,9 +20,14 @@ occupants.size=15
 roster=true
 roster.offline=false
 roster.resource=false
-roster.by=presence
-roster.size=25
+roster.presence=false
+roster.status=false
 roster.empty=false
+roster.by=none
+roster.order=presence
+roster.count=false
+roster.priority=false
+roster.size=25
 privileges=false
 presence=false
 intype=false