From 10ca3e8c315794138ac4c413aea179ea8a0e1249 Mon Sep 17 00:00:00 2001 From: Michael Vetter Date: Fri, 2 Aug 2019 15:28:28 +0200 Subject: Possibility to specify alternative config file Introduce `profanity -c` to specify an alternative config file. --- src/profanity.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'src/profanity.c') diff --git a/src/profanity.c b/src/profanity.c index 324aa36d..f286d3df 100644 --- a/src/profanity.c +++ b/src/profanity.c @@ -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) { -- cgit 1.4.1-2-gfad0