gcr: Documentation, testing and distcheck fixes

 * Update symbols for new APIs
 * Update docs with new APIs
 * Change how tests find fixture files.

31 files changed, 60 insertions, 210 deletions

diff --git a/daemon/dbus/tests/Makefile.am b/daemon/dbus/tests/Makefile.am
index b4a3bc74..ad892682 100644
--- a/daemon/dbus/tests/Makefile.am
+++ b/daemon/dbus/tests/Makefile.am
@@ -1,7 +1,7 @@
 
 INCLUDES = \
 	-I$(top_srcdir)/daemon/dbus \
-	-DSRCDIR="\"$(srcdir)\"" \
+	-DSRCDIR="\"@abs_srcdir@\"" \
 	$(DAEMON_CFLAGS) \
 	$(GLIB_CFLAGS)
 
diff --git a/docs/reference/gcr/Makefile.am b/docs/reference/gcr/Makefile.am
index 8f619089..47499c97 100644
--- a/docs/reference/gcr/Makefile.am
+++ b/docs/reference/gcr/Makefile.am
@@ -63,11 +63,13 @@ IGNORE_HFILES= \
 	gcr-certificate-details-widget.h \
 	gcr-display-scrolled.h \
 	gcr-display-view.h \
+	gcr-failure-renderer.h \
 	gcr-icons.h \
 	gcr-import-dialog.h \
 	gcr-internal.h \
 	gcr-live-search.h \
 	gcr-marshal.h \
+	gcr-unlock-renderer.h \
 	gcr-xxx.h \
 	gcr-zzz.h
 
diff --git a/docs/reference/gcr/gcr-sections.txt b/docs/reference/gcr/gcr-sections.txt
index c4e8937b..e69ad898 100644
--- a/docs/reference/gcr/gcr-sections.txt
+++ b/docs/reference/gcr/gcr-sections.txt
@@ -381,6 +381,7 @@ GcrViewerIface
 gcr_viewer_new
 gcr_viewer_new_scrolled
 gcr_viewer_add_renderer
+gcr_viewer_insert_renderer
 gcr_viewer_remove_renderer
 gcr_viewer_count_renderers
 gcr_viewer_get_renderer
diff --git a/egg/egg-testing.c b/egg/egg-testing.c
index b41ec852..0235ac09 100644
--- a/egg/egg-testing.c
+++ b/egg/egg-testing.c
@@ -80,27 +80,6 @@ egg_assertion_message_cmpmem (const char     *domain,
 }
 
 void
