[gnome-keyring] gck: Fix more argument types

[Stefan Walter <stefw src gnome org>]

commit 5745cac7b6a4af55ab5c2a2beddf1e878e1ca062
Author: Stef Walter <stefw collabora co uk>
Date:   Fri Sep 30 09:50:39 2011 +0200

    gck: Fix more argument types
    
     * and mark up introspection annotations on some more arrays

 gck/gck-object.c |   12 ++++++------
 gck/gck-slot.c   |    8 +++++---
 gck/gck.h        |   14 +++++++-------
 3 files changed, 18 insertions(+), 16 deletions(-)
---
diff --git a/gck/gck-object.c b/gck/gck-object.c
index 7288760..7798db2 100644
--- a/gck/gck-object.c
+++ b/gck/gck-object.c
@@ -692,9 +692,9 @@ gck_object_get (GckObject *self, GCancellable *cancellable, GError **error, ...)
 /**
  * gck_object_get_full:
  * @self: The object to get attributes from.
- * @attr_types: The types of the attributes to get.
- * @n_attr_types: The number of attr_types
- * @cancellable: Optional cancellation object, or NULL.
+ * @attr_types: (array length=n_attr_types): the types of the attributes to get
+ * @n_attr_types: the number of attr_types
+ * @cancellable: optional cancellation object, or %NULL
  * @error: A location to store an error.
  *
  * Get the specified attributes from the object. This call may
@@ -742,9 +742,9 @@ gck_object_get_full (GckObject *self, gulong *attr_types, guint n_attr_types,
 /**
  * gck_object_get_async:
  * @self: The object to get attributes from.
- * @attr_types: The types of the attributes to get.
- * @n_attr_types: The number of attr_types
- * @cancellable: Optional cancellation object, or NULL.
+ * @attr_types: (array length=n_attr_types): the types of the attributes to get
+ * @n_attr_types: the number of attr_types
+ * @cancellable: optional cancellation object, or %NULL
  * @callback: A callback which is called when the operation completes.
  * @user_data: Data to be passed to the callback.
  *
diff --git a/gck/gck-slot.c b/gck/gck-slot.c
index 16f0ec8..05c7d8e 100644
--- a/gck/gck-slot.c
+++ b/gck/gck-slot.c
@@ -912,7 +912,7 @@ gck_slot_has_flags (GckSlot *self, gulong flags)
  * gck_slots_enumerate_objects:
  * @slots: (element-type Gck.Slot): a list of #GckSlot to enumerate objects on.
  * @attrs: Attributes that the objects must have, or empty for all objects.
- * @session_options: Options for opening a session.
+ * @options: options for opening a session
  *
  * Setup an enumerator for listing matching objects on the slots.
  *
@@ -921,7 +921,9 @@ gck_slot_has_flags (GckSlot *self, gulong flags)
  * Returns: (transfer full): a new enumerator
  **/
 GckEnumerator*
-gck_slots_enumerate_objects (GList *slots, GckAttributes *attrs, guint session_options)
+gck_slots_enumerate_objects (GList *slots,
+                             GckAttributes *attrs,
+                             GckSessionOptions options)
 {
 	GckUriData *uri_data;
 
@@ -930,7 +932,7 @@ gck_slots_enumerate_objects (GList *slots, GckAttributes *attrs, guint session_o
 	uri_data = gck_uri_data_new ();
 	uri_data->attributes = gck_attributes_ref (attrs);
 
-	return _gck_enumerator_new (slots, session_options, uri_data);
+	return _gck_enumerator_new (slots, options, uri_data);
 }
 
 
diff --git a/gck/gck.h b/gck/gck.h
index 0401f11..890854b 100644
--- a/gck/gck.h
+++ b/gck/gck.h
@@ -589,15 +589,15 @@ gboolean            gck_slot_has_flags                      (GckSlot *self,
 
 GckEnumerator*      gck_slots_enumerate_objects             (GList *slots,
                                                              GckAttributes *attrs,
-                                                             GckSessionOptions session_options);
+                                                             GckSessionOptions options);
 
 GckSession*         gck_slot_open_session                   (GckSlot *self,
-                                                             guint options,
+                                                             GckSessionOptions options,
                                                              GCancellable *cancellable,
                                                              GError **error);
 
 GckSession*         gck_slot_open_session_full              (GckSlot *self,
-                                                             guint options,
+                                                             GckSessionOptions options,
                                                              gulong pkcs11_flags,
                                                              gpointer app_data,
                                                              CK_NOTIFY notify,
@@ -605,13 +605,13 @@ GckSession*         gck_slot_open_session_full              (GckSlot *self,
                                                              GError **error);
 
 void                gck_slot_open_session_async             (GckSlot *self,
-                                                             guint options,
+                                                             GckSessionOptions options,
                                                              GCancellable *cancellable,
                                                              GAsyncReadyCallback callback,
                                                              gpointer user_data);
 
 void                gck_slot_open_session_full_async        (GckSlot *self,
-                                                             guint options,
+                                                             GckSessionOptions options,
                                                              gulong pkcs11_flags,
                                                              gpointer app_data,
                                                              CK_NOTIFY notify,
@@ -675,7 +675,7 @@ GType               gck_session_get_type                    (void) G_GNUC_CONST;
 
 GckSession *        gck_session_from_handle                 (GckSlot *slot,
                                                              gulong session_handle,
-                                                             guint options);
+                                                             GckSessionOptions options);
 
 GckModule*          gck_session_get_module                  (GckSession *self);
 
@@ -687,7 +687,7 @@ GckSessionInfo*     gck_session_get_info                    (GckSession *self);
 
 gulong              gck_session_get_state                   (GckSession *self);
 
-guint               gck_session_get_options                 (GckSession *self);
+GckSessionOptions   gck_session_get_options                 (GckSession *self);
 
 gboolean            gck_session_init_pin                    (GckSession *self,
                                                              const guchar *pin,