more string fixes

This commit is contained in:
dignifiedquire
2019-07-12 23:22:03 +02:00
parent d19d3985e8
commit c5252c9313
2 changed files with 11 additions and 4 deletions

View File

@@ -1180,9 +1180,16 @@ pub unsafe fn dc_job_send_msg(context: &Context, msg_id: uint32_t) -> libc::c_in
/* create message */ /* create message */
if 0 == dc_mimefactory_render(&mut mimefactory) { if 0 == dc_mimefactory_render(&mut mimefactory) {
dc_set_msg_failed(context, msg_id, mimefactory.error); dc_set_msg_failed(context, msg_id, mimefactory.error);
} else if 0 != dc_param_get_int((*mimefactory.msg).param, 'c' as i32, 0i32) } else if 0 != dc_param_get_int((*mimefactory.msg).param, 'c' as i32, 0)
&& 0 == mimefactory.out_encrypted && 0 == mimefactory.out_encrypted
{ {
warn!(
context,
0,
"e2e encryption unavailable {} - {}",
msg_id,
dc_param_get_int((*mimefactory.msg).param, 'c' as i32, 0),
);
dc_set_msg_failed( dc_set_msg_failed(
context, context,
msg_id, msg_id,

View File

@@ -541,12 +541,12 @@ pub unsafe fn dc_receive_imf(
(*part).bytes, (*part).bytes,
hidden, hidden,
if 0 != save_mime_headers { if 0 != save_mime_headers {
Some(as_str(imf_raw_not_terminated)) Some(to_string(imf_raw_not_terminated))
} else { } else {
None None
}, },
as_str(mime_in_reply_to), to_string(mime_in_reply_to),
as_str(mime_references), to_string(mime_references),
]); ]);
if res.is_err() { if res.is_err() {