aniani/profanity
1
0
Fork 0
mirror of https://github.com/profanity-im/profanity.git synced 2025-01-03 14:57:42 -05:00
Code

pref: Use helper functions for setting/getting the encryption char

Browse Source 
Dont duplicate code.
This commit is contained in:
Michael Vetter 2020-02-21 09:51:40 +01:00
parent 7fdc4ed7f6
commit fd04727212
1 changed files with 26 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

66
src/config/preferences.c
View File

@ -868,14 +868,14 @@ prefs_get_roster_size(void)
}
}
char*
prefs_get_otr_char(void)
static char*
_prefs_get_encryption_char(const char *const ch, const char *const pref_group, const char *const key)
{
char *result = "~";
char *result = NULL;
char *resultstr = g_key_file_get_string(prefs, PREF_GROUP_OTR, "otr.char", NULL);
char *resultstr = g_key_file_get_string(prefs, pref_group, key, NULL);
if (!resultstr) {
result = strdup("~");
result = strdup(ch);
} else {
result = resultstr;
}
@ -883,64 +883,50 @@ prefs_get_otr_char(void)
return result;
}
static void
_prefs_set_encryption_char(const char *const ch, const char *const pref_group, const char *const key)
{
if (g_utf8_strlen(ch, 4) == 1) {
g_key_file_set_string(prefs, pref_group, key, ch);
} else {
log_error("Could not set %s encryption char to: %s", key, ch);
}
}
char*
prefs_get_otr_char(void)
{
return _prefs_get_encryption_char("~", PREF_GROUP_OTR, "otr.char");
}
void
prefs_set_otr_char(char *ch)
{
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);
}
_prefs_set_encryption_char(ch, PREF_GROUP_OTR, "otr.char");
}
char*
prefs_get_pgp_char(void)
{
char *result = "~";
char *resultstr = g_key_file_get_string(prefs, PREF_GROUP_PGP, "pgp.char", NULL);
if (!resultstr) {
result = strdup("~");
} else {
result = resultstr;
}
return result;
return _prefs_get_encryption_char("~", PREF_GROUP_PGP, "pgp.char");
}
void
prefs_set_pgp_char(char *ch)
{
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);
}
_prefs_set_encryption_char(ch, PREF_GROUP_PGP, "pgp.char");
}
char*
prefs_get_omemo_char(void)
{
char *result = "~";
char *resultstr = g_key_file_get_string(prefs, PREF_GROUP_OMEMO, "omemo.char", NULL);
if (!resultstr) {
result = strdup("~");
} else {
result = resultstr;
}
return result;
return _prefs_get_encryption_char("~", PREF_GROUP_OMEMO, "omemo.char");
}
void
prefs_set_omemo_char(char *ch)
{
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);
}
_prefs_set_encryption_char(ch, PREF_GROUP_OMEMO, "omemo.char");
}
char