Merge lp:~rainct/libzeitgeist/986230 into lp:libzeitgeist

[Siegfried Gevatter]

[lp:~rainct/libzeitgeist/986230]

238. By Siegfried Gevatter on 2012-04-21

Call callbacks with g_idle and properly free stuff.

[Michal Hruby (mhr3)]

There's still one issue left - if the cancellable is cancelled, _finish needs to throw IO_ERROR_CANCELLED even if it wanted to throw the log_error. Ideally we'd just use g_simple_async_result_set_check_cancellable, but that's available only from 2.32, so we need to implement it manually.

review: Needs Fixing

[lp:~rainct/libzeitgeist/986230]

239. By Siegfried Gevatter on 2012-04-23

Return G_IO_ERROR_CANCELLED when the cancellable is activated

We do this by abusing GSimpleAsyncResult to get a copy of the
cancellable.

[Michal Hruby (mhr3)]

Actually, looking at the non-trivial changes this requires, let's just bump the gio dependency and use the check_cancellable method.

[lp:~rainct/libzeitgeist/986230]

240. By Siegfried Gevatter on 2012-04-24

So now we're gonna use g_simple_async_result_set_check_cancellable :)

[Michal Hruby (mhr3)]

To make sure this doesn't get lost: (from IRC)

- shouldn't you still check for log_error != NULL in the _finish methods?
- also log_error is not freed in finalize
- and if you use simple..._set_from_error, you don't need to copy it yourself

[Michal Hruby (mhr3)]

Finished up in https://code.launchpad.net/~mhr3/libzeitgeist/fix-986230/+merge/103845

=== modified file 'configure.ac'
--- configure.ac	2012-04-05 10:11:53 +0000
+++ configure.ac	2012-04-24 15:44:23 +0000
@@ -69,7 +69,7 @@
 ####################################################################
 # Check library deps
 ####################################################################
-GLIB_REQUIRED=2.26
+GLIB_REQUIRED=2.32
 PKG_CHECK_MODULES(GLIB2, [glib-2.0 >= $GLIB_REQUIRED ])
 PKG_CHECK_MODULES(GOBJECT2, [gobject-2.0 >= $GLIB_REQUIRED ])
 PKG_CHECK_MODULES(GIO2, [gio-2.0 >= $GLIB_REQUIRED ])
 
=== modified file 'src/zeitgeist-log.c'
--- src/zeitgeist-log.c	2012-03-26 11:03:34 +0000
+++ src/zeitgeist-log.c	2012-04-24 15:44:23 +0000
@@ -57,6 +57,10 @@
    * If log != NULL it means we have a connection */
   GDBusProxy *log;
 
+  /* In case auto-launching the ZG daemon failed, this
+   * variable will hold the error. */
+  GError *log_error;
+
   /* Hash set of ZeitgeistMonitors we've installed.
    * We store a map of (monitor, registration_id)  */
   GHashTable *monitors;
@@ -124,6 +128,7 @@
 
   priv = ZEITGEIST_LOG_GET_PRIVATE (self);
   priv->log = NULL;
+  priv->log_error = NULL;
 
   /* Reset hash set of monitors */
   priv->monitors = g_hash_table_new (g_direct_hash, g_direct_equal);
@@ -251,6 +256,8 @@
 dispatch_method (MethodDispatchContext *ctx)
 {
   ZeitgeistLogPrivate *priv;
+  GSimpleAsyncResult *async_result;
+  GError *error_copy;
 
   priv = ZEITGEIST_LOG_GET_PRIVATE (ctx->self);
 
@@ -265,9 +272,33 @@
                          dispatch_async_callback,
                          ctx);
     }
+  else if (priv->log_error)
+    {
+      // Zeitgeist couldn't be auto-started. We'll run the callback
+      // anyway and give it an error.
+      if (ctx->cb != NULL)
+        {
+          async_result = g_simple_async_result_new (G_OBJECT(ctx->self),
+                                                    ctx->cb,
+                                                    ctx,
+                                                    NULL);
+          g_simple_async_result_set_check_cancellable (async_result,
+                                                       ctx->cancellable);
+          error_copy = g_error_copy (priv->log_error);
+          g_simple_async_result_take_error (async_result, error_copy);
+          g_simple_async_result_complete_in_idle (async_result);
+          g_object_unref (async_result);
+        }
+
+      g_object_unref (ctx->self);
+      g_free (ctx);
+    }
   else
