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

Start implementing Ui config on top of the Config enum

Browse Source
This commit is contained in:
jikstra
2019-09-14 21:44:59 +02:00
parent 70a69d5313
commit 1ab014f96f
7 changed files with 68 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
deltachat-ffi/src/lib.rs
View File

@@ -151,13 +151,7 @@ pub unsafe extern "C" fn dc_set_config(
let context = &*context;
let key = dc_tools::as_str(key);
let value = as_opt_str(value);
if key.starts_with(".ui") {
return context.set_ui_config(key, value).is_ok() as libc::c_int;
}
match config::Config::from_str(key) {
Ok(key) => context.set_config(key, value).is_ok() as libc::c_int,
Err(_) => 0,
}
context.set_config_from_str(key, value).is_ok() as libc::c_int
}
#[no_mangle]
@@ -173,14 +167,7 @@ pub unsafe extern "C" fn dc_get_config(
let context = &*context;
let key = dc_tools::as_str(key);
if key.starts_with(".ui") {
return context.get_ui_config(key).unwrap_or_default().strdup();
}
let key = config::Config::from_str(key).expect("invalid key");
// TODO: Translating None to NULL would be more sensible than translating None
// to "", as it is now.
context.get_config(key).unwrap_or_default().strdup()
context.get_config_from_str(key).unwrap_or_default().strdup()
}
#[no_mangle]