Merge lp:~3v1n0/notify-osd/fix-notifications-replacing into lp:notify-osd

[Marco Trevisan (Treviño)]

Stack: allow to replace a notification when the replace_id has been provided

This fixes the case where we want to replace a notification with a given
ID that is about to show or currently visible. As the NotifyOSD and Desktop
Notification protocols expect.

[lp:~3v1n0/notify-osd/fix-notifications-replacing]

506. By Marco Trevisan (Treviño) on 2016-04-13

Stack: indentation fix

[Andrea Azzarone (azzar1)]

LGTM.

review: Approve

=== modified file 'src/stack.c'
--- src/stack.c	2015-11-12 08:51:08 +0000
+++ src/stack.c	2016-04-13 05:32:07 +0000
@@ -388,8 +388,10 @@
 	if (!self || !IS_BUBBLE (bubble))
 		return -1;
 
+	notification_id = bubble_get_id (bubble);
+
 	/* check if this is just an update */
-	if (find_bubble_by_id (self, bubble_get_id (bubble)))
+	if (find_bubble_by_id (self, notification_id))
 	{
 		bubble_start_timer (bubble, TRUE);
 		bubble_refresh (bubble);
@@ -400,11 +402,17 @@
 			if (stack_is_at_top_corner (self, sync_bubble))
 				bubble_sync_with (sync_bubble, bubble);
 
-		return bubble_get_id (bubble);
+		return notification_id;
 	}
 
 	/* add bubble/id to stack */
-	notification_id = self->next_id++;
+	if (notification_id == 0)
+	{
+		do
+		{
+			notification_id = self->next_id++;
+		} while (find_bubble_by_id (self, notification_id));
+	}
 
 	// FIXME: migrate stack to use abstract notification object and don't
 	// keep heavy bubble objects around, at anyone time at max. only two
@@ -582,6 +590,7 @@
 	gboolean   new_bubble = FALSE;
 	gboolean   turn_into_dialog;
 	guint      real_id;
+	gchar     *sender;
 
 	// check max. allowed limit queue-size
 	if (g_list_length (self->list) > MAX_STACK_SIZE)
@@ -620,22 +629,34 @@
 		return TRUE;
 	}
 
-        // check if a bubble exists with same id
+	// check if a bubble exists with same id
 	bubble = find_bubble_by_id (self, id);
+	sender = dbus_g_method_get_sender (context);
+
+	if (bubble)
+	{
+		if (g_strcmp0 (bubble_get_sender (bubble), sender) != 0)
+		{
+			// Another sender is trying to replace a notification, let's block it!
+			id = 0;
+			bubble = NULL;
+		}
+	}
+
 	if (bubble == NULL)
 	{
-		gchar *sender;
 		new_bubble = TRUE;
 		bubble = bubble_new (self->defaults);
 		g_object_weak_ref (G_OBJECT (bubble),
 				   _weak_notify_cb,
 				   (gpointer) self);
-		
-		sender = dbus_g_method_get_sender (context);
+
 		bubble_set_sender (bubble, sender);
-		g_free (sender);
+		bubble_set_id (bubble, id);
 	}
 
+	g_free (sender);
+
 	if (new_bubble && hints)
 	{
 		data   = (GValue*) g_hash_table_lookup (hints, "x-canonical-append");