From 56e872dbc5cc49d24c7593c0cc2fc42ea8666850 Mon Sep 17 00:00:00 2001
From: M33 <327-m33@git.qoto.org>
Date: Wed, 17 Mar 2021 12:05:27 +0000
Subject: [PATCH] Update src/data.rs
---
src/data.rs | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/src/data.rs b/src/data.rs
index cab4b2f2..cb6b6969 100644
--- a/src/data.rs
+++ b/src/data.rs
@@ -136,7 +136,7 @@ type LayoutSource = (ArrangementKind, DataSource);
fn list_layout_sources(
name: &str,
kind: ArrangementKind,
- keyboards_path: Option<PathBuf>, // PathBuf,
+ keyboards_path: Option<PathBuf>,
) -> Vec<LayoutSource> {
// Just a simplification of often called code.
let add_by_name = |
@@ -144,7 +144,7 @@ fn list_layout_sources(
name: &str,
kind: &ArrangementKind,
| -> Vec<LayoutSource> {
- if let path = keyboards_path.clone() { // Some(path)
+ if let Some(path) = keyboards_path.clone() {
ret.push((
kind.clone(),
DataSource::File(
@@ -238,16 +238,16 @@ fn load_layout_data_with_fallback(
// Build the path to the right keyboard layout subdirectory
//let mut variant_path = env::var_os("SQUEEKBOARD_KEYBOARDSDIR").unwrap();
- let mut variant_name=String::new();
+ //let mut variant_name=String::new();
let path = env::var_os("SQUEEKBOARD_KEYBOARDSDIR")
.map(PathBuf::from)
.or_else(|| xdg::data_path("squeekboard/keyboards"));
- if variant == ::data::ContentPurpose::Terminal {
- variant_name.push_str("/terminal/");
- }
- variant_name.push_str(name);
+ //if variant == ::data::ContentPurpose::Terminal {
+ // variant_name.push_str("/terminal/");
+ //}
+ //variant_name.push_str(name);
//match variant {
// ::data::ContentPurpose::Normal => env::var_os("SQUEEKBOARD_KEYBOARDSDIR").unwrap(),
@@ -269,7 +269,7 @@ fn load_layout_data_with_fallback(
//let mut variant_path_buf = PathBuf::new();
//variant_path_buf.push(variant_path);
- for (kind, source) in list_layout_sources(&variant_name, kind, path) {
+ for (kind, source) in list_layout_sources(name, kind, path) {
let layout = load_layout_data(source.clone());
match layout {
Err(e) => match (e, source) {
--
GitLab