Mirrors/chatmail-core
1
0
Fork 0
mirror of https://github.com/chatmail/core.git synced 2026-05-21 15:56:30 +03:00
Code Issues Packages Projects Releases Wiki Activity

Change type of dc_mimepart_t.msg to Option<String>

Browse Source
This commit is contained in:
Dmitry Bogatov
2019-08-27 00:23:41 +00:00
committed by Floris Bruynooghe
parent b3df24d188
commit eca11a74d7
2 changed files with 33 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/dc_receive_imf.rs
View File

@@ -630,18 +630,15 @@ unsafe fn add_parts(
continue;
}
if !mime_parser.location_kml.is_none()
&& icnt == 1
&& !part.msg.is_null()
&& (strcmp(
part.msg,
b"-location-\x00" as *const u8 as *const libc::c_char,
) == 0
|| *part.msg.offset(0) as libc::c_int == 0)
{
*hidden = 1;
if state == MessageState::InFresh {
state = MessageState::InNoticed;
if let Some(ref msg) = part.msg {
if !mime_parser.location_kml.is_none()
&& icnt == 1
&& (msg == "-location-" || msg.is_empty())
{
*hidden = 1;
if state == MessageState::InFresh {
state = MessageState::InNoticed;
}
}
}
if part.type_0 == Viewtype::Text {
@@ -673,11 +670,7 @@ unsafe fn add_parts(
part.type_0,
state,
msgrmsg,
if !part.msg.is_null() {
as_str(part.msg)
} else {
""
},
part.msg.as_ref().map_or("", String::as_str),
// txt_raw might contain invalid utf8
if !txt_raw.is_null() {
to_string_lossy(txt_raw)
@@ -1861,8 +1854,7 @@ unsafe fn set_better_msg<T: AsRef<str>>(mime_parser: &mut dc_mimeparser_t, bette
if msg.len() > 0 && !mime_parser.parts.is_empty() {
let part = &mut mime_parser.parts[0];
if (*part).type_0 == Viewtype::Text {
free(part.msg as *mut libc::c_void);
part.msg = msg.strdup();
part.msg = Some(msg.to_string());
}
};
}