[gnome-keyring] gcr: Documentation fixes for secret exchange commits

[Stefan Walter <stefw src gnome org>]

commit db4f39bb74c0fa7cca2dd1e1fef6ae5034256d63
Author: Stef Walter <stefw collabora co uk>
Date:   Sat Oct 1 13:17:17 2011 +0200

    gcr: Documentation fixes for secret exchange commits

 docs/reference/gcr/Makefile.am      |    3 +++
 docs/reference/gcr/gcr-sections.txt |   29 ++---------------------------
 gcr/gcr-secret-exchange.c           |    2 +-
 3 files changed, 6 insertions(+), 28 deletions(-)
---
diff --git a/docs/reference/gcr/Makefile.am b/docs/reference/gcr/Makefile.am
index 4c3e870..7ad4c12 100644
--- a/docs/reference/gcr/Makefile.am
+++ b/docs/reference/gcr/Makefile.am
@@ -58,6 +58,7 @@ EXTRA_HFILES=
 # Header files to ignore when scanning. Use base file name, no paths
 # e.g. IGNORE_HFILES=gtkdebug.h gtkintl.h
 IGNORE_HFILES= \
+	gcr-callback-output-stream.h \
 	gcr-certificate-exporter.h \
 	gcr-certificate-basics-widget.h \
 	gcr-certificate-details-widget.h \
@@ -66,6 +67,7 @@ IGNORE_HFILES= \
 	gcr-display-scrolled.h \
 	gcr-display-view.h \
 	gcr-failure-renderer.h \
+	gcr-gnupg-importer.h \
 	gcr-gnupg-renderer.h \
 	gcr-icons.h \
 	gcr-import-dialog.h \
@@ -74,6 +76,7 @@ IGNORE_HFILES= \
 	gcr-marshal.h \
 	gcr-menu-button.h \
 	gcr-openpgp.h \
+	gcr-pkcs11-importer.h \
 	gcr-pkcs11-renderer.h \
 	gcr-record.h \
 	gcr-single-collection.h \
diff --git a/docs/reference/gcr/gcr-sections.txt b/docs/reference/gcr/gcr-sections.txt
index 070fafe..6cf19bc 100644
--- a/docs/reference/gcr/gcr-sections.txt
+++ b/docs/reference/gcr/gcr-sections.txt
@@ -107,24 +107,6 @@ GCR_TYPE_IMPORTER
 gcr_importer_get_type
 GCR_IMPORTER_GET_INTERFACE
 <SUBSECTION Private>
-GCR_GNUPG_IMPORTER
-GCR_GNUPG_IMPORTER_CLASS
-GCR_GNUPG_IMPORTER_GET_CLASS
-GCR_IS_GNUPG_IMPORTER
-GCR_IS_GNUPG_IMPORTER_CLASS
-GCR_IS_PKCS11_IMPORTER
-GCR_IS_PKCS11_IMPORTER_CLASS
-GCR_PKCS11_IMPORTER
-GCR_PKCS11_IMPORTER_CLASS
-GCR_PKCS11_IMPORTER_GET_CLASS
-GCR_TYPE_GNUPG_IMPORTER
-GCR_TYPE_PKCS11_IMPORTER
-GcrGnupgImporter
-GcrGnupgImporterClass
-GcrGnupgImporterPrivate
-GcrPkcs11Importer
-GcrPkcs11ImporterClass
-GcrPkcs11ImporterPrivate
 </SECTION>
 
 <SECTION>
@@ -574,9 +556,11 @@ GcrViewerWidgetPrivate
 <FILE>gcr-secret-exchange</FILE>
 GcrSecretExchange
 GcrSecretExchangeClass
+GCR_SECRET_EXCHANGE_PROTOCOL_1
 gcr_secret_exchange_new
 gcr_secret_exchange_begin
 gcr_secret_exchange_receive
+gcr_secret_exchange_get_protocol
 gcr_secret_exchange_get_secret
 gcr_secret_exchange_send
 <SUBSECTION Standard>
@@ -634,15 +618,6 @@ GcrMemoryIcon
 GcrMemoryIconClass
 GcrMemoryIconPrivate
 GcrOpensshPubCallback
-GCR_CALLBACK_OUTPUT_STREAM
-GCR_CALLBACK_OUTPUT_STREAM_CLASS
-GCR_CALLBACK_OUTPUT_STREAM_GET_CLASS
-GCR_IS_CALLBACK_OUTPUT_STREAM
-GCR_IS_CALLBACK_OUTPUT_STREAM_CLASS
-GCR_TYPE_CALLBACK_OUTPUT_STREAM
-GcrCallbackOutputFunc
-GcrCallbackOutputStream
-GcrCallbackOutputStreamClass
 GCR_TYPE_IMPORTER_PROMPT_BEHAVIOR
 gcr_importer_prompt_behavior_get_type
 </SECTION>
diff --git a/gcr/gcr-secret-exchange.c b/gcr/gcr-secret-exchange.c
index 5f99def..492fde5 100644
--- a/gcr/gcr-secret-exchange.c
+++ b/gcr/gcr-secret-exchange.c
@@ -234,7 +234,7 @@ gcr_secret_exchange_new (const gchar *protocol)
 
 /**
  * gcr_secret_exchange_get_protocol:
- *
+ * @self: a #GcrSecretExchange object
  * Get the secret exchange protocol.
  *
  * Will return %NULL if no protocol was specified, and either