Empathy Hard code freeze exception request: Shouldn't format notification header (Bug 646097)

[Guillaume Desmottes <gdesmott gnome org>]

Hi guys,

While testing Empathy with gnome-shell I noticed that online/offine
notifications appeared as "<b>Guillaume</b> connected" in the Shell.
I fixed that in https://bugzilla.gnome.org/show_bug.cgi?id=646097

Thanks,

	G.

-- 
Guillaume Desmottes <gdesmott gnome org>
Jabber <cassidy jabber belnet be>
GPG 1024D/711E31B1 | 1B5A 1BA8 11AA F0F1 2169  E28A AC55 8671 711E 31B1

>From 42d8206c772865ab8229f01e76d51f7690435a50 Mon Sep 17 00:00:00 2001
From: Guillaume Desmottes <guillaume desmottes collabora co uk>
Date: Tue, 29 Mar 2011 15:08:59 +0200
Subject: [PATCH] don't format header of presence notifications (#646097)

According to the spec [1], only the Body can be formated.

Furthermore, the Shell doesn't support such formating in the header.

[1] http://www.galago-project.org/specs/notification/0.9/x161.html
---
 src/empathy-event-manager.c |   14 ++++----------
 1 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/src/empathy-event-manager.c b/src/empathy-event-manager.c
index 799e91a..e2ad93d 100644
--- a/src/empathy-event-manager.c
+++ b/src/empathy-event-manager.c
@@ -1097,7 +1097,6 @@ event_manager_presence_changed_cb (EmpathyContact *contact,
 {
   EmpathyEventManagerPriv *priv = GET_PRIV (manager);
   TpAccount *account;
-  gchar *header = NULL;
   EmpathyPresenceManager *presence_mgr;
   GtkWidget *window = empathy_main_window_dup ();
 
@@ -1121,12 +1120,10 @@ event_manager_presence_changed_cb (EmpathyContact *contact,
           if (g_settings_get_boolean (priv->gsettings_notif,
                 EMPATHY_PREFS_NOTIFICATIONS_CONTACT_SIGNOUT))
             {
-              header = g_strdup_printf ("<b>%s</b>",
-                  empathy_contact_get_alias (contact));
-
               event_manager_add (manager, NULL, contact,
                   EMPATHY_EVENT_TYPE_PRESENCE, EMPATHY_IMAGE_AVATAR_DEFAULT,
-                  header, _("Disconnected"), NULL, NULL, NULL);
+                  empathy_contact_get_alias (contact), _("Disconnected"),
+                  NULL, NULL, NULL);
             }
         }
     }
@@ -1143,16 +1140,13 @@ event_manager_presence_changed_cb (EmpathyContact *contact,
           if (g_settings_get_boolean (priv->gsettings_notif,
                 EMPATHY_PREFS_NOTIFICATIONS_CONTACT_SIGNIN))
             {
-              header = g_strdup_printf ("<b>%s</b>",
-                  empathy_contact_get_alias (contact));
-
               event_manager_add (manager, NULL, contact,
                   EMPATHY_EVENT_TYPE_PRESENCE, EMPATHY_IMAGE_AVATAR_DEFAULT,
-                  header, _("Connected"), NULL, NULL, NULL);
+                  empathy_contact_get_alias (contact), _("Connected"),
+                  NULL, NULL, NULL);
             }
         }
     }
-  g_free (header);
 
 out:
   g_object_unref (presence_mgr);
-- 
1.7.4.1