Merge lp:~sjakthol/notify-osd/fix-1191565 into lp:notify-osd

Proposed by Sami Jaktholm
Status: Merged
Approved by: Mirco Müller
Approved revision: 470
Merged at revision: 470
Proposed branch: lp:~sjakthol/notify-osd/fix-1191565
Merge into: lp:notify-osd
Diff against target: 12 lines (+1/-1)
1 file modified
src/stack.c (+1/-1)
To merge this branch: bzr merge lp:~sjakthol/notify-osd/fix-1191565
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Approve
Mirco Müller (community) Approve
Review via email:

Commit message

Return correct notification ID to clients.

Description of the change

stack_push_bubble might change the notification ID so that's the one notify-osd should return to clients. Otherwise a new notification is created every time client tries to update old one because the ID client sends back to notify-osd is incorrect.

To post a comment you must log in.
Revision history for this message
Mirco Müller (macslow) wrote :

This patch breaks synchronous icon-value notifications (e.g. Volume Up/Down)

review: Needs Fixing
Revision history for this message
Mirco Müller (macslow) wrote :

My bad... local build/test-script for notify-osd played some nasty tricks on me causing the initial failure. I verified the patch working with the described rhythmbox-usecase and examples from notify-osd branch now, doing configure, build etc. the usual manual way.

review: Approve
Revision history for this message
Sami Jaktholm (sjakthol) wrote :

Works fine for me... What kind of breakage are you noticing? No notifications at all? Notifications not updating? Any steps to reproduce?

This shouldn't have any effect on synchronous notifications as they are handled in the if block above - the changes are in the else block. On top of my head, I can't really think of an obvious way for these changes to break synchronous notifications. But if I can reproduce the issues I'll see what I can do...

Revision history for this message
PS Jenkins bot (ps-jenkins) :
review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/stack.c'
2--- src/stack.c 2013-06-10 21:29:09 +0000
3+++ src/stack.c 2013-09-08 08:42:30 +0000
4@@ -753,7 +753,7 @@
5 {
6 stack_display_sync_bubble (self, bubble);
7 } else {
8- stack_push_bubble (self, bubble);
9+ real_id = stack_push_bubble (self, bubble);
11 if (! new_bubble && bubble_is_append_allowed (bubble))
12 log_bubble (bubble, app_name, "appended");


People subscribed via source and target branches