Added pgp key list command

This commit is contained in:
James Booth
2015-03-22 00:12:14 +00:00
parent f1f047889e
commit 2490c3ed20
12 changed files with 210 additions and 4 deletions

View File

@@ -848,6 +848,14 @@ static struct cmd_t command_defs[] =
"Send chat state notifications during chat sessions.",
NULL } } },
{ "/pgp",
cmd_pgp, parse_args, 1, 1, NULL,
{ "/pgp keys", "Open PGP.",
{ "/pgp keys",
"---------",
"Open PGP.",
NULL } } },
{ "/otr",
cmd_otr, parse_args, 1, 3, NULL,
{ "/otr command [args..]", "Off The Record encryption commands.",
@@ -1202,6 +1210,7 @@ static Autocomplete time_statusbar_ac;
static Autocomplete resource_ac;
static Autocomplete inpblock_ac;
static Autocomplete receipts_ac;
static Autocomplete pgp_ac;
/*
* Initialise command autocompleter and history
@@ -1563,6 +1572,9 @@ cmd_init(void)
receipts_ac = autocomplete_new();
autocomplete_add(receipts_ac, "send");
autocomplete_add(receipts_ac, "request");
pgp_ac = autocomplete_new();
autocomplete_add(pgp_ac, "keys");
}
void
@@ -1621,6 +1633,7 @@ cmd_uninit(void)
autocomplete_free(resource_ac);
autocomplete_free(inpblock_ac);
autocomplete_free(receipts_ac);
autocomplete_free(pgp_ac);
}
gboolean
@@ -1788,6 +1801,7 @@ cmd_reset_autocomplete()
autocomplete_reset(resource_ac);
autocomplete_reset(inpblock_ac);
autocomplete_reset(receipts_ac);
autocomplete_reset(pgp_ac);
if (ui_current_win_type() == WIN_CHAT) {
ProfChatWin *chatwin = wins_get_current_chat();
@@ -1971,8 +1985,8 @@ _cmd_complete_parameters(const char * const input)
}
}
gchar *cmds[] = { "/help", "/prefs", "/disco", "/close", "/wins", "/subject", "/room" };
Autocomplete completers[] = { help_ac, prefs_ac, disco_ac, close_ac, wins_ac, subject_ac, room_ac };
gchar *cmds[] = { "/help", "/prefs", "/disco", "/close", "/wins", "/subject", "/room", "/pgp" };
Autocomplete completers[] = { help_ac, prefs_ac, disco_ac, close_ac, wins_ac, subject_ac, room_ac, pgp_ac };
for (i = 0; i < ARRAY_SIZE(cmds); i++) {
result = autocomplete_param_with_ac(input, cmds[i], completers[i], TRUE);

View File

@@ -56,6 +56,9 @@
#ifdef HAVE_LIBOTR
#include "otr/otr.h"
#endif
#ifdef HAVE_LIBGPGME
#include "pgp/gpg.h"
#endif
#include "profanity.h"
#include "tools/autocomplete.h"
#include "tools/parser.h"
@@ -4063,6 +4066,31 @@ cmd_xa(gchar **args, struct cmd_help_t help)
return TRUE;
}
gboolean
cmd_pgp(gchar **args, struct cmd_help_t help)
{
#ifdef HAVE_LIBGPGME
if (g_strcmp0(args[0], "keys") == 0) {
GSList *keys = p_gpg_list_keys();
if (keys) {
while (keys) {
cons_debug("Key: %s", keys->data);
keys = g_slist_next(keys);
}
} else {
cons_debug("No keys found");
}
g_slist_free_full(keys, (GDestroyNotify)free);
}
return TRUE;
#else
cons_show("This version of Profanity has not been built with PGP support enabled");
return TRUE;
#endif
}
gboolean
cmd_otr(gchar **args, struct cmd_help_t help)
{

View File

@@ -103,6 +103,7 @@ gboolean cmd_nick(gchar **args, struct cmd_help_t help);
gboolean cmd_notify(gchar **args, struct cmd_help_t help);
gboolean cmd_online(gchar **args, struct cmd_help_t help);
gboolean cmd_otr(gchar **args, struct cmd_help_t help);
gboolean cmd_pgp(gchar **args, struct cmd_help_t help);
gboolean cmd_outtype(gchar **args, struct cmd_help_t help);
gboolean cmd_prefs(gchar **args, struct cmd_help_t help);
gboolean cmd_priority(gchar **args, struct cmd_help_t help);