diff options
| author | Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk> | 2011-06-22 00:53:07 +0800 |
|---|---|---|
| committer | Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk> | 2011-07-05 00:50:21 +0800 |
| commit | 858a4d27abd2f040d44eaeda17f618a1a63b1631 (patch) | |
| tree | 536e016b2b4aa3ffe8dbfb4e755d4f94d4831fc3 /libempathy-gtk | |
| parent | 247f9a497a9dee8eb62d08cb161b9a5e1d7a6562 (diff) | |
| download | gsoc2013-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')
| -rw-r--r-- | libempathy-gtk/empathy-theme-adium.c | 2 | ||||
| -rw-r--r-- | libempathy-gtk/empathy-theme-boxes.c | 4 | ||||
| -rw-r--r-- | libempathy-gtk/empathy-theme-irc.c | 4 |
3 files changed, 5 insertions, 5 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); diff --git a/libempathy-gtk/empathy-theme-boxes.c b/libempathy-gtk/empathy-theme-boxes.c index c0377b6ae..7bfc313e1 100644 --- a/libempathy-gtk/empathy-theme-boxes.c +++ b/libempathy-gtk/empathy-theme-boxes.c @@ -206,7 +206,7 @@ theme_boxes_maybe_append_header (EmpathyThemeBoxes *theme, gboolean consecutive; contact = empathy_message_get_sender (msg); - name = empathy_contact_get_alias (contact); + name = empathy_contact_get_logged_alias (contact); last_contact = empathy_chat_text_view_get_last_contact (view); buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (theme)); time_ = empathy_message_get_timestamp (msg); @@ -349,7 +349,7 @@ theme_boxes_append_message (EmpathyChatTextView *view, gchar *body; body = g_strdup_printf (" * %s %s", - empathy_contact_get_alias (sender), + empathy_contact_get_logged_alias (sender), empathy_message_get_body (message)); empathy_chat_text_view_append_body (EMPATHY_CHAT_TEXT_VIEW (view), body, diff --git a/libempathy-gtk/empathy-theme-irc.c b/libempathy-gtk/empathy-theme-irc.c index afd59523e..2ee81a23e 100644 --- a/libempathy-gtk/empathy-theme-irc.c +++ b/libempathy-gtk/empathy-theme-irc.c @@ -62,11 +62,11 @@ theme_irc_append_message (EmpathyChatTextView *view, buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (view)); contact = empathy_message_get_sender (message); - name = empathy_contact_get_alias (contact); + name = empathy_contact_get_logged_alias (contact); if (empathy_message_get_tptype (message) == TP_CHANNEL_TEXT_MESSAGE_TYPE_ACTION) { tmp = g_strdup_printf (" * %s %s", - empathy_contact_get_alias (contact), + empathy_contact_get_logged_alias (contact), empathy_message_get_body (message)); empathy_chat_text_view_append_body (view, tmp, EMPATHY_CHAT_TEXT_VIEW_TAG_ACTION); |