From 0115d71e2549408d289d4520bc869c0b16fa3dcf Mon Sep 17 00:00:00 2001 From: James Booth Date: Tue, 8 Jul 2014 20:18:43 +0100 Subject: [PATCH 1/2] Added OTR and notification info to --version --- src/main.c | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/src/main.c b/src/main.c index 140df545..6e5775fc 100644 --- a/src/main.c +++ b/src/main.c @@ -90,6 +90,8 @@ main(int argc, char **argv) if (version == TRUE) { + g_print("\n"); + if (strcmp(PACKAGE_STATUS, "development") == 0) { #ifdef HAVE_GIT_VERSION g_print("Profanity, version %sdev.%s.%s\n", PACKAGE_VERSION, PROF_GIT_BRANCH, PROF_GIT_REVISION); @@ -105,6 +107,28 @@ main(int argc, char **argv) g_print("\n"); g_print("This is free software; you are free to change and redistribute it.\n"); g_print("There is NO WARRANTY, to the extent permitted by law.\n"); + g_print("\n"); + + g_print("Build information:\n"); +#ifdef HAVE_OSXNOTIFY + g_print("Desktop notification support: Enabled\n"); +#endif +#ifdef HAVE_LIBNOTIFY + g_print("Desktop notification support: Enabled\n"); +#endif +#ifndef HAVE_OSXNOTIFY +#ifndef HAVE_LIBNOTIFY + g_print("Desktop notification support: Disabled\n"); +#endif +#endif +#ifdef HAVE_LIBOTR + g_print("OTR support: Enabled\n"); +#else + g_print("OTR support: Disabled\n"); +#endif + + g_print("\n"); + return 0; } From 06caa0c4f13d04736d28db8197f24dcd66db141c Mon Sep 17 00:00:00 2001 From: James Booth Date: Tue, 8 Jul 2014 20:20:01 +0100 Subject: [PATCH 2/2] Removed empty lines --- src/main.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/src/main.c b/src/main.c index 6e5775fc..39a39e26 100644 --- a/src/main.c +++ b/src/main.c @@ -89,9 +89,6 @@ main(int argc, char **argv) g_option_context_free(context); if (version == TRUE) { - - g_print("\n"); - if (strcmp(PACKAGE_STATUS, "development") == 0) { #ifdef HAVE_GIT_VERSION g_print("Profanity, version %sdev.%s.%s\n", PACKAGE_VERSION, PROF_GIT_BRANCH, PROF_GIT_REVISION); @@ -127,8 +124,6 @@ main(int argc, char **argv) g_print("OTR support: Disabled\n"); #endif - g_print("\n"); - return 0; }