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

Enable the use of AyatanaAppIndicator #2200

Merged
merged 3 commits into from
Oct 9, 2023

Conversation

EbonJaeger
Copy link
Contributor

This uses the newer successor to AppIndicator3 for the tray icon implementation, with a fallback to the older AppIndicator3 if the Ayatana version is not found. AyatanaAppIndicator is backwards compatible with AppIndicator3, so the API remains the same. The icon is also fixed.

Tested on Solus 4.4 with Budgie Desktop 10.8.

Ref BuddiesOfBudgie/budgie-desktop#446
Fixes #433

This uses the newer successor to AppIndicator3 for the tray icon implementation, with a fallback to the older AppIndicator3 if the Ayatana version is not found. AyatanaAppIndicator is backwards compatible with AppIndicator3, so the API remains the same. The icon is also fixed.

Ref BuddiesOfBudgie/budgie-desktop#446
Fixes Guake#433

sem-ver: bug-fix

Signed-off-by: Evan Maddock <[email protected]>
@Davidy22
Copy link
Collaborator

Davidy22 commented Oct 7, 2023

Sorry about the delay, been a little buried. Couldn't reproduce, can't confirm for myself but if this works for you then it should be fine. CI is complaining about black, a passthrough of that should silence that and this'll be good to go.

Signed-off-by: Evan Maddock <[email protected]>
@EbonJaeger
Copy link
Contributor Author

No problem, I know the feeling, heh.

@Davidy22
Copy link
Collaborator

Davidy22 commented Oct 8, 2023

Linter's now objecting to the inline import. The pylint exclusion comments might need to be on the first line where the import keyword is, I think there should be a way for you to turn CI on with your fork so that you can get feedback from our checks faster. Locally, make check should also do it.

Signed-off-by: Evan Maddock <[email protected]>
@EbonJaeger
Copy link
Contributor Author

Hopefully this does it. Thanks for pointing out make check, I had overlooked it. Had to edit the .flake8 file to get it to actually work; newer versions of Flake appear to no longer allow inline comments in lists.

Copy link
Collaborator

@Davidy22 Davidy22 left a comment

Choose a reason for hiding this comment

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

Looks good, green checks on CI, merging.

@Davidy22 Davidy22 merged commit 4a97d19 into Guake:master Oct 9, 2023
3 checks passed
@EbonJaeger EbonJaeger deleted the fix-appindicator-support branch October 9, 2023 00:58
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.

Broken tray icon with Appindicators
2 participants