[gcr] More tweaks and fixes for vapi bindings

[Stefan Walter <stefw src gnome org>]

commit cce5afa45450e03c7949c0a31378ae70032fc8a8
Author: Stef Walter <stefw gnome org>
Date:   Sat Apr 27 11:50:53 2013 +0200

    More tweaks and fixes for vapi bindings

 gcr/Gcr-3.metadata    |    7 ++++++-
 gcr/Makefile.am       |    2 +-
 gcr/gcr-certificate.c |   37 ++++++++++++++++++++++++++++++++++++-
 ui/Makefile.am        |    2 +-
 4 files changed, 44 insertions(+), 4 deletions(-)
---
diff --git a/gcr/Gcr-3.metadata b/gcr/Gcr-3.metadata
index cbecc9f..5fa1e76 100644
--- a/gcr/Gcr-3.metadata
+++ b/gcr/Gcr-3.metadata
@@ -2,4 +2,9 @@
 // See https://live.gnome.org/Vala/UpstreamGuide for more information
 
 Certificate
-       .get_der_data#virtual_method name="provide_der_data"
\ No newline at end of file
+       .get_der_data#virtual_method name="provide_der_data"
+       .label nullable=true
+       .markup nullable=true
+       .subject nullable=true
+       .issuer nullable=true
+       .expiry nullable=true
diff --git a/gcr/Makefile.am b/gcr/Makefile.am
index bd6bcfc..778f020 100644
--- a/gcr/Makefile.am
+++ b/gcr/Makefile.am
@@ -229,7 +229,7 @@ Gcr_ GCR_MAJOR@_gir_LIBS = libgcr-base- GCR_MAJOR@.la
 Gcr_ GCR_MAJOR@_gir_CFLAGS = -I$(top_srcdir) -I$(top_builddir) \
        -DGCR_COMPILATION -DGCR_API_SUBJECT_TO_CHANGE
 Gcr_ GCR_MAJOR@_gir_FILES = $(PUBLIC_FILES)
-Gcr_ GCR_MAJOR@_gir_SCANNERFLAGS = --c-include "gcr-base.h" \
+Gcr_ GCR_MAJOR@_gir_SCANNERFLAGS = --c-include "gcr/gcr-base.h" \
        --identifier-prefix Gcr
 
 girdir = $(datadir)/gir-1.0
diff --git a/gcr/gcr-certificate.c b/gcr/gcr-certificate.c
index 10a0402..6d18935 100644
--- a/gcr/gcr-certificate.c
+++ b/gcr/gcr-certificate.c
@@ -253,30 +253,65 @@ gcr_certificate_default_init (GcrCertificateIface *iface)
        if (g_once_init_enter (&initialized)) {
                CERTIFICATE_INFO = g_quark_from_static_string ("_gcr_certificate_certificate_info");
 
+               /**
+                * GcrCertificate:label: (allow-none)
+                *
+                * A readable label for this certificate.
+                */
                g_object_interface_install_property (iface,
                         g_param_spec_string ("label", "Label", "Certificate label",
                                              "", G_PARAM_READABLE));
 
+               /**
+                * GcrCertificate:description:
+                *
+                * A readable description for this certificate
+                */
                g_object_interface_install_property (iface,
                         g_param_spec_string ("description", "Description", "Description of object being 
rendered",
                                              "", G_PARAM_READABLE));
 
+               /**
+                * GcrCertificate:markup: (allow-none)
+                *
+                * GLib markup to describe the certificate
+                */
                g_object_interface_install_property (iface,
                         g_param_spec_string ("markup", "Markup", "Markup which describes object being 
rendered",
                                              "", G_PARAM_READABLE));
 
+               /**
+                * GcrCertificate:icon:
+                *
+                * An icon representing the certificate
+                */
                g_object_interface_install_property (iface,
                         g_param_spec_object ("icon", "Icon", "Icon for the object being rendered",
                                              G_TYPE_ICON, G_PARAM_READABLE));
 
+               /**
+                * GcrCertificate:subject: (allow-none)
+                *
+                * Common name part of the certificate subject
+                */
                g_object_interface_install_property (iface,
                           g_param_spec_string ("subject", "Subject", "Common name of subject",
                                                "", G_PARAM_READABLE));
 
+               /**
+                * GcrCertificate:issuer: (allow-none)
+                *
+                * Common name part of the certificate issuer
+                */
                g_object_interface_install_property (iface,
                           g_param_spec_string ("issuer", "Issuer", "Common name of issuer",
                                                "", G_PARAM_READABLE));
 
+               /**
+                * GcrCertificate:expiry: (allow-none)
+                *
+                * The expiry date of the certificate
+                */
                g_object_interface_install_property (iface,
                           g_param_spec_boxed ("expiry", "Expiry", "Certificate expiry",
                                               G_TYPE_DATE, G_PARAM_READABLE));
@@ -951,7 +986,7 @@ gcr_certificate_get_serial_number_hex (GcrCertificate *self)
 }
 
 /**
- * gcr_certificate_get_icon:
+ * gcr_certificate_get_icon: (skip)
  * @self: The certificate
  *
  * Get the icon for a certificate.
diff --git a/ui/Makefile.am b/ui/Makefile.am
index 012fe79..ae2dab4 100644
--- a/ui/Makefile.am
+++ b/ui/Makefile.am
@@ -178,7 +178,7 @@ GcrUi_ GCR_MAJOR@_gir_INCLUDES = GLib-2.0 GObject-2.0 Gtk-3.0
 GcrUi_ GCR_MAJOR@_gir_LIBS = $(top_builddir)/gcr/libgcr-base- GCR_MAJOR@.la libgcr-ui- GCR_MAJOR@.la
 GcrUi_ GCR_MAJOR@_gir_CFLAGS = -I$(top_srcdir) -I$(top_builddir) -DGCR_COMPILATION 
-DGCR_API_SUBJECT_TO_CHANGE
 GcrUi_ GCR_MAJOR@_gir_FILES = $(PUBLIC_FILES)
-GcrUi_ GCR_MAJOR@_gir_SCANNERFLAGS = --c-include "gcr-ui.h" \
+GcrUi_ GCR_MAJOR@_gir_SCANNERFLAGS = --c-include "gcr/gcr-ui.h" \
        --identifier-prefix Gcr --symbol-prefix gcr \
        --include-uninstalled=$(top_builddir)/gcr/Gcr- GCR_MAJOR@.gir