devs/profanity
2
0
Fork 0
mirror of https://git.jabber.space/devs/cproof.git synced 2026-07-21 10:16:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into refactor2

Browse Source 
Conflicts:
	src/ui/core.c
This commit is contained in:
James Booth
2013-11-11 20:51:35 +00:00
parent 3e86d108a3 c5f76721ce
commit 8c97658b8d
16 changed files with 139 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/profanity.c
View File

@@ -58,7 +58,7 @@ static void _create_directories(void);
static gboolean idle = FALSE;
void
prof_run(const int disable_tls, char *log_level)
prof_run(const int disable_tls, char *log_level, char *account_name)
{
_init(disable_tls, log_level);
log_info("Starting main event loop");
@@ -70,6 +70,18 @@ prof_run(const int disable_tls, char *log_level)
char inp[INP_WIN_MAX];
int size = 0;
ui_refresh();
if (account_name != NULL) {
char *cmd = "/connect";
snprintf(inp, sizeof(inp), "%s %s", cmd, account_name);
_process_input(inp);
} else if (prefs_get_string(PREF_CONNECT_ACCOUNT) != NULL) {
char *cmd = "/connect";
snprintf(inp, sizeof(inp), "%s %s", cmd, prefs_get_string(PREF_CONNECT_ACCOUNT));
_process_input(inp);
}
while(cmd_result == TRUE) {
wint_t ch = ERR;
size = 0;