Allow utf8 in roster rooms char

This commit is contained in:
Michael Vetter
2021-10-22 16:39:54 +02:00
parent 7faf15a18c
commit 8fc359ba2d
6 changed files with 24 additions and 29 deletions

View File

@@ -1182,30 +1182,22 @@ prefs_clear_roster_private_char(void)
g_key_file_remove_key(prefs, PREF_GROUP_UI, "roster.private.char", NULL);
}
char
char*
prefs_get_roster_room_char(void)
{
char result = 0;
char* resultstr = g_key_file_get_string(prefs, PREF_GROUP_UI, "roster.rooms.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.char", NULL);
return result;
}
void
prefs_set_roster_room_char(char ch)
prefs_set_roster_room_char(char* ch)
{
char str[2];
str[0] = ch;
str[1] = '\0';
g_key_file_set_string(prefs, PREF_GROUP_UI, "roster.rooms.char", str);
if (g_utf8_strlen(ch, 4) == 1) {
g_key_file_set_string(prefs, PREF_GROUP_UI, "roster.rooms.char", ch);
} else {
log_error("Could not set roster resource char: %s", ch);
}
}
void

View File

@@ -266,8 +266,8 @@ void prefs_clear_roster_resource_char(void);
char* prefs_get_roster_private_char(void);
void prefs_set_roster_private_char(char* ch);
void prefs_clear_roster_private_char(void);
char prefs_get_roster_room_char(void);
void prefs_set_roster_room_char(char ch);
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);

View File

@@ -448,8 +448,8 @@ _load_preferences(void)
if (g_key_file_has_key(theme, "ui", "roster.rooms.char", NULL)) {
gchar* ch = g_key_file_get_string(theme, "ui", "roster.rooms.char", NULL);
if (ch && strlen(ch) > 0) {
prefs_set_roster_room_char(ch[0]);
if (ch && g_utf8_strlen(ch, 4) == 1) {
prefs_set_roster_room_char(ch);
g_free(ch);
}
}