aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2011-03-29 21:08:59 +0800
committerGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2011-03-29 21:08:59 +0800
commit42d8206c772865ab8229f01e76d51f7690435a50 (patch)
tree531e8d39f0b29cb00f32b88d70e35a9955e2cd37
parentfd5c50d89b88d0b62692aaf85252cf61eeba3341 (diff)
downloadgsoc2013-empathy-42d8206c772865ab8229f01e76d51f7690435a50.tar
gsoc2013-empathy-42d8206c772865ab8229f01e76d51f7690435a50.tar.gz
gsoc2013-empathy-42d8206c772865ab8229f01e76d51f7690435a50.tar.bz2
gsoc2013-empathy-42d8206c772865ab8229f01e76d51f7690435a50.tar.lz
gsoc2013-empathy-42d8206c772865ab8229f01e76d51f7690435a50.tar.xz
gsoc2013-empathy-42d8206c772865ab8229f01e76d51f7690435a50.tar.zst
gsoc2013-empathy-42d8206c772865ab8229f01e76d51f7690435a50.zip
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
-rw-r--r--src/empathy-event-manager.c14
1 files changed, 4 insertions, 10 deletions
diff --git a/src/empathy-event-manager.c b/src/empathy-event-manager.c
index 799e91abc..e2ad93db3 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);