diff --git a/Cargo.toml b/Cargo.toml index 15e5112d5..3af94700f 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "deltachat" -version = "0.1.0" +version = "1.0.0-alpha.0" authors = ["dignifiedquire "] edition = "2018" diff --git a/deltachat-ffi/Cargo.toml b/deltachat-ffi/Cargo.toml index ee8d9133a..0026c82c5 100644 --- a/deltachat-ffi/Cargo.toml +++ b/deltachat-ffi/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "deltachat_ffi" -version = "0.1.0" +version = "1.0.0-alpha.0" description = "Deltachat FFI" authors = ["dignifiedquire "] edition = "2018" diff --git a/deltachat-ffi/deltachat.h b/deltachat-ffi/deltachat.h index 5b55cef34..e73ac7ec5 100644 --- a/deltachat-ffi/deltachat.h +++ b/deltachat-ffi/deltachat.h @@ -11,9 +11,6 @@ extern "C" { #endif -#define DC_VERSION_STR "0.43.0" - - /** * @mainpage Getting started * diff --git a/deltachat-ffi/src/lib.rs b/deltachat-ffi/src/lib.rs index 3d9473e07..ccae8e24c 100644 --- a/deltachat-ffi/src/lib.rs +++ b/deltachat-ffi/src/lib.rs @@ -12,8 +12,6 @@ extern crate human_panic; use deltachat::*; -pub const DC_VERSION_STR: &'static str = "0.43.0\x00"; - // TODO: constants // dc_context_t diff --git a/src/constants.rs b/src/constants.rs index dc51bb2c9..ce9b17aba 100644 --- a/src/constants.rs +++ b/src/constants.rs @@ -1,6 +1,6 @@ //! Constants -pub const VERSION: &'static [u8; 7] = b"0.43.0\x00"; +pub const DC_VERSION_STR: &'static [u8; 14] = b"1.0.0-alpha.0\x00"; pub const DC_MOVE_STATE_MOVING: u32 = 3; pub const DC_MOVE_STATE_STAY: u32 = 2; diff --git a/src/context.rs b/src/context.rs index 822faa185..47cf0aa1b 100644 --- a/src/context.rs +++ b/src/context.rs @@ -549,7 +549,7 @@ static mut sys_config_keys: [*const libc::c_char; 3] = [ unsafe fn get_sys_config_str(key: *const libc::c_char) -> *mut libc::c_char { if strcmp(key, b"sys.version\x00" as *const u8 as *const libc::c_char) == 0 { - return dc_strdup(VERSION as *const u8 as *const libc::c_char); + return dc_strdup(DC_VERSION_STR as *const u8 as *const libc::c_char); } else if strcmp( key, b"sys.msgsize_max_recommended\x00" as *const u8 as *const libc::c_char, @@ -755,7 +755,7 @@ pub unsafe fn dc_get_info(context: &Context) -> *mut libc::c_char { public_key_count={}\n\ fingerprint={}\n\ level=awesome\n", - to_str(VERSION as *const u8 as *const _), + to_str(DC_VERSION_STR as *const u8 as *const _), to_str(libsqlite3_sys::SQLITE_VERSION as *const u8 as *const libc::c_char), sqlite3_threadsafe(), // arch @@ -809,7 +809,7 @@ pub unsafe fn dc_get_info(context: &Context) -> *mut libc::c_char { } pub unsafe fn dc_get_version_str() -> *mut libc::c_char { - dc_strdup(VERSION as *const u8 as *const libc::c_char) + dc_strdup(DC_VERSION_STR as *const u8 as *const libc::c_char) } pub unsafe fn dc_get_fresh_msgs(context: &Context) -> *mut dc_array_t { diff --git a/src/dc_mimefactory.rs b/src/dc_mimefactory.rs index baa659fef..c5cbe070e 100644 --- a/src/dc_mimefactory.rs +++ b/src/dc_mimefactory.rs @@ -8,7 +8,7 @@ use mmime::mailmime_write_mem::*; use mmime::mmapstring::*; use mmime::other::*; -use crate::constants::VERSION; +use crate::constants::DC_VERSION_STR; use crate::context::Context; use crate::dc_chat::*; use crate::dc_contact::*; @@ -464,7 +464,7 @@ pub unsafe fn dc_mimefactory_render(mut factory: *mut dc_mimefactory_t) -> libc: strdup(b"X-Mailer\x00" as *const u8 as *const libc::c_char), dc_mprintf( b"Delta Chat Core %s%s%s\x00" as *const u8 as *const libc::c_char, - VERSION as *const u8 as *const libc::c_char, + DC_VERSION_STR as *const u8 as *const libc::c_char, if !(*(*factory).context).os_name.is_null() { b"/\x00" as *const u8 as *const libc::c_char } else { @@ -957,7 +957,7 @@ pub unsafe fn dc_mimefactory_render(mut factory: *mut dc_mimefactory_t) -> libc: message_text2 = dc_mprintf(b"Reporting-UA: Delta Chat %s\r\nOriginal-Recipient: rfc822;%s\r\nFinal-Recipient: rfc822;%s\r\nOriginal-Message-ID: <%s>\r\nDisposition: manual-action/MDN-sent-automatically; displayed\r\n\x00" as *const u8 as *const libc::c_char, - VERSION as *const u8 as *const libc::c_char, + DC_VERSION_STR as *const u8 as *const libc::c_char, (*factory).from_addr, (*factory).from_addr, (*(*factory).msg).rfc724_mid); let content_type_0: *mut mailmime_content = mailmime_content_new_with_str(