Skip to content

book: Make book listings work on macos by using glib user_data_dir #1866

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Oct 17, 2024
Merged

book: Make book listings work on macos by using glib user_data_dir #1866

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8775196
book: Make listings work on macos by using glib user_data_dir
daxhuiberts Oct 17, 2024
5cc613a
book: Remove unused dirs dependency
daxhuiberts Oct 17, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
49 changes: 0 additions & 49 deletions book/listings/Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion book/listings/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ adw = { version = "0.7", package = "libadwaita", features = ["v1_5"] }
anyhow = "1.0"
ashpd = { version = "0.9", features = ["gtk4"] }
async-channel = "2.0"
dirs = "5.0"
gtk = { version = "0.9", package = "gtk4", features = ["v4_12"] }
reqwest = { version = "0.12", default-features = false, features = [
"rustls-tls",
Expand Down
5 changes: 1 addition & 4 deletions book/listings/xtask/main.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
use std::env;
use std::path::PathBuf;

use anyhow::Context;
use walkdir::WalkDir;
use xshell::{cmd, Shell};

Expand Down Expand Up @@ -53,9 +52,7 @@ fn schema_dir() -> anyhow::Result<PathBuf> {
let schema_dir = if cfg!(windows) {
PathBuf::from("C:/ProgramData/glib-2.0/schemas/")
} else {
dirs::data_dir()
.context("Could not get data dir")?
.join("glib-2.0/schemas")
gtk::glib::user_data_dir().join("glib-2.0/schemas")
};
Ok(schema_dir)
}
Expand Down
Loading