summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid King <amigadave@amigadave.com>2013-06-29 16:24:45 +0100
committerDavid King <amigadave@amigadave.com>2013-06-30 10:11:09 +0100
commite501ebb4c8c9742eaac8d7fb18b76a5097ed8197 (patch)
tree73f62528b6bc0685f55580f53d023ad858e9752c
parentc1229ef9071714aded42640a5afede4493274a64 (diff)
downloadcheese-e501ebb4c8c9742eaac8d7fb18b76a5097ed8197.tar.gz
Mark cheese_[gtk_]init() arguments as allow-none
It is reasonable to pass NULL for argc and argv.
-rw-r--r--libcheese/cheese-gtk.c4
-rw-r--r--libcheese/cheese.c4
-rw-r--r--src/vapi/cheese-common.vapi4
3 files changed, 6 insertions, 6 deletions
diff --git a/libcheese/cheese-gtk.c b/libcheese/cheese-gtk.c
index f6f77155..08cca76e 100644
--- a/libcheese/cheese-gtk.c
+++ b/libcheese/cheese-gtk.c
@@ -38,8 +38,8 @@
/**
* cheese_gtk_init:
- * @argc: pointer to the argument list count
- * @argv: pointer to the argument list vector
+ * @argc: (allow-none): pointer to the argument list count
+ * @argv: (allow-none): pointer to the argument list vector
*
* Initialize libcheese-gtk, by initializing Clutter, GStreamer and GTK+. This
* automatically calls cheese_init(), initializing libcheese.
diff --git a/libcheese/cheese.c b/libcheese/cheese.c
index 03935624..0e2e33e2 100644
--- a/libcheese/cheese.c
+++ b/libcheese/cheese.c
@@ -33,8 +33,8 @@
/**
* cheese_init:
- * @argc: pointer to the argument list count
- * @argv: pointer to the argument list vector
+ * @argc: (allow-none): pointer to the argument list count
+ * @argv: (allow-none): pointer to the argument list vector
*
* Initialize libcheese, by initializing Clutter and GStreamer.
*
diff --git a/src/vapi/cheese-common.vapi b/src/vapi/cheese-common.vapi
index 075b5943..26e12a27 100644
--- a/src/vapi/cheese-common.vapi
+++ b/src/vapi/cheese-common.vapi
@@ -4,10 +4,10 @@
namespace Cheese
{
[CCode (cheader_filename = "cheese.h")]
- public static bool init([CCode (array_length_pos = 0.9)] ref unowned string[] argv);
+ public static bool init([CCode (array_length_cname = "argc", array_length_pos = 0.5)] ref unowned string[]? argv);
[CCode (cheader_filename = "cheese-gtk.h")]
- public static bool gtk_init([CCode (array_length_pos = 0.9)] ref unowned string[] argv);
+ public static bool gtk_init([CCode (array_length_cname = "argc", array_length_pos = 0.5)] ref unowned string[]? argv);
[CCode (cheader_filename = "cheese-effect.h")]
public class Effect : GLib.Object