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

Merge branch 'stable', resolving conflicts

Browse Source
This commit is contained in:
link2xt
2023-10-01 00:44:37 +00:00
parent 5daa6274e8 53230b6eb0
commit 59e5a63d5f
12 changed files with 126 additions and 101 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -805,7 +805,7 @@ pub unsafe extern "C" fn dc_maybe_network(context: *mut dc_context_t) {
pub unsafe extern "C" fn dc_preconfigure_keypair(
context: *mut dc_context_t,
addr: *const libc::c_char,
public_data: *const libc::c_char,
_public_data: *const libc::c_char,
secret_data: *const libc::c_char,
) -> i32 {
if context.is_null() {
@@ -814,9 +814,8 @@ pub unsafe extern "C" fn dc_preconfigure_keypair(
}
let ctx = &*context;
let addr = to_string_lossy(addr);
let public_data = to_string_lossy(public_data);
let secret_data = to_string_lossy(secret_data);
block_on(preconfigure_keypair(ctx, &addr, &public_data, &secret_data))
block_on(preconfigure_keypair(ctx, &addr, &secret_data))
.context("Failed to save keypair")
.log_err(ctx)
.is_ok() as libc::c_int