From 1c21031d5ea7c6b0feaf6d39a8c86c4bd05ed036 Mon Sep 17 00:00:00 2001 From: James Booth Date: Thu, 7 Nov 2013 21:57:41 +0000 Subject: [PATCH] Merge remote-tracking branch 'tsenart/connect-on-startup' --- src/main.c | 4 +++- src/profanity.c | 10 +++++++++- src/profanity.h | 2 +- 3 files changed, 13 insertions(+), 3 deletions(-) diff --git a/src/main.c b/src/main.c index 99f71351..8db0c007 100644 --- a/src/main.c +++ b/src/main.c @@ -29,6 +29,7 @@ static gboolean disable_tls = FALSE; static gboolean version = FALSE; static char *log = "INFO"; +static char *account_name = NULL; int main(int argc, char **argv) @@ -37,6 +38,7 @@ main(int argc, char **argv) { { "version", 'v', 0, G_OPTION_ARG_NONE, &version, "Show version information", NULL }, { "disable-tls", 'd', 0, G_OPTION_ARG_NONE, &disable_tls, "Disable TLS", NULL }, + { "account", 'a', 0, G_OPTION_ARG_STRING, &account_name, "Auto connect to an account on start-up" }, { "log",'l', 0, G_OPTION_ARG_STRING, &log, "Set logging levels, DEBUG, INFO (default), WARN, ERROR", "LEVEL" }, { NULL } }; @@ -64,7 +66,7 @@ main(int argc, char **argv) return 0; } - prof_run(disable_tls, log); + prof_run(disable_tls, log, account_name); return 0; } diff --git a/src/profanity.c b/src/profanity.c index 7d5df1a5..0ad66a68 100644 --- a/src/profanity.c +++ b/src/profanity.c @@ -54,7 +54,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"); @@ -66,6 +66,14 @@ 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); + } + while(cmd_result == TRUE) { wint_t ch = ERR; size = 0; diff --git a/src/profanity.h b/src/profanity.h index 0cd59fd0..3dac6c3e 100644 --- a/src/profanity.h +++ b/src/profanity.h @@ -26,7 +26,7 @@ #include "resource.h" #include "xmpp/xmpp.h" -void prof_run(const int disable_tls, char *log_level); +void prof_run(const int disable_tls, char *log_level, char *account_name); void prof_handle_login_success(const char *jid, const char *altdomain); void prof_handle_login_account_success(char *account_name);