aboutsummaryrefslogtreecommitdiffstats
path: root/libempathy-gtk
diff options
context:
space:
mode:
authorTravis Reitter <travis.reitter@collabora.co.uk>2011-05-03 08:05:19 +0800
committerTravis Reitter <travis.reitter@collabora.co.uk>2011-06-07 00:30:51 +0800
commita17f14769b6867e240f1f79288ed1d33ec51760b (patch)
treeb339fc794850342d4839eea1d30ea3b9c9c4c934 /libempathy-gtk
parentfcce5893bda44c7e9276b47ba1f9c20b84da8b9e (diff)
downloadgsoc2013-empathy-a17f14769b6867e240f1f79288ed1d33ec51760b.tar
gsoc2013-empathy-a17f14769b6867e240f1f79288ed1d33ec51760b.tar.gz
gsoc2013-empathy-a17f14769b6867e240f1f79288ed1d33ec51760b.tar.bz2
gsoc2013-empathy-a17f14769b6867e240f1f79288ed1d33ec51760b.tar.lz
gsoc2013-empathy-a17f14769b6867e240f1f79288ed1d33ec51760b.tar.xz
gsoc2013-empathy-a17f14769b6867e240f1f79288ed1d33ec51760b.tar.zst
gsoc2013-empathy-a17f14769b6867e240f1f79288ed1d33ec51760b.zip
Don't shadow the global definition of 'log'.
Diffstat (limited to 'libempathy-gtk')
-rw-r--r--libempathy-gtk/empathy-chat.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/libempathy-gtk/empathy-chat.c b/libempathy-gtk/empathy-chat.c
index f026bbc8e..74ee8ec96 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)) {