Merge lp:~larsu/notify-osd/fix-1189281 into lp:notify-osd

[Lars Karlitski]

Don't crash when an application is fullscreen when a notification arrives.

Don't crash when an application is fullscreen when a notification arrives.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:466
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/fix-1189281/+merge/168550/+edit-commit-message

http://jenkins.qa.ubuntu.com/job/notify-osd-ci/2/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-coverity-check/31/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/notify-osd-saucy-amd64-ci/1
    SUCCESS: http://jenkins.qa.ubuntu.com/job/notify-osd-saucy-armhf-ci/1
    SUCCESS: http://jenkins.qa.ubuntu.com/job/notify-osd-saucy-i386-ci/1
Coverity artifacts:
    http://jenkins.qa.ubuntu.com/job/generic-coverity-check/31/artifact/results/coverity/CID_10932.html
    http://jenkins.qa.ubuntu.com/job/generic-coverity-check/31/artifact/results/coverity/CID_10933.html
    http://jenkins.qa.ubuntu.com/job/generic-coverity-check/31/artifact/results/coverity/CID_10934.html
    http://jenkins.qa.ubuntu.com/job/generic-coverity-check/31/artifact/results/coverity/CID_10935.html
    http://jenkins.qa.ubuntu.com/job/generic-coverity-check/31/artifact/results/coverity/CID_10936.html
    http://jenkins.qa.ubuntu.com/job/generic-coverity-check/31/artifact/results/coverity/CID_10937.html
    http://jenkins.qa.ubuntu.com/job/generic-coverity-check/31/artifact/results/coverity/CID_10938.html
    http://jenkins.qa.ubuntu.com/job/generic-coverity-check/31/artifact/results/coverity/CID_10939.html
    http://jenkins.qa.ubuntu.com/job/generic-coverity-check/31/artifact/results/coverity/CID_10940.html
    http://jenkins.qa.ubuntu.com/job/generic-coverity-check/31/artifact/results/coverity/CID_10941.html
    http://jenkins.qa.ubuntu.com/job/generic-coverity-check/31/artifact/results/coverity/CID_13648.html
    http://jenkins.qa.ubuntu.com/job/generic-coverity-check/31/artifact/results/coverity/CID_13649.html

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

review: Needs Fixing (continuous-integration)

[Mirco Müller (macslow)]

Looks ok.

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/notify-osd-autolanding/6/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-coverity-check/33/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/notify-osd-saucy-amd64-autolanding/1
    SUCCESS: http://jenkins.qa.ubuntu.com/job/notify-osd-saucy-armhf-autolanding/1
    SUCCESS: http://jenkins.qa.ubuntu.com/job/notify-osd-saucy-i386-autolanding/1
Coverity artifacts:
    http://jenkins.qa.ubuntu.com/job/generic-coverity-check/33/artifact/results/coverity/CID_10932.html
    http://jenkins.qa.ubuntu.com/job/generic-coverity-check/33/artifact/results/coverity/CID_10933.html
    http://jenkins.qa.ubuntu.com/job/generic-coverity-check/33/artifact/results/coverity/CID_10934.html
    http://jenkins.qa.ubuntu.com/job/generic-coverity-check/33/artifact/results/coverity/CID_10935.html
    http://jenkins.qa.ubuntu.com/job/generic-coverity-check/33/artifact/results/coverity/CID_10936.html
    http://jenkins.qa.ubuntu.com/job/generic-coverity-check/33/artifact/results/coverity/CID_10937.html
    http://jenkins.qa.ubuntu.com/job/generic-coverity-check/33/artifact/results/coverity/CID_10938.html
    http://jenkins.qa.ubuntu.com/job/generic-coverity-check/33/artifact/results/coverity/CID_10939.html
    http://jenkins.qa.ubuntu.com/job/generic-coverity-check/33/artifact/results/coverity/CID_10940.html
    http://jenkins.qa.ubuntu.com/job/generic-coverity-check/33/artifact/results/coverity/CID_10941.html
    http://jenkins.qa.ubuntu.com/job/generic-coverity-check/33/artifact/results/coverity/CID_13648.html
    http://jenkins.qa.ubuntu.com/job/generic-coverity-check/33/artifact/results/coverity/CID_13649.html

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:466
http://jenkins.qa.ubuntu.com/job/notify-osd-ci/3/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-coverity-check/32/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/notify-osd-saucy-amd64-ci/2
    SUCCESS: http://jenkins.qa.ubuntu.com/job/notify-osd-saucy-armhf-ci/2
    SUCCESS: http://jenkins.qa.ubuntu.com/job/notify-osd-saucy-i386-ci/2
