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

it compiles with async-imap, remove local dependency

Browse Source
This commit is contained in:
dignifiedquire
2019-11-09 16:29:05 +01:00
committed by holger krekel
parent 4b8252e001
commit 1687e8d26f
6 changed files with 1542 additions and 925 deletions
Download Patch File Download Diff File Expand all files Collapse all files

894
Cargo.lock generated
View File

File diff suppressed because it is too large Load Diff

5
Cargo.toml
View File

@@ -20,7 +20,10 @@ num-derive = "0.2.5"
num-traits = "0.2.6" num-traits = "0.2.6"
native-tls = "0.2.3" native-tls = "0.2.3"
lettre = { git = "https://github.com/deltachat/lettre", branch = "master" } lettre = { git = "https://github.com/deltachat/lettre", branch = "master" }
imap = { git = "https://github.com/deltachat/rust-imap", branch = "master" } # imap = { git = "https://github.com/deltachat/rust-imap", branch = "master" }
async-imap = { git = "https://github.com/dignifiedquire/async-imap", branch = "master" }
async-tls = { git = "https://github.com/async-rs/async-tls", branch = "master" }
async-std = { git = "https://github.com/async-rs/async-std", branch = "master", features = ["unstable"] }
base64 = "0.10" base64 = "0.10"
charset = "0.1" charset = "0.1"
percent-encoding = "2.0" percent-encoding = "2.0"

2
rust-toolchain
View File

@@ -1 +1 @@
nightly-2019-08-13 nightly-2019-09-12

2
src/configure/mod.rs
View File

@@ -569,7 +569,7 @@ fn try_smtp_one_param(context: &Context, param: &LoginParam) -> Option<bool> {
pub fn dc_connect_to_configured_imap(context: &Context, imap: &Imap) -> libc::c_int { pub fn dc_connect_to_configured_imap(context: &Context, imap: &Imap) -> libc::c_int {
let mut ret_connected = 0; let mut ret_connected = 0;
if imap.is_connected() { if async_std::task::block_on(async move { imap.is_connected().await }) {
ret_connected = 1 ret_connected = 1
} else if !context.sql.get_raw_config_bool(context, "configured") { } else if !context.sql.get_raw_config_bool(context, "configured") {
warn!(context, "Not configured, cannot connect.",); warn!(context, "Not configured, cannot connect.",);

1562
src/imap.rs
View File

File diff suppressed because it is too large Load Diff

2
src/job_thread.rs
View File

@@ -107,7 +107,7 @@ impl JobThread {
} }
fn connect_to_imap(&self, context: &Context) -> bool { fn connect_to_imap(&self, context: &Context) -> bool {
if self.imap.is_connected() { if async_std::task::block_on(async move { self.imap.is_connected().await }) {
return true; return true;
} }