From 5cc9c220bc3a51a072bfdaced045bc205d681021 Mon Sep 17 00:00:00 2001
From: M33 <327-m33@git.qoto.org>
Date: Wed, 17 Mar 2021 14:56:53 +0000
Subject: [PATCH] Update src/data.rs
---
src/data.rs | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/data.rs b/src/data.rs
index dd9cfa22..126336f4 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) {
--
GitLab