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

Use version 2 of ext-idle-notify-v1 protocol #590

Closed
wants to merge 17 commits into from

Conversation

jjramsey
Copy link
Contributor

@jjramsey jjramsey commented Dec 8, 2024

For now, this is only a draft, meant as a proof-of-concept client implementation of a revision to the ext-idle-notify protocol described in this merge request to wayland-protocols here: wayland/wayland-protocols!367.

If implemented, it should allow Workrave to work on Wayland without interference from idle inhibitors.

I mangled the rebase for my fork, so I'm going to nuke my branch and start over.

@jjramsey jjramsey force-pushed the ext-idle-notify-update branch 2 times, most recently from a827bae to 9096354 Compare January 14, 2025 12:32
@jjramsey jjramsey closed this Jan 14, 2025
@jjramsey jjramsey deleted the ext-idle-notify-update branch January 14, 2025 12:43
@Consolatis
Copy link

I suggest using feature branches instead of the main/master branch. That makes rebasing way easier.
Something like

git checkout main
git checkout -b feature/notify-v1
[do changes and commit]
# maybe replace origin with the name of your remote
git push origin feature/notify-1:feature/notify-v1

Then when you want to sync changes from main:

git checkout main
git pull
git checkout feature/notify-v1
git rebase main
# maybe replace origin with the name of your remote
git push --force origin feature/notify-1:feature/notify-v1

@jjramsey
Copy link
Contributor Author

jjramsey commented Jan 14, 2025

I suggest using feature branches instead of the main/master branch.

I did use a branch! It's just that I thought I knew more about rebasing than I did, and it got me in trouble.

Anyway. for the record, the redone pull request is here: #596

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