From: Emmanuele Bassi <ebassi@gnome.org>
Date: Fri, 30 Dec 2011 09:51:36 +0000 (+0000)
Subject: box: Remove the sentinel annotation
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=65889fa075f6123caf0d47568413466e039b5eef;p=profile%2Fivi%2Fclutter.git

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().
---

diff --git a/clutter/clutter-box.h b/clutter/clutter-box.h
index 7c4764a..abc4e55 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