empathy r2610 - trunk/libempathy

[xclaesse svn gnome org]

Author: xclaesse
Date: Fri Mar  6 11:53:04 2009
New Revision: 2610
URL: http://svn.gnome.org/viewvc/empathy?rev=2610&view=rev

Log:
Call GET_PRIV after checking the parameters of empathy_message_equal.

Signed-off-by: Jonny Lamb <jonny lamb collabora co uk>

Modified:
   trunk/libempathy/empathy-message.c

Modified: trunk/libempathy/empathy-message.c
==============================================================================
--- trunk/libempathy/empathy-message.c	(original)
+++ trunk/libempathy/empathy-message.c	Fri Mar  6 11:53:04 2009
@@ -509,12 +509,15 @@
 gboolean
 empathy_message_equal (EmpathyMessage *message1, EmpathyMessage *message2)
 {
-	EmpathyMessagePriv *priv1 = GET_PRIV (message1);
-	EmpathyMessagePriv *priv2 = GET_PRIV (message2);
+	EmpathyMessagePriv *priv1;
+	EmpathyMessagePriv *priv2;
 
 	g_return_val_if_fail (EMPATHY_IS_MESSAGE (message1), FALSE);
 	g_return_val_if_fail (EMPATHY_IS_MESSAGE (message2), FALSE);
 
+	priv1 = GET_PRIV (message1);
+	priv2 = GET_PRIV (message2);
+
 	if (priv1->id == priv2->id && g_str_hash (priv1->body) == g_str_hash (priv2->body)) {
 		return TRUE;
 	}