mredaelli
/
meli
forked from meli/meli
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

ui: rename ignore to subscribe to match IMAP term

embed
Manos Pitsidianakis 2019-07-18 20:26:49 +03:00
parent 6e63e8a6f6
commit 8543a06f59
Signed by: Manos Pitsidianakis
GPG Key ID: 73627C2F690DF710
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ui/src/conf.rs
View File

@ -94,7 +94,7 @@ pub struct FolderConf {
#[serde(default = "true_val")] #[serde(default = "true_val")]
autoload: bool, autoload: bool,
#[serde(deserialize_with = "toggleflag_de", default)] #[serde(deserialize_with = "toggleflag_de", default)]
ignore: ToggleFlag, subscribe: ToggleFlag,
} }
impl Default for FolderConf { impl Default for FolderConf {
@ -102,7 +102,7 @@ impl Default for FolderConf {
FolderConf { FolderConf {
rename: None, rename: None,
autoload: true, autoload: true,
ignore: ToggleFlag::Unset, subscribe: ToggleFlag::Unset,
} }
} }
} }

6
ui/src/conf/accounts.rs
View File

@ -176,9 +176,9 @@ impl Account {
|| f.name().eq_ignore_ascii_case("spam") || f.name().eq_ignore_ascii_case("spam")
|| f.name().eq_ignore_ascii_case("sent") || f.name().eq_ignore_ascii_case("sent")
|| f.name().eq_ignore_ascii_case("trash")) || 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()); 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 ref_folders: FnvHashMap<FolderHash, Folder> = self.backend.folders();
let folder_conf = &self.settings.folder_confs[&self.folder_names[&folder_hash]]; 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; return None;
} }
let (_, thread_node) = self.mail_and_thread(env_hash, folder_hash); let (_, thread_node) = self.mail_and_thread(env_hash, folder_hash);