dbus/glib dbus-gproxy.c,1.12,1.12.2.1

[Joe Shaw]

Update of /cvs/dbus/dbus/glib
In directory gabe:/tmp/cvs-serv28286/glib

Modified Files:
      Tag: dbus-0-23
	dbus-gproxy.c 
Log Message:
2005-02-16  Joe Shaw  <joeshaw at novell.com>

	* dbus/dbus-connection-internal.h, dbus/dbus-connection.[ch],
	dbus/dbus-pending-call.[ch], dbus/dbus-server-protected.h,
	dbus/dbus-server-unix.c, dbus/dbus-server.c,
	dbus/dbus-transport-unix.c, dbus/dbus-transport.c: Backport
	a ton of thread-related fixes from HEAD to this branch.

	* glib/dbus-gproxy.c: Update dbus_pending_call_get_reply() to
	dbus_pending_call_steal_reply().

Index: dbus-gproxy.c
===================================================================
RCS file: /cvs/dbus/dbus/glib/dbus-gproxy.c,v
retrieving revision 1.12
retrieving revision 1.12.2.1
diff -u -d -r1.12 -r1.12.2.1
--- dbus-gproxy.c	10 Aug 2004 03:07:01 -0000	1.12
+++ dbus-gproxy.c	16 Feb 2005 22:45:40 -0000	1.12.2.1
@@ -1135,7 +1135,7 @@
   g_return_val_if_fail (pending != NULL, FALSE);
 
   dbus_pending_call_block (DBUS_PENDING_CALL_FROM_G_PENDING_CALL (pending));
-  message = dbus_pending_call_get_reply (DBUS_PENDING_CALL_FROM_G_PENDING_CALL (pending));
+  message = dbus_pending_call_steal_reply (DBUS_PENDING_CALL_FROM_G_PENDING_CALL (pending));
 
   g_assert (message != NULL);
 
@@ -1152,6 +1152,7 @@
         }
       va_end (args);
 
+      dbus_message_unref (message);
       return TRUE;
       
     case DBUS_MESSAGE_TYPE_ERROR:
@@ -1165,6 +1166,7 @@
     }
 
  error:
+  dbus_message_unref (message);
   dbus_set_g_error (error, &derror);
   dbus_error_free (&derror);
   return FALSE;