renaming dc_configure to configure

and renaming the autoconfigure modules

deltachat-ffi/src/lib.rs

@@ -173,7 +173,7 @@ pub unsafe extern "C" fn dc_configure(context: *mut dc_context_t) {
     assert!(!context.is_null());
     let context = &*context;
 
-    dc_configure::dc_configure(context)
+    configure::configure(context)
 }
 
 #[no_mangle]
@@ -181,7 +181,7 @@ pub unsafe extern "C" fn dc_is_configured(context: *mut dc_context_t) -> libc::c
     assert!(!context.is_null());
     let context = &*context;
 
-    dc_configure::dc_is_configured(context)
+    configure::dc_is_configured(context)
 }
 
 #[no_mangle]
@@ -986,7 +986,7 @@ pub unsafe extern "C" fn dc_stop_ongoing_process(context: *mut dc_context_t) {
     assert!(!context.is_null());
     let context = &*context;
 
-    dc_configure::dc_stop_ongoing_process(context)
+    configure::dc_stop_ongoing_process(context)
 }
 
 #[no_mangle]

examples/repl/cmdline.rs

@@ -7,7 +7,7 @@ use deltachat::config;
 use deltachat::constants::*;
 use deltachat::contact::*;
 use deltachat::context::*;
-use deltachat::dc_configure::*;
+use deltachat::configure::*;
 use deltachat::dc_imex::*;
 use deltachat::dc_location::*;
 use deltachat::dc_msg::*;

examples/repl/main.rs

@@ -20,7 +20,7 @@ use std::sync::{Arc, Mutex, RwLock};
 use deltachat::config;
 use deltachat::constants::*;
 use deltachat::context::*;
-use deltachat::dc_configure::*;
+use deltachat::configure::*;
 use deltachat::dc_securejoin::*;
 use deltachat::dc_tools::*;
 use deltachat::job::*;
@@ -495,7 +495,7 @@ unsafe fn handle_cmd(line: &str, ctx: Arc<RwLock<Context>>) -> Result<ExitResult
         }
         "configure" => {
             start_threads(ctx.clone());
-            dc_configure(&ctx.read().unwrap());
+            configure(&ctx.read().unwrap());
         }
         "oauth2" => {
             if let Some(addr) = ctx.read().unwrap().get_config(config::Config::Addr) {

examples/simple.rs

@@ -11,7 +11,7 @@ use deltachat::config;
 use deltachat::constants::Event;
 use deltachat::contact::*;
 use deltachat::context::*;
-use deltachat::dc_configure::*;
+use deltachat::configure::*;
 use deltachat::job::{
     perform_imap_fetch, perform_imap_idle, perform_imap_jobs, perform_smtp_idle, perform_smtp_jobs,
 };
@@ -87,7 +87,7 @@ fn main() {
         ctx.set_config(config::Config::Addr, Some("d@testrun.org"))
             .unwrap();
         ctx.set_config(config::Config::MailPw, Some(&pw)).unwrap();
-        dc_configure(&ctx);
+        configure(&ctx);
 
         thread::sleep(duration);
 

src/configure/mod.rs

@@ -11,10 +11,10 @@ use crate::oauth2::*;
 use crate::param::Params;
 use crate::types::*;
 
-mod auto_outlk;
+mod auto_outlook;
-use auto_outlk::outlk_autodiscover;
+use auto_outlook::outlk_autodiscover;
-mod auto_moz;
+mod auto_mozilla;
-use auto_moz::moz_autoconfigure;
+use auto_mozilla::moz_autoconfigure;
 
 macro_rules! progress {
     ($context:tt, $progress:expr) => {
@@ -31,7 +31,7 @@ macro_rules! progress {
 }
 
 // connect
-pub unsafe fn dc_configure(context: &Context) {
+pub unsafe fn configure(context: &Context) {
     if 0 != dc_has_ongoing(context) {
         warn!(
             context,

src/constants.rs

@@ -128,7 +128,7 @@ pub const DC_CREATE_MVBOX: usize = 1;
 // via dc_set_config() using the key "server_flags".
 
 /// Force OAuth2 authorization. This flag does not skip automatic configuration.
-/// Before calling dc_configure() with DC_LP_AUTH_OAUTH2 set,
+/// Before calling configure() with DC_LP_AUTH_OAUTH2 set,
 /// the user has to confirm access at the URL returned by dc_get_oauth2_url().
 pub const DC_LP_AUTH_OAUTH2: usize = 0x2;
 
@@ -282,7 +282,7 @@ pub enum Event {
     /// As most things are asynchronous, things may go wrong at any time and the user
     /// should not be disturbed by a dialog or so.  Instead, use a bubble or so.
     ///
-    /// However, for ongoing processes (eg. dc_configure())
+    /// However, for ongoing processes (eg. configure())
     /// or for functions that are expected to fail (eg. dc_continue_key_transfer())
     /// it might be better to delay showing these events until the function has really
     /// failed (returned false). It should be sufficient to report only the _last_ error
@@ -400,7 +400,7 @@ pub enum Event {
     /// @return 0
     LOCATION_CHANGED = 2035,
 
-    /// Inform about the configuration progress started by dc_configure().
+    /// Inform about the configuration progress started by configure().
     ///
     /// @param data1 (int) 0=error, 1-999=progress in permille, 1000=success and done
     /// @param data2 0

src/dc_imex.rs

@@ -10,7 +10,7 @@ use crate::chat;
 use crate::config::Config;
 use crate::constants::*;
 use crate::context::Context;
-use crate::dc_configure::*;
+use crate::configure::*;
 use crate::dc_e2ee::*;
 use crate::dc_msg::*;
 use crate::dc_tools::*;

src/dc_securejoin.rs

@@ -6,7 +6,7 @@ use crate::chat::{self, Chat};
 use crate::constants::*;
 use crate::contact::*;
 use crate::context::Context;
-use crate::dc_configure::*;
+use crate::configure::*;
 use crate::dc_e2ee::*;
 use crate::dc_mimeparser::*;
 use crate::dc_msg::*;

src/job.rs

@@ -8,7 +8,7 @@ use rand::{thread_rng, Rng};
 use crate::chat;
 use crate::constants::*;
 use crate::context::Context;
-use crate::dc_configure::*;
+use crate::configure::*;
 use crate::dc_imex::*;
 use crate::dc_location::*;
 use crate::dc_loginparam::*;

src/job_thread.rs

@@ -1,7 +1,7 @@
 use std::sync::{Arc, Condvar, Mutex};
 
 use crate::context::Context;
-use crate::dc_configure::*;
+use crate::configure::*;
 use crate::imap::Imap;
 
 pub struct JobThread {

src/lib.rs

@@ -26,6 +26,7 @@ mod aheader;
 pub mod chat;
 pub mod chatlist;
 pub mod config;
+pub mod configure;
 pub mod constants;
 pub mod contact;
 pub mod context;
@@ -47,7 +48,6 @@ pub mod types;
 pub mod x;
 
 pub mod dc_array;
-pub mod dc_configure;
 mod dc_dehtml;
 mod dc_e2ee;
 pub mod dc_imex;