[libgnome-keyring] introspection: some minor fixes to avoid Vala regressions

[Evan Nemerson <evann src gnome org>]

commit 7ffe9e63a4a2ec53a062ead98454709cdfb3ef11
Author: Evan Nemerson <evan coeus-group com>
Date:   Sat Jun 16 14:32:34 2012 -0700

    introspection: some minor fixes to avoid Vala regressions
    
    https://bugzilla.gnome.org/show_bug.cgi?id=678229

 library/Makefile.am     |    1 +
 library/gnome-keyring.h |   21 ++++++++++++++-------
 2 files changed, 15 insertions(+), 7 deletions(-)
---
diff --git a/library/Makefile.am b/library/Makefile.am
index 04049ca..ccfd328 100644
--- a/library/Makefile.am
+++ b/library/Makefile.am
@@ -71,6 +71,7 @@ GnomeKeyring_1_0_gir_INCLUDES = GObject-2.0
 GnomeKeyring_1_0_gir_CFLAGS = $(INCLUDES)
 GnomeKeyring_1_0_gir_LIBS = $(lib_LTLIBRARIES)
 GnomeKeyring_1_0_gir_FILES = $(introspection_sources)
+GnomeKeyring_1_0_gir_SCANNERFLAGS = --c-include "gnome-keyring.h"
 INTROSPECTION_GIRS += GnomeKeyring-1.0.gir
 
 girdir = $(datadir)/gir-1.0
diff --git a/library/gnome-keyring.h b/library/gnome-keyring.h
index 37dd68b..eaa4150 100644
--- a/library/gnome-keyring.h
+++ b/library/gnome-keyring.h
@@ -92,25 +92,32 @@ typedef struct {
 void gnome_keyring_string_list_free (GList *strings);
 
 typedef void (*GnomeKeyringOperationDoneCallback)           (GnomeKeyringResult result,
-                                                             gpointer           data);
+                                                             gpointer           user_data);
+/**
+ * GnomeKeyringOperationGetStringCallback:
+ * @result: result of the operation
+ * @string: (allow-none): the string, or %NULL
+ * @user_data: user data
+ */
 typedef void (*GnomeKeyringOperationGetStringCallback)      (GnomeKeyringResult result,
                                                              const char        *string,
-                                                             gpointer           data);
+                                                             gpointer           user_data);
 typedef void (*GnomeKeyringOperationGetIntCallback)         (GnomeKeyringResult result,
                                                              guint32            val,
-                                                             gpointer           data);
+                                                             gpointer           user_data);
 typedef void (*GnomeKeyringOperationGetListCallback)        (GnomeKeyringResult result,
                                                              GList             *list,
-                                                             gpointer           data);
+                                                             gpointer           user_data);
 typedef void (*GnomeKeyringOperationGetKeyringInfoCallback) (GnomeKeyringResult result,
                                                              GnomeKeyringInfo  *info,
-                                                             gpointer           data);
+                                                             gpointer           user_data);
 typedef void (*GnomeKeyringOperationGetItemInfoCallback)    (GnomeKeyringResult   result,
                                                              GnomeKeyringItemInfo*info,
-                                                             gpointer             data);
+                                                             gpointer             user_data);
 typedef void (*GnomeKeyringOperationGetAttributesCallback)  (GnomeKeyringResult   result,
                                                              GnomeKeyringAttributeList *attributes,
-                                                             gpointer             data);
+                                                             gpointer             user_data);
+
 
 GType                      gnome_keyring_attribute_get_type           (void) G_GNUC_CONST;
 const gchar*               gnome_keyring_attribute_get_string         (GnomeKeyringAttribute *attribute);