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

Change type of MimeFactory.out_{gossip,encrypted} to bool

Browse Source
This commit is contained in:
Dmitry Bogatov
2019-09-14 12:59:33 +00:00
parent 34a3ad82e0
commit fa7bb71f3f
2 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/dc_mimefactory.rs
View File

@@ -44,8 +44,8 @@ pub struct MimeFactory<'a> {
pub references: *mut libc::c_char, pub references: *mut libc::c_char,
pub req_mdn: libc::c_int, pub req_mdn: libc::c_int,
pub out: *mut MMAPString, pub out: *mut MMAPString,
pub out_encrypted: libc::c_int, pub out_encrypted: bool,
pub out_gossiped: libc::c_int, pub out_gossiped: bool,
pub out_last_added_location_id: u32, pub out_last_added_location_id: u32,
pub error: *mut libc::c_char, pub error: *mut libc::c_char,
pub context: &'a Context, pub context: &'a Context,
@@ -105,8 +105,8 @@ pub unsafe fn dc_mimefactory_load_msg(
references: ptr::null_mut(), references: ptr::null_mut(),
req_mdn: 0, req_mdn: 0,
out: ptr::null_mut(), out: ptr::null_mut(),
out_encrypted: 0, out_encrypted: false,
out_gossiped: 0, out_gossiped: false,
out_last_added_location_id: 0, out_last_added_location_id: 0,
error: ptr::null_mut(), error: ptr::null_mut(),
context, context,
@@ -295,8 +295,8 @@ pub unsafe fn dc_mimefactory_load_mdn<'a>(
references: ptr::null_mut(), references: ptr::null_mut(),
req_mdn: 0, req_mdn: 0,
out: ptr::null_mut(), out: ptr::null_mut(),
out_encrypted: 0, out_encrypted: false,
out_gossiped: 0, out_gossiped: false,
out_last_added_location_id: 0, out_last_added_location_id: 0,
error: ptr::null_mut(), error: ptr::null_mut(),
context, context,
@@ -1024,9 +1024,9 @@ pub unsafe fn dc_mimefactory_render(context: &Context, factory: &mut MimeFactory
); );
} }
if e2ee_helper.encryption_successfull { if e2ee_helper.encryption_successfull {
factory.out_encrypted = 1; factory.out_encrypted = true;
if 0 != do_gossip { if 0 != do_gossip {
factory.out_gossiped = 1 factory.out_gossiped = true;
} }
} }
factory.out = mmap_string_new(b"\x00" as *const u8 as *const libc::c_char); factory.out = mmap_string_new(b"\x00" as *const u8 as *const libc::c_char);

6
src/job.rs
View File

@@ -686,7 +686,7 @@ pub unsafe fn job_send_msg(context: &Context, msg_id: u32) -> libc::c_int {
.param .param
.get_int(Param::GuranteeE2ee) .get_int(Param::GuranteeE2ee)
.unwrap_or_default() .unwrap_or_default()
&& 0 == mimefactory.out_encrypted && !mimefactory.out_encrypted
{ {
warn!( warn!(
context, context,
@@ -713,7 +713,7 @@ pub unsafe fn job_send_msg(context: &Context, msg_id: u32) -> libc::c_int {
dc_strdup(mimefactory.from_addr) as *mut libc::c_void, dc_strdup(mimefactory.from_addr) as *mut libc::c_void,
); );
} }
if 0 != mimefactory.out_gossiped { if mimefactory.out_gossiped {
chat::set_gossiped_timestamp(context, mimefactory.msg.chat_id, time()); chat::set_gossiped_timestamp(context, mimefactory.msg.chat_id, time());
} }
if 0 != mimefactory.out_last_added_location_id { if 0 != mimefactory.out_last_added_location_id {
@@ -732,7 +732,7 @@ pub unsafe fn job_send_msg(context: &Context, msg_id: u32) -> libc::c_int {
} }
} }
} }
if 0 != mimefactory.out_encrypted if mimefactory.out_encrypted
&& mimefactory && mimefactory
.msg .msg
.param .param