aboutsummaryrefslogtreecommitdiffstats
path: root/libempathy-gtk/empathy-theme-adium.c
diff options
context:
space:
mode:
authorEmilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>2011-06-22 00:53:07 +0800
committerEmilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>2011-07-05 00:50:21 +0800
commit858a4d27abd2f040d44eaeda17f618a1a63b1631 (patch)
tree536e016b2b4aa3ffe8dbfb4e755d4f94d4831fc3 /libempathy-gtk/empathy-theme-adium.c
parent247f9a497a9dee8eb62d08cb161b9a5e1d7a6562 (diff)
downloadgsoc2013-empathy-858a4d27abd2f040d44eaeda17f618a1a63b1631.tar
gsoc2013-empathy-858a4d27abd2f040d44eaeda17f618a1a63b1631.tar.gz
gsoc2013-empathy-858a4d27abd2f040d44eaeda17f618a1a63b1631.tar.bz2
gsoc2013-empathy-858a4d27abd2f040d44eaeda17f618a1a63b1631.tar.lz
gsoc2013-empathy-858a4d27abd2f040d44eaeda17f618a1a63b1631.tar.xz
gsoc2013-empathy-858a4d27abd2f040d44eaeda17f618a1a63b1631.tar.zst
gsoc2013-empathy-858a4d27abd2f040d44eaeda17f618a1a63b1631.zip
empathy_contact_from_tpl_contact: don't override the alias
Add a logged-alias property instead, which can be used by those who need the old alias. And use it in chat themes for the backlog.
Diffstat (limited to 'libempathy-gtk/empathy-theme-adium.c')
-rw-r--r--libempathy-gtk/empathy-theme-adium.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libempathy-gtk/empathy-theme-adium.c b/libempathy-gtk/empathy-theme-adium.c
index bb2b189ca..de9716960 100644
--- a/libempathy-gtk/empathy-theme-adium.c
+++ b/libempathy-gtk/empathy-theme-adium.c
@@ -897,7 +897,7 @@ theme_adium_append_message (EmpathyChatView *view,
body_escaped = theme_adium_parse_body (theme,
empathy_message_get_body (msg),
empathy_message_get_token (msg));
- name = empathy_contact_get_alias (sender);
+ name = empathy_contact_get_logged_alias (sender);
contact_id = empathy_contact_get_id (sender);
action = (empathy_message_get_tptype (msg) == TP_CHANNEL_TEXT_MESSAGE_TYPE_ACTION);