aniani/profanity
1
0
Fork 0
mirror of https://github.com/profanity-im/profanity.git synced 2024-09-22 19:45:54 -04:00
Code

Show libotr and libgpgme versions on --version

Browse Source 
issue #956
This commit is contained in:
James Booth 2017-08-10 22:47:17 +01:00
parent 17b4e45c57
commit ca1dcdda6c
2 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/main.c
View File

@ -41,6 +41,14 @@
#include "gitversion.h" #include "gitversion.h"
#endif #endif
#ifdef HAVE_LIBOTR
#include "otr/otr.h"
#endif
#ifdef HAVE_LIBGPGME
#include "pgp/gpg.h"
#endif
#ifdef HAVE_PYTHON #ifdef HAVE_PYTHON
#include "plugins/python_plugins.h" #include "plugins/python_plugins.h"
#endif #endif
@ -117,13 +125,15 @@ main(int argc, char **argv)
} }
#ifdef HAVE_LIBOTR #ifdef HAVE_LIBOTR
g_print("OTR support: Enabled\n"); char *otr_version = otr_libotr_version();
g_print("OTR support: Enabled (libotr %s)\n", otr_version);
#else #else
g_print("OTR support: Disabled\n"); g_print("OTR support: Disabled\n");
#endif #endif
#ifdef HAVE_LIBGPGME #ifdef HAVE_LIBGPGME
g_print("PGP support: Enabled\n"); const char *pgp_version = p_gpg_libver();
g_print("PGP support: Enabled (libgpgme %s)\n", pgp_version);
#else #else
g_print("PGP support: Disabled\n"); g_print("PGP support: Disabled\n");
#endif #endif

5
src/pgp/gpg.c
View File

@ -56,7 +56,7 @@
#define PGP_MESSAGE_HEADER "-----BEGIN PGP MESSAGE-----" #define PGP_MESSAGE_HEADER "-----BEGIN PGP MESSAGE-----"
#define PGP_MESSAGE_FOOTER "-----END PGP MESSAGE-----" #define PGP_MESSAGE_FOOTER "-----END PGP MESSAGE-----"
static const char *libversion; static const char *libversion = NULL;
static GHashTable *pubkeys; static GHashTable *pubkeys;
static gchar *pubsloc; static gchar *pubsloc;
@ -420,6 +420,9 @@ p_gpg_pubkeys(void)
const char* const char*
p_gpg_libver(void) p_gpg_libver(void)
{ {
if (libversion == NULL) {
libversion = gpgme_check_version(NULL);
}
return libversion; return libversion;
} }