clerie/xmppc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

main: Read config file only if no jid parameter provided

Browse Source 
Signed-off-by: nex <nex@nexadn.de>
This commit is contained in:
nex
2020-06-11 12:22:35 +02:00
parent ecb5697ddb
commit d1abb7ebc5
1 changed files with 24 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
src/main.c
View File

@@ -413,30 +413,32 @@ int main(int argc, char *argv[]) {
}
}
// Loading config file
GKeyFile *config_file = g_key_file_new();
GError *error = NULL;
GString* configfile = g_string_new( g_get_home_dir());
g_string_append(configfile,"/.config/xmppc.conf");
gboolean configfilefound = g_key_file_load_from_file(
config_file,
configfile->str,
G_KEY_FILE_NONE,
&error);
// Loading config file if jid not provided by command line
if (jid == NULL) {
GKeyFile *config_file = g_key_file_new();
GError *error = NULL;
GString* configfile = g_string_new( g_get_home_dir());
g_string_append(configfile,"/.config/xmppc.conf");
gboolean configfilefound = g_key_file_load_from_file(
config_file,
configfile->str,
G_KEY_FILE_NONE,
&error);
if (!configfilefound) {
if(!g_error_matches(error, G_KEY_FILE_ERROR, G_KEY_FILE_ERROR_KEY_NOT_FOUND)) {
logError(&xmppc, "Error loading key file: %s", error->message);
return -1;
}
} else {
if(jid == NULL && pwd == NULL) {
logInfo(&xmppc,"Loading default account\n");
if( account == NULL ) {
account = "default";
if (!configfilefound) {
if(!g_error_matches(error, G_KEY_FILE_ERROR, G_KEY_FILE_ERROR_KEY_NOT_FOUND)) {
logError(&xmppc, "Error loading key file: %s", error->message);
return -1;
}
} else {
if(jid == NULL && pwd == NULL) {
logInfo(&xmppc,"Loading default account\n");
if( account == NULL ) {
account = "default";
}
jid = g_key_file_get_value (config_file, account, "jid" ,&error);
pwd = g_key_file_get_value (config_file, account, "pwd" ,&error);
}
jid = g_key_file_get_value (config_file, account, "jid" ,&error);
pwd = g_key_file_get_value (config_file, account, "pwd" ,&error);
}
}