diff options
| author | Will Song <incertia9474@gmail.com> | 2015-05-29 19:53:37 -0500 |
|---|---|---|
| committer | Will Song <incertia9474@gmail.com> | 2015-05-29 19:53:37 -0500 |
| commit | 9463c6719036957c8468e1363a48afbfe751fd3e (patch) | |
| tree | aed6ccd050fc182a0d4d111bef6f743d28a42a73 /src/main.c | |
| parent | 7f436d614b11d72893d856f1c3d817ab34b0b9eb (diff) | |
| parent | 304e08a9c0bfa27ed84dc1ff0a2e2d32b36529f8 (diff) | |
| download | profani-tty-9463c6719036957c8468e1363a48afbfe751fd3e.tar.gz | |
fix conflicts
Diffstat (limited to 'src/main.c')
| -rw-r--r-- | src/main.c | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/src/main.c b/src/main.c index f3b6a17f..3bb7eeb6 100644 --- a/src/main.c +++ b/src/main.c @@ -1,7 +1,7 @@ /* * main.c * - * Copyright (C) 2012 - 2014 James Booth <boothj5@gmail.com> + * Copyright (C) 2012 - 2015 James Booth <boothj5@gmail.com> * * This file is part of Profanity. * @@ -40,13 +40,7 @@ #endif #include "profanity.h" - -#ifdef HAVE_LIBOTR -#include "otr/otr.h" -#endif -#include "xmpp/xmpp.h" - -#include "ui/ui.h" +#include "command/command.h" static gboolean disable_tls = FALSE; static gboolean version = FALSE; @@ -56,6 +50,11 @@ static char *account_name = NULL; int main(int argc, char **argv) { + if (argc == 2 && g_strcmp0(argv[1], "docgen") == 0 && g_strcmp0(PACKAGE_STATUS, "development") == 0) { + command_docgen(); + return 0; + } + static GOptionEntry entries[] = { { "version", 'v', 0, G_OPTION_ARG_NONE, &version, "Show version information", NULL }, @@ -90,7 +89,7 @@ main(int argc, char **argv) g_print("Profanity, version %s\n", PACKAGE_VERSION); } - g_print("Copyright (C) 2012 - 2014 James Booth <%s>.\n", PACKAGE_BUGREPORT); + g_print("Copyright (C) 2012 - 2015 James Booth <%s>.\n", PACKAGE_BUGREPORT); g_print("License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>\n"); g_print("\n"); g_print("This is free software; you are free to change and redistribute it.\n"); |