diff --git a/src/data.rs b/src/data.rs index dd9cfa22b0e3e50439c6edd7b36fd41f4a94a62e..126336f4815290defee8a75c08853a5af8d3292b 100644 --- a/src/data.rs +++ b/src/data.rs @@ -241,9 +241,9 @@ fn load_layout_data_with_fallback( //let mut variant_path = env::var_os("SQUEEKBOARD_KEYBOARDSDIR").unwrap(); let mut variant_prefix: &str = ""; - let path = env::var_os("SQUEEKBOARD_KEYBOARDSDIR") - .map(PathBuf::from) - .or_else(|| xdg::data_path("squeekboard/keyboards")); + //let path = env::var_os("SQUEEKBOARD_KEYBOARDSDIR") + // .map(PathBuf::from) + // .or_else(|| xdg::data_path("squeekboard/keyboards")); match variant { // ::data::ContentPurpose::Normal => env::var_os("SQUEEKBOARD_KEYBOARDSDIR").unwrap(), @@ -259,7 +259,7 @@ fn load_layout_data_with_fallback( // ::data::ContentPurpose::Date => env::var_os("SQUEEKBOARD_KEYBOARDSDIR").unwrap(), // ::data::ContentPurpose::Time => env::var_os("SQUEEKBOARD_KEYBOARDSDIR").unwrap(), // ::data::ContentPurpose::Datetime => env::var_os("SQUEEKBOARD_KEYBOARDSDIR").unwrap(), - ::data::ContentPurpose::Terminal => variant_prefix = "terminal_", // terminal specific layouts + ::data::ContentPurpose::Terminal => variant_prefix = "/terminal/", // terminal specific layouts _ => variant_prefix = "", } @@ -270,7 +270,7 @@ fn load_layout_data_with_fallback( //variant_path_buf.push(variant_path); log_print!(logging::Level::Warning, "fn load_layout_data_with_fallback(): list_layout_sources(name:{}, variant_name:{}, kind:{:?}, path:{:?})", name, variant_name, kind, path); - for (kind, source) in list_layout_sources(&variant_name, kind, path) { + for (kind, source) in list_layout_sources(&variant_name, kind, None) { let layout = load_layout_data(source.clone()); match layout { Err(e) => match (e, source) {