[telepathy-mission-control/master] dispatch_operation_claim: adjust to the convention that @self has type McdDispatchOperation

Simon McVittie simon.mcvittie at collabora.co.uk
Tue Oct 27 14:42:30 PDT 2009


---
 src/mcd-dispatch-operation.c |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/mcd-dispatch-operation.c b/src/mcd-dispatch-operation.c
index 37ccf21..974c265 100644
--- a/src/mcd-dispatch-operation.c
+++ b/src/mcd-dispatch-operation.c
@@ -609,12 +609,12 @@ dispatch_operation_handle_with (TpSvcChannelDispatchOperation *cdo,
 }
 
 static void
-dispatch_operation_claim (TpSvcChannelDispatchOperation *self,
+dispatch_operation_claim (TpSvcChannelDispatchOperation *cdo,
                           DBusGMethodInvocation *context)
 {
-    McdDispatchOperationPrivate *priv;
+    McdDispatchOperation *self = MCD_DISPATCH_OPERATION (cdo);
+    McdDispatchOperationPrivate *priv = self->priv;
 
-    priv = MCD_DISPATCH_OPERATION_PRIV (self);
     if (priv->wants_to_finish)
     {
         GError *error = g_error_new (TP_ERRORS, TP_ERROR_NOT_YOURS,
@@ -634,7 +634,7 @@ dispatch_operation_claim (TpSvcChannelDispatchOperation *self,
 
     g_queue_push_tail (priv->approvals,
                        approval_new (APPROVAL_TYPE_CLAIM));
-    _mcd_dispatch_operation_finish (MCD_DISPATCH_OPERATION (self));
+    _mcd_dispatch_operation_finish (self);
 }
 
 static void
-- 
1.5.6.5




More information about the telepathy-commits mailing list