From f6afcd058cd5d4f0d411c1b9a5adbefbff4ef3bb Mon Sep 17 00:00:00 2001
From: Stefan Kost <ensonic@users.sourceforge.net>
Date: Tue, 22 Nov 2005 09:35:25 +0000
Subject: [PATCH] gst/gst.h: include "gstchildproxy.h"

Original commit message from CVS:
* gst/gst.h:
include "gstchildproxy.h"
* gst/gstchildproxy.h:
* libs/gst/controller/gstcontroller.h:
use G_GNUC_NULL_TERMINATED
---
 ChangeLog                           | 8 ++++++++
 gst/gst.h                           | 1 +
 gst/gstchildproxy.h                 | 4 ++--
 libs/gst/controller/gstcontroller.h | 8 ++++----
 4 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 6e9fe4d2b2..42d1f9346d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2005-11-22  Stefan Kost  <ensonic@users.sf.net>
+
+	* gst/gst.h:
+	  include "gstchildproxy.h"
+	* gst/gstchildproxy.h:
+	* libs/gst/controller/gstcontroller.h:
+	  use G_GNUC_NULL_TERMINATED
+
 2005-11-22  Jan Schmidt  <thaytan@mad.scientist.com>
 
 	* check/gst/capslist.h:
diff --git a/gst/gst.h b/gst/gst.h
index c5aab1d9ca..2bce4d414a 100644
--- a/gst/gst.h
+++ b/gst/gst.h
@@ -34,6 +34,7 @@
 #include <gst/gstbin.h>
 #include <gst/gstbuffer.h>
 #include <gst/gstcaps.h>
+#include <gst/gstchildproxy.h>
 #include <gst/gstclock.h>
 #include <gst/gstelement.h>
 #include <gst/gsterror.h>
diff --git a/gst/gstchildproxy.h b/gst/gstchildproxy.h
index 5f5580cb78..d507847060 100644
--- a/gst/gstchildproxy.h
+++ b/gst/gstchildproxy.h
@@ -62,12 +62,12 @@ void gst_child_proxy_get_property (GstObject * object, const gchar *name, GValue
 void gst_child_proxy_get_valist (GstObject * object,
     const gchar * first_property_name, va_list var_args);
 void gst_child_proxy_get (GstObject * object, const gchar * first_property_name,
-    ...);
+    ...) G_GNUC_NULL_TERMINATED;
 void gst_child_proxy_set_property (GstObject * object, const gchar *name, const GValue *value);
 void gst_child_proxy_set_valist (GstObject* object,
     const gchar * first_property_name, va_list var_args);
 void gst_child_proxy_set (GstObject * object, const gchar * first_property_name,
-    ...);
+    ...) G_GNUC_NULL_TERMINATED;
 void gst_child_proxy_child_added (GstObject * object, GstObject *  child);
 void gst_child_proxy_child_removed (GstObject * object, GstObject *  child);
 
diff --git a/libs/gst/controller/gstcontroller.h b/libs/gst/controller/gstcontroller.h
index ff51b7c7ea..776ffd1994 100644
--- a/libs/gst/controller/gstcontroller.h
+++ b/libs/gst/controller/gstcontroller.h
@@ -207,13 +207,13 @@ GType gst_controller_get_type (void);
 
 GstController *gst_controller_new_valist (GObject * object, va_list var_args);
 GstController *gst_controller_new_list (GObject * object, GList *list);
-GstController *gst_controller_new (GObject * object, ...);
+GstController *gst_controller_new (GObject * object, ...) G_GNUC_NULL_TERMINATED;
 
 gboolean gst_controller_remove_properties_valist (GstController * self,
     va_list var_args);
 gboolean gst_controller_remove_properties_list (GstController * self,
 						GList *list);
-gboolean gst_controller_remove_properties (GstController * self, ...);
+gboolean gst_controller_remove_properties (GstController * self, ...) G_GNUC_NULL_TERMINATED;
 
 gboolean gst_controller_set (GstController * self, gchar * property_name,
     GstClockTime timestamp, GValue * value);
@@ -244,8 +244,8 @@ gboolean gst_controller_set_interpolation_mode (GstController * self,
 
 /* GObject convenience functions */
 
-GstController *gst_object_control_properties (GObject * object, ...);
-gboolean gst_object_uncontrol_properties (GObject * object, ...);
+GstController *gst_object_control_properties (GObject * object, ...) G_GNUC_NULL_TERMINATED;
+gboolean gst_object_uncontrol_properties (GObject * object, ...) G_GNUC_NULL_TERMINATED;
 
 GstController *gst_object_get_controller (GObject * object);
 gboolean gst_object_set_controller (GObject * object, GstController * controller);