diff options
| author | James Booth <boothj5@gmail.com> | 2013-11-11 20:51:35 +0000 |
|---|---|---|
| committer | James Booth <boothj5@gmail.com> | 2013-11-11 20:51:35 +0000 |
| commit | 8c97658b8d1f7a10f146e33ca3dc5a7ff2aa3527 (patch) | |
| tree | bd88eee2f2138e2d1cf5f5b52c7bb27972e0e75e /src/main.c | |
| parent | 3e86d108a314a067589e32b60d2f6374eae501b6 (diff) | |
| parent | c5f76721ce9d10b127d54e127ac34e555c749465 (diff) | |
| download | profani-tty-8c97658b8d1f7a10f146e33ca3dc5a7ff2aa3527.tar.gz | |
Merge branch 'master' into refactor2
Conflicts: src/ui/core.c
Diffstat (limited to 'src/main.c')
| -rw-r--r-- | src/main.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/main.c b/src/main.c index 253c9237..c3065bd3 100644 --- a/src/main.c +++ b/src/main.c @@ -32,6 +32,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) @@ -40,6 +41,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 } }; @@ -77,7 +79,7 @@ main(int argc, char **argv) return 0; } - prof_run(disable_tls, log); + prof_run(disable_tls, log, account_name); return 0; } |