empathy_message_equal: always use the timestamp+body (#621797)

There is no reason to only use this new heuristic only in the TPL case.
Furthermore, we're about to make TPL mandatory so it's good to have it more
tested.

diff --git a/libempathy/empathy-message.c b/libempathy/empathy-message.c
index a46d7d9a735163fff332f002f7ddda3778010c1f..85d5cbc588bf107e5cce92eef8057e2d71b03540 100644 (file)
--- a/libempathy/empathy-message.c
+++ b/libempathy/empathy-message.c
@@ -666,12 +666,8 @@ empathy_message_equal (EmpathyMessage *message1, EmpathyMessage *message2)
        priv1 = GET_PRIV (message1);
        priv2 = GET_PRIV (message2);
 
-#ifdef ENABLE_TPL
        if (priv1->timestamp == priv2->timestamp &&
                        !tp_strdiff (priv1->body, priv2->body)) {
-#else
-       if (priv1->id == priv2->id && !tp_strdiff (priv1->body, priv2->body)) {
-#endif /* ENABLE_TPL */
                return TRUE;
        }