aniani/profanity
1
0
Fork 0
mirror of https://github.com/profanity-im/profanity.git synced 2024-12-04 14:46:46 -05:00
Code

Free account_name preference on autoconnect

Browse Source
This commit is contained in:
James Booth 2014-06-17 22:22:35 +01:00
parent fa0be4e50e
commit 4a485a64f9
2 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/config/preferences.c
View File

@ -171,7 +171,7 @@ prefs_get_string(preference_t pref)
char *result = g_key_file_get_string(prefs, group, key, NULL); char *result = g_key_file_get_string(prefs, group, key, NULL);
if (result == NULL) { if (result == NULL) {
return def; return strdup(def);
} else { } else {
return result; return result;
} }

8
src/profanity.c
View File

@ -72,15 +72,19 @@ prof_run(const int disable_tls, char *log_level, char *account_name)
ui_update_screen(); ui_update_screen();
char *pref_connect_account = prefs_get_string(PREF_CONNECT_ACCOUNT);
if (account_name != NULL) { if (account_name != NULL) {
char *cmd = "/connect"; char *cmd = "/connect";
snprintf(inp, sizeof(inp), "%s %s", cmd, account_name); snprintf(inp, sizeof(inp), "%s %s", cmd, account_name);
process_input(inp); process_input(inp);
} else if (prefs_get_string(PREF_CONNECT_ACCOUNT) != NULL) { } else if (pref_connect_account != NULL) {
char *cmd = "/connect"; char *cmd = "/connect";
snprintf(inp, sizeof(inp), "%s %s", cmd, prefs_get_string(PREF_CONNECT_ACCOUNT)); snprintf(inp, sizeof(inp), "%s %s", cmd, pref_connect_account);
process_input(inp); process_input(inp);
} }
if (pref_connect_account != NULL) {
free(pref_connect_account);
}
while(cmd_result == TRUE) { while(cmd_result == TRUE) {
wint_t ch = ERR; wint_t ch = ERR;