[empathy] Don't shadow the global definition of 'log'.

[Travis Reitter <treitter src gnome org>]

commit a17f14769b6867e240f1f79288ed1d33ec51760b
Author: Travis Reitter <travis reitter collabora co uk>
Date:   Mon May 2 17:05:19 2011 -0700

    Don't shadow the global definition of 'log'.

 libempathy-gtk/empathy-chat.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)
---
diff --git a/libempathy-gtk/empathy-chat.c b/libempathy-gtk/empathy-chat.c
index f026bbc..74ee8ec 100644
--- a/libempathy-gtk/empathy-chat.c
+++ b/libempathy-gtk/empathy-chat.c
@@ -2248,7 +2248,7 @@ chat_input_populate_popup_cb (GtkTextView *view,
 
 
 static gboolean
-chat_log_filter (TplEvent *log,
+chat_log_filter (TplEvent *event,
 		 gpointer user_data)
 {
 	EmpathyChat *chat = user_data;
@@ -2256,11 +2256,11 @@ chat_log_filter (TplEvent *log,
 	EmpathyChatPriv *priv = GET_PRIV (chat);
 	const GList *pending;
 
-	g_return_val_if_fail (TPL_IS_EVENT (log), FALSE);
+	g_return_val_if_fail (TPL_IS_EVENT (event), FALSE);
 	g_return_val_if_fail (EMPATHY_IS_CHAT (chat), FALSE);
 
 	pending = empathy_tp_chat_get_pending_messages (priv->tp_chat);
-	message = empathy_message_from_tpl_log_event (log);
+	message = empathy_message_from_tpl_log_event (event);
 
 	for (; pending; pending = g_list_next (pending)) {
 		if (empathy_message_equal (message, pending->data)) {