[telepathy-mission-control/master] McdDispatchOperation: inline _mcd_dispatch_operation_set_cancelled

[Simon McVittie]

---
 src/mcd-dispatch-operation-priv.h |    2 --
 src/mcd-dispatch-operation.c      |    9 +--------
 2 files changed, 1 insertions(+), 10 deletions(-)

diff --git a/src/mcd-dispatch-operation-priv.h b/src/mcd-dispatch-operation-priv.h
index a9ee56d..e940133 100644
--- a/src/mcd-dispatch-operation-priv.h
+++ b/src/mcd-dispatch-operation-priv.h
@@ -146,8 +146,6 @@ G_GNUC_INTERNAL void _mcd_dispatch_operation_set_channels_handled (
 
 G_GNUC_INTERNAL gboolean _mcd_dispatch_operation_get_cancelled (
     McdDispatchOperation *self);
-G_GNUC_INTERNAL void _mcd_dispatch_operation_set_cancelled (
-    McdDispatchOperation *self);
 
 G_GNUC_INTERNAL void _mcd_dispatch_operation_check_client_locks (
     McdDispatchOperation *self);
diff --git a/src/mcd-dispatch-operation.c b/src/mcd-dispatch-operation.c
index 87d3920..4bc79c2 100644
--- a/src/mcd-dispatch-operation.c
+++ b/src/mcd-dispatch-operation.c
@@ -302,13 +302,6 @@ _mcd_dispatch_operation_get_cancelled (McdDispatchOperation *self)
 }
 
 void
-_mcd_dispatch_operation_set_cancelled (McdDispatchOperation *self)
-{
-    g_return_if_fail (MCD_IS_DISPATCH_OPERATION (self));
-    self->priv->cancelled = TRUE;
-}
-
-void
 _mcd_dispatch_operation_check_client_locks (McdDispatchOperation *self)
 {
     if (!self->priv->invoking_early_clients &&
@@ -635,7 +628,7 @@ mcd_dispatch_operation_channel_aborted_cb (McdChannel *channel,
      * context should be aborted */
     error = mcd_channel_get_error (channel);
     if (error && error->code == TP_ERROR_CANCELLED)
-        _mcd_dispatch_operation_set_cancelled (self);
+        self->priv->cancelled = TRUE;
 
     _mcd_dispatch_operation_lose_channel (self, channel);
 
-- 
1.5.6.5