From ee317cb1b58daf2bc50222ae002d6721a6cb3da6 Mon Sep 17 00:00:00 2001 From: holger krekel Date: Thu, 18 Jul 2019 11:38:10 +0200 Subject: [PATCH] fix some merge issues --- src/dc_configure.rs | 6 +++--- src/dc_job.rs | 2 +- src/imap.rs | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/dc_configure.rs b/src/dc_configure.rs index 60d2a8d36..455a81734 100644 --- a/src/dc_configure.rs +++ b/src/dc_configure.rs @@ -774,7 +774,7 @@ pub unsafe fn dc_job_do_DC_JOB_CONFIGURE_IMAP(context: &Context, _job: *mut dc_j 0 as uintptr_t, ); /* try to connect to SMTP - if we did not got an autoconfig, the first try was SSL-465 and we do a second try with STARTTLS-587 */ - if context + if !context .smtp .clone() .lock() @@ -814,7 +814,7 @@ pub unsafe fn dc_job_do_DC_JOB_CONFIGURE_IMAP(context: &Context, _job: *mut dc_j 0, "Trying: {}", r_3, ); - if context + if !context .smtp .clone() .lock() @@ -860,7 +860,7 @@ pub unsafe fn dc_job_do_DC_JOB_CONFIGURE_IMAP(context: &Context, _job: *mut dc_j r_4 ); - if context + if !context .smtp .clone() .lock() diff --git a/src/dc_job.rs b/src/dc_job.rs index d801ef6f4..29d5c96b9 100644 --- a/src/dc_job.rs +++ b/src/dc_job.rs @@ -285,7 +285,7 @@ unsafe fn dc_job_do_DC_JOB_SEND(context: &Context, job: &mut dc_job_t) { let loginparam = dc_loginparam_read(context, &context.sql, "configured_"); let connected = context.smtp.lock().unwrap().connect(context, &loginparam); - if connected { + if !connected { dc_job_try_again_later(job, 3i32, 0 as *const libc::c_char); current_block = 14216916617354591294; } else { diff --git a/src/imap.rs b/src/imap.rs index 951909810..0dc30e99c 100644 --- a/src/imap.rs +++ b/src/imap.rs @@ -547,7 +547,7 @@ impl Imap { config.server_flags = server_flags; } - if self.setup_handle_if_needed(context) { + if !self.setup_handle_if_needed(context) { self.free_connect_params(); return false; }