Skip to content
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

Jump to bottom

window-list: use ~/.local/share when looking for apps / icons #225

Merged
merged 2 commits into from
Apr 3, 2024
Merged

window-list: use ~/.local/share when looking for apps / icons #225

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
cf94c16
window-list: use DesktopAppInfo to find apps for icons
lcolitti Mar 27, 2024
b811c95
Use alpine:latest instead of alpine:edge (currently broken)
lcolitti Mar 27, 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
2 changes: 1 addition & 1 deletion .github/workflows/ci.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ jobs:
test_musl_gcc:
name: "Test with with GCC/musl/libstdc++/BFD on Alpine Linux"
runs-on: ubuntu-latest
container: alpine:edge
container: alpine:latest
steps:
- run: echo 'http://dl-cdn.alpinelinux.org/alpine/edge/testing' >> /etc/apk/repositories
- run: apk --no-cache add git g++ binutils pkgconf meson ninja musl-dev gtk+3.0-dev gtkmm3-dev wayland-protocols wayfire-dev gtk-layer-shell-dev pulseaudio-dev libdbusmenu-gtk3-dev alsa-lib-dev
Expand Down
9 changes: 2 additions & 7 deletions src/panel/widgets/window-list/toplevel.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -665,11 +665,7 @@ Icon get_from_desktop_app_info(std::string app_id)

std::vector<std::string> prefixes = {
"",
"/usr/share/applications/",
"/usr/share/applications/kde/",
"/usr/share/applications/org.kde.",
"/usr/local/share/applications/",
"/usr/local/share/applications/org.kde.",
"org.kde.",
};

std::vector<std::string> app_id_variations = {
Expand All @@ -690,8 +686,7 @@ Icon get_from_desktop_app_info(std::string app_id)
{
if (!app_info)
{
app_info = Gio::DesktopAppInfo
::create_from_filename(prefix + id + suffix);
app_info = Gio::DesktopAppInfo::create(prefix + id + suffix);
}
}
}
Expand Down
Loading