Attachment 47310 Details for Bug 28015 – add tp_channel_dispatch_operation_leave_channels_async (#28015)

[patch] add tp_channel_dispatch_operation_leave_channels_async (#28015)

add-tpchanneldispatchoperationleavechannelsasync-2.patch (text/plain), 8.06 KB, created by Guillaume Desmottes on 2011-05-30 05:13:57 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Guillaume Desmottes

Created: 2011-05-30 05:13:57 UTC

Size: 8.06 KB

patch

obsolete

>From db9d23c30197248ef00320e9427493f7f0a02f83 Mon Sep 17 00:00:00 2001
>From: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
>Date: Fri, 27 May 2011 17:29:01 +0200
>Subject: [PATCH] add tp_channel_dispatch_operation_leave_channels_async (#28015)
>
>---
> docs/reference/telepathy-glib-sections.txt  |    2 +
> telepathy-glib/channel-dispatch-operation.c |  130 ++++++++++++++++++++++++++-
> telepathy-glib/channel-dispatch-operation.h |   12 +++
> tests/dbus/channel-dispatch-operation.c     |   40 ++++++++
> 4 files changed, 183 insertions(+), 1 deletions(-)
>
>diff --git a/docs/reference/telepathy-glib-sections.txt b/docs/reference/telepathy-glib-sections.txt
>index ffc9178..b66f70e 100644
>--- a/docs/reference/telepathy-glib-sections.txt
>+++ b/docs/reference/telepathy-glib-sections.txt
>@@ -4554,6 +4554,8 @@ tp_channel_dispatch_operation_claim_with_async
> tp_channel_dispatch_operation_claim_with_finish
> tp_channel_dispatch_operation_close_channels_async
> tp_channel_dispatch_operation_close_channels_finish
>+tp_channel_dispatch_operation_leave_channels_async
>+tp_channel_dispatch_operation_leave_channels_finish
> <SUBSECTION Standard>
> TP_CHANNEL_DISPATCH_OPERATION
> TP_CHANNEL_DISPATCH_OPERATION_CLASS
>diff --git a/telepathy-glib/channel-dispatch-operation.c b/telepathy-glib/channel-dispatch-operation.c
>index d6afb42..c4155bd 100644
>--- a/telepathy-glib/channel-dispatch-operation.c
>+++ b/telepathy-glib/channel-dispatch-operation.c
>@@ -1661,7 +1661,7 @@ tp_channel_dispatch_operation_close_channels_async (
>  * @error: a #GError to fill
>  *
>  * Finishes an async operation initiated using
>- * tp_channel_dispatch_operation_close_channels_finish().
>+ * tp_channel_dispatch_operation_close_channels_async().
>  *
>  * Returns: %TRUE if the Claim() call was successful and
>  * Close() has at least been attempted on all the channels, otherwise %FALSE
>@@ -1677,3 +1677,131 @@ tp_channel_dispatch_operation_close_channels_finish (
>   _tp_implement_finish_void (self, \
>       tp_channel_dispatch_operation_close_channels_async)
> }
>+
>+typedef struct
>+{
>+  TpChannelGroupChangeReason reason;
>+  gchar *message;
>+} LeaveChannelsCtx;
>+
>+static LeaveChannelsCtx *
>+leave_channels_ctx_new (TpChannelGroupChangeReason reason,
>+    const gchar *message)
>+{
>+  LeaveChannelsCtx *ctx = g_slice_new (LeaveChannelsCtx);
>+
>+  ctx->reason = reason;
>+  ctx->message = g_strdup (message);
>+  return ctx;
>+}
>+
>+static void
>+leave_channels_ctx_free (LeaveChannelsCtx *ctx)
>+{
>+  g_free (ctx->message);
>+  g_slice_free (LeaveChannelsCtx, ctx);
>+}
>+
>+static void
>+channel_leave_cb (GObject *source,
>+    GAsyncResult *result,
>+    gpointer user_data)
>+{
>+  GError *error = NULL;
>+
>+  if (!tp_channel_leave_finish (TP_CHANNEL (source), result, &error))
>+    {
>+      DEBUG ("Failed to leave %s: %s", tp_proxy_get_object_path (source),
>+          error->message);
>+
>+      g_error_free (error);
>+    }
>+}
>+
>+static void
>+claim_leave_channels_cb (TpChannelDispatchOperation *self,
>+    GSimpleAsyncResult *result)
>+{
>+  guint i;
>+  LeaveChannelsCtx *ctx;
>+
>+  ctx = g_simple_async_result_get_op_res_gpointer (result);
>+
>+  for (i = 0; i < self->priv->channels->len; i++)
>+    {
>+      TpChannel *channel = g_ptr_array_index (self->priv->channels, i);
>+
>+      tp_channel_leave_async (channel, ctx->reason, ctx->message,
>+          channel_leave_cb, NULL);
>+    }
>+
>+  g_simple_async_result_complete (result);
>+  g_object_unref (result);
>+}
>+
>+/**
>+ * tp_channel_dispatch_operation_leave_channels_async:
>+ * @self: a #TpChannelDispatchOperation
>+ * @reason: the leave reason
>+ * @message: the leave message
>+ * @callback: a callback to call when the request has been satisfied
>+ * @user_data: data to pass to @callback
>+ *
>+ * Called by an approver to claim channels and leave them all right away.
>+ * If this method is called successfully, @self has been claimed and
>+ * tp_channel_leave_async() has been called on all of its channels.
>+ *
>+ * If successful, this method will cause the #TpProxy::invalidated signal
>+ * to be emitted, in the same way as for
>+ * tp_channel_dispatch_operation_handle_with_async().
>+ *
>+ * This method may fail because the dispatch operation has already
>+ * been completed. Again, see tp_channel_dispatch_operation_handle_with_async()
>+ * for more details.
>+ *
>+ * Since: 0.15.UNRELEASED
>+ */
>+void
>+tp_channel_dispatch_operation_leave_channels_async (
>+    TpChannelDispatchOperation *self,
>+    TpChannelGroupChangeReason reason,
>+    const gchar *message,
>+    GAsyncReadyCallback callback,
>+    gpointer user_data)
>+{
>+  GSimpleAsyncResult *result;
>+
>+  result = g_simple_async_result_new (G_OBJECT (self), callback, user_data,
>+      tp_channel_dispatch_operation_leave_channels_async);
>+
>+  g_simple_async_result_set_op_res_gpointer (result,
>+      leave_channels_ctx_new (reason, message),
>+      (GDestroyNotify) leave_channels_ctx_free);
>+
>+  prepare_core_and_claim (self, claim_leave_channels_cb, result);
>+}
>+
>+/**
>+ * tp_channel_dispatch_operation_leave_channels_finish:
>+ * @self: a #TpChannelDispatchOperation
>+ * @result: a #GAsyncResult
>+ * @error: a #GError to fill
>+ *
>+ * Finishes an async operation initiated using
>+ * tp_channel_dispatch_operation_leave_channels_async().
>+ *
>+ * Returns: %TRUE if the Claim() call was successful and
>+ * tp_channel_leave_async() has at least been attempted on all the
>+ * channels, otherwise %FALSE
>+ *
>+ * Since: 0.15.UNRELEASED
>+ */
>+gboolean
>+tp_channel_dispatch_operation_leave_channels_finish (
>+    TpChannelDispatchOperation *self,
>+    GAsyncResult *result,
>+    GError **error)
>+{
>+  _tp_implement_finish_void (self, \
>+      tp_channel_dispatch_operation_leave_channels_async)
>+}
>diff --git a/telepathy-glib/channel-dispatch-operation.h b/telepathy-glib/channel-dispatch-operation.h
>index 387496d..6bdbff1 100644
>--- a/telepathy-glib/channel-dispatch-operation.h
>+++ b/telepathy-glib/channel-dispatch-operation.h
>@@ -154,6 +154,18 @@ gboolean tp_channel_dispatch_operation_close_channels_finish (
>     GAsyncResult *result,
>     GError **error);
> 
>+void tp_channel_dispatch_operation_leave_channels_async (
>+    TpChannelDispatchOperation *self,
>+    TpChannelGroupChangeReason reason,
>+    const gchar *message,
>+    GAsyncReadyCallback callback,
>+    gpointer user_data);
>+
>+gboolean tp_channel_dispatch_operation_leave_channels_finish (
>+    TpChannelDispatchOperation *self,
>+    GAsyncResult *result,
>+    GError **error);
>+
> G_END_DECLS
> 
> #include <telepathy-glib/_gen/tp-cli-channel-dispatch-operation.h>
>diff --git a/tests/dbus/channel-dispatch-operation.c b/tests/dbus/channel-dispatch-operation.c
>index fa57d5d..0c89cd6 100644
>--- a/tests/dbus/channel-dispatch-operation.c
>+++ b/tests/dbus/channel-dispatch-operation.c
>@@ -830,6 +830,44 @@ test_close_channels (Test *test,
>   g_assert_no_error (test->error);
> }
> 
>+static void
>+leave_channels_cb (GObject *source,
>+    GAsyncResult *result,
>+    gpointer user_data)
>+{
>+  Test *test = user_data;
>+
>+  tp_channel_dispatch_operation_leave_channels_finish (
>+      TP_CHANNEL_DISPATCH_OPERATION (source), result, &test->error);
>+
>+  test->sig--;
>+  if (test->sig == 0)
>+    g_main_loop_quit (test->mainloop);
>+}
>+
>+static void
>+test_leave_channels (Test *test,
>+    gconstpointer data G_GNUC_UNUSED)
>+{
>+  test->cdo = tp_channel_dispatch_operation_new (test->dbus,
>+      "/whatever", NULL, &test->error);
>+  g_assert_no_error (test->error);
>+
>+  g_signal_connect (test->text_chan, "invalidated",
>+      G_CALLBACK (channel_invalidated_cb), test);
>+  g_signal_connect (test->text_chan_2, "invalidated",
>+      G_CALLBACK (channel_invalidated_cb), test);
>+
>+  tp_channel_dispatch_operation_leave_channels_async (test->cdo,
>+      TP_CHANNEL_GROUP_CHANGE_REASON_BUSY, "Busy right now",
>+      leave_channels_cb, test);
>+
>+  test->sig = 3;
>+  g_main_loop_run (test->mainloop);
>+
>+  g_assert_no_error (test->error);
>+}
>+
> int
> main (int argc,
>       char **argv)
>@@ -858,6 +896,8 @@ main (int argc,
>       test_handle_with_time, teardown_services);
>   g_test_add ("/cdo/close-channels", Test, NULL, setup_services,
>       test_close_channels, teardown_services);
>+  g_test_add ("/cdo/leave-channels", Test, NULL, setup_services,
>+      test_leave_channels, teardown_services);
> 
>   return g_test_run ();
> }
>-- 
>1.7.4.1

Actions: View | Splinter Review

Attachments on bug 28015: 47117 | 47118 | 47310 | 47311 | 47312

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.