aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2010-06-18 17:23:45 +0800
committerGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2010-06-18 17:23:45 +0800
commit247ea7a25d8495d2f1cd2b6ac2bf6fe582a3c5fb (patch)
tree2816208bf03048ca59aff52fbb3b2543efe8feb6
parent5185368aeb46bbf1380b4a80248e401f08a82ac0 (diff)
downloadgsoc2013-empathy-247ea7a25d8495d2f1cd2b6ac2bf6fe582a3c5fb.tar
gsoc2013-empathy-247ea7a25d8495d2f1cd2b6ac2bf6fe582a3c5fb.tar.gz
gsoc2013-empathy-247ea7a25d8495d2f1cd2b6ac2bf6fe582a3c5fb.tar.bz2
gsoc2013-empathy-247ea7a25d8495d2f1cd2b6ac2bf6fe582a3c5fb.tar.lz
gsoc2013-empathy-247ea7a25d8495d2f1cd2b6ac2bf6fe582a3c5fb.tar.xz
gsoc2013-empathy-247ea7a25d8495d2f1cd2b6ac2bf6fe582a3c5fb.tar.zst
gsoc2013-empathy-247ea7a25d8495d2f1cd2b6ac2bf6fe582a3c5fb.zip
rename channel_claim_cb to reject_channel_claim_cb
-rw-r--r--src/empathy-event-manager.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/empathy-event-manager.c b/src/empathy-event-manager.c
index 4a19b52eb..7d144dda8 100644
--- a/src/empathy-event-manager.c
+++ b/src/empathy-event-manager.c
@@ -352,7 +352,7 @@ event_update (EmpathyEventManager *manager, EventPriv *event,
}
static void
-channel_claim_cb (GObject *source,
+reject_channel_claim_cb (GObject *source,
GAsyncResult *result,
gpointer user_data)
{
@@ -383,8 +383,9 @@ out:
static void
reject_approval (EventManagerApproval *approval)
{
+ /* We have to claim the channel before closing it */
tp_channel_dispatch_operation_claim_async (approval->operation,
- channel_claim_cb, g_object_ref (approval->handler_instance));
+ reject_channel_claim_cb, g_object_ref (approval->handler_instance));
}
static void