blankie
/
Waybar
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #3102 from dep4/taskbar-directories 

taskbar: search user directories first for desktop files
This commit is contained in:
Alexis Rouillard 2024-04-03 08:58:49 +02:00 committed by GitHub
parent 3de9e0cbd3 245043f9e7
commit 42dc9cb85f
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/modules/wlr/taskbar.cpp
View File

@ -30,6 +30,9 @@ namespace waybar::modules::wlr {
static std::vector<std::string> search_prefix() { static std::vector<std::string> search_prefix() {
std::vector<std::string> prefixes = {""}; std::vector<std::string> prefixes = {""};
std::string home_dir = std::getenv("HOME");
prefixes.push_back(home_dir + "/.local/share/");
auto xdg_data_dirs = std::getenv("XDG_DATA_DIRS"); auto xdg_data_dirs = std::getenv("XDG_DATA_DIRS");
if (!xdg_data_dirs) { if (!xdg_data_dirs) {
prefixes.emplace_back("/usr/share/"); prefixes.emplace_back("/usr/share/");
@ -47,9 +50,6 @@ static std::vector<std::string> search_prefix() {
} while (end != std::string::npos); } while (end != std::string::npos);
} }
std::string home_dir = std::getenv("HOME");
prefixes.push_back(home_dir + "/.local/share/");
for (auto &p : prefixes) spdlog::debug("Using 'desktop' search path prefix: {}", p); for (auto &p : prefixes) spdlog::debug("Using 'desktop' search path prefix: {}", p);
return prefixes; return prefixes;