2005-06-29 Colin Walters <walters@verbum.org>

	Patch from Ross Burton <ross@openedhand.com>

	* glib/dbus-gobject.c (invoke_object_method): Unset object
	value in all cases, not only in async case.

diff --git a/ChangeLog b/ChangeLog
index e67e5ee4d65c8d9c570b510fb0522b75b9643d3d..ec8453f234d6f154a851582fb37b0b70ae639795 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2005-06-29  Colin Walters  <walters@verbum.org>
+       
+       Patch from Ross Burton <ross@openedhand.com>
+       
+       * glib/dbus-gobject.c (invoke_object_method): Unset object
+       value in all cases, not only in async case.
+
 2005-06-29  Colin Walters  <walters@verbum.org>
 
        * glib/dbus-gproxy.c (struct _DBusGProxy): Add new member

diff --git a/glib/dbus-gobject.c b/glib/dbus-gobject.c
index 2bebf5eb53e143904b55d57ee50cbf5a376c7b92..8e3997965960ad206df6a8fc67dfa6b09f6ecd92 100644 (file)
--- a/glib/dbus-gobject.c
+++ b/glib/dbus-gobject.c
@@ -845,7 +845,8 @@ invoke_object_method (GObject         *object,
   g_value_init (&object_value, G_TYPE_OBJECT);
   g_value_set_object (&object_value, object);
   g_value_array_prepend (value_array, &object_value);
-
+  g_value_unset (&object_value);
+  
   if (call_only)
     {
       GValue context_value = {0,};
@@ -986,7 +987,6 @@ invoke_object_method (GObject         *object,
     {
       g_array_free (out_param_values, TRUE);
       g_value_array_free (out_param_gvalues);
-      g_value_unset (&object_value);
       g_value_unset (&error_value);
     }
   g_value_array_free (value_array);