[empathy/next] CDO operations are now singular

[Guillaume Desmottes <gdesmott src gnome org>]

commit 51ab04ae46e93109b1edae269e52fbf2f970daea
Author: Guillaume Desmottes <guillaume desmottes collabora co uk>
Date:   Mon Jan 27 13:27:46 2014 +0100

    CDO operations are now singular

 src/empathy-call-observer.c |    4 ++--
 src/empathy-call-window.c   |    2 +-
 src/empathy-event-manager.c |    2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)
---
diff --git a/src/empathy-call-observer.c b/src/empathy-call-observer.c
index 72d8d9f..06ff764 100644
--- a/src/empathy-call-observer.c
+++ b/src/empathy-call-observer.c
@@ -184,7 +184,7 @@ claim_and_leave_cb (GObject *source,
   AutoRejectCtx *ctx = user_data;
   GError *error = NULL;
 
-  if (!tp_channel_dispatch_operation_leave_channels_finish (
+  if (!tp_channel_dispatch_operation_leave_channel_finish (
         TP_CHANNEL_DISPATCH_OPERATION (source), result, &error))
     {
       DEBUG ("Failed to reject call: %s", error->message);
@@ -233,7 +233,7 @@ observe_channels (TpSimpleObserver *observer,
       DEBUG ("Autorejecting incoming call since there are others in "
           "progress: %s", tp_proxy_get_object_path (channel));
 
-      tp_channel_dispatch_operation_leave_channels_async (dispatch_operation,
+      tp_channel_dispatch_operation_leave_channel_async (dispatch_operation,
           TP_CHANNEL_GROUP_CHANGE_REASON_BUSY, "Already in a call",
           claim_and_leave_cb, ctx);
 
diff --git a/src/empathy-call-window.c b/src/empathy-call-window.c
index 7371abd..a12d123 100644
--- a/src/empathy-call-window.c
+++ b/src/empathy-call-window.c
@@ -1520,7 +1520,7 @@ empathy_call_window_incoming_call_response_cb (GtkDialog *dialog,
 
         break;
       case GTK_RESPONSE_CANCEL:
-        tp_channel_dispatch_operation_close_channels_async (
+        tp_channel_dispatch_operation_close_channel_async (
             self->priv->pending_cdo, NULL, NULL);
 
         empathy_call_window_status_message (self, _("Disconnected"));
diff --git a/src/empathy-event-manager.c b/src/empathy-event-manager.c
index ab2e6e1..7e1b8da 100644
--- a/src/empathy-event-manager.c
+++ b/src/empathy-event-manager.c
@@ -411,7 +411,7 @@ reject_approval (EventManagerApproval *approval)
   else if (tp_channel_get_channel_type_id (approval->main_channel)
       == TP_IFACE_QUARK_CHANNEL_TYPE_SERVER_AUTHENTICATION1)
     {
-      tp_channel_dispatch_operation_close_channels_async (approval->operation,
+      tp_channel_dispatch_operation_close_channel_async (approval->operation,
           NULL, NULL);
     }
 }