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

cleanup from rebase

Browse Source
This commit is contained in:
dignifiedquire
2019-07-05 22:10:51 +02:00
parent 34414b6059
commit 078c8859f4
5 changed files with 8 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/dc_imex.rs
View File

@@ -1016,7 +1016,7 @@ unsafe fn export_backup(context: &Context, dir: *const libc::c_char) -> libc::c_
context, context,
0, 0,
"Backup: Cannot copy from blob-directory \"{}\".", "Backup: Cannot copy from blob-directory \"{}\".",
context.get_blobdir(), as_str(context.get_blobdir()),
); );
} else { } else {
let dir_handle = dir_handle.unwrap(); let dir_handle = dir_handle.unwrap();

9
src/dc_jobthread.rs
View File

@@ -6,7 +6,6 @@ use crate::dc_sqlite3::*;
use crate::imap::Imap; use crate::imap::Imap;
use crate::types::*; use crate::types::*;
use crate::x::*; use crate::x::*;
use std::ffi::CString;
#[repr(C)] #[repr(C)]
pub struct dc_jobthread_t { pub struct dc_jobthread_t {
@@ -142,12 +141,8 @@ unsafe fn connect_to_imap(context: &Context, jobthread: &dc_jobthread_t) -> libc
if dc_sqlite3_get_config_int(context, &context.sql, "folders_configured", 0) < 3 { if dc_sqlite3_get_config_int(context, &context.sql, "folders_configured", 0) < 3 {
jobthread.imap.configure_folders(context, 0x1); jobthread.imap.configure_folders(context, 0x1);
} }
let mvbox_name = dc_sqlite3_get_config( let mvbox_name =
context, dc_sqlite3_get_config(context, &context.sql, jobthread.folder_config_name, None);
&context.sql,
as_str(&jobthread.folder_config_name[..]),
None,
);
if let Some(name) = mvbox_name { if let Some(name) = mvbox_name {
jobthread.imap.set_watch_folder(name); jobthread.imap.set_watch_folder(name);
} else { } else {

2
src/imap.rs
View File

@@ -555,7 +555,7 @@ impl Imap {
Event::IMAP_CONNECTED, Event::IMAP_CONNECTED,
0, 0,
"IMAP-LOGIN as {} ok", "IMAP-LOGIN as {} ok",
as_str(lp.mail_user), lp.mail_user,
); );
info!(context, 0, "IMAP-capabilities:{}", caps_list); info!(context, 0, "IMAP-capabilities:{}", caps_list);

7
src/peerstate.rs
View File

@@ -9,7 +9,6 @@ use crate::context::Context;
use crate::dc_chat::*; use crate::dc_chat::*;
use crate::dc_sqlite3::*; use crate::dc_sqlite3::*;
use crate::key::*; use crate::key::*;
use crate::types::uintptr_t;
/// Peerstate represents the state of an Autocrypt peer. /// Peerstate represents the state of an Autocrypt peer.
pub struct Peerstate<'a> { pub struct Peerstate<'a> {
@@ -515,9 +514,9 @@ mod tests {
unsafe extern "C" fn cb( unsafe extern "C" fn cb(
_context: &Context, _context: &Context,
_event: Event, _event: Event,
_data1: uintptr_t, _data1: libc::uintptr_t,
_data2: uintptr_t, _data2: libc::uintptr_t,
) -> uintptr_t { ) -> libc::uintptr_t {
0 0
} }

3
src/smtp.rs
View File

@@ -6,7 +6,6 @@ use crate::constants::*;
use crate::context::Context; use crate::context::Context;
use crate::dc_loginparam::*; use crate::dc_loginparam::*;
use crate::oauth2::*; use crate::oauth2::*;
use crate::types::*;
pub struct Smtp { pub struct Smtp {
transport: Option<lettre::smtp::SmtpTransport>, transport: Option<lettre::smtp::SmtpTransport>,
@@ -115,7 +114,7 @@ impl Smtp {
Event::SMTP_CONNECTED, Event::SMTP_CONNECTED,
0, 0,
"SMTP-LOGIN as {} ok", "SMTP-LOGIN as {} ok",
as_str(lp.send_user), lp.send_user,
); );
1 1
} }