[telepathy-mission-control/master] McdChannel: implement ChannelRequest.Cancel

[Simon McVittie]

---
 src/mcd-channel.c |   18 ++++++++++--------
 1 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/src/mcd-channel.c b/src/mcd-channel.c
index 9ab6b4d..a17b79f 100644
--- a/src/mcd-channel.c
+++ b/src/mcd-channel.c
@@ -1517,15 +1517,17 @@ channel_request_cancel (McSvcChannelRequest *iface,
                         DBusGMethodInvocation *context)
 {
     McdChannel *self = MCD_CHANNEL (iface);
-    GError ni = { TP_ERRORS, TP_ERROR_NOT_IMPLEMENTED,
-        "Cancel not yet implemented" };
-
-#if 0
-    mc_svc_channel_request_return_from_cancel (context);
-#endif
+    GError *error = NULL;
 
-    (void) self;
-    dbus_g_method_return_error (context, &ni);
+    if (_mcd_channel_request_cancel (self, &error))
+    {
+        mc_svc_channel_request_return_from_cancel (context);
+    }
+    else
+    {
+        dbus_g_method_return_error (context, error);
+        g_error_free (error);
+    }
 }
 
 static void
-- 
1.5.6.5