From 86acd4649bed31e0de9bbe469ac45184e2cee640 Mon Sep 17 00:00:00 2001 From: James Booth Date: Mon, 22 Jun 2015 21:09:14 +0100 Subject: [PATCH] Added PGP prefs --- src/command/command.c | 1 + src/command/commands.c | 4 ++++ src/ui/console.c | 21 +++++++++++++++++++++ src/ui/ui.h | 1 + tests/unittests/ui/stub_ui.c | 1 + 5 files changed, 28 insertions(+) diff --git a/src/command/command.c b/src/command/command.c index 1d99e56a..c43e968e 100644 --- a/src/command/command.c +++ b/src/command/command.c @@ -1299,6 +1299,7 @@ cmd_init(void) autocomplete_add(prefs_ac, "conn"); autocomplete_add(prefs_ac, "presence"); autocomplete_add(prefs_ac, "otr"); + autocomplete_add(prefs_ac, "pgp"); notify_ac = autocomplete_new(); autocomplete_add(notify_ac, "message"); diff --git a/src/command/commands.c b/src/command/commands.c index 38f15a74..f865b873 100644 --- a/src/command/commands.c +++ b/src/command/commands.c @@ -905,6 +905,10 @@ cmd_prefs(ProfWin *window, gchar **args, struct cmd_help_t help) cons_show(""); cons_show_otr_prefs(); cons_show(""); + } else if (strcmp(args[0], "pgp") == 0) { + cons_show(""); + cons_show_pgp_prefs(); + cons_show(""); } else { cons_show("Usage: %s", help.usage); } diff --git a/src/ui/console.c b/src/ui/console.c index ac18c7da..6c396376 100644 --- a/src/ui/console.c +++ b/src/ui/console.c @@ -1422,6 +1422,25 @@ cons_show_otr_prefs(void) cons_alert(); } +void +cons_show_pgp_prefs(void) +{ + cons_show("PGP preferences:"); + cons_show(""); + + char *log_value = prefs_get_string(PREF_PGP_LOG); + if (strcmp(log_value, "on") == 0) { + cons_show("PGP logging (/pgp log) : ON"); + } else if (strcmp(log_value, "off") == 0) { + cons_show("PGP logging (/pgp log) : OFF"); + } else { + cons_show("PGP logging (/pgp log) : Redacted"); + } + prefs_free_string(log_value); + + cons_alert(); +} + void cons_show_themes(GSList *themes) { @@ -1458,6 +1477,8 @@ cons_prefs(void) cons_show(""); cons_show_otr_prefs(); cons_show(""); + cons_show_pgp_prefs(); + cons_show(""); cons_alert(); } diff --git a/src/ui/ui.h b/src/ui/ui.h index b5bfb482..80fc6997 100644 --- a/src/ui/ui.h +++ b/src/ui/ui.h @@ -250,6 +250,7 @@ void cons_show_log_prefs(void); void cons_show_presence_prefs(void); void cons_show_connection_prefs(void); void cons_show_otr_prefs(void); +void cons_show_pgp_prefs(void); void cons_show_account(ProfAccount *account); void cons_debug(const char * const msg, ...); void cons_show_time(void); diff --git a/tests/unittests/ui/stub_ui.c b/tests/unittests/ui/stub_ui.c index 6d008414..8fea64a7 100644 --- a/tests/unittests/ui/stub_ui.c +++ b/tests/unittests/ui/stub_ui.c @@ -369,6 +369,7 @@ void cons_show_log_prefs(void) {} void cons_show_presence_prefs(void) {} void cons_show_connection_prefs(void) {} void cons_show_otr_prefs(void) {} +void cons_show_pgp_prefs(void) {} void cons_show_account(ProfAccount *account) {