[empathy] Revert "Escape the header of the notification (#599431)"



commit 939f04e4a193187fb4bc79a0ecf2ab3c580dc661
Author: Guillaume Desmottes <guillaume desmottes collabora co uk>
Date:   Tue Jan 12 17:05:09 2010 +0000

    Revert "Escape the header of the notification (#599431)"
    
    This reverts commit 4363fe7a71208ee2d696211838f028ef97700b45.
    
    According to the notification spec, headers should not be escaped.
    Escaping them leads to displaying escaped text in the notification with some
    daemon (#603498).
    
    The bug #599431 was probably due to a bug in the notification-daemon and seems
    to work fine now.

 src/empathy-status-icon.c |    9 ++-------
 1 files changed, 2 insertions(+), 7 deletions(-)
---
diff --git a/src/empathy-status-icon.c b/src/empathy-status-icon.c
index c6acb03..2dabc54 100644
--- a/src/empathy-status-icon.c
+++ b/src/empathy-status-icon.c
@@ -154,21 +154,17 @@ status_icon_update_notification (EmpathyStatusIcon *icon)
 
 	if (priv->event) {
 		gchar *message_esc = NULL;
-		gchar *header_esc = NULL;
 
 		if (priv->event->message != NULL)
 			message_esc = g_markup_escape_text (priv->event->message, -1);
 
-		if (priv->event->header != NULL)
-			header_esc = g_markup_escape_text (priv->event->header, -1);
-
 		if (priv->notification) {
 			notify_notification_update (priv->notification,
-						    header_esc, message_esc,
+						    priv->event->header, message_esc,
 						    NULL);
 		} else {
 			priv->notification = notify_notification_new_with_status_icon
-				(header_esc, message_esc, NULL, priv->icon);
+				(priv->event->header, message_esc, NULL, priv->icon);
 			notify_notification_set_timeout (priv->notification,
 							 NOTIFY_EXPIRES_DEFAULT);
 
@@ -199,7 +195,6 @@ status_icon_update_notification (EmpathyStatusIcon *icon)
 		notify_notification_show (priv->notification, NULL);
 
 		g_free (message_esc);
-		g_free (header_esc);
 	} else {
 		notification_close_helper (priv);
 	}



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]