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.

2 files changed, 9 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index e67e5ee4..ec8453f2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,11 @@
 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
 	name_call for keeping track of any outgoing GetNameOwner call.
diff --git a/glib/dbus-gobject.c b/glib/dbus-gobject.c
index 2bebf5eb..8e399796 100644
--- 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);