-egg_tests_chdir_base (gchar* argv0)
-{
-	gchar *dir, *base;
-
-	dir = g_path_get_dirname (argv0);
-	if (chdir (dir) < 0)
-		g_warning ("couldn't change directory to: %s: %s",
-		           dir, g_strerror (errno));
-
-	base = g_path_get_basename (dir);
-	if (strcmp (base, ".libs") == 0) {
-		if (chdir ("..") < 0)
-			g_warning ("couldn't change directory to ..: %s",
-			           g_strerror (errno));
-	}
-
-	g_free (base);
-	g_free (dir);
-}
-
-void
 egg_test_wait_stop (void)
 {
 	GTimeVal tv;
diff --git a/egg/egg-testing.h b/egg/egg-testing.h
index 0d74d812..f6b7a0ea 100644
--- a/egg/egg-testing.h
+++ b/egg/egg-testing.h
@@ -47,8 +47,6 @@ void       egg_test_wait_stop                  (void);
 
 gboolean   egg_test_wait_until                 (int timeout);
 
-void       egg_tests_chdir_base                (gchar* argv0);
-
 gint       egg_tests_run_in_thread_with_loop   (void);
 
 #endif /* EGG_DH_H_ */
diff --git a/egg/tests/Makefile.am b/egg/tests/Makefile.am
index 146e7098..aa5fac70 100644
--- a/egg/tests/Makefile.am
+++ b/egg/tests/Makefile.am
@@ -5,7 +5,7 @@ asn1-def-test.c: test.asn
 INCLUDES = \
 	-I$(top_builddir) \
 	-I$(top_srcdir) \
-	-DSRCDIR="\"$(srcdir)\"" \
+	-DSRCDIR="\"@abs_srcdir@\"" \
 	$(GLIB_CFLAGS)
 
 LDADD =  \
diff --git a/egg/tests/test-asn1x.c b/egg/tests/test-asn1x.c
index 7556e5de..baeba55e 100644
--- a/egg/tests/test-asn1x.c
+++ b/egg/tests/test-asn1x.c
@@ -100,8 +100,6 @@ main (int argc, char **argv)
 	build_personal_name ();
 #endif
 
-	egg_tests_chdir_base (argv[0]);
-
 	test_some_asn1_stuff (pkix_asn1_tab, SRCDIR "/files/test-certificate-1.der", "Certificate");
 	test_some_asn1_stuff (pkix_asn1_tab, SRCDIR "/files/test-pkcs8-1.der", "pkcs-8-PrivateKeyInfo");
 	test_some_asn1_stuff (pk_asn1_tab, SRCDIR "/files/test-rsakey-1.der", "RSAPrivateKey");
diff --git a/egg/tests/test-openssl.c b/egg/tests/test-openssl.c
index 6721f742..e2c35167 100644
--- a/egg/tests/test-openssl.c
+++ b/egg/tests/test-openssl.c
@@ -204,7 +204,6 @@ int
 main (int argc, char **argv)
 {
 	g_test_init (&argc, &argv, NULL);
-	egg_tests_chdir_base (argv[0]);
 
 	g_test_add ("/openssl/parse_reference", Test, NULL, setup, test_parse_reference, teardown);
 	g_test_add ("/openssl/write_reference", Test, NULL, setup, test_write_reference, teardown);
diff --git a/gck/Makefile.am b/gck/Makefile.am
index f0c35445..0ab15c1b 100644
--- a/gck/Makefile.am
+++ b/gck/Makefile.am
@@ -96,7 +96,8 @@ check-local: check-symbols
 EXTRA_DIST = \
 	gck.pc.in \
 	gck-marshal.list \
-	gck.symbols
+	gck.symbols \
+	pkcs11-trust-assertions.h
 
 CLEANFILES = \
 	gck-actual.abi \
diff --git a/gck/gck.symbols b/gck/gck.symbols
index 4b708a3b..1cf6a1dc 100644
--- a/gck/gck.symbols
+++ b/gck/gck.symbols
@@ -83,6 +83,7 @@ gck_modules_initialize_registered_finish
 gck_modules_object_for_uri
 gck_modules_objects_for_uri
 gck_modules_token_for_uri
+gck_modules_tokens_for_uri
 gck_object_destroy
 gck_object_destroy_async
 gck_object_destroy_finish
diff --git a/gck/tests/Makefile.am b/gck/tests/Makefile.am
index 4864fb87..99aaf100 100644
--- a/gck/tests/Makefile.am
+++ b/gck/tests/Makefile.am
@@ -2,7 +2,7 @@
 INCLUDES = \
 	-I$(top_builddir) \
 	-I$(top_srcdir) \
-	-DSRCDIR="\"$(srcdir)\"" \
+	-DSRCDIR="\"@abs_srcdir@\"" \
 	-DBUILDDIR="\"$(builddir)\"" \
 	-DGCK_API_SUBJECT_TO_CHANGE \
 	$(GLIB_CFLAGS)
diff --git a/gcr/gcr-parser.c b/gcr/gcr-parser.c
index 95a4d2a3..f5139cf6 100644
--- a/gcr/gcr-parser.c
+++ b/gcr/gcr-parser.c
@@ -1779,15 +1779,12 @@ gcr_parser_format_enable (GcrParser *self, gint format_id)
 
 	g_return_if_fail (GCR_IS_PARSER (self));
 
-	if (format_id != -1) {
-		format = parser_format_lookup (format_id);
-		g_return_if_fail (format);
-	}
-
 	if (!self->pv->specific_formats)
 		self->pv->specific_formats = g_tree_new (compare_pointers);
 
 	if (format_id != -1) {
+		format = parser_format_lookup (format_id);
+		g_return_if_fail (format);
 		g_tree_insert (self->pv->specific_formats,
 		               (gpointer)format, (gpointer)format);
 	} else {
diff --git a/gcr/gcr.symbols b/gcr/gcr.symbols
index dc2a714f..f1bd4b3a 100644
--- a/gcr/gcr.symbols
+++ b/gcr/gcr.symbols
@@ -122,6 +122,7 @@ gcr_parser_format_disable
 gcr_parser_format_enable
 gcr_parser_format_supported
 gcr_parser_get_parsed_attributes
+gcr_parser_get_parsed_block
 gcr_parser_get_parsed_description
 gcr_parser_get_parsed_label
 gcr_parser_get_type
@@ -190,6 +191,7 @@ gcr_unlock_options_widget_set_label
 gcr_unlock_options_widget_set_sensitive
 gcr_unlock_options_widget_set_ttl
 gcr_viewer_add_renderer
+gcr_viewer_insert_renderer
 gcr_viewer_count_renderers
 gcr_viewer_get_renderer
 gcr_viewer_get_type
diff --git a/gcr/tests/Makefile.am b/gcr/tests/Makefile.am
index ed98f4d6..f2f3b7ab 100644
--- a/gcr/tests/Makefile.am
+++ b/gcr/tests/Makefile.am
@@ -38,7 +38,7 @@ check_PROGRAMS = $(TEST_PROGS)
 
 test: $(TEST_PROGS)
 	chmod -f 700 $(srcdir)/files/gnupg-homedir
-	SRCDIR=$(srcdir) gtester --verbose -m $(TEST_MODE) --g-fatal-warnings $(TEST_PROGS)
+	gtester --verbose -m $(TEST_MODE) --g-fatal-warnings $(TEST_PROGS)
 
 check-local: test
 
diff --git a/gcr/tests/frob-certificate.c b/gcr/tests/frob-certificate.c
index c938483f..a84dbc7f 100644
--- a/gcr/tests/frob-certificate.c
+++ b/gcr/tests/frob-certificate.c
@@ -32,27 +32,6 @@
 #include <errno.h>
 
 static void
-chdir_base_dir (char* argv0)
-{
-	gchar *dir, *base;
-
-	dir = g_path_get_dirname (argv0);
-	if (chdir (dir) < 0)
-		g_warning ("couldn't change directory to: %s: %s",
-		           dir, g_strerror (errno));
-
-	base = g_path_get_basename (dir);
-	if (strcmp (base, ".libs") == 0) {
-		if (chdir ("..") < 0)
-			g_warning ("couldn't change directory to ..: %s",
-			           g_strerror (errno));
-	}
-
-	g_free (base);
-	g_free (dir);
-}
-
-static void
 on_parser_parsed (GcrParser *parser, gpointer user_data)
 {
 	GcrCertificateWidget *details;
@@ -104,12 +83,10 @@ main(int argc, char *argv[])
 	gtk_init (&argc, &argv);
 	g_set_prgname ("frob-certificate");
 
-	if (argc > 1) {
+	if (argc > 1)
 		test_certificate (argv[1]);
-	} else {
-		chdir_base_dir (argv[0]);
+	else
 		test_certificate (SRCDIR "/files/der-certificate.crt");
-	}
 
 	return 0;
 }
diff --git a/gcr/tests/frob-combo-selector.c b/gcr/tests/frob-combo-selector.c
index d05f9a4b..fd9fc868 100644
--- a/gcr/tests/frob-combo-selector.c
+++ b/gcr/tests/frob-combo-selector.c
@@ -10,27 +10,6 @@
 #include <errno.h>
 
 static void
-chdir_base_dir (char* argv0)
-{
-	gchar *dir, *base;
-
-	dir = g_path_get_dirname (argv0);
-	if (chdir (dir) < 0)
-		g_warning ("couldn't change directory to: %s: %s",
-		           dir, g_strerror (errno));
-
-	base = g_path_get_basename (dir);
-	if (strcmp (base, ".libs") == 0) {
-		if (chdir ("..") < 0)
-			g_warning ("couldn't change directory to ..: %s",
-			           g_strerror (errno));
-	}
-
-	g_free (base);
-	g_free (dir);
-}
-
-static void
 on_parser_parsed (GcrParser *parser, gpointer user_data)
 {
 	GcrSimpleCollection *collection = user_data;
@@ -89,7 +68,6 @@ main (int argc, char *argv[])
 	g_signal_connect (parser, "parsed", G_CALLBACK (on_parser_parsed), collection);
 
 	if (argc == 1) {
-		chdir_base_dir (argv[0]);
 		add_to_selector (parser, "files/ca-certificates.crt");
 	} else {
 		for (i = 1; i < argc; ++i)
diff --git a/gcr/tests/frob-key.c b/gcr/tests/frob-key.c
index 3292e2fc..3eedb493 100644
--- a/gcr/tests/frob-key.c
+++ b/gcr/tests/frob-key.c
@@ -32,27 +32,6 @@
 #include <errno.h>
 
 static void
-chdir_base_dir (char* argv0)
-{
-	gchar *dir, *base;
-
-	dir = g_path_get_dirname (argv0);
-	if (chdir (dir) < 0)
-		g_warning ("couldn't change directory to: %s: %s",
-		           dir, g_strerror (errno));
-
-	base = g_path_get_basename (dir);
-	if (strcmp (base, ".libs") == 0) {
-		if (chdir ("..") < 0)
-			g_warning ("couldn't change directory to ..: %s",
-			           g_strerror (errno));
-	}
-
-	g_free (base);
-	g_free (dir);
-}
-
-static void
 on_parser_parsed (GcrParser *parser, gpointer unused)
 {
 	GcrKeyWidget *details;
@@ -99,12 +78,10 @@ main(int argc, char *argv[])
 	gtk_init (&argc, &argv);
 	g_set_prgname ("frob-key");
 
-	if (argc > 1) {
+	if (argc > 1)
 		test_key (argv[1]);
-	} else {
-		chdir_base_dir (argv[0]);
+	else
 		test_key (SRCDIR "/files/pem-dsa-1024.key");
-	}
 
 	return 0;
 }
diff --git a/gcr/tests/frob-tree-selector.c b/gcr/tests/frob-tree-selector.c
index db04e91c..73765ce7 100644
--- a/gcr/tests/frob-tree-selector.c
+++ b/gcr/tests/frob-tree-selector.c
@@ -10,27 +10,6 @@
 #include <errno.h>
 
 static void
-chdir_base_dir (char* argv0)
-{
-	gchar *dir, *base;
-
-	dir = g_path_get_dirname (argv0);
-	if (chdir (dir) < 0)
-		g_warning ("couldn't change directory to: %s: %s",
-		           dir, g_strerror (errno));
-
-	base = g_path_get_basename (dir);
-	if (strcmp (base, ".libs") == 0) {
-		if (chdir ("..") < 0)
-			g_warning ("couldn't change directory to ..: %s",
-			           g_strerror (errno));
-	}
-
-	g_free (base);
-	g_free (dir);
-}
-
-static void
 on_parser_parsed (GcrParser *parser, gpointer user_data)
 {
 	GcrSimpleCollection *collection = user_data;
@@ -96,7 +75,6 @@ main (int argc, char *argv[])
 	g_signal_connect (parser, "parsed", G_CALLBACK (on_parser_parsed), collection);
 
 	if (argc == 1) {
-		chdir_base_dir (argv[0]);
 		add_to_selector (parser, "files/ca-certificates.crt");
 	} else {
 		for (i = 1; i < argc; ++i)
diff --git a/gcr/tests/frob-unlock-options.c b/gcr/tests/frob-unlock-options.c
index eb604e00..fdcf116e 100644
--- a/gcr/tests/frob-unlock-options.c
+++ b/gcr/tests/frob-unlock-options.c
@@ -32,27 +32,6 @@
 #include <errno.h>
 
 static void
-chdir_base_dir (char* argv0)
-{
-	gchar *dir, *base;
-
-	dir = g_path_get_dirname (argv0);
-	if (chdir (dir) < 0)
-		g_warning ("couldn't change directory to: %s: %s",
-		           dir, g_strerror (errno));
-
-	base = g_path_get_basename (dir);
-	if (strcmp (base, ".libs") == 0) {
-		if (chdir ("..") < 0)
-			g_warning ("couldn't change directory to ..: %s",
-			           g_strerror (errno));
-	}
-
-	g_free (base);
-	g_free (dir);
-}
-
-static void
 test_unlock_options (void)
 {
 	GcrUnlockOptionsWidget *unlock;
@@ -99,7 +78,6 @@ main(int argc, char *argv[])
 	gtk_init (&argc, &argv);
 	g_set_prgname ("frob-unlock-options");
 
-	chdir_base_dir (argv[0]);
 	test_unlock_options ();
 
 	return 0;
diff --git a/gcr/tests/test-fingerprint.c b/gcr/tests/test-fingerprint.c
index 55377e58..34b59604 100644
--- a/gcr/tests/test-fingerprint.c
+++ b/gcr/tests/test-fingerprint.c
@@ -53,24 +53,26 @@ typedef struct {
 static void
 setup (Test *test, gconstpointer unused)
 {
-	if (!g_file_get_contents ("files/client.crt", (gchar**)&test->cert_rsa,
-	                          &test->n_cert_rsa, NULL))
-		g_assert_not_reached ();
+	GError *error = NULL;
+
+	g_file_get_contents (SRCDIR "/files/client.crt", (gchar**)&test->cert_rsa,
+	                     &test->n_cert_rsa, &error);
+	g_assert_no_error (error);
 	g_assert (test->cert_rsa);
 
-	if (!g_file_get_contents ("files/client.key", (gchar**)&test->key_rsa,
-	                          &test->n_key_rsa, NULL))
-		g_assert_not_reached ();
+	g_file_get_contents (SRCDIR "/files/client.key", (gchar**)&test->key_rsa,
+	                     &test->n_key_rsa, &error);
+	g_assert_no_error (error);
 	g_assert (test->key_rsa);
 
-	if (!g_file_get_contents ("files/generic-dsa.crt", (gchar**)&test->cert_dsa,
-	                          &test->n_cert_dsa, NULL))
-		g_assert_not_reached ();
+	g_file_get_contents (SRCDIR "/files/generic-dsa.crt", (gchar**)&test->cert_dsa,
+	                     &test->n_cert_dsa, &error);
+	g_assert_no_error (error);
 	g_assert (test->cert_dsa);
 
-	if (!g_file_get_contents ("files/generic-dsa.key", (gchar**)&test->key_dsa,
-	                          &test->n_key_dsa, NULL))
-		g_assert_not_reached ();
+	g_file_get_contents (SRCDIR "/files/generic-dsa.key", (gchar**)&test->key_dsa,
+	                     &test->n_key_dsa, &error);
+	g_assert_no_error (error);
 	g_assert (test->key_dsa);
 }
 
@@ -83,22 +85,31 @@ teardown (Test *test, gconstpointer unused)
 	g_free (test->key_dsa);
 }
 
+static void
+on_parser_parsed (GcrParser *parser,
+                  gpointer user_data)
+{
+	GckAttributes **attrs = user_data;
+	g_assert (!*attrs);
+	*attrs = gcr_parser_get_parsed_attributes (parser);
+	g_assert (*attrs);
+	gck_attributes_ref (*attrs);
+}
+
 static GckAttributes*
 parse_attributes_for_key (gpointer data, gsize n_data)
 {
 	GcrParser *parser;
-	GckAttributes *attrs;
+	GckAttributes *attrs = NULL;
 	GError *error = NULL;
 
 	parser = gcr_parser_new ();
+	g_signal_connect (parser, "parsed", G_CALLBACK (on_parser_parsed), &attrs);
 	gcr_parser_parse_data (parser, data, n_data, &error);
 	g_assert_no_error (error);
+	g_object_unref (parser);
 
-	attrs = gcr_parser_get_parsed_attributes (parser);
 	g_assert (attrs);
-	gck_attributes_ref (attrs);
-
-	g_object_unref (parser);
 	return attrs;
 }
 
@@ -165,15 +176,9 @@ test_dsa (Test *test, gconstpointer unused)
 int
 main (int argc, char **argv)
 {
-	const gchar *srcdir;
-
 	g_type_init ();
 	g_test_init (&argc, &argv, NULL);
 
-	srcdir = g_getenv ("SRCDIR");
-	if (srcdir && chdir (srcdir) < 0)
-		g_error ("couldn't change directory to: %s: %s", srcdir, g_strerror (errno));
-
 	g_test_add ("/gcr/fingerprint/rsa", Test, NULL, setup, test_rsa, teardown);
 	g_test_add ("/gcr/fingerprint/dsa", Test, NULL, setup, test_dsa, teardown);
 
diff --git a/gcr/tests/test-gnupg-collection.c b/gcr/tests/test-gnupg-collection.c
index 80988659..0bdec96c 100644
--- a/gcr/tests/test-gnupg-collection.c
+++ b/gcr/tests/test-gnupg-collection.c
@@ -82,10 +82,8 @@ static void
 setup (Test *test, gconstpointer unused)
 {
 	GcrCollection *collection;
-	gchar *directory;
 
-	directory = g_get_current_dir ();
-	test->directory = g_build_filename (directory, "files", "gnupg-homedir", NULL);
+	test->directory = g_build_filename (SRCDIR, "files", "gnupg-homedir", NULL);
 
 	collection = _gcr_gnupg_collection_new (test->directory);
 	test->collection = GCR_GNUPG_COLLECTION (collection);
@@ -93,8 +91,6 @@ setup (Test *test, gconstpointer unused)
 	test->keys = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, NULL);
 	g_signal_connect (collection, "added", G_CALLBACK (on_collection_added), test);
 	g_signal_connect (collection, "removed", G_CALLBACK (on_collection_removed), test);
-
-	g_free (directory);
 }
 
 static void
@@ -214,16 +210,10 @@ test_reload (Test *test, gconstpointer unused)
 int
 main (int argc, char **argv)
 {
-	const gchar *srcdir;
-
 	g_type_init ();
 	g_test_init (&argc, &argv, NULL);
 	g_set_prgname ("test-gnupg-collection");
 
-	srcdir = g_getenv ("SRCDIR");
-	if (srcdir && chdir (srcdir) < 0)
-		g_error ("couldn't change directory to: %s: %s", srcdir, g_strerror (errno));
-
 	g_test_add ("/gcr/gnupg-collection/properties", Test, NULL, setup, test_properties, teardown);
 	g_test_add ("/gcr/gnupg-collection/load", Test, NULL, setup, test_load, teardown);
 	g_test_add ("/gcr/gnupg-collection/reload", Test, NULL, setup, test_reload, teardown);
diff --git a/gcr/tests/test-gnupg-process.c b/gcr/tests/test-gnupg-process.c
index e9095f3e..c42a7b14 100644
--- a/gcr/tests/test-gnupg-process.c
+++ b/gcr/tests/test-gnupg-process.c
@@ -97,12 +97,9 @@ on_async_ready (GObject *source, GAsyncResult *result, gpointer user_data)
 static gchar*
 build_script_path (const gchar *name)
 {
-	gchar *directory;
 	gchar *path;
 
-	directory = g_get_current_dir ();
-	path = g_build_filename (directory, "files", "gnupg-mock", name, NULL);
-	g_free (directory);
+	path = g_build_filename (SRCDIR, "files", "gnupg-mock", name, NULL);
 
 	return path;
 }
@@ -332,14 +329,11 @@ test_run_with_homedir (Test *test, gconstpointer unused)
 	const gchar *argv[] = { NULL };
 	GError *error = NULL;
 	gchar *script;
-	gchar *directory;
 	gchar *check;
 	gboolean ret;
 
-	directory = g_get_current_dir ();
-
 	script = build_script_path ("mock-with-homedir");
-	test->process = _gcr_gnupg_process_new (directory, script);
+	test->process = _gcr_gnupg_process_new (SRCDIR, script);
 	g_free (script);
 
 	g_signal_connect (test->process, "output-data", G_CALLBACK (on_process_output_data), test);
@@ -352,10 +346,9 @@ test_run_with_homedir (Test *test, gconstpointer unused)
 	g_assert_no_error (error);
 	g_assert (ret == TRUE);
 
-	check = g_strdup_printf ("DIR: %s\n", directory);
+	check = g_strdup_printf ("DIR: %s\n", SRCDIR);
 	g_assert_cmpstr (check, ==, test->output_buf->str);
 	g_free (check);
-	g_free (directory);
 
 	g_clear_object (&test->result);
 	g_clear_object (&test->process);
@@ -508,16 +501,10 @@ test_run_and_cancel_later (Test *test, gconstpointer unused)
 int
 main (int argc, char **argv)
 {
-	const gchar *srcdir;
-
 	g_type_init ();
 	g_test_init (&argc, &argv, NULL);
 	g_set_prgname ("test-gnupg-process");
 
-	srcdir = g_getenv ("SRCDIR");
-	if (srcdir && chdir (srcdir) < 0)
-		g_error ("couldn't change directory to: %s: %s", srcdir, g_strerror (errno));
-
 	g_test_add ("/gcr/gnupg-process/create", Test, NULL, setup, test_create, teardown);
 	g_test_add ("/gcr/gnupg-process/run_simple_output", Test, NULL, setup, test_run_simple_output, teardown);
 	g_test_add ("/gcr/gnupg-process/run_simple_error", Test, NULL, setup, test_run_simple_error, teardown);
diff --git a/pkcs11/gkm/tests/Makefile.am b/pkcs11/gkm/tests/Makefile.am
index 5b65fcdc..f18f951d 100644
--- a/pkcs11/gkm/tests/Makefile.am
+++ b/pkcs11/gkm/tests/Makefile.am
@@ -3,7 +3,7 @@ INCLUDES = \
 	-I$(top_builddir) \
 	-I$(top_srcdir) \
 	-I$(top_srcdir)/pkcs11 \
-	-DSRCDIR="\"$(srcdir)\"" \
+	-DSRCDIR="\"@abs_srcdir@\"" \
 	$(GLIB_CFLAGS) \
 	$(LIBGCRYPT_CFLAGS)
 
diff --git a/pkcs11/gnome2-store/tests/Makefile.am b/pkcs11/gnome2-store/tests/Makefile.am
index 2c86e17f..6dfa12a3 100644
--- a/pkcs11/gnome2-store/tests/Makefile.am
+++ b/pkcs11/gnome2-store/tests/Makefile.am
@@ -3,7 +3,7 @@ INCLUDES = \
 	-I$(top_builddir) \
 	-I$(top_srcdir) \
 	-I$(top_srcdir)/pkcs11 \
-	-DSRCDIR="\"$(srcdir)\"" \
+	-DSRCDIR="\"@abs_srcdir@\"" \
 	$(GLIB_CFLAGS) \
 	$(LIBGCRYPT_CFLAGS)
 
diff --git a/pkcs11/roots-store/tests/Makefile.am b/pkcs11/roots-store/tests/Makefile.am
index 146d9e21..0e21a724 100644
--- a/pkcs11/roots-store/tests/Makefile.am
+++ b/pkcs11/roots-store/tests/Makefile.am
@@ -3,7 +3,7 @@ INCLUDES = \
 	-I$(top_builddir) \
 	-I$(top_srcdir) \
 	-I$(top_srcdir)/pkcs11 \
-	-DSRCDIR="\"$(srcdir)\"" \
+	-DSRCDIR="\"@abs_srcdir@\"" \
 	$(GLIB_CFLAGS) \
 	$(LIBGCRYPT_CFLAGS)
 
diff --git a/pkcs11/secret-store/tests/Makefile.am b/pkcs11/secret-store/tests/Makefile.am
index 0ad27a21..d4500013 100644
--- a/pkcs11/secret-store/tests/Makefile.am
+++ b/pkcs11/secret-store/tests/Makefile.am
@@ -3,7 +3,7 @@ INCLUDES = \
 	-I$(top_builddir) \
 	-I$(top_srcdir) \
 	-I$(top_srcdir)/pkcs11 \
-	-DSRCDIR="\"$(srcdir)\"" \
+	-DSRCDIR="\"@abs_srcdir@\"" \
 	$(GLIB_CFLAGS) \
 	$(LIBGCRYPT_CFLAGS)
 
diff --git a/pkcs11/ssh-store/tests/Makefile.am b/pkcs11/ssh-store/tests/Makefile.am
index 803de6fe..5b670c63 100644
--- a/pkcs11/ssh-store/tests/Makefile.am
+++ b/pkcs11/ssh-store/tests/Makefile.am
@@ -3,7 +3,7 @@ INCLUDES = \
 	-I$(top_builddir) \
 	-I$(top_srcdir) \
 	-I$(top_srcdir)/pkcs11 \
-	-DSRCDIR="\"$(srcdir)\"" \
+	-DSRCDIR="\"@abs_srcdir@\"" \
 	$(GLIB_CFLAGS) \
 	$(LIBGCRYPT_CFLAGS)
 
diff --git a/pkcs11/wrap-layer/tests/Makefile.am b/pkcs11/wrap-layer/tests/Makefile.am
index 92d8ef87..152905df 100644
--- a/pkcs11/wrap-layer/tests/Makefile.am
+++ b/pkcs11/wrap-layer/tests/Makefile.am
@@ -3,7 +3,7 @@ INCLUDES = \
 	-I$(top_builddir) \
 	-I$(top_srcdir) \
 	-I$(top_srcdir)/pkcs11 \
-	-DSRCDIR="\"$(srcdir)\"" \
+	-DSRCDIR="\"@abs_srcdir@\"" \
 	$(GLIB_CFLAGS) \
 	-DWITH_TESTABLE
 
diff --git a/pkcs11/xdg-store/tests/Makefile.am b/pkcs11/xdg-store/tests/Makefile.am
index f41a469d..a0347b3c 100644
--- a/pkcs11/xdg-store/tests/Makefile.am
+++ b/pkcs11/xdg-store/tests/Makefile.am
@@ -3,7 +3,7 @@ INCLUDES = \
 	-I$(top_builddir) \
 	-I$(top_srcdir) \
 	-I$(top_srcdir)/pkcs11 \
-	-DSRCDIR="\"$(srcdir)\"" \
+	-DSRCDIR="\"@abs_srcdir@\"" \
 	$(GLIB_CFLAGS) \
 	$(LIBGCRYPT_CFLAGS)
 
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 89e03347..f8476a0a 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -20,6 +20,7 @@ gcr/gcr-certificate-extensions.c
 gcr/gcr-certificate-renderer.c
 gcr/gcr-certificate-widget.c
 gcr/gcr-display-view.c
+gcr/gcr-failure-renderer.c
 [type: gettext/glade]gcr/gcr-import-dialog.ui
 gcr/gcr-gnupg-key.c
 gcr/gcr-gnupg-process.c
@@ -29,6 +30,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-unlock-renderer.c
 gcr/gcr-viewer-tool.c
 gck/gck-uri.c
 gck/gck-misc.c
diff --git a/ui/tests/Makefile.am b/ui/tests/Makefile.am
index c42fe5d3..d5b44819 100644
--- a/ui/tests/Makefile.am
+++ b/ui/tests/Makefile.am
@@ -2,7 +2,7 @@
 INCLUDES = \
 	-I$(top_builddir) \
 	-I$(top_srcdir) \
-	-DSRCDIR="\"$(srcdir)\"" \
+	-DSRCDIR="\"@abs_srcdir@\"" \
 	$(GLIB_CFLAGS) \
 	$(LIBGCRYPT_CFLAGS)