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

Allow utf8 in roster resource char

Browse Source
This commit is contained in:
Michael Vetter
2021-10-22 16:29:08 +02:00
parent a668ca45b7
commit 83ee4a27cb
6 changed files with 28 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/ui/console.c
View File

@@ -1491,11 +1491,13 @@ cons_roster_setting(void)
cons_show("Roster contact char (/roster) : none");
}
char resource_ch = prefs_get_roster_resource_char();
if (resource_ch)
cons_show("Roster resource char (/roster) : %c", resource_ch);
else
char* resource_ch = prefs_get_roster_resource_char();
if (resource_ch) {
cons_show("Roster resource char (/roster) : %s", resource_ch);
free(resource_ch);
} else {
cons_show("Roster resource char (/roster) : none");
}
char room_ch = prefs_get_roster_room_char();
if (room_ch)

12
src/ui/rosterwin.c
View File

@@ -317,6 +317,7 @@ _rosterwin_unsubscribed_item(ProfLayoutSplit* layout, ProfChatWin* chatwin)
char *ch = prefs_get_roster_contact_char();
if (ch) {
g_string_append_printf(msg, "%s", ch);
free(ch);
}
char* unreadpos = prefs_get_string(PREF_ROSTER_UNREAD);
@@ -379,6 +380,7 @@ _rosterwin_contact(ProfLayoutSplit* layout, PContact contact)
char *ch = prefs_get_roster_contact_char();
if (ch) {
g_string_append_printf(msg, "%s", ch);
free(ch);
}
char* unreadpos = prefs_get_string(PREF_ROSTER_UNREAD);
@@ -527,9 +529,10 @@ _rosterwin_resources(ProfLayoutSplit* layout, PContact contact, int current_inde
wattron(layout->subwin, theme_attrs(resource_presence_colour));
GString* msg = g_string_new("");
char ch = prefs_get_roster_resource_char();
char* ch = prefs_get_roster_resource_char();
if (ch) {
g_string_append_printf(msg, "%c", ch);
g_string_append_printf(msg, "%s", ch);
free(ch);
} else {
g_string_append(msg, " ");
}
@@ -590,9 +593,10 @@ _rosterwin_resources(ProfLayoutSplit* layout, PContact contact, int current_inde
g_string_append(msg, " ");
this_indent--;
}
char ch = prefs_get_roster_resource_char();
char* ch = prefs_get_roster_resource_char();
if (ch) {
g_string_append_printf(msg, "%c", ch);
g_string_append_printf(msg, "%s", ch);
free(ch);
}
g_string_append(msg, resource->name);
if (prefs_get_boolean(PREF_ROSTER_PRIORITY)) {