summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEmmanuele Bassi <ebassi@gnome.org>2011-12-30 09:51:36 +0000
committerEmmanuele Bassi <ebassi@linux.intel.com>2012-01-30 11:11:08 +0000
commita2f587f1c4621de3f6979e39e83788ee0e8347c5 (patch)
tree43279090c5ba246c8e283619886a000ed7d3d6c8
parent85a466268360ad007de90e34b24fa0f56692eaa8 (diff)
downloadclutter-a2f587f1c4621de3f6979e39e83788ee0e8347c5.tar.gz
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 <ebassi@linux.intel.com>
-rw-r--r--clutter/clutter-box.h8
1 files 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