From a668ca45b78bf9653f93c0380e58101da3c3bced Mon Sep 17 00:00:00 2001 From: Michael Vetter Date: Fri, 22 Oct 2021 16:23:18 +0200 Subject: Allow utf8 in roster contact char --- src/config/preferences.c | 24 ++++++++---------------- 1 file changed, 8 insertions(+), 16 deletions(-) (limited to 'src/config/preferences.c') diff --git a/src/config/preferences.c b/src/config/preferences.c index 6539fc0c..3bc5800f 100644 --- a/src/config/preferences.c +++ b/src/config/preferences.c @@ -1110,30 +1110,22 @@ prefs_clear_roster_header_char(void) g_key_file_remove_key(prefs, PREF_GROUP_UI, "roster.header.char", NULL); } -char +char* prefs_get_roster_contact_char(void) { - char result = 0; - - char* resultstr = g_key_file_get_string(prefs, PREF_GROUP_UI, "roster.contact.char", NULL); - if (!resultstr) { - result = 0; - } else { - result = resultstr[0]; - } - free(resultstr); + char* result = g_key_file_get_string(prefs, PREF_GROUP_UI, "roster.contact.char", NULL); return result; } void -prefs_set_roster_contact_char(char ch) +prefs_set_roster_contact_char(char* ch) { - char str[2]; - str[0] = ch; - str[1] = '\0'; - - g_key_file_set_string(prefs, PREF_GROUP_UI, "roster.contact.char", str); + if (g_utf8_strlen(ch, 4) == 1) { + g_key_file_set_string(prefs, PREF_GROUP_UI, "roster.contact.char", ch); + } else { + log_error("Could not set roster contact char: %s", ch); + } } void -- cgit 1.4.1-2-gfad0