From 1c96115f97c1d72a12840a81ea54b8efd0f2a162 Mon Sep 17 00:00:00 2001
From: Michael Vetter <jubalh@iodoru.org>
Date: Fri, 22 Oct 2021 16:47:15 +0200
Subject: Allow utf8 in occupants char

---
 src/ui/console.c      | 14 ++++++++------
 src/ui/occupantswin.c |  5 +++--
 2 files changed, 11 insertions(+), 8 deletions(-)

(limited to 'src/ui')

diff --git a/src/ui/console.c b/src/ui/console.c
index a20d9fce..3ca981ba 100644
--- a/src/ui/console.c
+++ b/src/ui/console.c
@@ -1340,11 +1340,13 @@ cons_occupants_setting(void)
     else
         cons_show("Occupants wrap (/occupants)         : OFF");
 
-    char occupants_ch = prefs_get_occupants_char();
-    if (occupants_ch)
-        cons_show("Occupants char (/occupants)         : %c", occupants_ch);
-    else
+    char* occupants_ch = prefs_get_occupants_char();
+    if (occupants_ch) {
+        cons_show("Occupants char (/occupants)         : %s", occupants_ch);
+        free(occupants_ch);
+    } else {
         cons_show("Occupants char (/occupants)         : none");
+    }
 
     gint occupant_indent = prefs_get_occupants_indent();
     cons_show("Occupant indent (/occupants)        : %d", occupant_indent);
@@ -1509,7 +1511,7 @@ cons_roster_setting(void)
 
     char* room_priv_ch = prefs_get_roster_room_private_char();
     if (room_priv_ch) {
-        cons_show("Roster room private char (/roster)  : %c", room_priv_ch);
+        cons_show("Roster room private char (/roster)  : %s", room_priv_ch);
         free(room_priv_ch);
     } else {
         cons_show("Roster room private char (/roster)  : none");
@@ -1517,7 +1519,7 @@ cons_roster_setting(void)
 
     char* private_ch = prefs_get_roster_private_char();
     if (private_ch) {
-        cons_show("Roster private char (/roster)       : %c", private_ch);
+        cons_show("Roster private char (/roster)       : %s", private_ch);
         free(private_ch);
     } else {
         cons_show("Roster private char (/roster)       : none");
diff --git a/src/ui/occupantswin.c b/src/ui/occupantswin.c
index 4ceb5575..8d06de0e 100644
--- a/src/ui/occupantswin.c
+++ b/src/ui/occupantswin.c
@@ -77,9 +77,10 @@ _occuptantswin_occupant(ProfLayoutSplit* layout, GList* item, gboolean showjid,
 
     GString* msg = g_string_new(spaces->str);
 
-    char ch = prefs_get_occupants_char();
+    char* ch = prefs_get_occupants_char();
     if (ch) {
-        g_string_append_printf(msg, "%c", ch);
+        g_string_append_printf(msg, "%s", ch);
+        free(ch);
     }
 
     gboolean wrap = prefs_get_boolean(PREF_OCCUPANTS_WRAP);
-- 
cgit 1.4.1-2-gfad0