From f5e694cf5a688036c814c2ebd60a21779ca988c1 Mon Sep 17 00:00:00 2001 From: Manos Pitsidianakis Date: Thu, 6 Feb 2020 01:50:15 +0200 Subject: [PATCH] Make small cosmetic fixes --- melib/src/backends/imap.rs | 8 +------- src/components/mail/listing.rs | 1 + src/components/mail/view/thread.rs | 2 +- 3 files changed, 3 insertions(+), 8 deletions(-) diff --git a/melib/src/backends/imap.rs b/melib/src/backends/imap.rs index 56f683b0..b5b5327d 100644 --- a/melib/src/backends/imap.rs +++ b/melib/src/backends/imap.rs @@ -639,13 +639,7 @@ impl ImapType { let server_username = get_conf_val!(s["server_username"])?; let server_password = get_conf_val!(s["server_password"])?; let server_port = get_conf_val!(s["server_port"], 143)?; - let use_starttls = get_conf_val!(s["use_starttls"], { - if server_port == 993 { - false - } else { - true - } - })?; + let use_starttls = get_conf_val!(s["use_starttls"], !(server_port == 993))?; let danger_accept_invalid_certs: bool = get_conf_val!(s["danger_accept_invalid_certs"], false)?; let server_conf = ImapServerConf { diff --git a/src/components/mail/listing.rs b/src/components/mail/listing.rs index 7a64e5a3..628a7dfb 100644 --- a/src/components/mail/listing.rs +++ b/src/components/mail/listing.rs @@ -420,6 +420,7 @@ impl Component for Listing { } self.dirty = false; } + fn process_event(&mut self, event: &mut UIEvent, context: &mut Context) -> bool { match event { UIEvent::StartupCheck(ref f) => { diff --git a/src/components/mail/view/thread.rs b/src/components/mail/view/thread.rs index d98c4212..be2c2312 100644 --- a/src/components/mail/view/thread.rs +++ b/src/components/mail/view/thread.rs @@ -160,8 +160,8 @@ impl ThreadView { } self.set_dirty(true); } + fn initiate(&mut self, expanded_hash: Option, context: &Context) { - /* stack to push thread messages in order in order to pop and print them later */ let account = &context.accounts[self.coordinates.0]; let mailbox = &account[self.coordinates.1].unwrap(); let threads = &account.collection.threads[&mailbox.folder.hash()];