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

[Guillaume Desmottes <gdesmott src gnome org>]

commit 81073b4ead57026a71a8e192947123aef9f9a3cf
Author: Guillaume Desmottes <guillaume desmottes collabora co uk>
Date:   Thu Jun 17 12:49:26 2010 +0200

    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.

 libempathy/empathy-message.c |    4 ----
 1 files changed, 0 insertions(+), 4 deletions(-)
---
diff --git a/libempathy/empathy-message.c b/libempathy/empathy-message.c
index a46d7d9..85d5cbc 100644
--- 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;
 	}