Release version 3.1.4

 * Include some changes to make comparing symbols easier.
 * Fix some issues that came up when doing make distcheck

7 files changed, 30 insertions, 193 deletions

diff --git a/.gitignore b/.gitignore
index 32e5ba09..f0149618 100644
--- a/.gitignore
+++ b/.gitignore
@@ -36,6 +36,7 @@ run-tests
 *.gcno
 *.gcda
 *.valid
+*.symbols
 
 /compile
 /ABOUT-NLS
diff --git a/NEWS b/NEWS
index 909eaead..fe1a9cc5 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,14 @@
+Changes in version 3.1.4 are:
+ * New GcrListSelector class for selecting multiple keys.
+ * Add icons for key and key pair.
+ * Gcr now has support for loading of GnuPG keys from gpg, including photos.
+ * New gcr dependency on p11-kit for loading PKCS#11 modules.
+ * Remove support for GTK+ 2.x
+ * Implement calculation of fingerprints in gcr for keys.
+ * Fix problems in daemon if IPC lock or FS capabilities are not available.
+ * Bug fixes and build fixes.
+ * Code cleanup and refactoring.
+
 Changes in version 3.1.1 are:
  * Add 'Export Certificate' option to right click of certificate widget.
  * Use file system linux capabilities for memory locking.
diff --git a/configure.ac b/configure.ac
index 8de1457f..01c58042 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,6 @@
 AC_INIT(daemon/gkd-main.c)
 
-AM_INIT_AUTOMAKE(gnome-keyring, 3.1.2)
+AM_INIT_AUTOMAKE(gnome-keyring, 3.1.4)
 AM_CONFIG_HEADER(config.h)
 m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
 
diff --git a/gck/Makefile.am b/gck/Makefile.am
index 70f1f4f9..c8f44cec 100644
--- a/gck/Makefile.am
+++ b/gck/Makefile.am
@@ -87,3 +87,9 @@ DISTCLEANFILES = \
 
 gck-$(GCK_MAJOR).pc: gck.pc
 	cp gck.pc gck-$(GCK_MAJOR).pc
+
+symbols: libgck-$(VERSION).symbols
+
+libgck-$(VERSION).symbols: .libs/libgck-@GCK_MAJOR@.so
+	nm -D .libs/libgck-@GCK_MAJOR@.so | grep -F ' T ' | \
+		cut -d ' ' -f 3 | sort > $@
diff --git a/gcr/Makefile.am b/gcr/Makefile.am
index 8cc24bf6..f3035988 100644
--- a/gcr/Makefile.am
+++ b/gcr/Makefile.am
@@ -102,7 +102,7 @@ libgcr_@GCR_MAJOR@_la_SOURCES = \
 	gcr-key-renderer.c gcr-key-renderer.h \
 	gcr-key-widget.c gcr-key-widget.h \
 	gcr-library.c gcr-library.h \
-	gcr-list-selector.c gcr-list-selector.h \
+	gcr-list-selector.c gcr-list-selector.h gcr-list-selector-private.h \
 	gcr-live-search.c gcr-live-search.h \
 	gcr-memory-icon.c gcr-memory-icon.h \
 	gcr-parser.c gcr-parser.h \
@@ -172,21 +172,23 @@ gcr-$(GCR_MAJOR).pc: gcr.pc
 
 # ----------------------------------------------------------------
 
-libgcr.symbols: .libs/libgcr-@GCR_MAJOR@.so
-	nm -D .libs/libgcr-@GCR_MAJOR@.so | grep -F ' T ' | \
-		cut -d ' ' -f 3 | sort > $@
-
 EXTRA_DIST = \
 	gcr.pc.in \
 	gcr-marshal.list \
 	$(ui_DATA) \
 	$(conf_DATA) \
-	libgcr.symbols
+	gcr-enum-types.h.template \
+	gcr-enum-types.c.template
 
 CLEANFILES = \
 	$(BUILT_SOURCES) \
 	$(pkgconfig_DATA)
 
 DISTCLEANFILES = \
