Mirrors/chatmail-core
1
0
Fork 0
mirror of https://github.com/chatmail/core.git synced 2026-04-29 11:26:29 +03:00
Code Issues Packages Projects Releases Wiki Activity

rustifying dc_continue_key_transfer and fix master-conflict

Browse Source
This commit is contained in:
holger krekel
2019-09-25 17:19:44 +02:00
parent d5383aecc9
commit 6cd3580263
4 changed files with 27 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
deltachat-ffi/src/lib.rs
View File

@@ -1580,7 +1580,13 @@ pub unsafe extern "C" fn dc_continue_key_transfer(
let ffi_context = &*context;
ffi_context
.with_inner(|ctx| {
dc_imex::dc_continue_key_transfer(ctx, msg_id, as_str(setup_code)) as libc::c_int
match dc_imex::dc_continue_key_transfer(ctx, msg_id, as_str(setup_code)) {
Ok(()) => 1,
Err(err) => {
error!(ctx, "dc_continue_key_transfer: {}", err);
0
}
}
})
.unwrap_or(0)
}