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

[Sami Jaktholm]

Return correct notification ID to clients.

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.

[Mirco Müller (macslow)]

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

review: Needs Fixing

[Mirco Müller (macslow)]

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

[Sami Jaktholm (sjakthol)]

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...

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

=== modified file 'src/stack.c'
--- src/stack.c	2013-06-10 21:29:09 +0000
+++ src/stack.c	2013-09-08 08:42:30 +0000
@@ -753,7 +753,7 @@
 	{
 		stack_display_sync_bubble (self, bubble);
 	} else {
-		stack_push_bubble (self, bubble);
+		real_id = stack_push_bubble (self, bubble);
 
 		if (! new_bubble && bubble_is_append_allowed (bubble))
 			log_bubble (bubble, app_name, "appended");