[glib/wip/menus-rebase2: 62/64] Fix async GDbusActionGroup construction



commit f9f27ecb7e911044a44df208e1feefd1c611381d
Author: Matthias Clasen <mclasen redhat com>
Date:   Thu Nov 17 19:16:11 2011 -0500

    Fix async GDbusActionGroup construction
    
    The _finish function had an always-triggering assertion in it...

 gio/gdbusactiongroup.c |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)
---
diff --git a/gio/gdbusactiongroup.c b/gio/gdbusactiongroup.c
index 0240294..46180f3 100644
--- a/gio/gdbusactiongroup.c
+++ b/gio/gdbusactiongroup.c
@@ -530,10 +530,11 @@ GDBusActionGroup *
 g_dbus_action_group_new_finish (GAsyncResult  *result,
                                 GError       **error)
 {
-  GSimpleAsyncResult *simple;
+  GSimpleAsyncResult *simple = G_SIMPLE_ASYNC_RESULT (result);
 
-  g_return_val_if_fail (g_simple_async_result_is_valid (result, NULL, g_dbus_action_group_new), NULL);
-  simple = G_SIMPLE_ASYNC_RESULT (result);
+  g_return_val_if_fail (g_simple_async_result_is_valid (result,
+                                                        g_simple_async_result_get_op_res_gpointer (simple),
+                                                        g_dbus_action_group_new), NULL);
 
   if (g_simple_async_result_propagate_error (simple, error))
     return NULL;



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]