1
0
mirror of https://github.com/profanity-im/profanity.git synced 2024-12-04 14:46:46 -05:00

Merge branch 'master' into winbuffers

This commit is contained in:
James Booth 2014-07-08 20:31:39 +01:00
commit 5dda8cd14c

View File

@ -89,7 +89,6 @@ main(int argc, char **argv)
g_option_context_free(context); g_option_context_free(context);
if (version == TRUE) { if (version == TRUE) {
if (strcmp(PACKAGE_STATUS, "development") == 0) { if (strcmp(PACKAGE_STATUS, "development") == 0) {
#ifdef HAVE_GIT_VERSION #ifdef HAVE_GIT_VERSION
g_print("Profanity, version %sdev.%s.%s\n", PACKAGE_VERSION, PROF_GIT_BRANCH, PROF_GIT_REVISION); g_print("Profanity, version %sdev.%s.%s\n", PACKAGE_VERSION, PROF_GIT_BRANCH, PROF_GIT_REVISION);
@ -105,6 +104,26 @@ main(int argc, char **argv)
g_print("\n"); g_print("\n");
g_print("This is free software; you are free to change and redistribute it.\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("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
return 0; return 0;
} }