[gnome-keyring] Release 3.1.90

[Stefan Walter <stefw src gnome org>]

commit be87bd7bb1eb019ab61d8e4f07d559a66367378b
Author: Stef Walter <stefw collabora co uk>
Date:   Tue Aug 30 11:30:30 2011 +0200

    Release 3.1.90
    
     * Fix build issues to do with mime database
     * Fix testing issues in pkcs11 trust assertion database
     * Fix distribution issues.

 Makefile.am                          |    3 ++-
 NEWS                                 |   12 ++++++++++++
 configure.ac                         |    2 +-
 gcr/Makefile.am                      |    5 +++--
 gcr/gcr.symbols                      |    4 ++++
 pkcs11/xdg-store/gkm-xdg-assertion.c |    6 +++---
 po/POTFILES.in                       |    1 +
 7 files changed, 26 insertions(+), 7 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index b560ab4..3b8c7f5 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -38,7 +38,8 @@ DISTCHECK_CONFIGURE_FLAGS = \
 	--enable-gtk-doc \
 	--enable-tests=full \
 	--enable-debug=yes \
-	--disable-gcov
+	--disable-gcov \
+	--disable-update-mime
 
 DISTCLEANFILES = \
 	intltool-extract \
diff --git a/NEWS b/NEWS
index fe1a9cc..ed46e12 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,15 @@
+Changes in version 3.1.90 are:
+ * Install better xdg-mime files for identifying crypto related file types
+ * New gcr-viewer for viewing certificates and keys, hooked up to file types
+ * Display tweaks for the certificate and key widgets
+ * Don't initialize PKCS#11 modules automatically in gcr library unless needed.
+ * Cleanup the libgck API since we're bumping the major version.
+ * ABI fixes for the GCR library for changes in the 3.1.x release cycle
+ * New automatic checks for symbols that have changed in the ABI
+ * Add async PKCS#11 initialization functions to libgck
+ * Display Certificate otherName subject-alt-name for xmppAddr and DNS SRV
+ * Documentation, testing, translation and build fixes.
+
 Changes in version 3.1.4 are:
  * New GcrListSelector class for selecting multiple keys.
  * Add icons for key and key pair.
diff --git a/configure.ac b/configure.ac
index 542aeb1..c20bc7f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,6 @@
 AC_INIT(daemon/gkd-main.c)
 
-AM_INIT_AUTOMAKE(gnome-keyring, 3.1.5)
+AM_INIT_AUTOMAKE(gnome-keyring, 3.1.90)
 AM_CONFIG_HEADER(config.h)
 m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
 
diff --git a/gcr/Makefile.am b/gcr/Makefile.am
index 201e515..4bed971 100644
--- a/gcr/Makefile.am
+++ b/gcr/Makefile.am
@@ -243,10 +243,11 @@ EXTRA_DIST = \
 	$(conf_DATA) \
 	gcr-enum-types.h.template \
 	gcr-enum-types.c.template \
-	gcr.symbols
+	gcr.symbols \
 	$(desktop_in_in_files) \
 	$(desktop_in_files) \
-	$(desktop_DATA)
+	$(desktop_DATA) \
+	$(mime_DATA)
 
 CLEANFILES = \
 	$(BUILT_SOURCES) \
diff --git a/gcr/gcr.symbols b/gcr/gcr.symbols
index 86a6158..dc2a714 100644
--- a/gcr/gcr.symbols
+++ b/gcr/gcr.symbols
@@ -150,6 +150,7 @@ gcr_renderer_emit_data_changed
 gcr_renderer_get_type
 gcr_renderer_popuplate_popup
 gcr_renderer_register
+gcr_renderer_register_well_known
 gcr_renderer_render
 gcr_renderer_render_view
 gcr_simple_certificate_get_type
@@ -195,3 +196,6 @@ gcr_viewer_get_type
 gcr_viewer_new
 gcr_viewer_new_scrolled
 gcr_viewer_remove_renderer
+gcr_viewer_window_get_type
+gcr_viewer_window_load
+gcr_viewer_window_new
diff --git a/pkcs11/xdg-store/gkm-xdg-assertion.c b/pkcs11/xdg-store/gkm-xdg-assertion.c
index c8eea88..002c348 100644
--- a/pkcs11/xdg-store/gkm-xdg-assertion.c
+++ b/pkcs11/xdg-store/gkm-xdg-assertion.c
@@ -76,7 +76,7 @@ lookup_or_create_trust_object (GkmSession *session, GkmManager *manager,
 		}
 
 		/* Attributes used for looking up trust object */
-		memcpy (lookups + 1, value, sizeof (*value));
+		memcpy (&lookups[1], value, sizeof (CK_ATTRIBUTE));
 		n_lookups = 2;
 		break;
 
@@ -89,8 +89,8 @@ lookup_or_create_trust_object (GkmSession *session, GkmManager *manager,
 		}
 
 		/* Attributes used for looking up trust object */
-		memcpy (lookups + 1, issuer, sizeof (*issuer));
-		memcpy (lookups + 2, serial, sizeof (*serial));
+		memcpy (&lookups[1], issuer, sizeof (CK_ATTRIBUTE));
+		memcpy (&lookups[2], serial, sizeof (CK_ATTRIBUTE));
 		n_lookups = 3;
 		break;
 
diff --git a/po/POTFILES.in b/po/POTFILES.in
index efe4a52..89e0334 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -29,6 +29,7 @@ gcr/gcr-key-renderer.c
 gcr/gcr-parser.c
 gcr/gcr-trust.c
 [type: gettext/glade]gcr/gcr-unlock-options-widget.ui
+gcr/gcr-viewer-tool.c
 gck/gck-uri.c
 gck/gck-misc.c
 pkcs11/gkm/gkm-certificate.c