From a2f587f1c4621de3f6979e39e83788ee0e8347c5 Mon Sep 17 00:00:00 2001 From: Emmanuele Bassi Date: Fri, 30 Dec 2011 09:51:36 +0000 Subject: box: Remove the sentinel annotation Sadly, we need to remove the G_GNUC_NULL_TERMINATED annotation from ClutterBox packing API; the compiler will otherwise emit a warning for perfectly legal statements like: clutter_box_pack (box, child, NULL); because of the missing sentinel. See also: g_object_new(). (cherry picked from commit 65889fa075f6123caf0d47568413466e039b5eef) Signed-off-by: Emmanuele Bassi --- clutter/clutter-box.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/clutter/clutter-box.h b/clutter/clutter-box.h index 7c4764aa5..abc4e5546 100644 --- a/clutter/clutter-box.h +++ b/clutter/clutter-box.h @@ -99,7 +99,7 @@ void clutter_box_get_color (ClutterBox *box, void clutter_box_pack (ClutterBox *box, ClutterActor *actor, const gchar *first_property, - ...) G_GNUC_NULL_TERMINATED; + ...); void clutter_box_packv (ClutterBox *box, ClutterActor *actor, guint n_properties, @@ -110,17 +110,17 @@ void clutter_box_pack_after (ClutterBox *box, ClutterActor *actor, ClutterActor *sibling, const gchar *first_property, - ...) G_GNUC_NULL_TERMINATED; + ...); void clutter_box_pack_before (ClutterBox *box, ClutterActor *actor, ClutterActor *sibling, const gchar *first_property, - ...) G_GNUC_NULL_TERMINATED; + ...); void clutter_box_pack_at (ClutterBox *box, ClutterActor *actor, gint position, const gchar *first_property, - ...) G_GNUC_NULL_TERMINATED; + ...); G_END_DECLS -- cgit v1.2.1