[evolution-data-server] EServerSideSource: Remove clone of EAsyncClosure.
- From: Matthew Barnes <mbarnes src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [evolution-data-server] EServerSideSource: Remove clone of EAsyncClosure.
- Date: Mon, 23 Jul 2012 11:26:16 +0000 (UTC)
commit 0bc1e3d41dee57f227dccb1ee8c8ab423c8d307d
Author: Matthew Barnes <mbarnes redhat com>
Date: Mon Jul 23 07:24:11 2012 -0400
EServerSideSource: Remove clone of EAsyncClosure.
Can't remember why I copied EAsyncClosure there. Maybe it was before I
moved EAsyncClosure from Evolution to Evolution-Data-Server?
libebackend/e-server-side-source.c | 73 +++++-------------------------------
1 files changed, 10 insertions(+), 63 deletions(-)
---
diff --git a/libebackend/e-server-side-source.c b/libebackend/e-server-side-source.c
index b7ad5e3..af1b71a 100644
--- a/libebackend/e-server-side-source.c
+++ b/libebackend/e-server-side-source.c
@@ -41,8 +41,6 @@
#define PRIMARY_GROUP_NAME "Data Source"
-typedef struct _AsyncClosure AsyncClosure;
-
struct _EServerSideSourcePrivate {
gpointer server; /* weak pointer */
@@ -89,57 +87,6 @@ G_DEFINE_TYPE_WITH_CODE (
G_TYPE_INITABLE,
e_server_side_source_initable_init))
-static AsyncClosure *
-async_closure_new (void)
-{
- AsyncClosure *closure;
-
- closure = g_slice_new0 (AsyncClosure);
- closure->context = g_main_context_new ();
- closure->loop = g_main_loop_new (closure->context, FALSE);
-
- g_main_context_push_thread_default (closure->context);
-
- return closure;
-}
-
-static GAsyncResult *
-async_closure_wait (AsyncClosure *closure)
-{
- g_main_loop_run (closure->loop);
-
- return closure->result;
-}
-
-static void
-async_closure_free (AsyncClosure *closure)
-{
- g_main_context_pop_thread_default (closure->context);
-
- g_main_loop_unref (closure->loop);
- g_main_context_unref (closure->context);
-
- if (closure->result != NULL)
- g_object_unref (closure->result);
-
- g_slice_free (AsyncClosure, closure);
-}
-
-static void
-async_closure_callback (GObject *object,
- GAsyncResult *result,
- gpointer user_data)
-{
- AsyncClosure *closure = user_data;
-
- /* Replace any previous result. */
- if (closure->result != NULL)
- g_object_unref (closure->result);
- closure->result = g_object_ref (result);
-
- g_main_loop_quit (closure->loop);
-}
-
static gboolean
server_side_source_parse_data (GKeyFile *key_file,
const gchar *data,
@@ -544,20 +491,20 @@ server_side_source_remove_sync (ESource *source,
GCancellable *cancellable,
GError **error)
{
- AsyncClosure *closure;
+ EAsyncClosure *closure;
GAsyncResult *result;
gboolean success;
- closure = async_closure_new ();
+ closure = e_async_closure_new ();
e_source_remove (
- source, cancellable, async_closure_callback, closure);
+ source, cancellable, e_async_closure_callback, closure);
- result = async_closure_wait (closure);
+ result = e_async_closure_wait (closure);
success = e_source_remove_finish (source, result, error);
- async_closure_free (closure);
+ e_async_closure_free (closure);
return success;
}
@@ -660,20 +607,20 @@ server_side_source_write_sync (ESource *source,
GCancellable *cancellable,
GError **error)
{
- AsyncClosure *closure;
+ EAsyncClosure *closure;
GAsyncResult *result;
gboolean success;
- closure = async_closure_new ();
+ closure = e_async_closure_new ();
e_source_write (
- source, cancellable, async_closure_callback, closure);
+ source, cancellable, e_async_closure_callback, closure);
- result = async_closure_wait (closure);
+ result = e_async_closure_wait (closure);
success = e_source_write_finish (source, result, error);
- async_closure_free (closure);
+ e_async_closure_free (closure);
return success;
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]