gck: Enumerator can now retrieve object attributes

 * New interface called GckObjectAttributes. Callers derive from
   GckObject, implement GckObjectAttributes and set fields in the
   iface to denote which attributes are interested in.
 * Caller passes type of derived object to gck_enumerator_set_object_type()
   and then enumerator will retrieve attributes set in iface, and return
   objects of that type
 * GckObjectAttributes has attributes property.

5 files changed, 62 insertions, 5 deletions

diff --git a/docs/reference/gck/Makefile.am b/docs/reference/gck/Makefile.am
index 72ea16f..98cbc34 100644
--- a/docs/reference/gck/Makefile.am
+++ b/docs/reference/gck/Makefile.am
@@ -64,7 +64,7 @@ IGNORE_HFILES= \
 	pkcs11n.h \
 	pkcs11x.h \
 	pkcs11i.h \
-	tests/mock-interaction.h
+	mock-interaction.h
 
 # Images to copy into HTML directory.
 # e.g. HTML_IMAGES=$(top_srcdir)/gtk/stock-icons/stock_about_24.png
diff --git a/docs/reference/gck/gck-docs.sgml b/docs/reference/gck/gck-docs.sgml
index f5668f3..e70290a 100644
--- a/docs/reference/gck/gck-docs.sgml
+++ b/docs/reference/gck/gck-docs.sgml
@@ -21,6 +21,7 @@
 		<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-object-attributes.xml"/>
 		<xi:include href="xml/gck-enumerator.xml"/>
 		<xi:include href="xml/gck-modules.xml"/>
 		<xi:include href="xml/gck-error.xml"/>
diff --git a/docs/reference/gck/gck-sections.txt b/docs/reference/gck/gck-sections.txt
index a26f2c1..6482a6d 100644
--- a/docs/reference/gck/gck-sections.txt
+++ b/docs/reference/gck/gck-sections.txt
@@ -61,10 +61,10 @@ gck_attributes_unref
 gck_attributes_contains
 gck_attributes_dump
 gck_attributes_new_full
+GCK_TYPE_ATTRIBUTES
 GckAllocator
 <SUBSECTION Standard>
 gck_attributes_get_type
-GCK_TYPE_ATTRIBUTES
 gck_attributes_get_boxed_type
 </SECTION>
 
@@ -255,6 +255,7 @@ gck_session_info_get_type
 <SECTION>
 <FILE>gck-object</FILE>
 GckObject
+GckObjectClass
 gck_object_from_handle
 gck_objects_from_handle_array
 gck_object_equal
@@ -283,7 +284,6 @@ 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
@@ -295,6 +295,20 @@ GckObjectPrivate
 </SECTION>
 
 <SECTION>
+<FILE>gck-object-attributes</FILE>
+GckObjectAttributes
+GckObjectAttributesIface
+gck_object_attributes_get_attributes
+gck_object_attributes_set_attributes
+<SUBSECTION Standard>
+gck_object_attributes_get_type
+GCK_IS_OBJECT_ATTRIBUTES
+GCK_OBJECT_ATTRIBUTES
+GCK_OBJECT_ATTRIBUTES_GET_INTERFACE
+GCK_TYPE_OBJECT_ATTRIBUTES
+</SECTION>
+
+<SECTION>
 <FILE>gck-error</FILE>
 GCK_VENDOR_CODE
 GCK_ERROR
@@ -329,12 +343,14 @@ gck_uri_flags_get_type
 <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
+gck_enumerator_get_interaction
+gck_enumerator_set_interaction
+gck_enumerator_get_object_type
+gck_enumerator_set_object_type
 <SUBSECTION Standard>
 GckEnumeratorClass
 gck_enumerator_get_type
diff --git a/docs/reference/gck/gck.interfaces b/docs/reference/gck/gck.interfaces
new file mode 100644
index 0000000..5fdaecc
--- /dev/null
+++ b/docs/reference/gck/gck.interfaces
@@ -0,0 +1 @@
+gck_object_attributes_get_type
diff --git a/docs/reference/gcr/gcr.interfaces b/docs/reference/gcr/gcr.interfaces
new file mode 100644
index 0000000..5af264f
--- /dev/null
+++ b/docs/reference/gcr/gcr.interfaces
@@ -0,0 +1,39 @@
+GcrCertificateRenderer GcrRenderer GcrComparableIface GcrCertificate
+GtkWidget AtkImplementorIface GtkBuildable
+GtkContainer AtkImplementorIface GtkBuildable
+GtkBin AtkImplementorIface GtkBuildable
+GtkAlignment AtkImplementorIface GtkBuildable
+GcrCertificateWidget AtkImplementorIface GtkBuildable
+GcrKeyWidget AtkImplementorIface GtkBuildable
+GcrUnlockOptionsWidget AtkImplementorIface GtkBuildable
+GtkComboBox AtkImplementorIface GtkBuildable GtkCellLayout GtkCellEditable
+GcrComboSelector AtkImplementorIface GtkBuildable GtkCellLayout GtkCellEditable
+GtkButton AtkImplementorIface GtkBuildable GtkActivatable
+GcrImportButton AtkImplementorIface GtkBuildable GtkActivatable
+GtkScrolledWindow AtkImplementorIface GtkBuildable
+GcrDisplayScrolled AtkImplementorIface GtkBuildable GcrViewer
+GcrViewerWidget AtkImplementorIface GtkBuildable GcrViewer
+GtkWindow AtkImplementorIface GtkBuildable
+GcrViewerWindow AtkImplementorIface GtkBuildable
+GtkTreeView AtkImplementorIface GtkBuildable GtkScrollable
+GcrListSelector AtkImplementorIface GtkBuildable GtkScrollable
+GcrTreeSelector AtkImplementorIface GtkBuildable GtkScrollable
+GtkCellArea GtkCellLayout GtkBuildable
+GtkTreeViewColumn GtkCellLayout GtkBuildable
+GcrCollectionModel GtkTreeModel GtkTreeSortable
+GcrKeyRenderer GcrRenderer
+GcrPkcs11Certificate GcrComparableIface GcrCertificate
+GcrSimpleCertificate GcrComparableIface GcrCertificate
+GcrSimpleCollection GcrCollection
+GcrUnionCollection GcrCollection
+GtkWidgetAccessible AtkComponent
+GtkContainerAccessible AtkComponent
+GtkComboBoxAccessible AtkComponent AtkAction AtkSelection
+GtkButtonAccessible AtkComponent AtkAction AtkImage
+GtkTreeViewAccessible AtkComponent AtkTable AtkSelection GtkCellAccessibleParent
+GtkScrolledWindowAccessible AtkComponent
+GtkWindowAccessible AtkComponent AtkWindow
+GtkAction GtkBuildable
+GdkPixbuf GIcon
+GApplication GActionGroup
+GtkApplication GActionGroup