Split Gcr and Gck libraries out of gnome-keyringsplit

29 files changed, 4 insertions, 2271 deletions

diff --git a/docs/Makefile.am b/docs/Makefile.am
index cac25f2d..3f519b7f 100644
--- a/docs/Makefile.am
+++ b/docs/Makefile.am
@@ -1,2 +1,5 @@
 
-SUBDIRS = reference
+EXTRA_DIST = \
+	file-format.txt \
+	keyring-intro.txt \
+	gnome-keyring.svg
\ No newline at end of file
diff --git a/docs/reference/.gitignore b/docs/reference/.gitignore
deleted file mode 100644
index 7c09c11a..00000000
--- a/docs/reference/.gitignore
+++ /dev/null
@@ -1,11 +0,0 @@
-# Directories created by gtk-doc
-xml/
-tmpl/
-html/
-
-# Reports generated by gtk-doc
-*-undeclared.txt
-*-undocumented.txt
-*-unused.txt
-
-
diff --git a/docs/reference/COPYING b/docs/reference/COPYING
deleted file mode 100644
index d5c1293c..00000000
--- a/docs/reference/COPYING
+++ /dev/null
@@ -1,30 +0,0 @@
-This work may be reproduced and distributed in whole or in part, in
-any medium, physical or electronic, so as long as this copyright
-notice remains intact and unchanged on all copies.  Commercial
-redistribution is permitted and encouraged, but you may not
-redistribute, in whole or in part, under terms more restrictive than
-those under which you received it. If you redistribute a modified or
-translated version of this work, you must also make the source code to
-the modified or translated version available in electronic form
-without charge.  However, mere aggregation as part of a larger work
-shall not count as a modification for this purpose.
-
-All code examples in this work are placed into the public domain,
-and may be used, modified and redistributed without restriction.
-
-BECAUSE THIS WORK IS LICENSED FREE OF CHARGE, THERE IS NO
-WARRANTY FOR THE WORK, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
-EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
-OTHER PARTIES PROVIDE THE WORK "AS IS" WITHOUT WARRANTY OF ANY
-KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE.  SHOULD THE WORK PROVE DEFECTIVE, YOU ASSUME
-THE COST OF ALL NECESSARY REPAIR OR CORRECTION.
-
-IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
-WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
-AND/OR REDISTRIBUTE THE WORK AS PERMITTED ABOVE, BE LIABLE TO YOU
-FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
-CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
-WORK, EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGES.
diff --git a/docs/reference/Makefile.am b/docs/reference/Makefile.am
deleted file mode 100644
index 6a9b2af2..00000000
--- a/docs/reference/Makefile.am
+++ /dev/null
@@ -1,2 +0,0 @@
-
-SUBDIRS = gcr gck
diff --git a/docs/reference/gck/.gitignore b/docs/reference/gck/.gitignore
deleted file mode 100644
index 7522b0c7..00000000
--- a/docs/reference/gck/.gitignore
+++ /dev/null
@@ -1,8 +0,0 @@
-# Commit these files if you edit them
-*-decl-list.txt
-*-decl.txt
-*.args
-*.hierarchy
-*.interfaces
-*.prerequisites
-*.signals
diff --git a/docs/reference/gck/Makefile.am b/docs/reference/gck/Makefile.am
deleted file mode 100644
index a14f92ca..00000000
--- a/docs/reference/gck/Makefile.am
+++ /dev/null
@@ -1,100 +0,0 @@
-## Process this file with automake to produce Makefile.in
-
-# We require automake 1.6 at least.
-AUTOMAKE_OPTIONS = 1.6
-
-# The name of the module, e.g. 'glib'.
-DOC_MODULE=gck
-
-# Uncomment for versioned docs and specify the version of the module, e.g. '2'.
-#DOC_MODULE_VERSION=2
-
-
-# The top-level SGML file. You can change this if you want to.
-DOC_MAIN_SGML_FILE=$(DOC_MODULE)-docs.sgml
-
-# The directory containing the source code. Relative to $(srcdir).
-# gtk-doc will search all .c & .h files beneath here for inline comments
-# documenting the functions and macros.
-# e.g. DOC_SOURCE_DIR=../../../gtk
-DOC_SOURCE_DIR=../../../gck
-
-# Extra options to pass to gtkdoc-scangobj. Not normally needed.
-SCANGOBJ_OPTIONS=
-
-# Extra options to supply to gtkdoc-scan.
-# e.g. SCAN_OPTIONS=--deprecated-guards="GTK_DISABLE_DEPRECATED"
-SCAN_OPTIONS=--deprecated-guards="GCK_DISABLE_DEPRECATED"
-
-# Extra options to supply to gtkdoc-mkdb.
-# e.g. MKDB_OPTIONS=--sgml-mode --output-format=xml
-MKDB_OPTIONS=--sgml-mode --output-format=xml
-
-# Extra options to supply to gtkdoc-mktmpl
-# e.g. MKTMPL_OPTIONS=--only-section-tmpl
-MKTMPL_OPTIONS=
-
-# Extra options to supply to gtkdoc-mkhtml
-MKHTML_OPTIONS=
-
-# Extra options to supply to gtkdoc-fixref. Not normally needed.
-# e.g. FIXXREF_OPTIONS=--extra-dir=../gdk-pixbuf/html --extra-dir=../gdk/html
-FIXXREF_OPTIONS=
-
-# Used for dependencies. The docs will be rebuilt if any of these change.
-# e.g. HFILE_GLOB=$(top_srcdir)/gtk/*.h
-# e.g. CFILE_GLOB=$(top_srcdir)/gtk/*.c
-HFILE_GLOB=$(top_srcdir)/$(DOC_MODULE)/*.h
-CFILE_GLOB=$(top_srcdir)/$(DOC_MODULE)/*.c
-
-# Extra header to include when scanning, which are not under DOC_SOURCE_DIR
-# e.g. EXTRA_HFILES=$(top_srcdir}/contrib/extra.h
-EXTRA_HFILES=
-
-# Header files to ignore when scanning. Use base file name, no paths
-# e.g. IGNORE_HFILES=gtkdebug.h gtkintl.h
-IGNORE_HFILES= \
-	gck-debug.h \
-	gck-private.h \
-	test-suite.h \
-	gck-mock.h \
-	gck-test.h \
-	pkcs11-trust-assertions.h
-
-# Images to copy into HTML directory.
-# e.g. HTML_IMAGES=$(top_srcdir)/gtk/stock-icons/stock_about_24.png
-HTML_IMAGES=
-
-# Extra SGML files that are included by $(DOC_MAIN_SGML_FILE).
-# e.g. content_files=running.sgml building.sgml changes-2.0.sgml
-content_files= \
-	gck-pkcs11-links.xml
-
-# SGML files where gtk-doc abbrevations (#GtkWidget) are expanded
-# These files must be listed here *and* in content_files
-# e.g. expand_content_files=running.sgml
-expand_content_files=
-
-# CFLAGS and LDFLAGS for compiling gtkdoc-scangobj with your library.
-# Only needed if you are using gtkdoc-scangobj to dynamically query widget
-# signals and properties.
-# e.g. GTKDOC_CFLAGS=-I$(top_srcdir) -I$(top_builddir) $(GTK_DEBUG_FLAGS)
-# e.g. GTKDOC_LIBS=$(top_builddir)/gtk/$(gtktargetlib)
-GTKDOC_CFLAGS= -I$(top_srcdir) -I$(top_builddir) $(GOBJECT_CFLAGS) -Wno-error
-GTKDOC_LIBS= $(GOBJECT_LIBS) $(top_builddir)/$(DOC_MODULE)/lib$(DOC_MODULE).la
-
-# This includes the standard gtk-doc make rules, copied by gtkdocize.
-include $(top_srcdir)/gtk-doc.make
-
-# Other files to distribute
-# e.g. EXTRA_DIST += version.xml.in
-EXTRA_DIST +=
-
-# Files not to distribute
-# for --rebuild-types in $(SCAN_OPTIONS), e.g. $(DOC_MODULE).types
-# for --rebuild-sections in $(SCAN_OPTIONS) e.g. $(DOC_MODULE)-sections.txt
-DISTCLEANFILES = tmpl/gck-unused.sgml
-
-# Comment this out if you want your docs-status tested during 'make check'
-#TESTS_ENVIRONMENT = cd $(srcsrc)
-#TESTS = $(GTKDOC_CHECK)
diff --git a/docs/reference/gck/gck-docs.sgml b/docs/reference/gck/gck-docs.sgml
deleted file mode 100644
index f5668f3e..00000000
--- a/docs/reference/gck/gck-docs.sgml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN"
-               "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" [
-<!ENTITY version SYSTEM "version.xml">
-]>
-<book id="index" xmlns:xi="http://www.w3.org/2003/XInclude">
-	<bookinfo>
-		<title>Gck Library Reference Manual</title>
-		<releaseinfo>
-			For Gck &version;.
-			An online version of this documentation can be found at
-			<ulink role="online-location" url="http://developer.gnome.org/gck/stable/">http://developer.gnome.org/gck/stable/</ulink>.
-		</releaseinfo>
-	</bookinfo>
-
-	<chapter id="reference">
-		<title>PKCS#11 GObject Bindings</title>
-		<xi:include href="xml/gck-module.xml"/>
-		<xi:include href="xml/gck-slot.xml"/>
-		<xi:include href="xml/gck-session.xml"/>
-		<xi:include href="xml/gck-object.xml"/>
-		<xi:include href="xml/gck-attribute.xml"/>
-		<xi:include href="xml/gck-attributes.xml"/>
-		<xi:include href="xml/gck-enumerator.xml"/>
-		<xi:include href="xml/gck-modules.xml"/>
-		<xi:include href="xml/gck-error.xml"/>
-		<xi:include href="xml/gck-uri.xml"/>
-		<xi:include href="xml/gck-misc.xml"/>
-	</chapter>
-
-	<xi:include href="gck-pkcs11-links.xml"/>
-	<xi:include href="xml/annotation-glossary.xml">
-		<xi:fallback />
-	</xi:include>
-</book>
diff --git a/docs/reference/gck/gck-overrides.txt b/docs/reference/gck/gck-overrides.txt
deleted file mode 100644
index 13f485f1..00000000
--- a/docs/reference/gck/gck-overrides.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-# These are manually-edited to override or add declarations to those scanned
-# from the header files.
diff --git a/docs/reference/gck/gck-pkcs11-links.xml b/docs/reference/gck/gck-pkcs11-links.xml
deleted file mode 100644
index 9341ccf1..00000000
--- a/docs/reference/gck/gck-pkcs11-links.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE article PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN" "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" [
-]>
-<chapter xml:id="pkcs11-links">
-	<title>About PKCS#11</title>
-
-	<anchor id="CK-NOTIFY:CAPS"/>
-	<anchor id="CK-SLOT-ID:CAPS"/>
-	<anchor id="CK-FUNCTION-LIST-PTR:CAPS"/>
-	<anchor id="CK-RV:CAPS"/>
-	<anchor id="CK-SESSION-HANDLE:CAPS"/>
-	<anchor id="CK-OBJECT-HANDLE:CAPS"/>
-	<anchor id="CK-OBJECT-HANDLE-PTR:CAPS"/>
-	<anchor id="CK-ULONG:CAPS"/>
-	<anchor id="CK-BBOOL:CAPS"/>
-
-	<para>PKCS#11 is an API for storing and using crypto objects, and performing
-	crypto operations on them.</para>
-
-	<para>It is specified at the
-	<ulink href="http://www.rsa.com/rsalabs/node.asp?id=2133">RSA website</ulink>
-	and a <ulink href="http://www.cryptsoft.com/pkcs11doc/">handy reference</ulink> is also
-	available.</para>
-
-</chapter>
diff --git a/docs/reference/gck/gck-sections.txt b/docs/reference/gck/gck-sections.txt
deleted file mode 100644
index f6b2c7c8..00000000
--- a/docs/reference/gck/gck-sections.txt
+++ /dev/null
@@ -1,389 +0,0 @@
-<SECTION>
-<FILE>gck-attribute</FILE>
-GckAttribute
-gck_attribute_init
-gck_attribute_init_invalid
-gck_attribute_init_empty
-gck_attribute_init_boolean
-gck_attribute_init_date
-gck_attribute_init_ulong
-gck_attribute_init_string
-gck_attribute_init_copy
-gck_attribute_new
-gck_attribute_new_invalid
-gck_attribute_new_empty
-gck_attribute_new_boolean
-gck_attribute_new_date
-gck_attribute_new_ulong
-gck_attribute_new_string
-gck_attribute_is_invalid
-gck_attribute_get_boolean
-gck_attribute_get_ulong
-gck_attribute_get_string
-gck_attribute_get_date
-gck_attribute_dup
-gck_attribute_clear
-gck_attribute_free
-gck_attribute_dump
-gck_attribute_equal
-<SUBSECTION Private>
-GCK_TYPE_ATTRIBUTE
-gck_attribute_get_type
-</SECTION>
-
-<SECTION>
-<FILE>gck-attributes</FILE>
-GckAttributes
-gck_attributes_new
-gck_attributes_new_empty
-gck_attributes_at
-gck_attributes_add
-gck_attributes_add_data
-gck_attributes_add_invalid
-gck_attributes_add_empty
-gck_attributes_add_boolean
-gck_attributes_add_string
-gck_attributes_add_date
-gck_attributes_add_ulong
-gck_attributes_add_all
-gck_attributes_set_boolean
-gck_attributes_set_string
-gck_attributes_set_date
-gck_attributes_set_ulong
-gck_attributes_find
-gck_attributes_find_boolean
-gck_attributes_find_ulong
-gck_attributes_find_string
-gck_attributes_find_date
-gck_attributes_count
-gck_attributes_ref
-gck_attributes_unref
-gck_attributes_contains
-gck_attributes_dump
-gck_attributes_new_full
-GckAllocator
-<SUBSECTION Standard>
-gck_attributes_get_type
-GCK_TYPE_ATTRIBUTES
-gck_attributes_get_boxed_type
-</SECTION>
-
-<SECTION>
-<FILE>gck-module</FILE>
-GckModule
-gck_module_initialize
-gck_module_initialize_async
-gck_module_initialize_finish
-gck_module_new
-gck_module_equal
-gck_module_hash
-gck_module_match
-gck_module_get_path
-gck_module_get_functions
-gck_module_get_info
-gck_module_get_slots
-GckModuleInfo
-gck_module_info_copy
-gck_module_info_free
-<SUBSECTION Standard>
-GckModuleClass
-gck_module_get_type
-GCK_IS_MODULE
-GCK_IS_MODULE_CLASS
-GCK_MODULE
-GCK_MODULE_CLASS
-GCK_MODULE_GET_CLASS
-GCK_TYPE_MODULE
-GckModulePrivate
-GCK_TYPE_MODULE_INFO
-gck_module_info_get_type
-</SECTION>
-
-<SECTION>
-<FILE>gck-modules</FILE>
-gck_modules_initialize_registered
-gck_modules_initialize_registered_async
-gck_modules_initialize_registered_finish
-gck_modules_enumerate_objects
-gck_modules_enumerate_uri
-gck_modules_get_slots
-gck_modules_object_for_uri
-gck_modules_objects_for_uri
-gck_modules_token_for_uri
-gck_modules_tokens_for_uri
-</SECTION>
-
-<SECTION>
-<FILE>gck-slot</FILE>
-GckMechanismInfo
-gck_mechanism_info_copy
-gck_mechanism_info_free
-gck_mechanisms_length
-gck_mechanisms_at
-gck_mechanisms_check
-GckSessionOptions
-GckSlot
-gck_slot_equal
-gck_slot_hash
-gck_slot_get_module
-gck_slot_get_handle
-gck_slot_get_info
-gck_slot_get_interaction
-gck_slot_set_interaction
-gck_slot_match
-gck_slot_get_token_info
-gck_slot_get_mechanisms
-gck_slot_get_mechanism_info
-gck_slot_has_flags
-gck_slots_enumerate_objects
-gck_slot_open_session
-gck_slot_open_session_full
-gck_slot_open_session_full_async
-gck_slot_open_session_async
-gck_slot_open_session_finish
-gck_slot_from_handle
-GckSlotInfo
-gck_slot_info_copy
-gck_slot_info_free
-GckTokenInfo
-gck_token_info_copy
-gck_token_info_free
-<SUBSECTION Standard>
-GckSlotClass
-gck_slot_get_type
-GCK_IS_SLOT
-GCK_IS_SLOT_CLASS
-GCK_SLOT
-GCK_SLOT_CLASS
-GCK_SLOT_GET_CLASS
-GCK_TYPE_SLOT
-GckSlotPrivate
-GCK_TYPE_MECHANISM_INFO
-GCK_TYPE_SLOT_INFO
-GCK_TYPE_TOKEN_INFO
-GckMechanisms
-gck_mechanisms_free
-gck_mechanism_info_get_type
-gck_slot_info_get_type
-gck_token_info_get_type
-GCK_TYPE_SESSION_OPTIONS
-gck_session_options_get_type
-</SECTION>
-
-<SECTION>
-<FILE>gck-session</FILE>
-GckSession
-gck_session_from_handle
-gck_session_get_module
-gck_session_get_slot
-gck_session_get_handle
-gck_session_get_info
-gck_session_get_interaction
-gck_session_login
-gck_session_login_async
-gck_session_login_finish
-gck_session_logout
-gck_session_logout_async
-gck_session_logout_finish
-gck_session_create_object
-gck_session_create_object_async
-gck_session_create_object_finish
-gck_session_find_objects
-gck_session_find_objects_async
-gck_session_find_objects_finish
-gck_session_encrypt
-gck_session_encrypt_full
-gck_session_encrypt_async
-gck_session_encrypt_finish
-gck_session_decrypt
-gck_session_decrypt_full
-gck_session_decrypt_async
-gck_session_decrypt_finish
-gck_session_sign
-gck_session_sign_full
-gck_session_sign_async
-gck_session_sign_finish
-gck_session_verify
-gck_session_verify_full
-gck_session_verify_async
-gck_session_verify_finish
-gck_session_derive_key
-gck_session_derive_key_async
-gck_session_derive_key_finish
-gck_session_derive_key_full
-gck_session_generate_key_pair
-gck_session_generate_key_pair_async
-gck_session_generate_key_pair_finish
-gck_session_generate_key_pair_full
-gck_session_get_options
-gck_session_get_state
-gck_session_init_pin
-gck_session_init_pin_async
-gck_session_init_pin_finish
-gck_session_set_pin
-gck_session_set_pin_async
-gck_session_set_pin_finish
-gck_session_unwrap_key
-gck_session_unwrap_key_async
-gck_session_unwrap_key_finish
-gck_session_unwrap_key_full
-gck_session_wrap_key
-gck_session_wrap_key_async
-gck_session_wrap_key_finish
-gck_session_wrap_key_full
-GckSessionInfo
-gck_session_info_copy
-gck_session_info_free
-GckMechanism
-<SUBSECTION Standard>
-gck_session_get_type
-GckSessionClass
-GCK_IS_SESSION
-GCK_IS_SESSION_CLASS
-GCK_SESSION
-GCK_SESSION_CLASS
-GCK_SESSION_GET_CLASS
-GCK_TYPE_SESSION
-GckSessionPrivate
-GCK_TYPE_SESSION_INFO
-gck_session_info_get_type
-</SECTION>
-
-<SECTION>
-<FILE>gck-object</FILE>
-GckObject
-gck_object_from_handle
-gck_objects_from_handle_array
-gck_object_equal
-gck_object_hash
-gck_object_get_module
-gck_object_get_handle
-gck_object_get_session
-gck_object_destroy
-gck_object_destroy_async
-gck_object_destroy_finish
-gck_object_set
-gck_object_set_async
-gck_object_set_finish
-gck_object_get
-gck_object_get_async
-gck_object_get_finish
-gck_object_get_data
-gck_object_get_data_full
-gck_object_get_data_async
-gck_object_get_data_finish
-gck_object_get_full
-gck_object_get_template
-gck_object_get_template_async
-gck_object_get_template_finish
-gck_object_set_template
-gck_object_set_template_async
-gck_object_set_template_finish
-<SUBSECTION Standard>
-GckObjectClass
-gck_object_get_type
-GCK_IS_OBJECT
-GCK_IS_OBJECT_CLASS
-GCK_OBJECT
-GCK_OBJECT_CLASS
-GCK_OBJECT_GET_CLASS
-GCK_TYPE_OBJECT
-GckObjectPrivate
-</SECTION>
-
-<SECTION>
-<FILE>gck-error</FILE>
-GCK_VENDOR_CODE
-GCK_ERROR
-gck_message_from_rv
-</SECTION>
-
-<SECTION>
-<FILE>gck-uri</FILE>
-GckUriData
-GckUriError
-GckUriFlags
-GCK_URI_FOR_MODULE_WITH_VERSION
-GCK_URI_FOR_OBJECT_ON_TOKEN
-GCK_URI_FOR_OBJECT_ON_TOKEN_AND_MODULE
-gck_uri_data_new
-gck_uri_parse
-gck_uri_build
-gck_uri_data_copy
-gck_uri_data_free
-GCK_URI_ERROR
-<SUBSECTION Private>
-gck_uri_get_error_quark
-GCK_URI_DATA_TYPE
-gck_uri_data_get_type
-gck_uri_error_get_quark
-GCK_TYPE_URI_ERROR
-GCK_TYPE_URI_FLAGS
-gck_uri_error_get_type
-gck_uri_flags_get_type
-</SECTION>
-
-<SECTION>
-<FILE>gck-enumerator</FILE>
-GckEnumerator
-gck_enumerator_get_interaction
-gck_enumerator_set_interaction
-gck_enumerator_next
-gck_enumerator_next_async
-gck_enumerator_next_finish
-gck_enumerator_next_n
-<SUBSECTION Standard>
-GckEnumeratorClass
-gck_enumerator_get_type
-GckEnumeratorPrivate
-GCK_ENUMERATOR
-GCK_ENUMERATOR_CLASS
-GCK_ENUMERATOR_GET_CLASS
-GCK_IS_ENUMERATOR
-GCK_IS_ENUMERATOR_CLASS
-GCK_TYPE_ENUMERATOR
-</SECTION>
-
-<SECTION>
-<FILE>gck-password</FILE>
-GckPassword
-GckPasswordClass
-gck_password_get_key
-gck_password_get_module
-gck_password_get_token
-<SUBSECTION Private>
-gck_password_get_type
-GckPasswordPrivate
-GCK_IS_PASSWORD
-GCK_IS_PASSWORD_CLASS
-GCK_PASSWORD
-GCK_PASSWORD_CLASS
-GCK_PASSWORD_GET_CLASS
-GCK_TYPE_PASSWORD
-</SECTION>
-
-<SECTION>
-<FILE>gck-misc</FILE>
-GckError
-gck_list_ref_copy
-gck_list_unref_free
-gck_string_from_chars
-gck_string_to_chars
-gck_value_to_boolean
-gck_value_to_ulong
-GCK_INVALID
-<SUBSECTION Private>
-gck_get_error_quark
-gck_error_get_quark
-GCK_TYPE_LIST
-gck_list_get_boxed_type
-GCK_TYPE_ERROR
-gck_error_get_type
-</SECTION>
-
-<SECTION>
-<FILE>gck-private</FILE>
-<SUBSECTION Private>
-GCK_URI_BAD_PREFIX
-CKR_GCK_MODULE_PROBLEM
-</SECTION>
\ No newline at end of file
diff --git a/docs/reference/gck/version.xml.in b/docs/reference/gck/version.xml.in
deleted file mode 100644
index 27323dad..00000000
--- a/docs/reference/gck/version.xml.in
+++ /dev/null
@@ -1 +0,0 @@
-@VERSION@
\ No newline at end of file
diff --git a/docs/reference/gcr/.gitignore b/docs/reference/gcr/.gitignore
deleted file mode 100644
index 72bc88fc..00000000
--- a/docs/reference/gcr/.gitignore
+++ /dev/null
@@ -1,9 +0,0 @@
-# Commit these files if you edit them
-*-decl-list.txt
-*-decl.txt
-*.args
-*.hierarchy
-*.interfaces
-*.prerequisites
-*.signals
-
diff --git a/docs/reference/gcr/Makefile.am b/docs/reference/gcr/Makefile.am
deleted file mode 100644
index f7554f49..00000000
--- a/docs/reference/gcr/Makefile.am
+++ /dev/null
@@ -1,169 +0,0 @@
-## Process this file with automake to produce Makefile.in
-
-# We require automake 1.6 at least.
-AUTOMAKE_OPTIONS = 1.6
-
-# This is a blank Makefile.am for using gtk-doc.
-# Copy this to your project's API docs directory and modify the variables to
-# suit your project. See the GTK+ Makefiles in gtk+/docs/reference for examples
-# of using the various options.
-
-# The name the module, e.g. 'glib'.
-DOC_MODULE=gcr
-
-# Uncomment for versioned docs and specify the version of the module, e.g. '2'.
-DOC_MODULE_VERSION=@GCR_MAJOR@
-
-# The top-level SGML file. You can change this if you want to.
-DOC_MAIN_SGML_FILE=$(DOC_MODULE)-docs.sgml
-
-# The directory containing the source code. Relative to $(srcdir).
-# gtk-doc will search all .c & .h files beneath here for inline comments
-# documenting the functions and macros.
-# e.g. DOC_SOURCE_DIR=../../../gtk
-DOC_SOURCE_DIR=../../../$(DOC_MODULE)
-
-# Extra options to pass to gtkdoc-scangobj. Not normally needed.
-SCANGOBJ_OPTIONS=
-
-# Extra options to supply to gtkdoc-scan.
-# e.g. SCAN_OPTIONS=--deprecated-guards="GTK_DISABLE_DEPRECATED"
-SCAN_OPTIONS=--deprecated-guards="GCR_DISABLE_DEPRECATED"
-
-# Extra options to supply to gtkdoc-mkdb.
-# e.g. MKDB_OPTIONS=--sgml-mode --output-format=xml
-MKDB_OPTIONS=--sgml-mode --output-format=xml
-
-# Extra options to supply to gtkdoc-mktmpl
-# e.g. MKTMPL_OPTIONS=--only-section-tmpl
-MKTMPL_OPTIONS=
-
-# Extra options to supply to gtkdoc-mkhtml
-MKHTML_OPTIONS=
-
-# Extra options to supply to gtkdoc-fixref. Not normally needed.
-# e.g. FIXXREF_OPTIONS=--extra-dir=../gdk-pixbuf/html --extra-dir=../gdk/html
-FIXXREF_OPTIONS=
-
-# Used for dependencies. The docs will be rebuilt if any of these change.
-# e.g. HFILE_GLOB=$(top_srcdir)/gtk/*.h
-# e.g. CFILE_GLOB=$(top_srcdir)/gtk/*.c
-HFILE_GLOB=$(top_srcdir)/$(DOC_MODULE)/*.h
-CFILE_GLOB=$(top_srcdir)/$(DOC_MODULE)/*.c
-
-# Extra header to include when scanning, which are not under DOC_SOURCE_DIR
-# e.g. EXTRA_HFILES=$(top_srcdir}/contrib/extra.h
-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 \
-	gcr-deprecated.h \
-	gcr-deprecated-base.h \
-	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 \
-	gcr-internal.h \
-	gcr-live-search.h \
-	gcr-marshal.h \
-	gcr-menu-button.h \
-	gcr-openpgp.h \
-	gcr-pkcs11-importer.h \
-	gcr-pkcs11-import-interaction.h \
-	gcr-pkcs11-import-dialog.h \
-	gcr-pkcs11-renderer.h \
-	gcr-record.h \
-	gcr-single-collection.h \
-	gcr-unlock-renderer.h \
-	gcr-viewer-window.h \
-	gcr-xxx.h \
-	gcr-zzz.h
-
-# Images to copy into HTML directory.
-# e.g. HTML_IMAGES=$(top_srcdir)/gtk/stock-icons/stock_about_24.png
-HTML_IMAGES= \
-	$(srcdir)/images/certificate-widget.png \
-	$(srcdir)/images/combo-selector.png \
-	$(srcdir)/images/import-button.png \
-	$(srcdir)/images/list-selector.png \
-	$(srcdir)/images/key-widget.png \
-	$(srcdir)/images/tree-selector.png \
-	$(srcdir)/images/viewer-widget.png
-
-# Extra SGML files that are included by $(DOC_MAIN_SGML_FILE).
-# e.g. content_files=running.sgml building.sgml changes-2.0.sgml
-content_files=gcr-visual-index.xml
-
-# SGML files where gtk-doc abbrevations (#GtkWidget) are expanded
-# These files must be listed here *and* in content_files
-# e.g. expand_content_files=running.sgml
-expand_content_files=
-
-# CFLAGS and LDFLAGS for compiling gtkdoc-scangobj with your library.
-# Only needed if you are using gtkdoc-scangobj to dynamically query widget
-# signals and properties.
-# e.g. GTKDOC_CFLAGS=-I$(top_srcdir) -I$(top_builddir) $(GTK_DEBUG_FLAGS)
-# e.g. GTKDOC_LIBS=$(top_builddir)/gtk/$(gtktargetlib)
-GTKDOC_CFLAGS= -I$(top_srcdir) -I$(top_builddir) $(GOBJECT_CFLAGS) -Wno-error
-GTKDOC_LIBS= $(GOBJECT_LIBS) \
-	$(top_builddir)/$(DOC_MODULE)/libgcr-@GCR_MAJOR@.la \
-	$(top_builddir)/gck/libgck-@GCK_MAJOR@.la
-
-# This includes the standard gtk-doc make rules, copied by gtkdocize.
-include $(top_srcdir)/gtk-doc.make
-
-# Other files to distribute
-# e.g. EXTRA_DIST += version.xml.in
-# EXTRA_DIST +=
-
-# Files not to distribute
-# for --rebuild-types in $(SCAN_OPTIONS), e.g. $(DOC_MODULE).types
-# for --rebuild-sections in $(SCAN_OPTIONS) e.g. $(DOC_MODULE)-sections.txt
-DISTCLEANFILES = tmpl/gcr-unused.sgml
-
-# Comment this out if you want your docs-status tested during 'make check'
-#TESTS_ENVIRONMENT = cd $(srcsrc)
-#TESTS = $(GTKDOC_CHECK)
-
-# ------------------------------------------------------------------------------
-# SHOOTER
-
-WIDGETS = \
-	certificate-widget \
-	combo-selector \
-	import-button \
-	key-widget \
-	list-selector \
-	tree-selector \
-	viewer-widget
-
-shots: gcr-shooter
-	mkdir -p $(builddir)/images
-	for widget in $(WIDGETS); do ./gcr-shooter $$widget $(builddir)/images; done
-
-SHOOTER_SRCS = \
-	gcr-shooter.c \
-	gcr-widgets.c
-
-SHOOTER_HEADS = \
-	gcr-shooter.h
-
-gcr-shooter: $(SHOOTER_SRCS) $(SHOOTER_HEADERS) Makefile
-	$(AM_V_CC) libtool --mode=link gcc -o gcr-shooter -Wall -Werror $(GTK_CFLAGS) \
-		-I$(top_srcdir)/gcr -DGCR_API_SUBJECT_TO_CHANGE \
-		-DSRCDIR=\"$(srcdir)\" -DTOPDIR=\"$(top_srcdir)\" \
-		`pkg-config x11 xext --cflags --libs` \
-		$(GTK_LDFLAGS) -lm $(top_builddir)/gcr/libgcr-testable.la \
-		$(SHOOTER_SRCS)
-
-EXTRA_DIST += $(SHOOTER_SRCS) \
-	$(SHOOTER_HEADERS) \
-	images
\ No newline at end of file
diff --git a/docs/reference/gcr/gcr-docs.sgml b/docs/reference/gcr/gcr-docs.sgml
deleted file mode 100644
index 3af98371..00000000
--- a/docs/reference/gcr/gcr-docs.sgml
+++ /dev/null
@@ -1,68 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN"
-               "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" [
-<!ENTITY version SYSTEM "version.xml">
-]>
-<book id="index" xmlns:xi="http://www.w3.org/2003/XInclude">
-	<bookinfo>
-		<title>Gcr Library Reference Manual</title>
-		<releaseinfo>
-			for Gcr &version;.
-			An online version of this documentation can be found at
-			<ulink role="online-location" url="http://developer.gnome.org/gcr/stable/">http://developer.gnome.org/gcr/stable/</ulink>.
-		</releaseinfo>
-	</bookinfo>
-
-	<part id="certificates">
-		<title>Certificates</title>
-		<xi:include href="xml/gcr-certificate.xml"/>
-		<xi:include href="xml/gcr-simple-certificate.xml"/>
-		<xi:include href="xml/gcr-pkcs11-certificate.xml"/>
-		<xi:include href="xml/gcr-certificate-chain.xml"/>
-	</part>
-
-	<part id="collections">
-		<title>Collections</title>
-		<xi:include href="xml/gcr-collection.xml"/>
-		<xi:include href="xml/gcr-comparable.xml"/>
-		<xi:include href="xml/gcr-simple-collection.xml"/>
-		<xi:include href="xml/gcr-collection-model.xml"/>
-	</part>
-
-	<part id="widgets">
-		<title>Widgets</title>
-		<xi:include href="xml/gcr-certificate-widget.xml"/>
-		<xi:include href="xml/gcr-key-widget.xml"/>
-		<xi:include href="xml/gcr-column.xml"/>
-		<xi:include href="xml/gcr-combo-selector.xml"/>
-		<xi:include href="xml/gcr-import-button.xml"/>
-		<xi:include href="xml/gcr-list-selector.xml"/>
-		<xi:include href="xml/gcr-tree-selector.xml"/>
-		<xi:include href="xml/gcr-renderer.xml"/>
-		<xi:include href="xml/gcr-viewer.xml"/>
-		<xi:include href="xml/gcr-viewer-widget.xml"/>
-		<chapter>
-			<title>Widget Gallery</title>
-			<xi:include href="gcr-visual-index.xml" />
-		</chapter>
-	</part>
-
-	<part id="storage">
-		<title>Storage</title>
-		<xi:include href="xml/gcr-trust.xml"/>
-		<xi:include href="xml/gcr-importer.xml"/>
-		<xi:include href="xml/gcr-parser.xml"/>
-	</part>
-
-	<part id="misc">
-		<title>Miscellaneous</title>
-		<xi:include href="xml/gcr-library.xml"/>
-		<xi:include href="xml/gcr-fingerprint.xml"/>
-		<xi:include href="xml/gcr-secret-exchange.xml"/>
-		<xi:include href="xml/gcr-misc.xml"/>
-	</part>
-
-	<xi:include href="xml/annotation-glossary.xml">
-		<xi:fallback />
-	</xi:include>
-</book>
diff --git a/docs/reference/gcr/gcr-overrides.txt b/docs/reference/gcr/gcr-overrides.txt
deleted file mode 100644
index 13f485f1..00000000
--- a/docs/reference/gcr/gcr-overrides.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-# These are manually-edited to override or add declarations to those scanned
-# from the header files.
diff --git a/docs/reference/gcr/gcr-sections.txt b/docs/reference/gcr/gcr-sections.txt
deleted file mode 100644
index 31558e44..00000000
--- a/docs/reference/gcr/gcr-sections.txt
+++ /dev/null
@@ -1,642 +0,0 @@
-<SECTION>
-<FILE>gcr-parser</FILE>
-<TITLE>GcrParser</TITLE>
-GCR_DATA_ERROR
-GcrDataError
-GcrDataFormat
-GcrParser
-GcrParserClass
-gcr_parser_new
-gcr_parser_parse_data
-gcr_parser_parse_stream
-gcr_parser_parse_stream_async
-gcr_parser_parse_stream_finish
-gcr_parser_format_enable
-gcr_parser_format_disable
-gcr_parser_format_supported
-gcr_parser_add_password
-gcr_parser_get_parsed_label
-gcr_parser_get_parsed_description
-gcr_parser_get_parsed_attributes
-gcr_parser_get_parsed_block
-gcr_parser_get_parsed_format
-GcrParsed
-gcr_parsed_ref
-gcr_parsed_unref
-gcr_parsed_get_attributes
-gcr_parsed_get_data
-gcr_parsed_get_description
-gcr_parsed_get_format
-gcr_parsed_get_label
-gcr_parser_get_parsed
-<SUBSECTION Standard>
-GCR_TYPE_PARSED
-GcrParserPrivate
-gcr_parsed_get_type
-GCR_PARSER
-GCR_IS_PARSER
-GCR_TYPE_PARSER
-gcr_parser_get_type
-GCR_PARSER_CLASS
-GCR_IS_PARSER_CLASS
-GCR_PARSER_GET_CLASS
-GCK_API_SUBJECT_TO_CHANGE
-gcr_data_error_get_domain
-GCR_TYPE_DATA_ERROR
-GCR_TYPE_DATA_FORMAT
-gcr_data_error_get_type
-gcr_data_format_get_type
-</SECTION>
-
-<SECTION>
-<FILE>gcr-certificate</FILE>
-GcrCertificate
-GcrCertificateIface
-gcr_certificate_get_der_data
-gcr_certificate_get_issuer_cn
-gcr_certificate_get_issuer_dn
-gcr_certificate_get_issuer_part
-gcr_certificate_get_issuer_raw
-gcr_certificate_is_issuer
-gcr_certificate_get_subject_cn
-gcr_certificate_get_subject_dn
-gcr_certificate_get_subject_part
-gcr_certificate_get_subject_raw
-gcr_certificate_get_issued_date
-gcr_certificate_get_expiry_date
-gcr_certificate_get_serial_number
-gcr_certificate_get_serial_number_hex
-gcr_certificate_get_key_size
-gcr_certificate_get_fingerprint
-gcr_certificate_get_fingerprint_hex
-gcr_certificate_mixin_class_init
-gcr_certificate_mixin_get_property
-GCR_CERTIFICATE_MIXIN_IMPLEMENT_COMPARABLE
-gcr_certificate_mixin_comparable_init
-gcr_certificate_compare
-gcr_certificate_get_icon
-<SUBSECTION Standard>
-gcr_certificate_get_columns
-GCR_CERTIFICATE
-GCR_IS_CERTIFICATE
-GCR_TYPE_CERTIFICATE
-GCR_CERTIFICATE_GET_INTERFACE
-gcr_certificate_get_type
-<SUBSECTION Private>
-GcrCertificateExtensionKeyUsage
-GcrGeneralName
-GcrGeneralNameType
-</SECTION>
-
-<SECTION>
-<FILE>gcr-importer</FILE>
-GcrImporter
-GcrImporterIface
-gcr_importer_get_interaction
-gcr_importer_set_interaction
-gcr_importer_import
-gcr_importer_import_async
-gcr_importer_import_finish
-gcr_importer_register
-gcr_importer_register_well_known
-gcr_importer_create_for_parsed
-gcr_importer_queue_for_parsed
-gcr_importer_queue_and_filter_for_parsed
-gcr_import_interaction_supplement_prep
-gcr_import_interaction_supplement
-gcr_import_interaction_supplement_async
-gcr_import_interaction_supplement_finish
-<SUBSECTION Standard>
-GCR_IMPORTER
-GCR_IS_IMPORTER
-GCR_TYPE_IMPORTER
-gcr_importer_get_type
-GCR_IMPORTER_GET_INTERFACE
-GCR_IMPORT_INTERACTION
-GCR_IMPORT_INTERACTION_GET_INTERFACE
-GCR_IS_IMPORT_INTERACTION
-GCR_TYPE_IMPORT_INTERACTION
-GcrImportInteraction
-GcrImportInteractionIface
-gcr_import_interaction_get_type
-</SECTION>
-
-<SECTION>
-<FILE>gcr-import-button</FILE>
-GcrImportButton
-GcrImportButtonClass
-gcr_import_button_new
-gcr_import_button_add_parsed
-<SUBSECTION Standard>
-GCR_IMPORT_BUTTON
-GCR_IMPORT_BUTTON_CLASS
-GCR_IMPORT_BUTTON_GET_CLASS
-GCR_IS_IMPORT_BUTTON
-GCR_IS_IMPORT_BUTTON_CLASS
-gcr_import_button_get_type
-GCR_TYPE_IMPORT_BUTTON
-<SUBSECTION Private>
-GcrImportButtonPrivate
-</SECTION>
-
-<SECTION>
-<FILE>gcr-simple-certificate</FILE>
-<TITLE>GcrSimpleCertificate</TITLE>
-GcrSimpleCertificate
-GcrSimpleCertificateClass
-gcr_simple_certificate_new
-gcr_simple_certificate_new_static
-<SUBSECTION Standard>
-GcrSimpleCertificatePrivate
-GCR_SIMPLE_CERTIFICATE
-GCR_IS_SIMPLE_CERTIFICATE
-GCR_TYPE_SIMPLE_CERTIFICATE
-gcr_simple_certificate_get_type
-GCR_SIMPLE_CERTIFICATE_CLASS
-GCR_IS_SIMPLE_CERTIFICATE_CLASS
-GCR_SIMPLE_CERTIFICATE_GET_CLASS
-</SECTION>
-
-<SECTION>
-<FILE>gcr-pkcs11-certificate</FILE>
-<TITLE>GcrPkcs11Certificate</TITLE>
-GcrPkcs11Certificate
-GcrPkcs11CertificateClass
-gcr_pkcs11_certificate_lookup_issuer
-gcr_pkcs11_certificate_lookup_issuer_async
-gcr_pkcs11_certificate_lookup_issuer_finish
-gcr_pkcs11_certificate_get_attributes
-<SUBSECTION Standard>
-gcr_pkcs11_certificate_get_type
-GCR_IS_PKCS11_CERTIFICATE
-GCR_IS_PKCS11_CERTIFICATE_CLASS
-GcrPkcs11CertificatePrivate
-GCR_PKCS11_CERTIFICATE
-GCR_PKCS11_CERTIFICATE_CLASS
-GCR_PKCS11_CERTIFICATE_GET_CLASS
-GCR_TYPE_PKCS11_CERTIFICATE
-</SECTION>
-
-<SECTION>
-<FILE>gcr-trust</FILE>
-GCR_PURPOSE_SERVER_AUTH
-GCR_PURPOSE_CLIENT_AUTH
-GCR_PURPOSE_EMAIL
-GCR_PURPOSE_CODE_SIGNING
-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_add_pinned_certificate
-gcr_trust_add_pinned_certificate_async
-gcr_trust_add_pinned_certificate_finish
-gcr_trust_remove_pinned_certificate
-gcr_trust_remove_pinned_certificate_async
-gcr_trust_remove_pinned_certificate_finish
-</SECTION>
-
-<SECTION>
-<FILE>gcr-library</FILE>
-gcr_pkcs11_initialize
-gcr_pkcs11_initialize_async
-gcr_pkcs11_initialize_finish
-gcr_pkcs11_get_modules
-gcr_pkcs11_set_modules
-gcr_pkcs11_add_module
-gcr_pkcs11_add_module_from_file
-gcr_pkcs11_get_trust_lookup_slots
-gcr_pkcs11_get_trust_store_slot
-gcr_pkcs11_get_trust_lookup_uris
-gcr_pkcs11_set_trust_lookup_uris
-gcr_pkcs11_get_trust_store_uri
-gcr_pkcs11_set_trust_store_uri
-<SUBSECTION Private>
-GcrDebugFlags
-</SECTION>
-
-<SECTION>
-<FILE>gcr-certificate-chain</FILE>
-GcrCertificateChain
-GcrCertificateChainClass
-GcrCertificateChainStatus
-gcr_certificate_chain_new
-gcr_certificate_chain_add
-gcr_certificate_chain_get_certificate
-gcr_certificate_chain_get_status
-gcr_certificate_chain_get_anchor
-gcr_certificate_chain_get_endpoint
-gcr_certificate_chain_get_length
-GcrCertificateChainFlags
-gcr_certificate_chain_build
-gcr_certificate_chain_build_async
-gcr_certificate_chain_build_finish
-GCR_TYPE_CERTIFICATE_CHAIN_FLAGS
-GCR_TYPE_CERTIFICATE_CHAIN_STATUS
-<SUBSECTION Standard>
-gcr_certificate_chain_flags_get_type
-gcr_certificate_chain_status_get_type
-gcr_certificate_chain_get_type
-GCR_CERTIFICATE_CHAIN
-GCR_TYPE_CERTIFICATE_CHAIN
-GCR_CERTIFICATE_CHAIN_CLASS
-GCR_CERTIFICATE_CHAIN_GET_CLASS
-GCR_IS_CERTIFICATE_CHAIN
-GCR_IS_CERTIFICATE_CHAIN_CLASS
-GcrCertificateChainPrivate
-</SECTION>
-
-<SECTION>
-<FILE>gcr-comparable</FILE>
-GcrComparable
-GcrComparableIface
-gcr_comparable_compare
-gcr_comparable_memcmp
-<SUBSECTION Standard>
-gcr_comparable_get_type
-GCR_COMPARABLE
-GCR_COMPARABLE_GET_INTERFACE
-GCR_IS_COMPARABLE
-GCR_TYPE_COMPARABLE
-</SECTION>
-
-<SECTION>
-<FILE>gcr-collection</FILE>
-GcrCollection
-gcr_collection_get_length
-gcr_collection_get_objects
-gcr_collection_contains
-gcr_collection_emit_added
-gcr_collection_emit_removed
-<SUBSECTION Standard>
-gcr_collection_get_type
-GCR_COLLECTION
-GCR_COLLECTION_GET_INTERFACE
-GCR_IS_COLLECTION
-GCR_TYPE_COLLECTION
-GcrCollectionIface
-</SECTION>
-
-<SECTION>
-<FILE>gcr-simple-collection</FILE>
-GcrSimpleCollection
-GcrSimpleCollectionClass
-gcr_simple_collection_new
-gcr_simple_collection_add
-gcr_simple_collection_remove
-<SUBSECTION Standard>
-gcr_simple_collection_get_type
-GCR_IS_SIMPLE_COLLECTION
-GCR_IS_SIMPLE_COLLECTION_CLASS
-GCR_SIMPLE_COLLECTION
-GCR_SIMPLE_COLLECTION_CLASS
-GCR_SIMPLE_COLLECTION_GET_CLASS
-GCR_TYPE_SIMPLE_COLLECTION
-GcrSimpleCollectionPrivate
-</SECTION>
-
-<SECTION>
-<FILE>gcr-union-collection</FILE>
-GcrUnionCollection
-GcrUnionCollectionClass
-gcr_union_collection_new
-gcr_union_collection_add
-gcr_union_collection_take
-gcr_union_collection_remove
-gcr_union_collection_have
-gcr_union_collection_size
-<SUBSECTION Standard>
-GCR_IS_UNION_COLLECTION
-GCR_IS_UNION_COLLECTION_CLASS
-GCR_TYPE_UNION_COLLECTION
-GCR_UNION_COLLECTION
-GCR_UNION_COLLECTION_CLASS
-GCR_UNION_COLLECTION_GET_CLASS
-GcrUnionCollectionPrivate
-gcr_union_collection_get_type
-</SECTION>
-
-<SECTION>
-<FILE>gcr-collection-model</FILE>
-GcrCollectionModel
-GcrCollectionModelClass
-gcr_collection_model_new
-gcr_collection_model_new_full
-gcr_collection_model_set_columns
-gcr_collection_model_get_collection
-gcr_collection_model_iter_for_object
-gcr_collection_model_object_for_iter
-gcr_collection_model_is_selected
-gcr_collection_model_change_selected
-gcr_collection_model_toggle_selected
-gcr_collection_model_get_selected_objects
-gcr_collection_model_set_selected_objects
-gcr_collection_model_column_for_selected
-<SUBSECTION Standard>
-gcr_collection_model_get_type
-GCR_COLLECTION_MODEL
-GCR_COLLECTION_MODEL_CLASS
-GCR_COLLECTION_MODEL_GET_CLASS
-GCR_IS_COLLECTION_MODEL
-GCR_IS_COLLECTION_MODEL_CLASS
-GCR_TYPE_COLLECTION_MODEL
-GcrCollectionModelPrivate
-</SECTION>
-
-<SECTION>
-<FILE>gcr-column</FILE>
-GcrColumn
-GcrColumnFlags
-<SUBSECTION Standard>
-GCR_TYPE_COLUMN_FLAGS
-gcr_column_flags_get_type
-</SECTION>
-
-<SECTION>
-<FILE>gcr-tree-selector</FILE>
-GcrTreeSelector
-GcrTreeSelectorClass
-gcr_tree_selector_get_collection
-gcr_tree_selector_get_columns
-gcr_tree_selector_new
-gcr_tree_selector_get_selected
-gcr_tree_selector_set_selected
-<SUBSECTION Standard>
-gcr_tree_selector_get_type
-GCR_IS_TREE_SELECTOR
-GCR_IS_TREE_SELECTOR_CLASS
-GCR_TREE_SELECTOR
-GCR_TREE_SELECTOR_CLASS
-GCR_TREE_SELECTOR_GET_CLASS
-GCR_TYPE_TREE_SELECTOR
-GcrTreeSelectorPrivate
-</SECTION>
-
-<SECTION>
-<FILE>gcr-list-selector</FILE>
-GcrListSelector
-GcrListSelectorClass
-gcr_list_selector_new
-gcr_list_selector_get_collection
-gcr_list_selector_get_selected
-gcr_list_selector_set_selected
-<SUBSECTION Standard>
-gcr_list_selector_get_type
-GcrListSelectorPrivate
-GCR_IS_LIST_SELECTOR
-GCR_IS_LIST_SELECTOR_CLASS
-GCR_LIST_SELECTOR
-GCR_LIST_SELECTOR_CLASS
-GCR_LIST_SELECTOR_GET_CLASS
-GCR_TYPE_LIST_SELECTOR
-</SECTION>
-
-<SECTION>
-<FILE>gcr-combo-selector</FILE>
-GcrComboSelector
-GcrComboSelectorClass
-gcr_combo_selector_get_collection
-gcr_combo_selector_new
-gcr_combo_selector_get_selected
-gcr_combo_selector_set_selected
-<SUBSECTION Standard>
-gcr_combo_selector_get_type
-GCR_IS_COMBO_SELECTOR
-GCR_IS_COMBO_SELECTOR_CLASS
-GCR_COMBO_SELECTOR
-GCR_COMBO_SELECTOR_CLASS
-GCR_COMBO_SELECTOR_GET_CLASS
-GCR_TYPE_COMBO_SELECTOR
-GcrComboSelectorPrivate
-</SECTION>
-
-<SECTION>
-<FILE>gcr-renderer</FILE>
-GcrRenderer
-GcrRendererIface
-gcr_renderer_create
-gcr_renderer_register
-gcr_renderer_popuplate_popup
-gcr_renderer_render_view
-gcr_renderer_emit_data_changed
-gcr_renderer_register_well_known
-<SUBSECTION Standard>
-gcr_renderer_get_type
-GCR_IS_RENDERER
-GCR_RENDERER
-GCR_RENDERER_GET_INTERFACE
-GCR_TYPE_RENDERER
-</SECTION>
-
-<SECTION>
-<FILE>gcr-viewer</FILE>
-GcrViewer
-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
-<SUBSECTION Standard>
-gcr_viewer_get_type
-GCR_IS_VIEWER
-GCR_TYPE_VIEWER
-GCR_VIEWER
-GCR_VIEWER_GET_INTERFACE
-</SECTION>
-
-<SECTION>
-<FILE>gcr-certificate-widget</FILE>
-GCR_CERTIFICATE_COLUMNS
-GcrCertificateWidget
-GcrCertificateWidgetClass
-GcrCertificateRenderer
-GcrCertificateRendererClass
-gcr_certificate_widget_new
-gcr_certificate_widget_get_attributes
-gcr_certificate_widget_set_attributes
-gcr_certificate_widget_get_certificate
-gcr_certificate_widget_set_certificate
-gcr_certificate_renderer_new
-gcr_certificate_renderer_new_for_attributes
-gcr_certificate_renderer_get_attributes
-gcr_certificate_renderer_set_attributes
-gcr_certificate_renderer_get_certificate
-gcr_certificate_renderer_set_certificate
-<SUBSECTION Standard>
-gcr_certificate_widget_get_type
-GCR_CERTIFICATE_RENDERER
-GCR_CERTIFICATE_RENDERER_CLASS
-GCR_CERTIFICATE_RENDERER_GET_CLASS
-GCR_IS_CERTIFICATE_RENDERER
-GCR_IS_CERTIFICATE_RENDERER_CLASS
-GCR_CERTIFICATE_WIDGET
-GCR_CERTIFICATE_WIDGET_CLASS
-GCR_CERTIFICATE_WIDGET_GET_CLASS
-GCR_IS_CERTIFICATE_WIDGET
-GCR_IS_CERTIFICATE_WIDGET_CLASS
-GCR_TYPE_CERTIFICATE_RENDERER
-GCR_TYPE_CERTIFICATE_WIDGET
-GcrCertificateRendererPrivate
-GcrCertificateWidgetPrivate
-gcr_certificate_renderer_get_type
-</SECTION>
-
-<SECTION>
-<FILE>gcr-key-widget</FILE>
-GcrKeyWidget
-GcrKeyWidgetClass
-GcrKeyRenderer
-GcrKeyRendererClass
-gcr_key_widget_new
-gcr_key_widget_get_attributes
-gcr_key_widget_set_attributes
-gcr_key_renderer_new
-gcr_key_renderer_get_attributes
-gcr_key_renderer_set_attributes
-<SUBSECTION Standard>
-gcr_key_renderer_get_type
-gcr_key_widget_get_type
-GCR_IS_KEY_RENDERER
-GCR_IS_KEY_RENDERER_CLASS
-GCR_IS_KEY_WIDGET
-GCR_IS_KEY_WIDGET_CLASS
-GCR_KEY_RENDERER
-GCR_KEY_RENDERER_CLASS
-GCR_KEY_RENDERER_GET_CLASS
-GCR_KEY_WIDGET
-GCR_KEY_WIDGET_CLASS
-GCR_KEY_WIDGET_GET_CLASS
-GCR_TYPE_KEY_RENDERER
-GCR_TYPE_KEY_WIDGET
-GcrKeyRendererPrivate
-GcrKeyWidgetPrivate
-</SECTION>
-
-<SECTION>
-<FILE>gcr-unlock-options-widget</FILE>
-GcrUnlockOptionsWidget
-GcrUnlockOptionsWidgetClass
-GCR_UNLOCK_OPTION_ALWAYS
-GCR_UNLOCK_OPTION_IDLE
-GCR_UNLOCK_OPTION_SESSION
-GCR_UNLOCK_OPTION_TIMEOUT
-gcr_unlock_options_widget_new
-gcr_unlock_options_widget_get_choice
-gcr_unlock_options_widget_set_choice
-gcr_unlock_options_widget_get_label
-gcr_unlock_options_widget_set_label
-gcr_unlock_options_widget_get_ttl
-gcr_unlock_options_widget_set_ttl
-gcr_unlock_options_widget_get_sensitive
-gcr_unlock_options_widget_set_sensitive
-<SUBSECTION Standard>
-gcr_unlock_options_widget_get_type
-GCR_IS_UNLOCK_OPTIONS_WIDGET
-GCR_IS_UNLOCK_OPTIONS_WIDGET_CLASS
-GCR_TYPE_UNLOCK_OPTIONS_WIDGET
-GCR_UNLOCK_OPTIONS_WIDGET
-GCR_UNLOCK_OPTIONS_WIDGET_CLASS
-GCR_UNLOCK_OPTIONS_WIDGET_GET_CLASS
-GcrUnlockOptionsWidgetPrivate
-</SECTION>
-
-<SECTION>
-<FILE>gcr-viewer-widget</FILE>
-GcrViewerWidget
-GcrViewerWidgetClass
-gcr_viewer_widget_new
-gcr_viewer_widget_load_data
-gcr_viewer_widget_load_file
-gcr_viewer_widget_get_parser
-<SUBSECTION Standard>
-gcr_viewer_widget_get_type
-GCR_TYPE_VIEWER_WIDGET
-GCR_IS_VIEWER_WIDGET
-GCR_IS_VIEWER_WIDGET_CLASS
-GCR_VIEWER_WIDGET
-GCR_VIEWER_WIDGET_CLASS
-GCR_VIEWER_WIDGET_GET_CLASS
-<SUBSECTION Private>
-GcrViewerWidgetPrivate
-</SECTION>
-
-<SECTION>
-<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>
-gcr_secret_exchange_get_type
-GCR_IS_SECRET_EXCHANGE
-GCR_IS_SECRET_EXCHANGE_CLASS
-GCR_SECRET_EXCHANGE
-GCR_SECRET_EXCHANGE_CLASS
-GCR_SECRET_EXCHANGE_GET_CLASS
-GCR_TYPE_SECRET_EXCHANGE
-GcrSecretExchangePrivate
-</SECTION>
-
-<SECTION>
-<FILE>gcr-fingerprint</FILE>
-gcr_fingerprint_from_attributes
-gcr_fingerprint_from_certificate_public_key
-gcr_fingerprint_from_subject_public_key_info
-</SECTION>
-
-<SECTION>
-<FILE>gcr-private</FILE>
-<SUBSECTION Private>
-GCR_GNUPG_COLLECTION
-GCR_GNUPG_COLLECTION_CLASS
-GCR_GNUPG_COLLECTION_GET_CLASS
-GCR_GNUPG_KEY
-GCR_GNUPG_KEY_CLASS
-GCR_GNUPG_KEY_COLUMNS
-GCR_GNUPG_KEY_GET_CLASS
-GCR_IS_GNUPG_COLLECTION
-GCR_IS_GNUPG_COLLECTION_CLASS
-GCR_IS_GNUPG_KEY
-GCR_IS_GNUPG_KEY_CLASS
-GCR_TYPE_GNUPG_COLLECTION
-GCR_TYPE_GNUPG_KEY
-GCR_GNUPG_PROCESS
-GCR_GNUPG_PROCESS_CLASS
-GCR_GNUPG_PROCESS_GET_CLASS
-GCR_IS_GNUPG_PROCESS
-GCR_IS_GNUPG_PROCESS_CLASS
-GCR_TYPE_GNUPG_PROCESS
-GcrGnupgProcess
-GcrGnupgProcessClass
-GcrGnupgProcessPrivate
-GcrGnupgProcessFlags
-GcrGnupgCollection
-GcrGnupgCollectionClass
-GcrGnupgCollectionPrivate
-GcrGnupgKey
-GcrGnupgKeyClass
-GcrGnupgKeyPrivate
-GcrLineCallback
-GCR_IS_MEMORY_ICON
-GCR_IS_MEMORY_ICON_CLASS
-GCR_MEMORY_ICON
-GCR_MEMORY_ICON_CLASS
-GCR_MEMORY_ICON_COLUMNS
-GCR_MEMORY_ICON_GET_CLASS
-GCR_TYPE_MEMORY_ICON
-GcrMemoryIcon
-GcrMemoryIconClass
-GcrMemoryIconPrivate
-GcrOpensshPubCallback
-GCR_TYPE_IMPORTER_PROMPT_BEHAVIOR
-gcr_importer_prompt_behavior_get_type
-</SECTION>
diff --git a/docs/reference/gcr/gcr-shooter.c b/docs/reference/gcr/gcr-shooter.c
deleted file mode 100644
index 0ae3827a..00000000
--- a/docs/reference/gcr/gcr-shooter.c
+++ /dev/null
@@ -1,466 +0,0 @@
-
-#include "gcr-shooter.h"
-
-#include <gdk/gdk.h>
-#include <gtk/gtk.h>
-#include <gdk/gdkx.h>
-#include <stdio.h>
-#include <errno.h>
-#include <sys/wait.h>
-#include <unistd.h>
-#include <X11/extensions/shape.h>
-
-#include <gdk-pixbuf/gdk-pixbuf.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <sys/wait.h>
-#include <signal.h>
-#include <unistd.h>
-#include <stdlib.h>
-#include <fcntl.h>
-#include <errno.h>
-#include <locale.h>
-#include <math.h>
-
-#define MAXIMUM_WM_REPARENTING_DEPTH 4
-
-#define SMALL_WIDTH  240
-#define SMALL_HEIGHT 75
-#define MEDIUM_WIDTH 240
-#define MEDIUM_HEIGHT 165
-#define LARGE_WIDTH 240
-#define LARGE_HEIGHT 240
-
-static Window
-find_toplevel_window (Window xid)
-{
-	Window root, parent, *children;
-	guint nchildren;
-
-	do {
-		if (XQueryTree (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), xid, &root,
-		                &parent, &children, &nchildren) == 0) {
-			g_warning ("Couldn't find window manager window");
-			return None;
-		}
-
-		if (root == parent)
-			return xid;
-
-		xid = parent;
-	} while (TRUE);
-}
-
-
-static gboolean
-adjust_size_callback (GcrShooterInfo *info)
-{
-	Window toplevel;
-	Window root;
-	GdkWindow *window;
-	gint tx;
-	gint ty;
-	guint twidth;
-	guint theight;
-	guint tborder_width;
-	guint tdepth;
-	gint target_width = 0;
-	gint target_height = 0;
-
-	window = gtk_widget_get_window (info->window);
-	toplevel = find_toplevel_window (GDK_WINDOW_XID (window));
-	XGetGeometry (GDK_WINDOW_XDISPLAY (window), toplevel,
-	              &root, &tx, &ty, &twidth, &theight, &tborder_width, &tdepth);
-
-	switch (info->size) {
-	case GCR_SHOOTER_SMALL:
-		target_width = SMALL_WIDTH;
-		target_height = SMALL_HEIGHT;
-		break;
-	case GCR_SHOOTER_MEDIUM:
-		target_width = MEDIUM_WIDTH;
-		target_height = MEDIUM_HEIGHT;
-		break;
-	case GCR_SHOOTER_LARGE:
-		target_width = LARGE_WIDTH;
-		target_height = LARGE_HEIGHT;
-		break;
-	case GCR_SHOOTER_ASIS:
-		target_width = twidth;
-		target_height = theight;
-		break;
-	}
-
-	if (twidth > target_width || theight > target_height) {
-		gtk_widget_set_size_request (info->window,
-		                             2 + target_width - (twidth - target_width), /* Dunno why I need the +2 fudge factor; */
-		                             2 + target_height - (theight - target_height));
-	}
-	return FALSE;
-}
-
-static void
-realize_callback (GtkWidget  *widget, GcrShooterInfo *info)
-{
-	gdk_threads_add_timeout (500, (GSourceFunc)adjust_size_callback, info);
-}
-
-GcrShooterInfo*
-gcr_shooter_info_new (const gchar *name, GtkWidget *widget, GcrShooterSize size)
-{
-	GcrShooterInfo *info;
-
-	info = g_new0 (GcrShooterInfo, 1);
-	info->name = g_strdup (name);
-	info->size = size;
-	if (GTK_IS_WINDOW (widget)) {
-		info->window = widget;
-		gtk_window_set_resizable (GTK_WINDOW (info->window), FALSE);
-		info->include_decorations = TRUE;
-		g_signal_connect (info->window, "realize", G_CALLBACK (realize_callback), info);
-	} else {
-		info->window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
-		gtk_window_set_has_resize_grip (GTK_WINDOW (info->window), FALSE);
-		info->include_decorations = FALSE;
-		gtk_widget_show_all (widget);
-		gtk_container_add (GTK_CONTAINER (info->window), widget);
-	}
-	info->no_focus = TRUE;
-
-	gtk_widget_set_app_paintable (info->window, TRUE);
-	g_signal_connect (info->window, "focus", G_CALLBACK (gtk_true), NULL);
-	gtk_container_set_border_width (GTK_CONTAINER (info->window), 12);
-
-	switch (size) {
-	case GCR_SHOOTER_SMALL:
-		gtk_widget_set_size_request (info->window, 240, 75);
-		break;
-	case GCR_SHOOTER_MEDIUM:
-		gtk_widget_set_size_request (info->window, 240, 165);
-		break;
-	case GCR_SHOOTER_LARGE:
-		gtk_widget_set_size_request (info->window, 240, 240);
-		break;
-	default:
-		break;
-	}
-
-	return info;
-}
-
-#define BLUR_RADIUS 5
-#define SHADOW_OFFSET (BLUR_RADIUS * 4 / 5)
-#define SHADOW_OPACITY 0.75
-
-typedef struct {
-	int size;
-	double *data;
-} ConvFilter;
-
-static double
-gaussian (double x, double y, double r)
-{
-	return ((1 / (2 * M_PI * r)) *
-	        exp ((- (x * x + y * y)) / (2 * r * r)));
-}
-
-static ConvFilter *
-create_blur_filter (int radius)
-{
-	ConvFilter *filter;
-	int x, y;
-	double sum;
-
-	filter = g_new0 (ConvFilter, 1);
-	filter->size = radius * 2 + 1;
-	filter->data = g_new (double, filter->size * filter->size);
-
-	sum = 0.0;
-
-	for (y = 0 ; y < filter->size; y++) {
-		for (x = 0 ; x < filter->size; x++) {
-			sum += filter->data[y * filter->size + x] = gaussian (x - (filter->size >> 1),
-			       y - (filter->size >> 1),
-			       radius);
-		}
-	}
-
-	for (y = 0; y < filter->size; y++) {
-		for (x = 0; x < filter->size; x++) {
-			filter->data[y * filter->size + x] /= sum;
-		}
-	}
-
-	return filter;
-
-}
-
-static GdkPixbuf *
-create_shadow (GdkPixbuf *src)
-{
-	int x, y, i, j;
-	int width, height;
-	GdkPixbuf *dest;
-	static ConvFilter *filter = NULL;
-	int src_rowstride, dest_rowstride;
-	int src_bpp, dest_bpp;
-	guchar *src_pixels, *dest_pixels;
-
-	if (!filter)
-		filter = create_blur_filter (BLUR_RADIUS);
-
-	width = gdk_pixbuf_get_width (src) + BLUR_RADIUS * 2 + SHADOW_OFFSET;
-	height = gdk_pixbuf_get_height (src) + BLUR_RADIUS * 2 + SHADOW_OFFSET;
-
-	dest = gdk_pixbuf_new (gdk_pixbuf_get_colorspace (src),
-	                       gdk_pixbuf_get_has_alpha (src),
-	                       gdk_pixbuf_get_bits_per_sample (src),
-	                       width, height);
-	gdk_pixbuf_fill (dest, 0);
-	src_pixels = gdk_pixbuf_get_pixels (src);
-	src_rowstride = gdk_pixbuf_get_rowstride (src);
-	src_bpp = gdk_pixbuf_get_has_alpha (src) ? 4 : 3;
-
-	dest_pixels = gdk_pixbuf_get_pixels (dest);
-	dest_rowstride = gdk_pixbuf_get_rowstride (dest);
-	dest_bpp = gdk_pixbuf_get_has_alpha (dest) ? 4 : 3;
-
-	for (y = 0; y < height; y++) {
-		for (x = 0; x < width; x++) {
-			int sumr = 0, sumg = 0, sumb = 0, suma = 0;
-
-			for (i = 0; i < filter->size; i++) {
-				for (j = 0; j < filter->size; j++) {
-					int src_x, src_y;
-
-					src_y = -(BLUR_RADIUS + SHADOW_OFFSET) + y - (filter->size >> 1) + i;
-					src_x = -(BLUR_RADIUS + SHADOW_OFFSET) + x - (filter->size >> 1) + j;
-
-					if (src_y < 0 || src_y > gdk_pixbuf_get_height (src) ||
-					    src_x < 0 || src_x > gdk_pixbuf_get_width (src))
-						continue;
-
-					sumr += src_pixels [src_y * src_rowstride +
-					                    src_x * src_bpp + 0] *
-					                    filter->data [i * filter->size + j];
-					sumg += src_pixels [src_y * src_rowstride +
-					                    src_x * src_bpp + 1] *
-					                    filter->data [i * filter->size + j];
-
-					sumb += src_pixels [src_y * src_rowstride +
-					                    src_x * src_bpp + 2] *
-					                    filter->data [i * filter->size + j];
-
-					if (src_bpp == 4)
-						suma += src_pixels [src_y * src_rowstride +
-						                    src_x * src_bpp + 3] *
-						                    filter->data [i * filter->size + j];
-				}
-			}
-
-			if (dest_bpp == 4)
-				dest_pixels [y * dest_rowstride +
-				             x * dest_bpp + 3] = suma * SHADOW_OPACITY;
-		}
-	}
-
-	return dest;
-}
-
-GdkPixbuf *
-create_shadowed_pixbuf (GdkPixbuf *src)
-{
-	GdkPixbuf *dest;
-
-	dest = create_shadow (src);
-
-	gdk_pixbuf_composite (src, dest,
-	                      BLUR_RADIUS, BLUR_RADIUS,
-	                      gdk_pixbuf_get_width (src),
-	                      gdk_pixbuf_get_height (src),
-	                      BLUR_RADIUS, BLUR_RADIUS, 1.0, 1.0,
-	                      GDK_INTERP_NEAREST, 255);
-	return dest;
-}
-static GdkPixbuf *
-add_border_to_shot (GdkPixbuf *pixbuf)
-{
-	GdkPixbuf *retval;
-
-	retval = gdk_pixbuf_new (GDK_COLORSPACE_RGB, TRUE, 8,
-	                         gdk_pixbuf_get_width (pixbuf) + 2,
-	                         gdk_pixbuf_get_height (pixbuf) + 2);
-
-	/* Fill with solid black */
-	gdk_pixbuf_fill (retval, 0xFF);
-	gdk_pixbuf_copy_area (pixbuf,
-	                      0, 0,
-	                      gdk_pixbuf_get_width (pixbuf),
-	                      gdk_pixbuf_get_height (pixbuf),
-	                      retval, 1, 1);
-
-	return retval;
-}
-
-static GdkPixbuf *
-remove_shaped_area (GdkPixbuf *pixbuf, Window window)
-{
-	GdkPixbuf *retval;
-	XRectangle *rectangles;
-	int rectangle_count, rectangle_order;
-	int i;
-
-	retval = gdk_pixbuf_new (GDK_COLORSPACE_RGB, TRUE, 8,
-	                         gdk_pixbuf_get_width (pixbuf),
-	                         gdk_pixbuf_get_height (pixbuf));
-
-	gdk_pixbuf_fill (retval, 0);
-	rectangles = XShapeGetRectangles (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), window,
-	                                  ShapeBounding, &rectangle_count, &rectangle_order);
-
-	for (i = 0; i < rectangle_count; i++) {
-		int y, x;
-
-		for (y = rectangles[i].y; y < rectangles[i].y + rectangles[i].height; y++) {
-			guchar *src_pixels, *dest_pixels;
-
-			src_pixels = gdk_pixbuf_get_pixels (pixbuf) +
-			             y * gdk_pixbuf_get_rowstride (pixbuf) +
-			             rectangles[i].x * (gdk_pixbuf_get_has_alpha (pixbuf) ? 4 : 3);
-			dest_pixels = gdk_pixbuf_get_pixels (retval) +
-			              y * gdk_pixbuf_get_rowstride (retval) +
-			              rectangles[i].x * 4;
-
-			for (x = rectangles[i].x; x < rectangles[i].x + rectangles[i].width; x++) {
-				*dest_pixels++ = *src_pixels ++;
-				*dest_pixels++ = *src_pixels ++;
-				*dest_pixels++ = *src_pixels ++;
-				*dest_pixels++ = 255;
-
-				if (gdk_pixbuf_get_has_alpha (pixbuf))
-					src_pixels++;
-			}
-		}
-	}
-
-	return retval;
-}
-
-static GdkPixbuf *
-take_window_shot (Window child, gboolean include_decoration)
-{
-	GdkWindow *window;
-	Window xid;
-	gint x_orig, y_orig;
-	gint x = 0, y = 0;
-	gint width, height;
-
-	GdkPixbuf *tmp, *tmp2;
-	GdkPixbuf *retval;
-
-	if (include_decoration)
-		xid = find_toplevel_window (child);
-	else
-		xid = child;
-
-	window = gdk_x11_window_foreign_new_for_display (gdk_display_get_default (), xid);
-
-	width = gdk_window_get_width (window);
-	height = gdk_window_get_height (window);
-	gdk_window_get_origin (window, &x_orig, &y_orig);
-
-	if (x_orig < 0) {
-		x = - x_orig;
-		width = width + x_orig;
-		x_orig = 0;
-	}
-
-	if (y_orig < 0) {
-		y = - y_orig;
-		height = height + y_orig;
-		y_orig = 0;
-	}
-
-	if (x_orig + width > gdk_screen_width ())
-		width = gdk_screen_width () - x_orig;
-
-	if (y_orig + height > gdk_screen_height ())
-		height = gdk_screen_height () - y_orig;
-
-	tmp = gdk_pixbuf_get_from_window (window, x, y, width, height);
-
-	if (include_decoration)
-		tmp2 = remove_shaped_area (tmp, xid);
-	else
-		tmp2 = add_border_to_shot (tmp);
-
-	retval = create_shadowed_pixbuf (tmp2);
-	g_object_unref (tmp);
-	g_object_unref (tmp2);
-
-	return retval;
-}
-
-int
-main (int argc, char **argv)
-{
-	GdkPixbuf *screenshot = NULL;
-	GError *error = NULL;
-	GtkAllocation allocation;
-	GcrShooterInfo *info;
-	GdkWindow *window;
-	const gchar *outdir;
-	XID id;
-	char *filename;
-
-	/*
-	 * If there's no DISPLAY, we silently error out.  We don't want to break
-	 * headless builds.
-	 */
-
-	if (!gtk_init_check (&argc, &argv))
-		return 0;
-
-	if (argc < 2 || !argv[1]) {
-		g_printerr ("specify name of widget\n");
-		return 2;
-	}
-
-	info = gcr_widgets_create (argv[1]);
-	if (info == NULL) {
-		g_printerr ("no such widget: %s\n", argv[1]);
-		return 1;
-	}
-
-	gtk_widget_show (info->window);
-	window = gtk_widget_get_window (info->window);
-	gtk_widget_get_allocation (info->window, &allocation);
-
-	gtk_widget_show_now (info->window);
-	gtk_widget_queue_draw_area (info->window,
-	                            allocation.x, allocation.y,
-	                            allocation.width, allocation.height);
-	gdk_window_process_updates (window, TRUE);
-
-	while (gtk_events_pending ())
-		gtk_main_iteration ();
-	sleep (1);
-
-	while (gtk_events_pending ())
-		gtk_main_iteration ();
-
-	id = gdk_x11_window_get_xid (window);
-	screenshot = take_window_shot (id, info->include_decorations);
-
-	outdir = (argc >= 3) ? argv[2] : ".";
-	filename = g_strdup_printf ("%s/%s.png", outdir, info->name);
-	if (!gdk_pixbuf_save (screenshot, filename, "png", &error, NULL)) {
-		g_printerr ("couldn't write screenshot: %s: %s\n", filename, error->message);
-		g_clear_error (&error);
-		return 1;
-	}
-	g_free(filename);
-	gtk_widget_hide (info->window);
-
-	return 0;
-}
diff --git a/docs/reference/gcr/gcr-shooter.h b/docs/reference/gcr/gcr-shooter.h
deleted file mode 100644
index 407a3641..00000000
--- a/docs/reference/gcr/gcr-shooter.h
+++ /dev/null
@@ -1,23 +0,0 @@
-
-#include <gtk/gtk.h>
-
-typedef enum {
-	GCR_SHOOTER_SMALL,
-	GCR_SHOOTER_MEDIUM,
-	GCR_SHOOTER_LARGE,
-	GCR_SHOOTER_ASIS
-} GcrShooterSize;
-
-typedef struct GcrShooterInfo {
-	GtkWidget *window;
-	gchar *name;
-	gboolean no_focus;
-	gboolean include_decorations;
-	GcrShooterSize size;
-} GcrShooterInfo;
-
-GcrShooterInfo*   gcr_widgets_create        (const gchar *name);
-
-GcrShooterInfo*   gcr_shooter_info_new      (const gchar *name,
-                                             GtkWidget *widget,
-                                             GcrShooterSize size);
diff --git a/docs/reference/gcr/gcr-visual-index.xml b/docs/reference/gcr/gcr-visual-index.xml
deleted file mode 100644
index ced540a1..00000000
--- a/docs/reference/gcr/gcr-visual-index.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE para PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
-               "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
-]>
-<para role="gallery">
-  <link linkend="GcrCertificateWidget">
-    <inlinegraphic fileref="certificate-widget.png" format="PNG"></inlinegraphic>
-  </link>
-  <link linkend="GcrComboSelector">
-    <inlinegraphic fileref="combo-selector.png" format="PNG"></inlinegraphic>
-  </link>
-  <link linkend="GcrImportButton">
-    <inlinegraphic fileref="import-button.png" format="PNG"></inlinegraphic>
-  </link>
-  <link linkend="GcrListSelector">
-    <inlinegraphic fileref="list-selector.png" format="PNG"></inlinegraphic>
-  </link>
-  <link linkend="GcrKeyWidget">
-    <inlinegraphic fileref="key-widget.png" format="PNG"></inlinegraphic>
-  </link>
-  <link linkend="GcrTreeSelector">
-    <inlinegraphic fileref="tree-selector.png" format="PNG"></inlinegraphic>
-  </link>
-  <link linkend="GcrViewerWidget">
-    <inlinegraphic fileref="viewer-widget.png" format="PNG"></inlinegraphic>
-  </link>
-</para>
\ No newline at end of file
diff --git a/docs/reference/gcr/gcr-widgets.c b/docs/reference/gcr/gcr-widgets.c
deleted file mode 100644
index d8458eda..00000000
--- a/docs/reference/gcr/gcr-widgets.c
+++ /dev/null
@@ -1,236 +0,0 @@
-
-#include "gcr-shooter.h"
-#include "gcr.h"
-
-static gpointer
-load_gcr_test_file (const gchar *name, gsize *length)
-{
-	GError *error = NULL;
-	gchar *contents;
-	gchar *filename;
-
-	filename = g_build_filename (TOPDIR, "gcr", "tests", "files", name, NULL);
-	if (!g_file_get_contents (filename, &contents, length, &error))
-		g_error ("couldn't read file: %s: %s", filename, error->message);
-	g_free (filename);
-	return contents;
-}
-
-static GcrShooterInfo *
-create_certificate_widget (const gchar *name)
-{
-	GcrCertificate *certificate;
-	GtkWidget *widget;
-	GtkWidget *align;
-	gchar *contents;
-	gsize length;
-
-	contents = load_gcr_test_file ("cacert.org.cer", &length);
-	certificate = gcr_simple_certificate_new (contents, length);
-	g_free (contents);
-
-	widget = GTK_WIDGET (gcr_certificate_widget_new (certificate));
-	g_object_unref (certificate);
-
-	align = gtk_alignment_new (0.5, 0.5, 0.0, 0.0);
-	gtk_container_add (GTK_CONTAINER (align), widget);
-
-	return gcr_shooter_info_new (name, align, GCR_SHOOTER_LARGE);
-}
-
-static void
-on_parser_key_parsed (GcrParser *parser, gpointer unused)
-{
-	GckAttributes **attrs = unused;
-	*attrs = gck_attributes_ref (gcr_parser_get_parsed_attributes (parser));
-}
-
-static GcrShooterInfo *
-create_key_widget (const gchar *name)
-{
-	GError *error = NULL;
-	GckAttributes *attrs = NULL;
-	GtkWidget *widget;
-	GtkWidget *align;
-	GcrParser *parser;
-	gchar *contents;
-	gsize length;
-
-	contents = load_gcr_test_file ("der-dsa-1024.key", &length);
-	parser = gcr_parser_new ();
-	g_signal_connect (parser, "parsed", G_CALLBACK (on_parser_key_parsed), &attrs);
-	if (!gcr_parser_parse_data (parser, contents, length, &error))
-		g_error ("couldn't parse data: %s", error->message);
-	g_object_unref (parser);
-	g_free (contents);
-
-	g_assert (attrs);
-	widget = GTK_WIDGET (gcr_key_widget_new (attrs));
-	gck_attributes_unref (attrs);
-
-	align = gtk_alignment_new (0.5, 0.5, 0.0, 0.0);
-	gtk_container_add (GTK_CONTAINER (align), widget);
-
-	return gcr_shooter_info_new (name, align, GCR_SHOOTER_LARGE);
-}
-
-static GcrShooterInfo *
-create_combo_selector (const gchar *name)
-{
-	GcrComboSelector *selector;
-	GcrCertificate *certificate;
-	GcrCollection *collection;
-	GtkWidget *align;
-	gchar *contents;
-	gsize length;
-
-	contents = load_gcr_test_file ("cacert.org.cer", &length);
-	certificate = gcr_simple_certificate_new (contents, length);
-	g_free (contents);
-
-	collection = gcr_simple_collection_new ();
-	gcr_simple_collection_add (GCR_SIMPLE_COLLECTION (collection), G_OBJECT (certificate));
-
-	selector = gcr_combo_selector_new (collection);
-	g_object_unref (collection);
-
-	gcr_combo_selector_set_selected (selector, G_OBJECT (certificate));
-	g_object_unref (certificate);
-
-	align = gtk_alignment_new (0.5, 0.5, 0.0, 0.0);
-	gtk_container_add (GTK_CONTAINER (align), GTK_WIDGET (selector));
-
-	return gcr_shooter_info_new (name, align, GCR_SHOOTER_MEDIUM);
-}
-
-static GcrShooterInfo *
-create_tree_selector (const gchar *name)
-{
-	GcrTreeSelector *selector;
-	GcrCertificate *certificate;
-	GcrCollection *collection;
-	GtkWidget *align;
-	gchar *contents;
-	gsize length;
-	GList *selected = NULL;
-
-	collection = gcr_simple_collection_new ();
-	selector = gcr_tree_selector_new (collection, GCR_CERTIFICATE_COLUMNS);
-
-	contents = load_gcr_test_file ("cacert.org.cer", &length);
-	certificate = gcr_simple_certificate_new (contents, length);
-	g_free (contents);
-	gcr_simple_collection_add (GCR_SIMPLE_COLLECTION (collection), G_OBJECT (certificate));
-	selected = g_list_append (selected, certificate);
-	gcr_tree_selector_set_selected (selector, selected);
-	g_list_free (selected);
-	g_object_unref (certificate);
-
-	contents = load_gcr_test_file ("der-certificate-dsa.cer", &length);
-	certificate = gcr_simple_certificate_new (contents, length);
-	g_free (contents);
-	gcr_simple_collection_add (GCR_SIMPLE_COLLECTION (collection), G_OBJECT (certificate));
-	g_object_unref (certificate);
-
-	g_object_unref (collection);
-
-	align = gtk_alignment_new (0.5, 0.5, 0.0, 0.0);
-	gtk_container_add (GTK_CONTAINER (align), GTK_WIDGET (selector));
-
-	return gcr_shooter_info_new (name, align, GCR_SHOOTER_MEDIUM);
-}
-
-static GcrShooterInfo *
-create_list_selector (const gchar *name)
-{
-	GcrListSelector *selector;
-	GcrCertificate *certificate;
-	GcrCollection *collection;
-	GtkWidget *align;
-	gchar *contents;
-	gsize length;
-	GList *selected = NULL;
-
-	collection = gcr_simple_collection_new ();
-	selector = gcr_list_selector_new (collection);
-
-	contents = load_gcr_test_file ("cacert.org.cer", &length);
-	certificate = gcr_simple_certificate_new (contents, length);
-	g_free (contents);
-	gcr_simple_collection_add (GCR_SIMPLE_COLLECTION (collection), G_OBJECT (certificate));
-	selected = g_list_append (selected, certificate);
-	gcr_list_selector_set_selected (selector, selected);
-	g_list_free (selected);
-	g_object_unref (certificate);
-
-	contents = load_gcr_test_file ("der-certificate-dsa.cer", &length);
-	certificate = gcr_simple_certificate_new (contents, length);
-	g_free (contents);
-	gcr_simple_collection_add (GCR_SIMPLE_COLLECTION (collection), G_OBJECT (certificate));
-	g_object_unref (certificate);
-
-	g_object_unref (collection);
-
-	align = gtk_alignment_new (0.5, 0.5, 0.0, 0.0);
-	gtk_container_add (GTK_CONTAINER (align), GTK_WIDGET (selector));
-
-	return gcr_shooter_info_new (name, align, GCR_SHOOTER_MEDIUM);
-}
-
-static GcrShooterInfo *
-create_import_button (const gchar *name)
-{
-	GcrImportButton *import;
-	GtkWidget *align;
-
-	import = gcr_import_button_new ("Import");
-
-	align = gtk_alignment_new (0.5, 0.5, 0.0, 0.0);
-	gtk_container_add (GTK_CONTAINER (align), GTK_WIDGET (import));
-
-	return gcr_shooter_info_new (name, align, GCR_SHOOTER_MEDIUM);
-}
-
-static GcrShooterInfo *
-create_viewer_widget (const gchar *name)
-{
-	GcrViewerWidget *viewer;
-	GtkWidget *align;
-	gchar *contents;
-	gsize length;
-
-	contents = load_gcr_test_file ("email.p12", &length);
-	viewer = gcr_viewer_widget_new ();
-	gcr_viewer_widget_load_data (viewer, "Email certificate", (gpointer)contents, length);
-	g_free (contents);
-
-	align = gtk_alignment_new (0.5, 0.5, 0.0, 0.0);
-	gtk_container_add (GTK_CONTAINER (align), GTK_WIDGET (viewer));
-
-	return gcr_shooter_info_new (name, align, GCR_SHOOTER_LARGE);
-}
-
-GcrShooterInfo*
-gcr_widgets_create (const gchar *name)
-{
-	g_assert (name);
-
-	if (g_str_equal (name, "certificate-widget"))
-		return create_certificate_widget (name);
-	else if (g_str_equal (name, "combo-selector"))
-		return create_combo_selector (name);
-	else if (g_str_equal (name, "import-button"))
-		return create_import_button (name);
-	else if (g_str_equal (name, "key-widget"))
-		return create_key_widget (name);
-	else if (g_str_equal (name, "list-selector"))
-		return create_list_selector (name);
-	else if (g_str_equal (name, "tree-selector"))
-		return create_tree_selector (name);
-	else if (g_str_equal (name, "viewer-widget"))
-		return create_viewer_widget (name);
-	else
-		g_assert_not_reached ();
-
-	return NULL;
-}
diff --git a/docs/reference/gcr/gcr.types b/docs/reference/gcr/gcr.types
deleted file mode 100644
index fcd2dd96..00000000
--- a/docs/reference/gcr/gcr.types
+++ /dev/null
@@ -1,24 +0,0 @@
-gcr_certificate_chain_get_type
-gcr_certificate_get_type
-gcr_certificate_renderer_get_type
-gcr_certificate_widget_get_type
-gcr_collection_get_type
-gcr_collection_model_get_type
-gcr_combo_selector_get_type
-gcr_comparable_get_type
-gcr_import_button_get_type
-gcr_importer_get_type
-gcr_key_renderer_get_type
-gcr_key_widget_get_type
-gcr_list_selector_get_type
-gcr_parser_get_type
-gcr_pkcs11_certificate_get_type
-gcr_renderer_get_type
-gcr_simple_certificate_get_type
-gcr_simple_collection_get_type
-gcr_tree_selector_get_type
-gcr_union_collection_get_type
-gcr_unlock_options_widget_get_type
-gcr_viewer_get_type
-gcr_viewer_widget_get_type
-gcr_viewer_window_get_type
\ No newline at end of file
diff --git a/docs/reference/gcr/images/certificate-widget.png b/docs/reference/gcr/images/certificate-widget.png
deleted file mode 100644
index e3c91582..00000000
--- a/docs/reference/gcr/images/certificate-widget.png
+++ /dev/null
diff --git a/docs/reference/gcr/images/combo-selector.png b/docs/reference/gcr/images/combo-selector.png
deleted file mode 100644
index 073f4839..00000000
--- a/docs/reference/gcr/images/combo-selector.png
+++ /dev/null
diff --git a/docs/reference/gcr/images/import-button.png b/docs/reference/gcr/images/import-button.png
deleted file mode 100644
index 9166bb88..00000000
--- a/docs/reference/gcr/images/import-button.png
+++ /dev/null
diff --git a/docs/reference/gcr/images/key-widget.png b/docs/reference/gcr/images/key-widget.png
deleted file mode 100644
index db3a371d..00000000
--- a/docs/reference/gcr/images/key-widget.png
+++ /dev/null
diff --git a/docs/reference/gcr/images/list-selector.png b/docs/reference/gcr/images/list-selector.png
deleted file mode 100644
index 7f9c6881..00000000
--- a/docs/reference/gcr/images/list-selector.png
+++ /dev/null
diff --git a/docs/reference/gcr/images/tree-selector.png b/docs/reference/gcr/images/tree-selector.png
deleted file mode 100644
index 7bcd1a18..00000000
--- a/docs/reference/gcr/images/tree-selector.png
+++ /dev/null
diff --git a/docs/reference/gcr/images/viewer-widget.png b/docs/reference/gcr/images/viewer-widget.png
deleted file mode 100644
index 1933e043..00000000
--- a/docs/reference/gcr/images/viewer-widget.png
+++ /dev/null
diff --git a/docs/reference/gcr/version.xml.in b/docs/reference/gcr/version.xml.in
deleted file mode 100644
index 27323dad..00000000
--- a/docs/reference/gcr/version.xml.in
+++ /dev/null
@@ -1 +0,0 @@
-@VERSION@
\ No newline at end of file