Mirrors/chatmail-core
1
0
Fork 0
mirror of https://github.com/chatmail/core.git synced 2026-05-08 01:16:31 +03:00
Code Issues Packages Projects Releases Wiki Activity

fix(job): only move if a mvbox folder is configured

Browse Source 
Closes #100
This commit is contained in:
dignifiedquire
2019-05-29 00:30:07 +02:00
parent b296ccf5a5
commit 30195a3bfd
1 changed files with 46 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/dc_job.rs
View File

@@ -485,12 +485,14 @@ unsafe fn dc_job_do_DC_JOB_MOVE_MSG(context: &Context, job: &mut dc_job_t) {
0 as *const libc::c_char, 0 as *const libc::c_char,
); );
let server_folder = CStr::from_ptr((*msg).server_folder).to_str().unwrap(); if !dest_folder.is_null() {
let server_folder = to_str((*msg).server_folder);
match inbox.mv( match inbox.mv(
context, context,
server_folder, server_folder,
(*msg).server_uid, (*msg).server_uid,
CStr::from_ptr(dest_folder).to_str().unwrap(), to_str(dest_folder),
&mut dest_uid, &mut dest_uid,
) as libc::c_uint ) as libc::c_uint
{ {
@@ -530,6 +532,7 @@ unsafe fn dc_job_do_DC_JOB_MOVE_MSG(context: &Context, job: &mut dc_job_t) {
} }
} }
} }
}
_ => {} _ => {}
} }
free(dest_folder as *mut libc::c_void); free(dest_folder as *mut libc::c_void);
@@ -589,12 +592,13 @@ unsafe fn dc_job_do_DC_JOB_MARKSEEN_MDN_ON_IMAP(context: &Context, job: &mut dc_
b"configured_mvbox_folder\x00" as *const u8 as *const libc::c_char, b"configured_mvbox_folder\x00" as *const u8 as *const libc::c_char,
0 as *const libc::c_char, 0 as *const libc::c_char,
); );
let dest_folder = CStr::from_ptr(dest_folder).to_str().unwrap(); if !dest_folder.is_null() {
match inbox.mv(context, folder, uid, dest_folder, &mut dest_uid) as libc::c_uint { let dest_folder = to_str(dest_folder);
1 => { if 1 == inbox.mv(context, folder, uid, dest_folder, &mut dest_uid)
dc_job_try_again_later(job, 3i32, 0 as *const libc::c_char); as libc::c_uint
{
dc_job_try_again_later(job, 3, 0 as *const libc::c_char);
} }
0 | _ => {}
} }
} }
} }