devs/cproof
1
2
Fork 1
Code Issues 43 Pull Requests 6 Actions Packages Projects 1 Releases Wiki Activity

Allow utf8 in occupants char

Browse Source
This commit is contained in:
Michael Vetter
2021-10-22 16:47:15 +02:00
parent fa2881fcea
commit 1c96115f97
6 changed files with 25 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/ui/console.c
View File

@@ -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");

5
src/ui/occupantswin.c
View File

@@ -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);