diff options
| author | Will Thompson <will.thompson@collabora.co.uk> | 2012-02-01 22:26:58 +0800 |
|---|---|---|
| committer | Will Thompson <will.thompson@collabora.co.uk> | 2012-02-02 01:28:47 +0800 |
| commit | cdfd5215dfa3e7dfe1254f76a5eccf4b4356816d (patch) | |
| tree | ac44db6f3d61d3e9a08fc0b6a7c52e7755604597 /libempathy-gtk | |
| parent | 0dc2ba9ea63c7d7d7f46b4d4e8b9311dfad823bb (diff) | |
| download | gsoc2013-empathy-cdfd5215dfa3e7dfe1254f76a5eccf4b4356816d.tar gsoc2013-empathy-cdfd5215dfa3e7dfe1254f76a5eccf4b4356816d.tar.gz gsoc2013-empathy-cdfd5215dfa3e7dfe1254f76a5eccf4b4356816d.tar.bz2 gsoc2013-empathy-cdfd5215dfa3e7dfe1254f76a5eccf4b4356816d.tar.lz gsoc2013-empathy-cdfd5215dfa3e7dfe1254f76a5eccf4b4356816d.tar.xz gsoc2013-empathy-cdfd5215dfa3e7dfe1254f76a5eccf4b4356816d.tar.zst gsoc2013-empathy-cdfd5215dfa3e7dfe1254f76a5eccf4b4356816d.zip | |
Chat: show who changed the subject
https://bugzilla.gnome.org/show_bug.cgi?id=669177
Diffstat (limited to 'libempathy-gtk')
| -rw-r--r-- | libempathy-gtk/empathy-chat.c | 9 |
1 files changed, 8 insertions, 1 deletions
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")); |