-	$(pkgconfig_DATA) \
-	libgcr.symbols
+	$(pkgconfig_DATA)
+
+symbols: libgcr-$(VERSION).symbols
+
+libgcr-$(VERSION).symbols: .libs/libgcr-@GCR_MAJOR@.so
+	nm -D .libs/libgcr-@GCR_MAJOR@.so | grep -F ' T ' | \
+		cut -d ' ' -f 3 | sort > $@
diff --git a/gcr/libgcr.symbols b/gcr/libgcr.symbols
deleted file mode 100644
index cc0308e5..00000000
--- a/gcr/libgcr.symbols
+++ /dev/null
@@ -1,183 +0,0 @@
-gcr_certificate_basics_widget_get_certificate
-gcr_certificate_basics_widget_get_type
-gcr_certificate_basics_widget_new
-gcr_certificate_basics_widget_set_certificate
-gcr_certificate_chain_add
-gcr_certificate_chain_build
-gcr_certificate_chain_build_async
-gcr_certificate_chain_build_finish
-gcr_certificate_chain_flags_get_type
-gcr_certificate_chain_get_anchor
-gcr_certificate_chain_get_certificate
-gcr_certificate_chain_get_endpoint
-gcr_certificate_chain_get_length
-gcr_certificate_chain_get_status
-gcr_certificate_chain_get_type
-gcr_certificate_chain_new
-gcr_certificate_chain_status_get_type
-gcr_certificate_compare
-gcr_certificate_details_widget_get_certificate
-gcr_certificate_details_widget_get_type
-gcr_certificate_details_widget_new
-gcr_certificate_details_widget_set_certificate
-gcr_certificate_get_columns
-gcr_certificate_get_der_data
-gcr_certificate_get_expiry_date
-gcr_certificate_get_fingerprint
-gcr_certificate_get_fingerprint_hex
-gcr_certificate_get_icon
-gcr_certificate_get_issued_date
-gcr_certificate_get_issuer_cn
-gcr_certificate_get_issuer_dn
-gcr_certificate_get_issuer_part
-gcr_certificate_get_issuer_raw
-gcr_certificate_get_key_size
-gcr_certificate_get_serial_number
-gcr_certificate_get_serial_number_hex
-gcr_certificate_get_subject_cn
-gcr_certificate_get_subject_dn
-gcr_certificate_get_subject_part
-gcr_certificate_get_subject_raw
-gcr_certificate_get_type
-gcr_certificate_is_issuer
-gcr_certificate_mixin_class_init
-gcr_certificate_mixin_comparable_init
-gcr_certificate_mixin_get_property
-gcr_certificate_renderer_get_attributes
-gcr_certificate_renderer_get_certificate
-gcr_certificate_renderer_get_type
-gcr_certificate_renderer_new
-gcr_certificate_renderer_new_for_attributes
-gcr_certificate_renderer_set_attributes
-gcr_certificate_renderer_set_certificate
-gcr_certificate_widget_get_attributes
-gcr_certificate_widget_get_certificate
-gcr_certificate_widget_get_type
-gcr_certificate_widget_new
-gcr_certificate_widget_set_attributes
-gcr_certificate_widget_set_certificate
-gcr_collection_emit_added
-gcr_collection_emit_removed
-gcr_collection_get_length
-gcr_collection_get_objects
-gcr_collection_get_type
-gcr_collection_model_change_selected
-gcr_collection_model_column_for_selected
-gcr_collection_model_get_selected_objects
-gcr_collection_model_get_type
-gcr_collection_model_is_selected
-gcr_collection_model_iter_for_object
-gcr_collection_model_new
-gcr_collection_model_new_full
-gcr_collection_model_object_for_iter
-gcr_collection_model_set_columns
-gcr_collection_model_set_selected_objects
-gcr_collection_model_toggle_selected
-gcr_combo_selector_get_collection
-gcr_combo_selector_get_selected
-gcr_combo_selector_get_type
-gcr_combo_selector_new
-gcr_combo_selector_set_selected
-gcr_comparable_compare
-gcr_comparable_get_type
-gcr_comparable_memcmp
-gcr_data_error_get_domain
-gcr_error_get_domain
-gcr_importer_get_parser
-gcr_importer_get_prompt_behavior
-gcr_importer_get_slot
-gcr_importer_get_type
-gcr_importer_import
-gcr_importer_import_async
-gcr_importer_import_finish
-gcr_importer_listen
-gcr_importer_new
-gcr_importer_queue
-gcr_importer_set_parser
-gcr_importer_set_prompt_behavior
-gcr_importer_set_slot
-gcr_key_renderer_get_attributes
-gcr_key_renderer_get_type
-gcr_key_renderer_new
-gcr_key_renderer_set_attributes
-gcr_key_widget_get_attributes
-gcr_key_widget_get_type
-gcr_key_widget_new
-gcr_key_widget_set_attributes
-gcr_parser_add_password
-gcr_parser_format_disable
-gcr_parser_format_enable
-gcr_parser_format_supported
-gcr_parser_get_parsed_attributes
-gcr_parser_get_parsed_description
-gcr_parser_get_parsed_label
-gcr_parser_get_type
-gcr_parser_new
-gcr_parser_parse_data
-gcr_parser_parse_stream
-gcr_parser_parse_stream_async
-gcr_parser_parse_stream_finish
-gcr_pkcs11_add_module
-gcr_pkcs11_add_module_from_file
-gcr_pkcs11_certificate_get_attributes
-gcr_pkcs11_certificate_get_type
-gcr_pkcs11_certificate_lookup_issuer
-gcr_pkcs11_certificate_lookup_issuer_async
-gcr_pkcs11_certificate_lookup_issuer_finish
-gcr_pkcs11_get_modules
-gcr_pkcs11_get_trust_lookup_slots
-gcr_pkcs11_get_trust_lookup_uris
-gcr_pkcs11_get_trust_store_slot
-gcr_pkcs11_get_trust_store_uri
-gcr_pkcs11_set_modules
-gcr_pkcs11_set_trust_lookup_uris
-gcr_pkcs11_set_trust_store_uri
-gcr_renderer_create
-gcr_renderer_emit_data_changed
-gcr_renderer_get_type
-gcr_renderer_popuplate_popup
-gcr_renderer_register
-gcr_renderer_render_view
-gcr_simple_certificate_get_type
-gcr_simple_certificate_new
-gcr_simple_certificate_new_static
-gcr_simple_collection_add
-gcr_simple_collection_contains
-gcr_simple_collection_get_type
-gcr_simple_collection_new
-gcr_simple_collection_remove
-gcr_tree_selector_get_collection
-gcr_tree_selector_get_columns
-gcr_tree_selector_get_selected
-gcr_tree_selector_get_type
-gcr_tree_selector_new
-gcr_tree_selector_set_selected
-gcr_trust_add_pinned_certificate
-gcr_trust_add_pinned_certificate_async
-gcr_trust_add_pinned_certificate_finish
-gcr_trust_is_certificate_anchored
-gcr_trust_is_certificate_anchored_async
-gcr_trust_is_certificate_anchored_finish
-gcr_trust_is_certificate_pinned
-gcr_trust_is_certificate_pinned_async
-gcr_trust_is_certificate_pinned_finish
-gcr_trust_remove_pinned_certificate
-gcr_trust_remove_pinned_certificate_async
-gcr_trust_remove_pinned_certificate_finish
-gcr_unlock_options_widget_get_choice
-gcr_unlock_options_widget_get_label
-gcr_unlock_options_widget_get_sensitive
-gcr_unlock_options_widget_get_ttl
-gcr_unlock_options_widget_get_type
-gcr_unlock_options_widget_new
-gcr_unlock_options_widget_set_choice
-gcr_unlock_options_widget_set_label
-gcr_unlock_options_widget_set_sensitive
-gcr_unlock_options_widget_set_ttl
-gcr_viewer_add_renderer
-gcr_viewer_count_renderers
-gcr_viewer_get_renderer
-gcr_viewer_get_type
-gcr_viewer_new
-gcr_viewer_new_scrolled
-gcr_viewer_remove_renderer
diff --git a/gcr/tests/test-gnupg-key.c b/gcr/tests/test-gnupg-key.c
index ec6547d3..152a0c03 100644
--- a/gcr/tests/test-gnupg-key.c
+++ b/gcr/tests/test-gnupg-key.c
@@ -101,7 +101,7 @@ test_markup (Test *test, gconstpointer unused)
 	gchar *markup;
 
 	g_object_get (test->key, "markup", &markup, NULL);
-	g_assert_cmpstr (markup, ==, "Werner Koch <wk@g10code.com>");
+	g_assert_cmpstr (markup, ==, "Werner Koch\n<small>wk@g10code.com</small>");
 
 	g_free (markup);
 }