Add 'expiring' criteria #56
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This also adds a field to mako_notification to track the requested timeout, as opposed to what we decided to give it. This was required for the value to be present at the time criteria are applied. Probably the most useful thing you can do with this is set ignore-timeout + default-timeout to prevent anything from sending you permanent notifications.
emersion
reviewed
Jul 3, 2018
dbus/xdg.c
Outdated
| @@ -227,7 +228,8 @@ static int handle_notify(sd_bus_message *msg, void *data, | |||
| return -1; | |||
| } | |||
|
|
|||
| if (expire_timeout < 0 || notif->style.ignore_timeout) { | |||
| int32_t expire_timeout; | |||
| if (notif->requested_timeout < 0 || notif->style.ignore_timeout) { | |||
There was a problem hiding this comment.
If this condition isn't satisfied, expire_timeout will be uninitialized. We should probably set it to requested_timeout.
There was a problem hiding this comment.
Fixed, good catch. My test notification wasn't specifying one.
emersion
approved these changes
Jul 3, 2018
|
Thanks! |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
A criteria to match whether a notification will ever disappear on its own.
This allows you to set
ignore-timeout+default-timeouton non-expiring notifications in general, rather than having to match on applications that tend to send them. This effectively prevents non-expiring notifications entirely:Obviously you can do other things with it as well, but this is the most immediately useful application.
This also adds a field to
mako_notificationto track the requested timeout, as opposed to what we decided to give it. This was necessary for the value to be present at the time criteria are applied. This means that you can only match based on the timeout that the notifier requested, not what you have overridden it to be in other criteria sections usingignore-timeout. There's no way to "fix" this without introducing multiple stages of criteria matching, which is a road I really don't want to go down. This case is a bit unique, asignore-timeoutis the only option which has the effect of changing something provided by the notifier.I don't see this as a big issue, as if you are overriding the timeout for something specific, you can also just set the other style options in that criteria section.