Merge branch 'master' into pgp

2015-04-12 02:16:13 +01:00
parent 7ba7e098fe 57dc5f14ef
commit bcfbbac49a
16 changed files with 113 additions and 23 deletions
--- a/src/ui/console.c
+++ b/src/ui/console.c
@@ -910,6 +910,11 @@ cons_occupants_setting(void)
    else
        cons_show("Occupants (/occupants)        : hide");

+    if (prefs_get_boolean(PREF_OCCUPANTS_JID))
+        cons_show("Occupant jids (/occupants)    : show");
+    else
+        cons_show("Occupant jids (/occupants)    : hide");
+
    int size = prefs_get_occupants_size();
    cons_show("Occupants size (/occupants)   : %d", size);
 }