isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-12-25 12:32:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

interval: Allow passing NULL values to the constructor

Browse Source 
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.
This commit is contained in:
Emmanuele Bassi 2012-04-11 14:18:56 +01:00
parent bf12e23199
commit d24eccd026
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
clutter/clutter-interval.c
View File

@ -567,8 +567,8 @@ out:
/** /**
* clutter_interval_new_with_values: * clutter_interval_new_with_values:
* @gtype: the type of the values in the interval * @gtype: the type of the values in the interval
* @initial: a #GValue holding the initial value of the interval * @initial: (allow-none): a #GValue holding the initial value of the interval
* @final: a #GValue holding the final 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 * Creates a new #ClutterInterval of type @gtype, between @initial
* and @final. * and @final.
@ -587,15 +587,16 @@ clutter_interval_new_with_values (GType gtype,
ClutterInterval *retval; ClutterInterval *retval;
g_return_val_if_fail (gtype != G_TYPE_INVALID, NULL); g_return_val_if_fail (gtype != G_TYPE_INVALID, NULL);
g_return_val_if_fail (initial != NULL, NULL); g_return_val_if_fail (initial == NULL || G_VALUE_TYPE (initial) == gtype, NULL);
g_return_val_if_fail (final != NULL, NULL); g_return_val_if_fail (final == NULL || G_VALUE_TYPE (final) == gtype, NULL);
g_return_val_if_fail (G_VALUE_TYPE (initial) == gtype, NULL);
g_return_val_if_fail (G_VALUE_TYPE (final) == gtype, NULL);
retval = g_object_new (CLUTTER_TYPE_INTERVAL, "value-type", gtype, NULL); retval = g_object_new (CLUTTER_TYPE_INTERVAL, "value-type", gtype, NULL);
clutter_interval_set_initial_value (retval, initial); if (initial != NULL)
clutter_interval_set_final_value (retval, final); clutter_interval_set_initial_value (retval, initial);
if (final != NULL)
clutter_interval_set_final_value (retval, final);
return retval; return retval;
} }