devs/profanity
2
0
Fork 0
mirror of https://git.jabber.space/devs/cproof.git synced 2026-07-29 19:16:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Allow utf8 symbols as omemo/pgp/otr indicator char

Browse Source 
Fix https://github.com/profanity-im/profanity/issues/1264
This commit is contained in:
Michael Vetter
2020-02-20 18:11:08 +01:00
parent 280b718cfb
commit 1f8b1eb740
21 changed files with 643 additions and 622 deletions
Download Patch File Download Diff File Expand all files Collapse all files

72
src/config/preferences.c
View File

@@ -868,82 +868,79 @@ prefs_get_roster_size(void)
}
}
char
char*
prefs_get_otr_char(void)
{
char result = '~';
char *result = "~";
char *resultstr = g_key_file_get_string(prefs, PREF_GROUP_OTR, "otr.char", NULL);
if (!resultstr) {
result = '~';
result = strdup("~");
} else {
result = resultstr[0];
result = resultstr;
}
free(resultstr);
return result;
}
void
prefs_set_otr_char(char ch)
prefs_set_otr_char(char *ch)
{
char str[2];
str[0] = ch;
str[1] = '\0';
g_key_file_set_string(prefs, PREF_GROUP_OTR, "otr.char", str);
if (g_utf8_strlen(ch, 4) == 1) {
g_key_file_set_string(prefs, PREF_GROUP_OTR, "otr.char", ch);
} else {
log_error("Could not set otr char: %s", ch);
}
}
char
char*
prefs_get_pgp_char(void)
{
char result = '~';
char *result = "~";
char *resultstr = g_key_file_get_string(prefs, PREF_GROUP_PGP, "pgp.char", NULL);
if (!resultstr) {
result = '~';
result = strdup("~");
} else {
result = resultstr[0];
result = resultstr;
}
free(resultstr);
return result;
}
void
prefs_set_pgp_char(char ch)
prefs_set_pgp_char(char *ch)
{
char str[2];
str[0] = ch;
str[1] = '\0';
g_key_file_set_string(prefs, PREF_GROUP_PGP, "pgp.char", str);
if (g_utf8_strlen(ch, 4) == 1) {
g_key_file_set_string(prefs, PREF_GROUP_PGP, "pgp.char", ch);
} else {
log_error("Could not set pgp char: %s", ch);
}
}
char
char*
prefs_get_omemo_char(void)
{
char result = '~';
char *result = "~";
char *resultstr = g_key_file_get_string(prefs, PREF_GROUP_OMEMO, "omemo.char", NULL);
if (!resultstr) {
result = '~';
result = strdup("~");
} else {
result = resultstr[0];
result = resultstr;
}
free(resultstr);
return result;
}
void
prefs_set_omemo_char(char ch)
prefs_set_omemo_char(char *ch)
{
char str[2];
str[0] = ch;
str[1] = '\0';
g_key_file_set_string(prefs, PREF_GROUP_OMEMO, "omemo.char", str);
if (g_utf8_strlen(ch, 4) == 1) {
g_key_file_set_string(prefs, PREF_GROUP_OMEMO, "omemo.char", ch);
} else {
log_error("Could not set omemo char: %s", ch);
}
}
char
@@ -1201,18 +1198,17 @@ prefs_set_roster_presence_indent(gint value)
g_key_file_set_integer(prefs, PREF_GROUP_UI, "roster.presence.indent", value);
}
char
char*
prefs_get_correction_char(void)
{
char result = '+';
char *result = "+";
char *resultstr = g_key_file_get_string(prefs, PREF_GROUP_UI, "correction.char", NULL);
if (!resultstr) {
result = '+';
result = strdup("+");
} else {
result = resultstr[0];
result = resultstr;
}
free(resultstr);
return result;
}