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

Merge branch 'master' into flub-py-glue-fixes

Browse Source
This commit is contained in:
holger krekel
2019-07-22 01:09:58 +02:00
parent 2576b78126 56f8717a40
commit 86d290832b
2 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/constants.rs
View File

@@ -491,3 +491,12 @@ pub enum KeyType {
Public = 0,
Private = 1,
}
pub const DC_CMD_GROUPNAME_CHANGED: libc::c_int = 2;
pub const DC_CMD_GROUPIMAGE_CHANGED: libc::c_int = 3;
pub const DC_CMD_MEMBER_ADDED_TO_GROUP: libc::c_int = 4;
pub const DC_CMD_MEMBER_REMOVED_FROM_GROUP: libc::c_int = 5;
pub const DC_CMD_AUTOCRYPT_SETUP_MESSAGE: libc::c_int = 6;
pub const DC_CMD_SECUREJOIN_MESSAGE: libc::c_int = 7;
pub const DC_CMD_LOCATION_STREAMING_ENABLED: libc::c_int = 8;
pub const DC_CMD_LOCATION_ONLY: libc::c_int = 9;

4
src/dc_receive_imf.rs
View File

@@ -215,7 +215,9 @@ pub unsafe fn dc_receive_imf(
maybe this can be optimized later,
by checking the state before the message body is downloaded */
let mut allow_creation: libc::c_int = 1;
if msgrmsg == 0 {
if mime_parser.is_system_message != DC_CMD_AUTOCRYPT_SETUP_MESSAGE
&& msgrmsg == 0
{
let show_emails = context
.sql
.get_config_int(context, "show_emails")