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

Move all filepath handling to files.c

Browse Source
This commit is contained in:
James Booth
2016-07-24 21:35:12 +01:00
parent 29452f8f1b
commit a3a73cf003
19 changed files with 174 additions and 262 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/otr/otr.c
View File

@@ -126,12 +126,11 @@ cb_write_fingerprints(void *opdata)
{
gcry_error_t err = 0;
gchar *data_home = files_get_xdg_data_home();
GString *basedir = g_string_new(data_home);
free(data_home);
char *otrdir = files_get_data_path(DIR_OTR);
GString *basedir = g_string_new(otrdir);
free(otrdir);
gchar *account_dir = str_replace(jid, "@", "_at_");
g_string_append(basedir, "/profanity/otr/");
g_string_append(basedir, "/");
g_string_append(basedir, account_dir);
g_string_append(basedir, "/");
free(account_dir);
@@ -215,12 +214,11 @@ otr_on_connect(ProfAccount *account)
jid = strdup(account->jid);
log_info("Loading OTR key for %s", jid);
gchar *data_home = files_get_xdg_data_home();
GString *basedir = g_string_new(data_home);
free(data_home);
char *otrdir = files_get_data_path(DIR_OTR);
GString *basedir = g_string_new(otrdir);
free(otrdir);
gchar *account_dir = str_replace(jid, "@", "_at_");
g_string_append(basedir, "/profanity/otr/");
g_string_append(basedir, "/");
g_string_append(basedir, account_dir);
g_string_append(basedir, "/");
free(account_dir);
@@ -393,12 +391,11 @@ otr_keygen(ProfAccount *account)
jid = strdup(account->jid);
log_info("Generating OTR key for %s", jid);
gchar *data_home = files_get_xdg_data_home();
GString *basedir = g_string_new(data_home);
free(data_home);
char *otrdir = files_get_data_path(DIR_OTR);
GString *basedir = g_string_new(otrdir);
free(otrdir);
gchar *account_dir = str_replace(jid, "@", "_at_");
g_string_append(basedir, "/profanity/otr/");
g_string_append(basedir, "/");
g_string_append(basedir, account_dir);
g_string_append(basedir, "/");
free(account_dir);