[gcr] gcr: Add missing symbols, and build fixes

[Stefan Walter <stefw src gnome org>]

commit 1d2a165dfd59ab2e1b604eaba12e18790c9ed281
Author: Stef Walter <stefw collabora co uk>
Date:   Mon Nov 21 13:01:32 2011 +0100

    gcr: Add missing symbols, and build fixes

 docs/reference/gcr/Makefile.am      |    1 +
 docs/reference/gcr/gcr-sections.txt |    9 ---------
 gcr/Makefile.am                     |    2 +-
 gcr/gcr-base.symbols                |   10 ++++++++++
 gcr/gcr-parser.c                    |    2 +-
 gcr/gcr-subject-public-key.c        |    2 +-
 po/POTFILES.in                      |    3 ++-
 7 files changed, 16 insertions(+), 13 deletions(-)
---
diff --git a/docs/reference/gcr/Makefile.am b/docs/reference/gcr/Makefile.am
index a801c50..6dc143f 100644
--- a/docs/reference/gcr/Makefile.am
+++ b/docs/reference/gcr/Makefile.am
@@ -63,6 +63,7 @@ IGNORE_HFILES= \
 	gcr-certificate-exporter.h \
 	gcr-certificate-basics-widget.h \
 	gcr-certificate-details-widget.h \
+	gcr-certificate-request-renderer.h \
 	gcr-deprecated.h \
 	gcr-deprecated-base.h \
 	gcr-display-scrolled.h \
diff --git a/docs/reference/gcr/gcr-sections.txt b/docs/reference/gcr/gcr-sections.txt
index 391c9ed..e918813 100644
--- a/docs/reference/gcr/gcr-sections.txt
+++ b/docs/reference/gcr/gcr-sections.txt
@@ -101,18 +101,9 @@ gcr_certificate_request_encode
 gcr_certificate_request_set_cn
 <SUBSECTION Private>
 GCR_CERTIFICATE_REQUEST
-GCR_CERTIFICATE_REQ_RENDERER
-GCR_CERTIFICATE_REQ_RENDERER_CLASS
-GCR_CERTIFICATE_REQ_RENDERER_GET_CLASS
 GCR_IS_CERTIFICATE_REQUEST
-GCR_IS_CERTIFICATE_REQ_RENDERER
-GCR_IS_CERTIFICATE_REQ_RENDERER_CLASS
 GCR_TYPE_CERTIFICATE_REQUEST
 GCR_TYPE_CERTIFICATE_REQUEST_FORMAT
-GCR_TYPE_CERTIFICATE_REQ_RENDERER
-GcrCertificateReqRenderer
-GcrCertificateReqRendererClass
-GcrCertificateReqRendererPrivate
 gcr_certificate_request_get_type
 gcr_certificate_request_format_get_type
 </SECTION>
diff --git a/gcr/Makefile.am b/gcr/Makefile.am
index b6d991c..13db5ed 100644
--- a/gcr/Makefile.am
+++ b/gcr/Makefile.am
@@ -140,7 +140,7 @@ libgcr_ GCR_MAJOR@_la_SOURCES = \
 	gcr-certificate-details-widget.c gcr-certificate-details-widget.h \
 	gcr-certificate-exporter.c gcr-certificate-exporter.h \
 	gcr-certificate-extensions.c gcr-certificate-extensions.h \
-	gcr-certificate-renderer.c gcr-certificate-renderer.h \
+	gcr-certificate-renderer.c gcr-certificate-renderer.h gcr-certificate-renderer-private.h \
 	gcr-certificate-request-renderer.c gcr-certificate-request-renderer.h \
 	gcr-certificate-widget.c gcr-certificate-widget.h \
 	gcr-collection-model.c gcr-collection-model.h \
diff --git a/gcr/gcr-base.symbols b/gcr/gcr-base.symbols
index 8d96291..d578127 100644
--- a/gcr/gcr-base.symbols
+++ b/gcr/gcr-base.symbols
@@ -40,6 +40,16 @@ gcr_certificate_mixin_comparable_init
 gcr_certificate_mixin_emit_notify
 gcr_certificate_mixin_get_property
 gcr_certificate_is_issuer
+gcr_certificate_request_complete
+gcr_certificate_request_complete_async
+gcr_certificate_request_complete_finish
+gcr_certificate_request_encode
+gcr_certificate_request_format_get_type
+gcr_certificate_request_get_format
+gcr_certificate_request_get_private_key
+gcr_certificate_request_get_type
+gcr_certificate_request_prepare
+gcr_certificate_request_set_cn
 gcr_collection_contains
 gcr_collection_emit_added
 gcr_collection_emit_removed
diff --git a/gcr/gcr-parser.c b/gcr/gcr-parser.c
index 7b4ea88..006e2ad 100644
--- a/gcr/gcr-parser.c
+++ b/gcr/gcr-parser.c
@@ -1607,7 +1607,7 @@ parse_der_pkcs10 (GcrParser *self,
 	GNode *asn = NULL;
 	GNode *node;
 	GcrParsed *parsed;
-	gchar *name;
+	gchar *name = NULL;
 
 	asn = egg_asn1x_create_and_decode (pkix_asn1_tab, "pkcs-10-CertificationRequest", data);
 	if (!asn)
diff --git a/gcr/gcr-subject-public-key.c b/gcr/gcr-subject-public-key.c
index fb93b56..6a50a08 100644
--- a/gcr/gcr-subject-public-key.c
+++ b/gcr/gcr-subject-public-key.c
@@ -728,7 +728,7 @@ _gcr_subject_public_key_for_attributes (GckAttributes *attributes)
 	gboolean ret = FALSE;
 	gulong key_type;
 	gulong klass;
-	GNode *asn;
+	GNode *asn = NULL;
 
 	if (!gck_attributes_find_ulong (attributes, CKA_CLASS, &klass)) {
 		_gcr_debug ("no class in attributes");
diff --git a/po/POTFILES.in b/po/POTFILES.in
index b8f5733..29609a8 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -7,7 +7,8 @@ gcr/gcr-callback-output-stream.c
 gcr/gcr-certificate.c
 gcr/gcr-certificate-exporter.c
 gcr/gcr-certificate-extensions.c
-gcr/gcr-certificate-req-renderer.c
+gcr/gcr-certificate-request.c
+gcr/gcr-certificate-request-renderer.c
 gcr/gcr-certificate-renderer.c
 gcr/gcr-certificate-widget.c
 gcr/gcr-display-view.c