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

prefer get_config_bool() where appropriate

Browse Source 
for db input/output, we still use get_config_int() to convert to/from 0/1.
also for info() we prefer get_config_int() to show the real value.
This commit is contained in:
B. Petersen
2019-10-03 21:41:30 +02:00
committed by Floris Bruynooghe
parent 8dfd04672f
commit 79b92727cc
4 changed files with 14 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/configure/mod.rs
View File

@@ -477,8 +477,8 @@ pub unsafe fn dc_job_do_DC_JOB_CONFIGURE_IMAP(context: &Context) {
} }
16 => { 16 => {
progress!(context, 900); progress!(context, 900);
let flags: libc::c_int = if 0 != context.get_config_int(Config::MvboxWatch) let flags: libc::c_int = if context.get_config_bool(Config::MvboxWatch)
|| 0 != context.get_config_int(Config::MvboxMove) || context.get_config_bool(Config::MvboxMove)
{ {
DC_CREATE_MVBOX as i32 DC_CREATE_MVBOX as i32
} else { } else {
@@ -602,12 +602,7 @@ pub fn dc_connect_to_configured_imap(context: &Context, imap: &Imap) -> libc::c_
if imap.is_connected() { if imap.is_connected() {
ret_connected = 1 ret_connected = 1
} else if context } else if !context.sql.get_raw_config_bool(context, "configured") {
.sql
.get_raw_config_int(context, "configured")
.unwrap_or_default()
== 0
{
warn!(context, "Not configured, cannot connect.",); warn!(context, "Not configured, cannot connect.",);
} else { } else {
let param = LoginParam::from_database(context, "configured_"); let param = LoginParam::from_database(context, "configured_");

2
src/context.rs
View File

@@ -393,7 +393,7 @@ impl Context {
} }
pub fn do_heuristics_moves(&self, folder: &str, msg_id: u32) { pub fn do_heuristics_moves(&self, folder: &str, msg_id: u32) {
if self.get_config_int(Config::MvboxMove) == 0 { if !self.get_config_bool(Config::MvboxMove) {
return; return;
} }

4
src/dc_receive_imf.rs
View File

@@ -852,9 +852,7 @@ unsafe fn handle_reports(
let mut param = Params::new(); let mut param = Params::new();
param.set(Param::ServerFolder, server_folder.as_ref()); param.set(Param::ServerFolder, server_folder.as_ref());
param.set_int(Param::ServerUid, server_uid as i32); param.set_int(Param::ServerUid, server_uid as i32);
if mime_parser.is_send_by_messenger if mime_parser.is_send_by_messenger && context.get_config_bool(Config::MvboxMove) {
&& 0 != context.get_config_int(Config::MvboxMove)
{
param.set_int(Param::AlsoMove, 1); param.set_int(Param::AlsoMove, 1);
} }
job_add(context, Action::MarkseenMdnOnImap, 0, param, 0); job_add(context, Action::MarkseenMdnOnImap, 0, param, 0);

18
src/job.rs
View File

@@ -368,7 +368,7 @@ pub fn perform_imap_fetch(context: &Context) {
if 0 == connect_to_inbox(context, &inbox) { if 0 == connect_to_inbox(context, &inbox) {
return; return;
} }
if context.get_config_int(Config::InboxWatch) == 0 { if !context.get_config_bool(Config::InboxWatch) {
info!(context, "INBOX-watch disabled.",); info!(context, "INBOX-watch disabled.",);
return; return;
} }
@@ -403,23 +403,23 @@ pub fn perform_imap_idle(context: &Context) {
} }
pub fn perform_mvbox_fetch(context: &Context) { pub fn perform_mvbox_fetch(context: &Context) {
let use_network = context.get_config_int(Config::MvboxWatch); let use_network = context.get_config_bool(Config::MvboxWatch);
context context
.mvbox_thread .mvbox_thread
.write() .write()
.unwrap() .unwrap()
.fetch(context, use_network == 1); .fetch(context, use_network);
} }
pub fn perform_mvbox_idle(context: &Context) { pub fn perform_mvbox_idle(context: &Context) {
let use_network = context.get_config_int(Config::MvboxWatch); let use_network = context.get_config_bool(Config::MvboxWatch);
context context
.mvbox_thread .mvbox_thread
.read() .read()
.unwrap() .unwrap()
.idle(context, use_network == 1); .idle(context, use_network);
} }
pub fn interrupt_mvbox_idle(context: &Context) { pub fn interrupt_mvbox_idle(context: &Context) {
@@ -427,23 +427,23 @@ pub fn interrupt_mvbox_idle(context: &Context) {
} }
pub fn perform_sentbox_fetch(context: &Context) { pub fn perform_sentbox_fetch(context: &Context) {
let use_network = context.get_config_int(Config::SentboxWatch); let use_network = context.get_config_bool(Config::SentboxWatch);
context context
.sentbox_thread .sentbox_thread
.write() .write()
.unwrap() .unwrap()
.fetch(context, use_network == 1); .fetch(context, use_network);
} }
pub fn perform_sentbox_idle(context: &Context) { pub fn perform_sentbox_idle(context: &Context) {
let use_network = context.get_config_int(Config::SentboxWatch); let use_network = context.get_config_bool(Config::SentboxWatch);
context context
.sentbox_thread .sentbox_thread
.read() .read()
.unwrap() .unwrap()
.idle(context, use_network == 1); .idle(context, use_network);
} }
pub fn interrupt_sentbox_idle(context: &Context) { pub fn interrupt_sentbox_idle(context: &Context) {