aboutsummaryrefslogtreecommitdiffstats
path: root/src/empathy-status-icon.c
diff options
context:
space:
mode:
authorGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2010-01-13 01:05:09 +0800
committerGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2010-01-13 01:05:16 +0800
commit939f04e4a193187fb4bc79a0ecf2ab3c580dc661 (patch)
tree53ca90f812a8cf989eab4852ab57a79aa151748d /src/empathy-status-icon.c
parent0ee842ac627f30fa14d75b06cd7147a67090731e (diff)
downloadgsoc2013-empathy-939f04e4a193187fb4bc79a0ecf2ab3c580dc661.tar
gsoc2013-empathy-939f04e4a193187fb4bc79a0ecf2ab3c580dc661.tar.gz
gsoc2013-empathy-939f04e4a193187fb4bc79a0ecf2ab3c580dc661.tar.bz2
gsoc2013-empathy-939f04e4a193187fb4bc79a0ecf2ab3c580dc661.tar.lz
gsoc2013-empathy-939f04e4a193187fb4bc79a0ecf2ab3c580dc661.tar.xz
gsoc2013-empathy-939f04e4a193187fb4bc79a0ecf2ab3c580dc661.tar.zst
gsoc2013-empathy-939f04e4a193187fb4bc79a0ecf2ab3c580dc661.zip
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.
Diffstat (limited to 'src/empathy-status-icon.c')
-rw-r--r--src/empathy-status-icon.c9
1 files changed, 2 insertions, 7 deletions
diff --git a/src/empathy-status-icon.c b/src/empathy-status-icon.c
index c6acb033f..2dabc5446 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);
}