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

Fixed merge

Browse Source
This commit is contained in:
James Booth 2013-11-08 00:26:57 +00:00
parent 305d2e5c85
commit 17883b5ef8
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/profanity.c
View File

@ -76,11 +76,11 @@ prof_run(const int disable_tls, char *log_level, char *account_name)
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); prof_process_input(inp);
} else if (prefs_get_string(PREF_CONNECT_ACCOUNT) != NULL) { } else if (prefs_get_string(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, prefs_get_string(PREF_CONNECT_ACCOUNT));
_process_input(inp); prof_process_input(inp);
} }
while(cmd_result == TRUE) { while(cmd_result == TRUE) {