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

Add SDL notifications #7468

Closed
wants to merge 3 commits into from
Closed

Add SDL notifications #7468

wants to merge 3 commits into from

Conversation

1bsyl
Copy link
Contributor

@1bsyl 1bsyl commented Mar 14, 2023

Refactor the patch for notification ( initially from #1932 )

currently only linux/DBUS

@1bsyl 1bsyl force-pushed the br_notification branch 3 times, most recently from a9e39a1 to 89d7038 Compare March 15, 2023 09:28
@1bsyl 1bsyl force-pushed the br_notification branch from 23d83da to 3dc2be7 Compare March 30, 2023 07:25
@orowith2os
Copy link

As @smcv suggested in the original issue:

For the Linux implementation, it would be best if this was container-friendly by trying both org.freedesktop.portal.Notification and org.freedesktop.Notifications, in some order (try one, and if it fails with a D-Bus error, try the other).

@1bsyl
Copy link
Contributor Author

1bsyl commented Jun 22, 2023

closing this PR, and re-open new one #7857

@1bsyl
Copy link
Contributor Author

1bsyl commented Jun 22, 2023

@madebr @sezero : hey! I don't know how to squash + force push the commit when I'have a "merge branch" in the middle ?
(it re-ask me to re-do the merge n times, so it's faster to close the branch, and re-create a new one)
Any idea ?

@1bsyl 1bsyl closed this Jun 22, 2023
@1bsyl 1bsyl deleted the br_notification branch June 22, 2023 09:25
@madebr
Copy link
Contributor

madebr commented Jun 22, 2023

You could have tried a squash merge. (git merge --squash)

@1bsyl
Copy link
Contributor Author

1bsyl commented Jun 22, 2023

thanks @madebr ! i'll try next time !

@1bsyl
Copy link
Contributor Author

1bsyl commented Jun 22, 2023

@madebr
I tried with updating the video capture PR ( 5477). Only the gendyapi files were divergent...

git checkout br_video_capture
git merge main --squash
... merge the gendynapi files ...
git commit
git push br_video_capture

// 1 new commit on github! (so 2, in total).

git rebase origin -i
I want to squash the merge with initial commit.. (changed, the second pick -> s)
but I am asked to re-do! the merge once-again . :/

@madebr
Copy link
Contributor

madebr commented Jun 22, 2023

You need to start from the main branch:

git fetch origin
git checkout origin/main
git merge br_notifications --squash

Fix the conflicts, and create the squash commit.

git add -u
git commit -m "Add SDL notifications"
git checkout -B br_notification

@1bsyl
Copy link
Contributor Author

1bsyl commented Jun 22, 2023

@madebr
but the commit will be done in the main branch ?

@madebr
Copy link
Contributor

madebr commented Jun 22, 2023

By doing git checkout origin/main, you are in detached state.
You're in no man lands.
In the last step, you're forcing the current branch to br_notifications.

@1bsyl
Copy link
Contributor Author

1bsyl commented Jun 22, 2023

ok :) thanks ! will try later !

@1bsyl
Copy link
Contributor Author

1bsyl commented Jun 22, 2023

@madebr thanks that works :)

(for my record, as a very last step, I need to do
git rebase origin -i and r to rewrite the commit message
git push origin br_notifications -f

)

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