From cdfd5215dfa3e7dfe1254f76a5eccf4b4356816d Mon Sep 17 00:00:00 2001 From: Will Thompson Date: Wed, 1 Feb 2012 14:26:58 +0000 Subject: Chat: show who changed the subject https://bugzilla.gnome.org/show_bug.cgi?id=669177 --- libempathy-gtk/empathy-chat.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'libempathy-gtk') diff --git a/libempathy-gtk/empathy-chat.c b/libempathy-gtk/empathy-chat.c index 8a17189ee..5dda2ce6b 100644 --- a/libempathy-gtk/empathy-chat.c +++ b/libempathy-gtk/empathy-chat.c @@ -1692,7 +1692,14 @@ chat_subject_changed_cb (EmpathyChat *chat) gchar *str = NULL; if (!EMP_STR_EMPTY (priv->subject)) { - str = g_strdup_printf (_("Topic set to: %s"), priv->subject); + const gchar *actor = empathy_tp_chat_get_subject_actor (priv->tp_chat); + + if (tp_str_empty (actor)) { + str = g_strdup_printf (_("Topic set to: %s"), priv->subject); + } else { + str = g_strdup_printf (_("Topic set by %s to: %s"), + actor, priv->subject); + } } else if (empathy_tp_chat_supports_subject (priv->tp_chat)) { /* No need to display this 'event' is no topic can be defined anyway */ str = g_strdup (_("No topic defined")); -- cgit v1.2.3