aboutsummaryrefslogtreecommitdiffstats
path: root/libempathy-gtk/empathy-theme-adium.c
diff options
context:
space:
mode:
authorPatryk Zawadzki <patrys@pld-linux.org>2009-06-16 21:37:08 +0800
committerPatryk Zawadzki <patrys@pld-linux.org>2009-06-16 21:37:08 +0800
commit40d33622db46952e016cc8e540403cccb7ba6103 (patch)
treef26977dd5915f8df13e60faa61b943890bb6575f /libempathy-gtk/empathy-theme-adium.c
parentcea163a21118f4f06aa6c37fa4463f9666a63019 (diff)
downloadgsoc2013-empathy-40d33622db46952e016cc8e540403cccb7ba6103.tar
gsoc2013-empathy-40d33622db46952e016cc8e540403cccb7ba6103.tar.gz
gsoc2013-empathy-40d33622db46952e016cc8e540403cccb7ba6103.tar.bz2
gsoc2013-empathy-40d33622db46952e016cc8e540403cccb7ba6103.tar.lz
gsoc2013-empathy-40d33622db46952e016cc8e540403cccb7ba6103.tar.xz
gsoc2013-empathy-40d33622db46952e016cc8e540403cccb7ba6103.tar.zst
gsoc2013-empathy-40d33622db46952e016cc8e540403cccb7ba6103.zip
Introduce empathy_contact_equal, adapt themes
Fixed adium and boxes theme engines to check if contacts refer to the same id instead of comparing pointers. This fixes bug #585885.
Diffstat (limited to 'libempathy-gtk/empathy-theme-adium.c')
-rw-r--r--libempathy-gtk/empathy-theme-adium.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/libempathy-gtk/empathy-theme-adium.c b/libempathy-gtk/empathy-theme-adium.c
index 82384acd1..321d1998c 100644
--- a/libempathy-gtk/empathy-theme-adium.c
+++ b/libempathy-gtk/empathy-theme-adium.c
@@ -500,7 +500,8 @@ theme_adium_append_message (EmpathyChatView *view,
}
/* Get the right html/func to add the message */
- if (priv->last_contact == sender) {
+ func = "appendMessage";
+ if (empathy_contact_equal (priv->last_contact, sender)) {
func = "appendNextMessage";
if (empathy_contact_is_user (sender)) {
html = priv->out_nextcontent_html;
@@ -512,7 +513,6 @@ theme_adium_append_message (EmpathyChatView *view,
}
}
if (!html) {
- func = "appendMessage";
if (empathy_contact_is_user (sender)) {
html = priv->out_content_html;
len = priv->out_content_len;