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

Merge branch 'eventlogging' into merge1

Browse Source
This commit is contained in:
holger krekel
2019-07-17 13:12:11 +02:00
parent f8db71e589 5cac4b5076
commit 4febfa6bd8
2 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
python/CHANGELOG
View File

@@ -4,6 +4,12 @@
- introduce automatic versioning via setuptools_scm, - introduce automatic versioning via setuptools_scm,
based on py-X.Y.Z tags based on py-X.Y.Z tags
- integrate latest DCC core-rust with dc_close() fixes
- provide a account.shutdown() method and improve termination
logic also in tests. also fixes output-clubbering during
test runs.
0.600.0 0.600.0
--------- ---------

6
src/context.rs
View File

@@ -177,7 +177,7 @@ pub fn dc_context_new(
userdata: *mut libc::c_void, userdata: *mut libc::c_void,
os_name: *const libc::c_char, os_name: *const libc::c_char,
) -> Context { ) -> Context {
let context = Context { Context {
blobdir: Arc::new(RwLock::new(std::ptr::null_mut())), blobdir: Arc::new(RwLock::new(std::ptr::null_mut())),
dbfile: Arc::new(RwLock::new(std::ptr::null_mut())), dbfile: Arc::new(RwLock::new(std::ptr::null_mut())),
inbox: Arc::new(RwLock::new({ inbox: Arc::new(RwLock::new({
@@ -221,8 +221,7 @@ pub fn dc_context_new(
))), ))),
probe_imap_network: Arc::new(RwLock::new(0)), probe_imap_network: Arc::new(RwLock::new(0)),
perform_inbox_jobs_needed: Arc::new(RwLock::new(0)), perform_inbox_jobs_needed: Arc::new(RwLock::new(0)),
}; }
context
} }
unsafe fn cb_receive_imf( unsafe fn cb_receive_imf(
@@ -342,7 +341,6 @@ pub unsafe fn dc_context_unref(context: &mut Context) {
} }
pub unsafe fn dc_close(context: &Context) { pub unsafe fn dc_close(context: &Context) {
println!("disconnecting inbox watch yooaa");
info!(context, 0, "disconnecting INBOX-watch",); info!(context, 0, "disconnecting INBOX-watch",);
context.inbox.read().unwrap().disconnect(context); context.inbox.read().unwrap().disconnect(context);
info!(context, 0, "disconnecting sentbox-thread",); info!(context, 0, "disconnecting sentbox-thread",);