aniani/profanity
1
1
Fork 0
mirror of https://github.com/profanity-im/profanity.git synced 2025-01-03 14:57:42 -05:00
Code

Added /pgp libver command

Browse Source
This commit is contained in:
James Booth 2015-03-22 00:29:57 +00:00
parent 1d90cc7894
commit fd86615549
5 changed files with 34 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/command/command.c
View File

@ -850,10 +850,12 @@ static struct cmd_t command_defs[] =
{ "/pgp", { "/pgp",
cmd_pgp, parse_args, 1, 1, NULL, cmd_pgp, parse_args, 1, 1, NULL,
{ "/pgp keys", "Open PGP.", { "/pgp keys|libver", "Open PGP.",
{ "/pgp keys", { "/pgp keys|libver",
"---------", "----------------",
"Open PGP.", "Open PGP.",
"keys : List private keys."
"libver : Show which version of the libgpgme library is being used.",
NULL } } }, NULL } } },
{ "/otr", { "/otr",
@ -1575,6 +1577,7 @@ cmd_init(void)
pgp_ac = autocomplete_new(); pgp_ac = autocomplete_new();
autocomplete_add(pgp_ac, "keys"); autocomplete_add(pgp_ac, "keys");
autocomplete_add(pgp_ac, "libver");
} }
void void

10
src/command/commands.c
View File

@ -4081,6 +4081,16 @@ cmd_pgp(gchar **args, struct cmd_help_t help)
cons_debug("No keys found"); cons_debug("No keys found");
} }
g_slist_free_full(keys, (GDestroyNotify)free); g_slist_free_full(keys, (GDestroyNotify)free);
} else if (g_strcmp0(args[0], "libver") == 0) {
const char *libver = p_gpg_libver();
if (libver) {
GString *fullstr = g_string_new("Using libgpgme version ");
g_string_append(fullstr, libver);
cons_show("%s", fullstr->str);
g_string_free(fullstr, TRUE);
} else {
cons_show("Could not get libgpgme version");
}
} }
return TRUE; return TRUE;

13
src/pgp/gpg.c
View File

@ -39,11 +39,13 @@
#include "log.h" #include "log.h"
static const char *libversion;
void void
p_gpg_init(void) p_gpg_init(void)
{ {
char *version = gpgme_check_version (NULL); libversion = gpgme_check_version(NULL);
log_debug("GPG: Found gpgme version: %s",version); log_debug("GPG: Found gpgme version: %s", libversion);
gpgme_set_locale(NULL, LC_CTYPE, setlocale(LC_CTYPE, NULL)); gpgme_set_locale(NULL, LC_CTYPE, setlocale(LC_CTYPE, NULL));
} }
@ -79,3 +81,10 @@ p_gpg_list_keys(void)
return result; return result;
} }
const char*
p_gpg_libver(void)
{
return libversion;
}

1
src/pgp/gpg.h
View File

@ -37,5 +37,6 @@
void p_gpg_init(void); void p_gpg_init(void);
GSList* p_gpg_list_keys(void); GSList* p_gpg_list_keys(void);
char* p_gpg_libver(void);
#endif #endif

6
tests/pgp/stub_gpg.c
View File

@ -1,7 +1,13 @@
#include <glib.h> #include <glib.h>
void p_gpg_init(void) {} void p_gpg_init(void) {}
GSList* p_gpg_list_keys(void) GSList* p_gpg_list_keys(void)
{ {
return NULL; return NULL;
} }
const char* p_gpg_libver(void) {
return NULL;
}