gnome-keyring r1149 - in trunk: . pk pkcs11 po

[nnielsen svn gnome org]

Author: nnielsen
Date: Mon May 26 17:19:06 2008
New Revision: 1149
URL: http://svn.gnome.org/viewvc/gnome-keyring?rev=1149&view=rev

Log:
	* configure.in:
	* NEWS: Release version 2.22.2


Modified:
   trunk/ChangeLog
   trunk/NEWS
   trunk/pk/gkr-pk-index.c
   trunk/pkcs11/gkr-pkcs11-daemon-session.c
   trunk/po/ChangeLog

Modified: trunk/NEWS
==============================================================================
--- trunk/NEWS	(original)
+++ trunk/NEWS	Mon May 26 17:19:06 2008
@@ -1,3 +1,11 @@
+Changes in version 2.22.2 are:
+* Streamline the importing of keys and make the proper prompts show up
+  consistently. Better fixes for this to come in 2.24.x
+* Don't show 'location' field in most password prompts.
+* Return serial number of certificates properly to requesting programs.
+* Fix crash when receiving certain HAL events.
+* Build fixes [Brian Cameron, Matthias Drochner, Antoine Jacoutot]
+
 Changes in version 2.22.1 are:
 * Add SSH agent protocol 1 support. 
 * Make 'ssh-add -D' lock any SSH private keys that gnome-keyring is 

Modified: trunk/pk/gkr-pk-index.c
==============================================================================
--- trunk/pk/gkr-pk-index.c	(original)
+++ trunk/pk/gkr-pk-index.c	Mon May 26 17:19:06 2008
@@ -580,11 +580,9 @@
 		                      location_to_key (loc), key_file);
 	}
 
-	if (!key_file) {
-		g_message ("no index available for location: %s", 
-		           g_quark_to_string (loc));
+	/* No index is available for this location */
+	if (!key_file)
 		return NULL;
-	}
 
 	return key_file;
 }

Modified: trunk/pkcs11/gkr-pkcs11-daemon-session.c
==============================================================================
--- trunk/pkcs11/gkr-pkcs11-daemon-session.c	(original)
+++ trunk/pkcs11/gkr-pkcs11-daemon-session.c	Mon May 26 17:19:06 2008
@@ -21,6 +21,8 @@
    Author: Stef Walter <stef memberwebs com>
 */
 
+#include "config.h"
+
 #include <glib.h>
 
 #include "gkr-pkcs11-message.h"