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.

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

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

Merged
merged 2 commits into from
Apr 3, 2024

Conversation

lcolitti
Copy link
Contributor

The icons in the window list are loaded by parsing the desktop files for a few variations of the window's app ID in a few known locations.

Add /.local/share/applications to the list of locations it looks in, to ensure that apps installed in the user's home directory are considered as well.

@soreau
Copy link
Member

soreau commented Mar 27, 2024

Somehow I'm thinking this should rely on XDG_DATA_DIRS to do the right thing. Consider Gio::DesktopAppInfo::create() here.

@ammen99
Copy link
Member

ammen99 commented Mar 27, 2024

I think @soreau is right, probably if we try the create() method first, we would most likely be able to cover this case and even a few others.

@lcolitti lcolitti force-pushed the window-list-icon-homedir branch from fb69c9b to 631ead1 Compare March 27, 2024 09:38
@lcolitti
Copy link
Contributor Author

Somehow I'm thinking this should rely on XDG_DATA_DIRS to do the right thing. Consider Gio::DesktopAppInfo::create() here.

Ah yes, that looks much better. Thanks for the suggestion!

The icons in the window list are loaded by parsing the .desktop
files for a few variations of the window's app ID in a few known
locations. This doesn't look everywhere it should - for example,
it doesn't look into ~/.local/share/applications or look at
XDG_DATA_DIRS.

Use the standard Gio::DesktopAppInfo::create instead.
@lcolitti lcolitti force-pushed the window-list-icon-homedir branch from 631ead1 to cf94c16 Compare March 27, 2024 09:40
@lcolitti
Copy link
Contributor Author

Looks like the CI tests are broken for unrelated reasons:

  Error relocating /usr/lib/libcurl.so.4: SSL_get0_group_name: symbol not found
  Error: The process '/usr/bin/git' failed with exit code 128

@ammen99
Copy link
Member

ammen99 commented Mar 27, 2024

@lcolitti We can probably use alpine:latest instead of alpine:edge to make the CI work again

@lcolitti
Copy link
Contributor Author

@lcolitti We can probably use alpine:latest instead of alpine:edge to make the CI work again

Yup, definitely looks happier after changing that.

Copy link
Member

@ammen99 ammen99 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

lgtm

@ammen99 ammen99 requested a review from soreau March 27, 2024 15:19
@ammen99 ammen99 merged commit a1c1dfb into WayfireWM:master Apr 3, 2024
2 checks passed
@soreau
Copy link
Member

soreau commented Apr 3, 2024

Bonus points for removing more lines than added. 👍

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants