Merge lp:~3v1n0/notify-osd/fix-empty-newlines-appending into lp:notify-osd

[Marco Trevisan (Treviño)]

Bubble: don't append new lines when receiving empty bodies

Delay the addition of new lines until there's some real content to append.

To be tested with something like

from gi.repository import Notify
from time import sleep

Notify.init("Test App")

for i in range(10):
    n = Notify.Notification.new("Title", "" if i % 3 else "test {}".format(i))
    n.set_hint_string("append", "true")
    n.show()
    sleep(1)

[Andrea Azzarone (azzar1)]

+1

review: Approve

[lp:~3v1n0/notify-osd/fix-empty-newlines-appending]

508. By Marco Trevisan (Treviño) on 2016-04-15

Bubble: strip body text when adding it

509. By Marco Trevisan (Treviño) on 2016-04-15

Bubble: Indentation fixes

510. By Marco Trevisan (Treviño) on 2016-04-15

Merging changelog from landing silo

=== modified file 'debian/changelog'
--- debian/changelog	2015-12-01 08:28:52 +0000
+++ debian/changelog	2016-04-15 11:52:53 +0000
@@ -1,3 +1,10 @@
+notify-osd (0.9.35+16.04.20160413-0ubuntu1) xenial; urgency=medium
+
+  * Stack: allow to replace a notification when the replace_id has been
+    provided (LP: #1569682)
+
+ -- Marco Trevisan (Treviño) <[e-mail]>  Wed, 13 Apr 2016 05:36:20 +0000
+
 notify-osd (0.9.35+16.04.20151201-0ubuntu1) xenial; urgency=medium
 
   [ CI Train Bot ]
 
=== modified file 'src/bubble.c'
--- src/bubble.c	2015-11-27 18:34:49 +0000
+++ src/bubble.c	2016-04-15 11:52:53 +0000
@@ -2323,6 +2323,7 @@
 
 	// filter out any HTML/markup if possible
 	text = filter_text (body);
+	g_strstrip (text);
 
 	if (priv->message_body)
 		if (g_strcmp0 (priv->message_body->str, text))
@@ -3766,7 +3767,36 @@
 
 	if (text)
 	{
+		g_strstrip (text);
+
+		if (text[0] == '\0')
+		{
+			if (priv->message_body->len > 0 &&
+			    priv->message_body->str[priv->message_body->len-1] != '\n')
+			{
+				// This is a special combination, that allows us to remember that a
+				// new empty body line has been requested, but we won't show this till
+				// something visible will be appended.
+				g_string_append_c (priv->message_body, '\0');
+				g_string_append_c (priv->message_body, '\n');
+			}
+
+			g_free (text);
+			return;
+		}
+
+		if (priv->message_body->len > 1)
+		{
+			if (priv->message_body->str[priv->message_body->len-1] == '\n' &&
+			    priv->message_body->str[priv->message_body->len-2] == '\0')
+			{
+				// A new message has been appended, let's remove the \0 we put before.
+				g_string_erase (priv->message_body, priv->message_body->len-2, 1);
+			}
+		}
+
 		// append text to current message-body
+		g_string_append_c (priv->message_body, '\n');
 		g_string_append (priv->message_body, text);
 		priv->message_body_needs_refresh = TRUE;
 
 
=== modified file 'src/stack.c'
--- src/stack.c	2016-04-15 11:52:52 +0000
+++ src/stack.c	2016-04-15 11:52:53 +0000
@@ -682,7 +682,6 @@
 			g_object_unref(bubble);
 			bubble = app_bubble;
 			if (body) {
-				bubble_append_message_body (bubble, "\n");
 				bubble_append_message_body (bubble, body);
 			}
 		}