Merge lp:~larsu/notify-osd/lp1319983 into lp:notify-osd

[Lars Karlitski]

Do not start timers if the appended bubble is not yet visible

Do not start timers if the appended bubble is not yet visible

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:484
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~larsu/notify-osd/lp1319983/+merge/219873/+edit-commit-message

http://jenkins.qa.ubuntu.com/job/notify-osd-ci/24/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/notify-osd-utopic-amd64-ci/2
    SUCCESS: http://jenkins.qa.ubuntu.com/job/notify-osd-utopic-armhf-ci/2
    SUCCESS: http://jenkins.qa.ubuntu.com/job/notify-osd-utopic-i386-ci/2

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/notify-osd-ci/24/rebuild

review: Needs Fixing (continuous-integration)

Unmerged revisions

484. By Andy Whitcroft on 2014-05-16

Do not start timers if the appended bubble is not yet visible

=== modified file 'src/stack.c'
--- src/stack.c	2013-11-07 15:37:20 +0000
+++ src/stack.c	2014-05-16 16:22:53 +0000
@@ -385,14 +385,16 @@
 	/* check if this is just an update */
 	if (find_bubble_by_id (self, bubble_get_id (bubble)))
 	{
-		bubble_start_timer (bubble, TRUE);
-		bubble_refresh (bubble);
+		if (bubble_is_visible(bubble)) {
+			bubble_start_timer (bubble, TRUE);
+			bubble_refresh (bubble);
 
-		/* resync the synchronous bubble if it's at the top */
-		if (sync_bubble != NULL
-		    && bubble_is_visible (sync_bubble))
-			if (stack_is_at_top_corner (self, sync_bubble))
-				bubble_sync_with (sync_bubble, bubble);
+			/* resync the synchronous bubble if it's at the top */
+			if (sync_bubble != NULL
+			    && bubble_is_visible (sync_bubble))
+				if (stack_is_at_top_corner (self, sync_bubble))
+					bubble_sync_with (sync_bubble, bubble);
+		}
 
 		return bubble_get_id (bubble);
 	}