From fa2881fcea9009ffbd50947d755a4c847a157cae Mon Sep 17 00:00:00 2001
From: Michael Vetter <jubalh@iodoru.org>
Date: Fri, 22 Oct 2021 16:42:57 +0200
Subject: [PATCH] Allow utf8 in roster room private char

---
 src/command/cmd_funcs.c  |  4 ++--
 src/config/preferences.c | 24 ++++++++----------------
 src/config/preferences.h |  4 ++--
 src/config/theme.c       |  4 ++--
 src/ui/console.c         |  8 +++++---
 src/ui/rosterwin.c       |  5 +++--
 6 files changed, 22 insertions(+), 27 deletions(-)

diff --git a/src/command/cmd_funcs.c b/src/command/cmd_funcs.c
index 77e12e3a..58c08331 100644
--- a/src/command/cmd_funcs.c
+++ b/src/command/cmd_funcs.c
@@ -2798,8 +2798,8 @@ cmd_roster(ProfWin* window, const char* const command, gchar** args)
                     cons_show("Roster room private char removed.");
                     rosterwin_roster();
                 } else {
-                    prefs_set_roster_room_private_char(args[3][0]);
-                    cons_show("Roster room private char set to %c.", args[3][0]);
+                    prefs_set_roster_room_private_char(args[3]);
+                    cons_show("Roster room private char set to %s.", args[3]);
                     rosterwin_roster();
                 }
                 return TRUE;
diff --git a/src/config/preferences.c b/src/config/preferences.c
index edbf6f63..b1686424 100644
--- a/src/config/preferences.c
+++ b/src/config/preferences.c
@@ -1206,30 +1206,22 @@ prefs_clear_roster_room_char(void)
     g_key_file_remove_key(prefs, PREF_GROUP_UI, "roster.rooms.char", NULL);
 }
 
-char
+char*
 prefs_get_roster_room_private_char(void)
 {
-    char result = 0;
-
-    char* resultstr = g_key_file_get_string(prefs, PREF_GROUP_UI, "roster.rooms.private.char", NULL);
-    if (!resultstr) {
-        result = 0;
-    } else {
-        result = resultstr[0];
-    }
-    free(resultstr);
+    char* result = g_key_file_get_string(prefs, PREF_GROUP_UI, "roster.rooms.private.char", NULL);
 
     return result;
 }
 
 void
-prefs_set_roster_room_private_char(char ch)
+prefs_set_roster_room_private_char(char* ch)
 {
-    char str[2];
-    str[0] = ch;
-    str[1] = '\0';
-
-    g_key_file_set_string(prefs, PREF_GROUP_UI, "roster.rooms.private.char", str);
+    if (g_utf8_strlen(ch, 4) == 1) {
+        g_key_file_set_string(prefs, PREF_GROUP_UI, "roster.rooms.private.char", ch);
+    } else {
+        log_error("Could not set roster resource char: %s", ch);
+    }
 }
 
 void
diff --git a/src/config/preferences.h b/src/config/preferences.h
index 972dfa8a..aec27094 100644
--- a/src/config/preferences.h
+++ b/src/config/preferences.h
@@ -269,8 +269,8 @@ void prefs_clear_roster_private_char(void);
 char* prefs_get_roster_room_char(void);
 void prefs_set_roster_room_char(char* ch);
 void prefs_clear_roster_room_char(void);
-char prefs_get_roster_room_private_char(void);
-void prefs_set_roster_room_private_char(char ch);
+char* prefs_get_roster_room_private_char(void);
+void prefs_set_roster_room_private_char(char* ch);
 void prefs_clear_roster_room_private_char(void);
 char prefs_get_occupants_char(void);
 void prefs_set_occupants_char(char ch);
diff --git a/src/config/theme.c b/src/config/theme.c
index 407fb82e..118cbaa2 100644
--- a/src/config/theme.c
+++ b/src/config/theme.c
@@ -456,8 +456,8 @@ _load_preferences(void)
 
     if (g_key_file_has_key(theme, "ui", "roster.rooms.private.char", NULL)) {
         gchar* ch = g_key_file_get_string(theme, "ui", "roster.rooms.private.char", NULL);
-        if (ch && strlen(ch) > 0) {
-            prefs_set_roster_room_private_char(ch[0]);
+        if (ch && g_utf8_strlen(ch, 4) == 1) {
+            prefs_set_roster_room_private_char(ch);
             g_free(ch);
         }
     }
diff --git a/src/ui/console.c b/src/ui/console.c
index 5702f26f..a20d9fce 100644
--- a/src/ui/console.c
+++ b/src/ui/console.c
@@ -1507,11 +1507,13 @@ cons_roster_setting(void)
         cons_show("Roster room char (/roster)          : none");
     }
 
-    char room_priv_ch = prefs_get_roster_room_private_char();
-    if (room_priv_ch)
+    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);
-    else
+        free(room_priv_ch);
+    } else {
         cons_show("Roster room private char (/roster)  : none");
+    }
 
     char* private_ch = prefs_get_roster_private_char();
     if (private_ch) {
diff --git a/src/ui/rosterwin.c b/src/ui/rosterwin.c
index fbfbd9cc..5d368253 100644
--- a/src/ui/rosterwin.c
+++ b/src/ui/rosterwin.c
@@ -857,9 +857,10 @@ _rosterwin_room(ProfLayoutSplit* layout, ProfMucWin* mucwin)
                 g_string_append_printf(privmsg, "(%d) ", privwin->unread);
             }
 
-            char ch = prefs_get_roster_room_private_char();
+            ch = prefs_get_roster_room_private_char();
             if (ch) {
-                g_string_append_printf(privmsg, "%c", ch);
+                g_string_append_printf(privmsg, "%s", ch);
+                free(ch);
             }
 
             char* nick = privwin->fulljid + strlen(mucwin->roomjid) + 1;