From 446027b9505342c09f62f6d7a279c65a0d1db107 Mon Sep 17 00:00:00 2001
From: James Booth <boothj5@gmail.com>
Date: Sun, 21 Jun 2015 21:07:57 +0100
Subject: Moved setting otr.warn -> enc.warn

---
 src/ui/console.c  | 17 +++++++++++------
 src/ui/titlebar.c |  3 +--
 src/ui/ui.h       |  1 +
 3 files changed, 13 insertions(+), 8 deletions(-)

(limited to 'src/ui')

diff --git a/src/ui/console.c b/src/ui/console.c
index 1e20c964..ac18c7da 100644
--- a/src/ui/console.c
+++ b/src/ui/console.c
@@ -884,6 +884,16 @@ cons_winstidy_setting(void)
         cons_show("Window Auto Tidy (/winstidy)  : OFF");
 }
 
+void
+cons_encwarn_setting(void)
+{
+    if (prefs_get_boolean(PREF_ENC_WARN)) {
+        cons_show("Warn unencrypted (/encwarn)   : ON");
+    } else {
+        cons_show("Warn unencrypted (/encwarn)   : OFF");
+    }
+}
+
 void
 cons_presence_setting(void)
 {
@@ -1058,6 +1068,7 @@ cons_show_ui_prefs(void)
     cons_roster_setting();
     cons_privileges_setting();
     cons_titlebar_setting();
+    cons_encwarn_setting();
     cons_presence_setting();
     cons_inpblock_setting();
 
@@ -1398,12 +1409,6 @@ cons_show_otr_prefs(void)
     cons_show("OTR policy (/otr policy) : %s", policy_value);
     prefs_free_string(policy_value);
 
-    if (prefs_get_boolean(PREF_OTR_WARN)) {
-        cons_show("Warn non-OTR (/otr warn) : ON");
-    } else {
-        cons_show("Warn non-OTR (/otr warn) : OFF");
-    }
-
     char *log_value = prefs_get_string(PREF_OTR_LOG);
     if (strcmp(log_value, "on") == 0) {
         cons_show("OTR logging (/otr log)   : ON");
diff --git a/src/ui/titlebar.c b/src/ui/titlebar.c
index 3642417a..16a9eaff 100644
--- a/src/ui/titlebar.c
+++ b/src/ui/titlebar.c
@@ -252,8 +252,7 @@ _show_privacy(ProfChatWin *chatwin)
 
     switch (chatwin->enc_mode) {
         case PROF_ENC_NONE:
-            // TODO generalise to PROF_ENC_WARN
-            if (prefs_get_boolean(PREF_OTR_WARN)) {
+            if (prefs_get_boolean(PREF_ENC_WARN)) {
                 wprintw(win, " ");
                 wattron(win, bracket_attrs);
                 wprintw(win, "[");
diff --git a/src/ui/ui.h b/src/ui/ui.h
index 7cfad86c..b5bfb482 100644
--- a/src/ui/ui.h
+++ b/src/ui/ui.h
@@ -288,6 +288,7 @@ void cons_privileges_setting(void);
 void cons_beep_setting(void);
 void cons_flash_setting(void);
 void cons_splash_setting(void);
+void cons_encwarn_setting(void);
 void cons_vercheck_setting(void);
 void cons_occupants_setting(void);
 void cons_roster_setting(void);
-- 
cgit 1.4.1-2-gfad0