[clutter/wip/transitions: 5/9] interval: Allow passing NULL values to the constructor
- From: Emmanuele Bassi <ebassi src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [clutter/wip/transitions: 5/9] interval: Allow passing NULL values to the constructor
- Date: Wed, 11 Apr 2012 16:50:09 +0000 (UTC)
commit 0c3a6e38bdf5792238948afed18dac6f54a91007
Author: Emmanuele Bassi <ebassi linux intel com>
Date: Wed Apr 11 14:18:56 2012 +0100
interval: Allow passing NULL values to the constructor
Given that we can create a ClutterInterval without an initial and final
values using g_object_new(), it stands to reason that we ought to be
able to create an instance when passing NULL GValue pointers to the
new_with_values() constructor as well.
clutter/clutter-interval.c | 17 +++++++++--------
1 files changed, 9 insertions(+), 8 deletions(-)
---
diff --git a/clutter/clutter-interval.c b/clutter/clutter-interval.c
index 5f4f6d7..5d09545 100644
--- a/clutter/clutter-interval.c
+++ b/clutter/clutter-interval.c
@@ -567,8 +567,8 @@ out:
/**
* clutter_interval_new_with_values:
* @gtype: the type of the values in the interval
- * @initial: a #GValue holding the initial value of the interval
- * @final: a #GValue holding the final value of the interval
+ * @initial: (allow-none): a #GValue holding the initial value of the interval
+ * @final: (allow-none): a #GValue holding the final value of the interval
*
* Creates a new #ClutterInterval of type @gtype, between @initial
* and @final.
@@ -587,15 +587,16 @@ clutter_interval_new_with_values (GType gtype,
ClutterInterval *retval;
g_return_val_if_fail (gtype != G_TYPE_INVALID, NULL);
- g_return_val_if_fail (initial != NULL, NULL);
- g_return_val_if_fail (final != NULL, NULL);
- g_return_val_if_fail (G_VALUE_TYPE (initial) == gtype, NULL);
- g_return_val_if_fail (G_VALUE_TYPE (final) == gtype, NULL);
+ g_return_val_if_fail (initial == NULL || G_VALUE_TYPE (initial) == gtype, NULL);
+ g_return_val_if_fail (final == NULL || G_VALUE_TYPE (final) == gtype, NULL);
retval = g_object_new (CLUTTER_TYPE_INTERVAL, "value-type", gtype, NULL);
- clutter_interval_set_initial_value (retval, initial);
- clutter_interval_set_final_value (retval, final);
+ if (initial != NULL)
+ clutter_interval_set_initial_value (retval, initial);
+
+ if (final != NULL)
+ clutter_interval_set_final_value (retval, final);
return retval;
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]