Coverity artifacts:
    http://jenkins.qa.ubuntu.com/job/generic-coverity-check/32/artifact/results/coverity/CID_10932.html
    http://jenkins.qa.ubuntu.com/job/generic-coverity-check/32/artifact/results/coverity/CID_10933.html
    http://jenkins.qa.ubuntu.com/job/generic-coverity-check/32/artifact/results/coverity/CID_10934.html
    http://jenkins.qa.ubuntu.com/job/generic-coverity-check/32/artifact/results/coverity/CID_10935.html
    http://jenkins.qa.ubuntu.com/job/generic-coverity-check/32/artifact/results/coverity/CID_10936.html
    http://jenkins.qa.ubuntu.com/job/generic-coverity-check/32/artifact/results/coverity/CID_10937.html
    http://jenkins.qa.ubuntu.com/job/generic-coverity-check/32/artifact/results/coverity/CID_10938.html
    http://jenkins.qa.ubuntu.com/job/generic-coverity-check/32/artifact/results/coverity/CID_10939.html
    http://jenkins.qa.ubuntu.com/job/generic-coverity-check/32/artifact/results/coverity/CID_10940.html
    http://jenkins.qa.ubuntu.com/job/generic-coverity-check/32/artifact/results/coverity/CID_10941.html
    http://jenkins.qa.ubuntu.com/job/generic-coverity-check/32/artifact/results/coverity/CID_13648.html
    http://jenkins.qa.ubuntu.com/job/generic-coverity-check/32/artifact/results/coverity/CID_13649.html

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:466
http://jenkins.qa.ubuntu.com/job/notify-osd-ci/4/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-coverity-check/34
    SUCCESS: http://jenkins.qa.ubuntu.com/job/notify-osd-saucy-amd64-ci/3
    SUCCESS: http://jenkins.qa.ubuntu.com/job/notify-osd-saucy-armhf-ci/3
    SUCCESS: http://jenkins.qa.ubuntu.com/job/notify-osd-saucy-i386-ci/3
Coverity artifacts:
    http://jenkins.qa.ubuntu.com/job/generic-coverity-check/34/artifact/results/coverity/NO_COVERITY_DEFECTS.txt

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

review: Approve (continuous-integration)

=== modified file 'src/display.c'
--- src/display.c	2012-08-29 22:05:41 +0000
+++ src/display.c	2013-06-10 21:39:30 +0000
@@ -278,7 +278,8 @@
 	return next_to_display;
 }
 
-static void
+/* Returns true if the next bubble is shown */
+static gboolean
 stack_layout (Stack* self)
 {
 	Bubble*    bubble = NULL;
@@ -294,7 +295,7 @@
 		/* this actually happens when we're called for a synchronous
 		   bubble or after a bubble timed out, but there where no other
 		   notifications waiting in the queue */
-		return;
+		return FALSE;
 
 	if (dnd_dont_disturb_user ()
 	    && (! bubble_is_urgent (bubble)))
@@ -310,7 +311,7 @@
 		/* loop, in case there are other bubbles to discard */
 		stack_layout (self);
 
-		return;
+		return FALSE;
 	}
 
 	bubble_set_timeout (bubble,
@@ -428,4 +429,6 @@
 		bubble_fade_in (bubble, 100);
 	else 
 		bubble_fade_in (bubble, 200);
+
+	return TRUE;
 }

=== modified file 'src/stack.c'
--- src/stack.c	2012-08-29 22:05:41 +0000
+++ src/stack.c	2013-06-10 21:39:30 +0000
@@ -575,6 +575,7 @@
 	GdkPixbuf* pixbuf     = NULL;
 	gboolean   new_bubble = FALSE;
 	gboolean   turn_into_dialog;
+	guint      real_id;
 
 	// check max. allowed limit queue-size
 	if (g_list_length (self->list) > MAX_STACK_SIZE)
@@ -660,6 +661,8 @@
 		}
 	}
 
+	real_id = bubble_get_id (bubble);
+
 	if (hints)
 	{
 		data   = (GValue*) g_hash_table_lookup (hints, "x-canonical-private-synchronous");
@@ -769,11 +772,11 @@
 
 		/* update the layout of the stack;
 		 * this will also open the new bubble */
-		stack_layout (self);
+		if (!stack_layout (self))
+			bubble = NULL;
 	}
 
-	if (bubble)
-		dbus_g_method_return (context, bubble_get_id (bubble));
+	dbus_g_method_return (context, real_id);
 
 	// FIXME: this is a temporary work-around, I do not like at all, until
 	// the heavy memory leakage of notify-osd is fully fixed...