diff options
| author | Patryk Zawadzki <patrys@pld-linux.org> | 2009-06-16 21:37:08 +0800 |
|---|---|---|
| committer | Patryk Zawadzki <patrys@pld-linux.org> | 2009-06-16 21:37:08 +0800 |
| commit | 40d33622db46952e016cc8e540403cccb7ba6103 (patch) | |
| tree | f26977dd5915f8df13e60faa61b943890bb6575f /libempathy-gtk | |
| parent | cea163a21118f4f06aa6c37fa4463f9666a63019 (diff) | |
| download | gsoc2013-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')
| -rw-r--r-- | libempathy-gtk/empathy-theme-adium.c | 4 | ||||
| -rw-r--r-- | libempathy-gtk/empathy-theme-boxes.c | 2 |
2 files changed, 3 insertions, 3 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; diff --git a/libempathy-gtk/empathy-theme-boxes.c b/libempathy-gtk/empathy-theme-boxes.c index 199132956..64d95d4f2 100644 --- a/libempathy-gtk/empathy-theme-boxes.c +++ b/libempathy-gtk/empathy-theme-boxes.c @@ -210,7 +210,7 @@ theme_boxes_maybe_append_header (EmpathyThemeBoxes *theme, /* Only insert a header if the previously inserted block is not the same * as this one. */ - if (last_contact == contact) { + if (empathy_contact_equal (last_contact, contact)) { return; } |