-    priv->method_dispatch_queue = g_slist_prepend (priv->method_dispatch_queue,
-                                                   ctx);
+    {
+      // Queue the request while we wait for Zeitgeist to show up
+      priv->method_dispatch_queue = g_slist_prepend (priv->method_dispatch_queue,
+                                                     ctx);
+    }
 }
 
 /* Used to marshal the async callbacks from GDBus into ones
@@ -495,6 +526,9 @@
   g_return_val_if_fail (G_IS_ASYNC_RESULT (res), NULL);
   g_return_val_if_fail (error == NULL || *error == NULL, NULL);
 
+  if (g_simple_async_result_propagate_error (G_SIMPLE_ASYNC_RESULT (res), error))
+      return NULL;
+
   priv = ZEITGEIST_LOG_GET_PRIVATE (self);
   val = g_dbus_proxy_call_finish (priv->log, res, error);
 
@@ -592,6 +626,9 @@
   g_return_val_if_fail (G_IS_ASYNC_RESULT (res), NULL);
   g_return_val_if_fail (error == NULL || *error == NULL, NULL);
 
+  if (g_simple_async_result_propagate_error (G_SIMPLE_ASYNC_RESULT (res), error))
+      return NULL;
+
   priv = ZEITGEIST_LOG_GET_PRIVATE (self);
   val = g_dbus_proxy_call_finish (priv->log, res, error);
 
@@ -672,6 +709,9 @@
   g_return_val_if_fail (G_IS_ASYNC_RESULT (res), NULL);
   g_return_val_if_fail (error == NULL || *error == NULL, NULL);
 
+  if (g_simple_async_result_propagate_error (G_SIMPLE_ASYNC_RESULT (res), error))
+      return NULL;
+
   priv = ZEITGEIST_LOG_GET_PRIVATE (self);
   val = g_dbus_proxy_call_finish (priv->log, res, error);
 
@@ -740,6 +780,9 @@
   g_return_val_if_fail (G_IS_ASYNC_RESULT (res), NULL);
   g_return_val_if_fail (error == NULL || *error == NULL, NULL);
 
+  if (g_simple_async_result_propagate_error (G_SIMPLE_ASYNC_RESULT (res), error))
+      return NULL;
+
   priv = ZEITGEIST_LOG_GET_PRIVATE (self);
   val = g_dbus_proxy_call_finish (priv->log, res, error);
 
@@ -850,6 +893,9 @@
   g_return_val_if_fail (G_IS_ASYNC_RESULT (res), FALSE);
   g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
 
+  if (g_simple_async_result_propagate_error (G_SIMPLE_ASYNC_RESULT (res), error))
+      return FALSE;
+
   priv = ZEITGEIST_LOG_GET_PRIVATE (self);
   val = g_dbus_proxy_call_finish (priv->log, res, error);
 
@@ -927,6 +973,9 @@
   g_return_val_if_fail (G_IS_ASYNC_RESULT (res), NULL);
   g_return_val_if_fail (error == NULL || *error == NULL, NULL);
 
+  if (g_simple_async_result_propagate_error (G_SIMPLE_ASYNC_RESULT (res), error))
+      return NULL;
+
   priv = ZEITGEIST_LOG_GET_PRIVATE (self);
   val = g_dbus_proxy_call_finish (priv->log, res, error);
 
@@ -981,6 +1030,9 @@
   g_return_val_if_fail (G_IS_ASYNC_RESULT (res), FALSE);
   g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
 
+  if (g_simple_async_result_propagate_error (G_SIMPLE_ASYNC_RESULT (res), error))
+      return FALSE;
+
   priv = ZEITGEIST_LOG_GET_PRIVATE (self);
   val = g_dbus_proxy_call_finish (priv->log, res, error);
 
@@ -1027,6 +1079,9 @@
   g_return_val_if_fail (G_IS_ASYNC_RESULT (res), FALSE);
   g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
 
+  if (g_simple_async_result_propagate_error (G_SIMPLE_ASYNC_RESULT (res), error))
+      return FALSE;
+
   priv = ZEITGEIST_LOG_GET_PRIVATE (self);
   val = g_dbus_proxy_call_finish (priv->log, res, error);
 
@@ -1061,6 +1116,7 @@
                   "but we already have one. Discarding the old and using the "
                   "new one");
       g_object_unref (priv->log);
+      g_clear_error (&priv->log_error);
       priv->log = NULL;
     }
 
@@ -1069,9 +1125,10 @@
 
   if (error != NULL)
     {
+      priv->log_error = g_error_copy (error);
       g_critical ("Failed to create proxy for Zeitgeist daemon: %s",
                   error->message);
-      goto cleanup;
+      goto process_pending_calls;
     }
 
   priv->connection = G_DBUS_CONNECTION (g_object_ref (
@@ -1097,12 +1154,14 @@
   priv->is_connected = TRUE;
   g_object_notify (G_OBJECT (self), "connected");
 
-  /* Dispatch all queued method calls we got while we didn't have a proxy.
-   * Note that dispatch_method() also frees all the queue members */
-  priv->method_dispatch_queue = g_slist_reverse (priv->method_dispatch_queue);
-  g_slist_foreach (priv->method_dispatch_queue, (GFunc) dispatch_method, NULL);
-  g_slist_free (priv->method_dispatch_queue);
-  priv->method_dispatch_queue = NULL;
+  process_pending_calls:
+
+    /* Dispatch all queued method calls we got while we didn't have a proxy.
+     * Note that dispatch_method() also frees all the queue members */
+    priv->method_dispatch_queue = g_slist_reverse (priv->method_dispatch_queue);
+    g_slist_foreach (priv->method_dispatch_queue, (GFunc) dispatch_method, NULL);
+    g_slist_free (priv->method_dispatch_queue);
+    priv->method_dispatch_queue = NULL;
 
   cleanup:
     g_object_unref (self);