[libvirt] [libvirt-glib] vapi: Get rid of redundant LibvirtGObject-1.0.metadata

Zeeshan Ali (Khattak) zeeshanak at gnome.org
Wed Apr 17 16:40:56 UTC 2013


From: "Zeeshan Ali (Khattak)" <zeeshanak at gnome.org>

Achieve the same through GIR annotations, just like we already do for
libvirt-glib.
---
 libvirt-gobject/libvirt-gobject-main.c | 8 ++++++--
 vapi/LibvirtGObject-1.0.metadata       | 2 --
 vapi/Makefile.am                       | 2 +-
 3 files changed, 7 insertions(+), 5 deletions(-)
 delete mode 100644 vapi/LibvirtGObject-1.0.metadata

diff --git a/libvirt-gobject/libvirt-gobject-main.c b/libvirt-gobject/libvirt-gobject-main.c
index 31d2514..f9f6e2d 100644
--- a/libvirt-gobject/libvirt-gobject-main.c
+++ b/libvirt-gobject/libvirt-gobject-main.c
@@ -33,7 +33,9 @@
 /**
  * gvir_init_object:
  * @argc: (inout): pointer to application's argc
- * @argv: (inout) (array length=argc) (allow-none): pointer to application's argv
+ * @argv: (array length=argc) (inout) (allow-none) (transfer none): Address of the
+ *     <parameter>argv</parameter> parameter of main(), or %NULL. Any options
+ *     understood by GTK+ are stripped before return.
  */
 void gvir_init_object(int *argc,
                       char ***argv)
@@ -58,7 +60,9 @@ static void gvir_log_handler(const gchar *log_domain G_GNUC_UNUSED,
 /**
  * gvir_init_object_check:
  * @argc: (inout): pointer to application's argc
- * @argv: (inout) (array length=argc) (allow-none): pointer to application's argv
+ * @argv: (array length=argc) (inout) (allow-none) (transfer none): Address of the
+ *     <parameter>argv</parameter> parameter of main(), or %NULL. Any options
+ *     understood by GTK+ are stripped before return.
  * @err: pointer to a #GError to which a message will be posted on error
  */
 gboolean gvir_init_object_check(int *argc,
diff --git a/vapi/LibvirtGObject-1.0.metadata b/vapi/LibvirtGObject-1.0.metadata
deleted file mode 100644
index 90e5197..0000000
--- a/vapi/LibvirtGObject-1.0.metadata
+++ /dev/null
@@ -1,2 +0,0 @@
-init_object.argv unowned
-init_object_check.argv unowned
diff --git a/vapi/Makefile.am b/vapi/Makefile.am
index 2ecc3e3..0154104 100644
--- a/vapi/Makefile.am
+++ b/vapi/Makefile.am
@@ -44,4 +44,4 @@ CLEANFILES =					\
 	libvirt-gobject-1.0.vapi		\
 	$(NULL)
 
-EXTRA_DIST = LibvirtGObject-1.0.metadata libvirt-gobject-1.0.deps
+EXTRA_DIST = libvirt-gobject-1.0.deps
-- 
1.8.1.4




More information about the libvir-list mailing list