dbus/dbus dbus-connection.c,1.122,1.123

[John Palmieri]

Update of /cvs/dbus/dbus/dbus
In directory kemper:/tmp/cvs-serv20907/dbus

Modified Files:
	dbus-connection.c 
Log Message:
* dbus/dbus-connection.c:
  (_dbus_connection_attach_pending_call_unlocked):
  (connection_timeout_and_complete_all_pending_calls_unlocked):
  Make sure we set timeout_added on pending calls to FALSE when
  we remove the timeout from the connection


Index: dbus-connection.c
===================================================================
RCS file: /cvs/dbus/dbus/dbus/dbus-connection.c,v
retrieving revision 1.122
retrieving revision 1.123
diff -u -d -r1.122 -r1.123
--- dbus-connection.c	14 Jul 2006 03:09:22 -0000	1.122
+++ dbus-connection.c	22 Jul 2006 17:06:14 -0000	1.123
@@ -798,6 +798,7 @@
     {
       _dbus_connection_remove_timeout_unlocked (connection, timeout);
 
+      _dbus_pending_call_set_timeout_added (pending, FALSE);
       HAVE_LOCK_CHECK (connection);
       return FALSE;
     }
@@ -2501,7 +2502,8 @@
                                               connection);
       _dbus_connection_remove_timeout_unlocked (connection,
                                                 _dbus_pending_call_get_timeout (pending));
-   
+
+      _dbus_pending_call_set_timeout_added (pending, FALSE); 
       _dbus_hash_iter_remove_entry (&iter);
 
       dbus_pending_call_unref (pending);