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

Fix battery widget with upower <= 0.99.7 #2221

Merged
merged 1 commit into from Aug 7, 2019

Conversation

rrrapha
Copy link
Contributor

@rrrapha rrrapha commented Aug 5, 2019

The should fix the "Battery status unknown" issue reported in #2161
(I have not tested this on ubuntu)

@ronso0
Copy link
Member

ronso0 commented Aug 5, 2019

Perfect, thanks for the fix!
Now the widget shows the same information as the OS indicator

works in Ubuntu Studio 18.04 w/ upower 0.99.7-2ubuntu0.18.04.1

@daschuer
Copy link
Member

daschuer commented Aug 5, 2019

Sometimes the obvious fix is hidden ... thank you for discovering.

I can confirm that this also works with upower 0.99.4 on Ubuntu Xenial 16.4

This issue exists also in the maintained 2.2 branch. Please rebase your changes to that
force push and change here the target branch.
Or just issue a new PR.
Thanks.

@rrrapha rrrapha changed the base branch from master to 2.2 August 5, 2019 21:54
@uklotzde uklotzde added this to the 2.2.2 milestone Aug 6, 2019
@uklotzde
Copy link
Contributor

uklotzde commented Aug 6, 2019

Merge? I already added an entry to the changelog in #2225.

@uklotzde
Copy link
Contributor

uklotzde commented Aug 6, 2019

The Windows build failure is unrelated.

@rrrapha
Copy link
Contributor Author

rrrapha commented Aug 6, 2019

Merge? I already added an entry to the changelog in #2225.

I think the battery widget is still broken in 2.2 without the following change:
https://github.com/mixxxdj/mixxx/pull/2146/files
Maybe this should be backported to 2.2?

@uklotzde
Copy link
Contributor

uklotzde commented Aug 7, 2019

Yes, of course. Just cherry pick that commit.

@ronso0
Copy link
Member

ronso0 commented Aug 7, 2019

Perfect, thanks for the fix!
Now the widget shows the same information as the OS indicator

works in Ubuntu Studio 18.04 w/ upower 0.99.7-2ubuntu0.18.04.1

Whoops, I just noticed this is targetd at 2.2. I only tested with master..

@uklotzde
Copy link
Contributor

uklotzde commented Aug 7, 2019

LGTM. Thank you! Those nasty kind of bugs are sometimes hard to discover.

@uklotzde uklotzde merged commit 0da8d8b into mixxxdj:2.2 Aug 7, 2019
@rrrapha rrrapha deleted the upower-0.99.7 branch August 9, 2019 07:47
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.

None yet

4 participants