From 8543a06f59c5f9883bab0d38a3cf61f05eb0cea6 Mon Sep 17 00:00:00 2001
From: Manos Pitsidianakis <el13635@mail.ntua.gr>
Date: Thu, 18 Jul 2019 20:26:49 +0300
Subject: [PATCH] ui: rename ignore to subscribe to match IMAP term

---
 ui/src/conf.rs          | 4 ++--
 ui/src/conf/accounts.rs | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/ui/src/conf.rs b/ui/src/conf.rs
index 878b90d1c..c4a72bed4 100644
--- a/ui/src/conf.rs
+++ b/ui/src/conf.rs
@@ -94,7 +94,7 @@ pub struct FolderConf {
     #[serde(default = "true_val")]
     autoload: bool,
     #[serde(deserialize_with = "toggleflag_de", default)]
-    ignore: ToggleFlag,
+    subscribe: ToggleFlag,
 }
 
 impl Default for FolderConf {
@@ -102,7 +102,7 @@ impl Default for FolderConf {
         FolderConf {
             rename: None,
             autoload: true,
-            ignore: ToggleFlag::Unset,
+            subscribe: ToggleFlag::Unset,
         }
     }
 }
diff --git a/ui/src/conf/accounts.rs b/ui/src/conf/accounts.rs
index 7a43c317d..fe2981bab 100644
--- a/ui/src/conf/accounts.rs
+++ b/ui/src/conf/accounts.rs
@@ -176,9 +176,9 @@ impl Account {
                 || f.name().eq_ignore_ascii_case("spam")
                 || f.name().eq_ignore_ascii_case("sent")
                 || f.name().eq_ignore_ascii_case("trash"))
-                && entry.ignore.is_unset()
+                && entry.subscribe.is_unset()
             {
-                entry.ignore = ToggleFlag::InternalVal(true);
+                entry.subscribe = ToggleFlag::InternalVal(false);
             }
             folder_names.insert(f.hash(), f.name().to_string());
         }
@@ -327,7 +327,7 @@ impl Account {
 
                     let ref_folders: FnvHashMap<FolderHash, Folder> = self.backend.folders();
                     let folder_conf = &self.settings.folder_confs[&self.folder_names[&folder_hash]];
-                    if folder_conf.ignore.is_true() {
+                    if folder_conf.subscribe.is_false() {
                         return None;
                     }
                     let (_, thread_node) = self.mail_and_thread(env_hash, folder_hash);