Merge lp:~macslow/notify-osd/fix-1257717 into lp:notify-osd

[Mirco Müller]

Avoid invalid call to g_source_remove() thus fixing LP: #1257717.

Avoid invalid call to g_source_remove() thus fixing LP: #1257717.

[Lars Karlitski (larsu)]

This will leak the timer source when the bubble gets dismissed before it times out. I don't know if that ever happens, but I recommend unsetting priv->timer_id in the callback, just in case:

=== modified file 'src/bubble.c'
--- src/bubble.c 2012-11-26 20:29:43 +0000
+++ src/bubble.c 2013-12-04 15:12:00 +0000
@@ -3038,6 +3038,11 @@
 {
        g_return_val_if_fail (IS_BUBBLE (self), FALSE);

+ /* This function always returns FALSE, which removes the timer
+ * source. Unset priv->timer_id so that we don't call
+ * g_source_remove() on it later. */
+ bubble_set_timer_id (self, 0);
+
        if (GET_PRIVATE (self)->composited)
        {
                bubble_fade_out (self, 300);

review: Disapprove

[Lars Karlitski (larsu)]

Ah, sorry. I meant "Needs Fixing" of course.

review: Needs Fixing

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:476
http://jenkins.qa.ubuntu.com/job/notify-osd-ci/14/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/notify-osd-trusty-amd64-ci/10
    SUCCESS: http://jenkins.qa.ubuntu.com/job/notify-osd-trusty-armhf-ci/10
    SUCCESS: http://jenkins.qa.ubuntu.com/job/notify-osd-trusty-i386-ci/10

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

review: Approve (continuous-integration)

[lp:~macslow/notify-osd/fix-1257717]

477. By Mirco Müller on 2013-12-04

Avoid a potential leak of the source, if a bubble gets dismissed before it normally times out.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:477
http://jenkins.qa.ubuntu.com/job/notify-osd-ci/15/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/notify-osd-trusty-amd64-ci/11
    SUCCESS: http://jenkins.qa.ubuntu.com/job/notify-osd-trusty-armhf-ci/11
    SUCCESS: http://jenkins.qa.ubuntu.com/job/notify-osd-trusty-i386-ci/11

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

review: Approve (continuous-integration)

[Lars Karlitski (larsu)]

Cool, thanks!

review: Approve

=== modified file 'src/bubble.c'
--- src/bubble.c	2012-11-26 20:29:43 +0000
+++ src/bubble.c	2013-12-04 16:45:31 +0000
@@ -3038,6 +3038,11 @@
 {
 	g_return_val_if_fail (IS_BUBBLE (self), FALSE);
 
+	/* This function always returns FALSE, which removes the timer
+	 * source. Unset priv->timer_id so that we don't call
+	 * g_source_remove() on it later. */
+	bubble_set_timer_id (self, 0);
+
 	if (GET_PRIVATE (self)->composited)
 	{
 		bubble_fade_out (self, 300);