gnome-keyring r1166 - in trunk: . common library/tests

[nnielsen svn gnome org]

Author: nnielsen
Date: Wed Jul  2 16:08:26 2008
New Revision: 1166
URL: http://svn.gnome.org/viewvc/gnome-keyring?rev=1166&view=rev

Log:
	* common/gkr-unix-credentials.c:
	* library/tests/unit-test-other.c: Fix problem with 
	gnome_keyring_is_available() producing spurious warnings
	in the logs. Fixes bug #511285


Modified:
   trunk/ChangeLog
   trunk/common/gkr-unix-credentials.c
   trunk/library/tests/unit-test-other.c

Modified: trunk/common/gkr-unix-credentials.c
==============================================================================
--- trunk/common/gkr-unix-credentials.c	(original)
+++ trunk/common/gkr-unix-credentials.c	Wed Jul  2 16:08:26 2008
@@ -90,6 +90,10 @@
 		if (errno == EINTR)
 			goto again;
 		return -1;
+		
+	} else if (ret == 0) {
+		/* Disconnected */
+		return -1;
 	}
 	
 	if (buf != '\0') {

Modified: trunk/library/tests/unit-test-other.c
==============================================================================
--- trunk/library/tests/unit-test-other.c	(original)
+++ trunk/library/tests/unit-test-other.c	Wed Jul  2 16:08:26 2008
@@ -86,3 +86,11 @@
 	msg = gnome_keyring_result_to_message (GNOME_KEYRING_RESULT_KEYRING_ALREADY_EXISTS); 	
 	CuAssert (cu, "should return a valid message", msg && msg[0]);
 }
+
+void unit_test_is_available (CuTest* cu)
+{
+	gboolean ret;
+	
+	ret = gnome_keyring_is_available ();
+	CuAssert (cu, "gnome_is_available returned false", ret == TRUE);
+}