Mirrors/chatmail-core
1
0
Fork 0
mirror of https://github.com/chatmail/core.git synced 2026-05-19 14:56:33 +03:00
Code Issues Packages Projects Releases Wiki Activity

fix some merge issues

Browse Source
This commit is contained in:
holger krekel
2019-07-18 11:38:10 +02:00
parent 7b736fe635
commit ee317cb1b5
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/dc_configure.rs
View File

@@ -774,7 +774,7 @@ pub unsafe fn dc_job_do_DC_JOB_CONFIGURE_IMAP(context: &Context, _job: *mut dc_j
0 as uintptr_t, 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 */ /* 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 .smtp
.clone() .clone()
.lock() .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, 0, "Trying: {}", r_3,
); );
if context if !context
.smtp .smtp
.clone() .clone()
.lock() .lock()
@@ -860,7 +860,7 @@ pub unsafe fn dc_job_do_DC_JOB_CONFIGURE_IMAP(context: &Context, _job: *mut dc_j
r_4 r_4
); );
if context if !context
.smtp .smtp
.clone() .clone()
.lock() .lock()

2
src/dc_job.rs
View File

@@ -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 loginparam = dc_loginparam_read(context, &context.sql, "configured_");
let connected = context.smtp.lock().unwrap().connect(context, &loginparam); 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); dc_job_try_again_later(job, 3i32, 0 as *const libc::c_char);
current_block = 14216916617354591294; current_block = 14216916617354591294;
} else { } else {

2
src/imap.rs
View File

@@ -547,7 +547,7 @@ impl Imap {
config.server_flags = server_flags; config.server_flags = server_flags;
} }
if self.setup_handle_if_needed(context) { if !self.setup_handle_if_needed(context) {
self.free_connect_params(); self.free_connect_params();
return false; return false;
} }