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

Possibility to specify alternative config file

Browse Source 
Introduce `profanity -c` to specify an alternative config file.
This commit is contained in:
Michael Vetter
2019-08-02 15:28:28 +02:00
parent 5d711639b0
commit 10ca3e8c31
7 changed files with 22 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/profanity.c
View File

@@ -85,7 +85,7 @@
#include "omemo/omemo.h"
#endif
static void _init(char *log_level);
static void _init(char *log_level, char *config_file);
static void _shutdown(void);
static void _connect_default(const char * const account);
@@ -93,9 +93,9 @@ static gboolean cont = TRUE;
static gboolean force_quit = FALSE;
void
prof_run(char *log_level, char *account_name)
prof_run(char *log_level, char *account_name, char *config_file)
{
_init(log_level);
_init(log_level, config_file);
plugins_on_start();
_connect_default(account_name);
@@ -156,7 +156,7 @@ _connect_default(const char *const account)
}
static void
_init(char *log_level)
_init(char *log_level, char *config_file)
{
setlocale(LC_ALL, "");
// ignore SIGPIPE
@@ -171,7 +171,7 @@ _init(char *log_level)
pthread_mutex_lock(&lock);
files_create_directories();
log_level_t prof_log_level = log_level_from_string(log_level);
prefs_load();
prefs_load(config_file);
log_init(prof_log_level);
log_stderr_init(PROF_LEVEL_ERROR);
if (strcmp(PACKAGE_STATUS, "development") == 0) {