devs/cproof
1
2
Fork 1
Code Issues 43 Pull Requests 9 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

24
src/config/preferences.c
View File

@@ -1134,30 +1134,22 @@ prefs_clear_roster_contact_char(void)
g_key_file_remove_key(prefs, PREF_GROUP_UI, "roster.contact.char", NULL);
}
char
char*
prefs_get_roster_resource_char(void)
{
char result = 0;
char* resultstr = g_key_file_get_string(prefs, PREF_GROUP_UI, "roster.resource.char", NULL);
if (!resultstr) {
result = 0;
} else {
result = resultstr[0];
}
free(resultstr);
char* result = g_key_file_get_string(prefs, PREF_GROUP_UI, "roster.resource.char", NULL);
return result;
}
void
prefs_set_roster_resource_char(char ch)
prefs_set_roster_resource_char(char* ch)
{
char str[2];
str[0] = ch;
str[1] = '\0';
g_key_file_set_string(prefs, PREF_GROUP_UI, "roster.resource.char", str);
if (g_utf8_strlen(ch, 4) == 1) {
g_key_file_set_string(prefs, PREF_GROUP_UI, "roster.resource.char", ch);
} else {
log_error("Could not set roster resource char: %s", ch);
}
}
void

4
src/config/preferences.h
View File

@@ -260,8 +260,8 @@ void prefs_clear_roster_header_char(void);
char* prefs_get_roster_contact_char(void);
void prefs_set_roster_contact_char(char* ch);
void prefs_clear_roster_contact_char(void);
char prefs_get_roster_resource_char(void);
void prefs_set_roster_resource_char(char ch);
char* prefs_get_roster_resource_char(void);
void prefs_set_roster_resource_char(char* ch);
void prefs_clear_roster_resource_char(void);
char prefs_get_roster_private_char(void);
void prefs_set_roster_private_char(char ch);

4
src/config/theme.c
View File

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