From 91898597dd15d2d8661ab587a69585b232b7d00e Mon Sep 17 00:00:00 2001 From: Michael Vetter Date: Thu, 21 Oct 2021 15:30:01 +0200 Subject: Allow utf8 in roster header char This and the following commits should make a couple of more configs allow utf8 chars so people can use their weird icons :-) We did the same for the otr/omemo/pgp indicators at: https://github.com/profanity-im/profanity/commit/1f8b1eb740391941e79e1004ad041f8178a2b674 https://github.com/profanity-im/profanity/commit/5cf6ee1bc6d0b99b01891bc455a657bf022a72b0 --- src/ui/console.c | 5 +++-- src/ui/rosterwin.c | 20 ++++++++++++-------- 2 files changed, 15 insertions(+), 10 deletions(-) (limited to 'src/ui') diff --git a/src/ui/console.c b/src/ui/console.c index bdb8f24d..b2773f2d 100644 --- a/src/ui/console.c +++ b/src/ui/console.c @@ -1475,11 +1475,12 @@ cons_roster_setting(void) else cons_show("Roster offline (/roster) : hide"); - char header_ch = prefs_get_roster_header_char(); + char* header_ch = prefs_get_roster_header_char(); if (header_ch) - cons_show("Roster header char (/roster) : %c", header_ch); + cons_show("Roster header char (/roster) : %s", header_ch); else cons_show("Roster header char (/roster) : none"); + free(header_ch); char contact_ch = prefs_get_roster_contact_char(); if (contact_ch) diff --git a/src/ui/rosterwin.c b/src/ui/rosterwin.c index 5c41fc82..9a5926a9 100644 --- a/src/ui/rosterwin.c +++ b/src/ui/rosterwin.c @@ -1028,9 +1028,10 @@ _rosterwin_unsubscribed_header(ProfLayoutSplit* layout, GList* wins) win_sub_newline_lazy(layout->subwin); GString* header = g_string_new(" "); - char ch = prefs_get_roster_header_char(); + char* ch = prefs_get_roster_header_char(); if (ch) { - g_string_append_printf(header, "%c", ch); + g_string_append_printf(header, "%s", ch); + free(ch); } g_string_append(header, "Unsubscribed"); @@ -1074,9 +1075,10 @@ _rosterwin_contacts_header(ProfLayoutSplit* layout, const char* const title, GSL win_sub_newline_lazy(layout->subwin); GString* header = g_string_new(" "); - char ch = prefs_get_roster_header_char(); + char* ch = prefs_get_roster_header_char(); if (ch) { - g_string_append_printf(header, "%c", ch); + g_string_append_printf(header, "%s", ch); + free(ch); } g_string_append(header, title); @@ -1125,9 +1127,10 @@ _rosterwin_rooms_header(ProfLayoutSplit* layout, GList* rooms, char* title) { win_sub_newline_lazy(layout->subwin); GString* header = g_string_new(" "); - char ch = prefs_get_roster_header_char(); + char* ch = prefs_get_roster_header_char(); if (ch) { - g_string_append_printf(header, "%c", ch); + g_string_append_printf(header, "%s", ch); + free(ch); } g_string_append(header, title); @@ -1188,9 +1191,10 @@ _rosterwin_private_header(ProfLayoutSplit* layout, GList* privs) win_sub_newline_lazy(layout->subwin); GString* title_str = g_string_new(" "); - char ch = prefs_get_roster_header_char(); + char* ch = prefs_get_roster_header_char(); if (ch) { - g_string_append_printf(title_str, "%c", ch); + g_string_append_printf(title_str, "%s", ch); + free(ch); } g_string_append(title_str, "Private chats"); -- cgit 1.4.1-2-gfad0