dbus/test/data/auth fallback.auth-script,1.3,1.4

[Mark McLoughlin]

Update of /cvs/dbus/dbus/test/data/auth
In directory gabe:/tmp/cvs-serv30632/test/data/auth

Modified Files:
	fallback.auth-script 
Log Message:
2005-09-11  Mark McLoughlin  <mark at skynet.ie>

	* test/data/auth/fallback.auth-script: we don't
	retry the EXTERNAL method when we know its going
	to fail anymore.

2005-09-11  Mark McLoughlin  <mark at skynet.ie>

	* dbus/dbus-connection-internal.h: rename
	(add|remove|toggle)_(watch|timeout) to unlocked()
	
	* dbus/dbus-connection.c: ditto.
	
	* dbus/dbus-timeout.c, dbus/dbus-transport-unix.c:
	Update some callers for the renaming.

2005-09-10  Mark McLoughlin  <mark at skynet.ie>

	* dbus/dbus-auth.c: (record_mechanisms): don't
	retry the first auth mechanism because we know
	we're just going to get rejected again.
	
	* dbus/dbus-keyring.c: (_dbus_keyring_reload):
	Fix thinko ... and what a nasty little bugger to
	track down you were ...

	* dbus/dbus-connection.c:
	(_dbus_connection_add_watch),
	(_dbus_connection_remove_watch): add note about
	these needing the connection to be locked.
	(_dbus_connection_get_dispatch_status_unlocked):
	set status to DATA_REMAINS when we queue the
	disconnected message.
	
	* bus/dispatch.c:
	(bus_dispatch): fix warning.
	(check_existent_service_no_auto_start):
	Expect ChildSignaled error too.
	(check_existent_hello_from_self): fix another
	couple of warnings.
	


Index: fallback.auth-script
===================================================================
RCS file: /cvs/dbus/dbus/test/data/auth/fallback.auth-script,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- fallback.auth-script	5 May 2005 22:02:11 -0000	1.3
+++ fallback.auth-script	11 Sep 2005 10:02:47 -0000	1.4
@@ -7,11 +7,6 @@
 EXPECT_COMMAND AUTH
 SEND 'REJECTED EXTERNAL DBUS_COOKIE_SHA1 DBUS_TEST_NONEXISTENT_MECH'
 
-## Will try EXTERNAL again.
-
-EXPECT_COMMAND AUTH
-SEND 'REJECTED EXTERNAL DBUS_COOKIE_SHA1 DBUS_TEST_NONEXISTENT_MECH'
-
 ## And this time we get DBUS_COOKIE_SHA1
 
 EXPECT_COMMAND AUTH