mirror of
https://github.com/brl/mutter.git
synced 2024-12-24 12:02:04 +00:00
Remove unnecessary GLib version checks
We now depend on a newer version of GLib than those checks tested for.
This commit is contained in:
parent
7dd09e2186
commit
8429aa8d75
@ -1924,15 +1924,9 @@ clutter_animation_setup_valist (ClutterAnimation *animation,
|
||||
break;
|
||||
}
|
||||
|
||||
#if GLIB_CHECK_VERSION (2, 23, 2)
|
||||
G_VALUE_COLLECT_INIT (&final, G_PARAM_SPEC_VALUE_TYPE (pspec),
|
||||
var_args, 0,
|
||||
&error);
|
||||
#else
|
||||
/* this is the same as G_VALUE_COLLECT_INIT(), but slower */
|
||||
g_value_init (&final, G_PARAM_SPEC_VALUE_TYPE (pspec));
|
||||
G_VALUE_COLLECT (&final, var_args, 0, &error);
|
||||
#endif /* GLIB_CHECK_VERSION (2, 23, 2) */
|
||||
|
||||
if (error)
|
||||
{
|
||||
|
@ -1217,14 +1217,9 @@ clutter_animator_set (ClutterAnimator *animator,
|
||||
break;
|
||||
}
|
||||
|
||||
#if GLIB_CHECK_VERSION (2, 23, 2)
|
||||
G_VALUE_COLLECT_INIT (&value, G_PARAM_SPEC_VALUE_TYPE (pspec),
|
||||
args, 0,
|
||||
&error);
|
||||
#else
|
||||
g_value_init (&value, G_PARAM_SPEC_VALUE_TYPE (pspec));
|
||||
G_VALUE_COLLECT (&value, args, 0, &error);
|
||||
#endif /* GLIB_CHECK_VERSION (2, 23, 2) */
|
||||
|
||||
if (error)
|
||||
{
|
||||
|
@ -738,14 +738,9 @@ clutter_box_set_property_valist (ClutterBox *box,
|
||||
break;
|
||||
}
|
||||
|
||||
#if GLIB_CHECK_VERSION (2, 23, 2)
|
||||
G_VALUE_COLLECT_INIT (&value, G_PARAM_SPEC_VALUE_TYPE (pspec),
|
||||
var_args, 0,
|
||||
&error);
|
||||
#else
|
||||
g_value_init (&value, G_PARAM_SPEC_VALUE_TYPE (pspec));
|
||||
G_VALUE_COLLECT (&value, var_args, 0, &error);
|
||||
#endif /* GLIB_CHECK_VERSION (2, 23, 2) */
|
||||
|
||||
if (error)
|
||||
{
|
||||
|
@ -1024,14 +1024,9 @@ clutter_container_child_set (ClutterContainer *container,
|
||||
break;
|
||||
}
|
||||
|
||||
#if GLIB_CHECK_VERSION (2, 23, 2)
|
||||
G_VALUE_COLLECT_INIT (&value, G_PARAM_SPEC_VALUE_TYPE (pspec),
|
||||
var_args, 0,
|
||||
&error);
|
||||
#else
|
||||
g_value_init (&value, G_PARAM_SPEC_VALUE_TYPE (pspec));
|
||||
G_VALUE_COLLECT (&value, var_args, 0, &error);
|
||||
#endif /* GLIB_CHECK_VERSION (2, 23, 2) */
|
||||
|
||||
if (error)
|
||||
{
|
||||
|
@ -103,10 +103,7 @@ clutter_frame_source_add_full (gint priority,
|
||||
if (priority != G_PRIORITY_DEFAULT)
|
||||
g_source_set_priority (source, priority);
|
||||
|
||||
#if GLIB_CHECK_VERSION (2, 25, 8)
|
||||
g_source_set_name (source, "Clutter frame timeout");
|
||||
#endif
|
||||
|
||||
g_source_set_callback (source, func, data, notify);
|
||||
|
||||
ret = g_source_attach (source, NULL);
|
||||
|
@ -420,12 +420,7 @@ clutter_interval_set_interval_valist (ClutterInterval *interval,
|
||||
gchar *error;
|
||||
|
||||
/* initial value */
|
||||
#if GLIB_CHECK_VERSION (2, 23, 2)
|
||||
G_VALUE_COLLECT_INIT (&value, gtype, var_args, 0, &error);
|
||||
#else
|
||||
g_value_init (&value, gtype);
|
||||
G_VALUE_COLLECT (&value, var_args, 0, &error);
|
||||
#endif /* GLIB_CHECK_VERSION (2, 23, 2) */
|
||||
|
||||
if (error)
|
||||
{
|
||||
@ -443,12 +438,7 @@ clutter_interval_set_interval_valist (ClutterInterval *interval,
|
||||
g_value_unset (&value);
|
||||
|
||||
/* final value */
|
||||
#if GLIB_CHECK_VERSION (2, 23, 2)
|
||||
G_VALUE_COLLECT_INIT (&value, gtype, var_args, 0, &error);
|
||||
#else
|
||||
g_value_init (&value, gtype);
|
||||
G_VALUE_COLLECT (&value, var_args, 0, &error);
|
||||
#endif /* GLIB_CHECK_VERSION (2, 23, 2) */
|
||||
|
||||
if (error)
|
||||
{
|
||||
|
@ -953,14 +953,9 @@ clutter_layout_manager_child_set (ClutterLayoutManager *manager,
|
||||
break;
|
||||
}
|
||||
|
||||
#if GLIB_CHECK_VERSION (2, 23, 2)
|
||||
G_VALUE_COLLECT_INIT (&value, G_PARAM_SPEC_VALUE_TYPE (pspec),
|
||||
var_args, 0,
|
||||
&error);
|
||||
#else
|
||||
g_value_init (&value, G_PARAM_SPEC_VALUE_TYPE (pspec));
|
||||
G_VALUE_COLLECT (&value, var_args, 0, &error);
|
||||
#endif /* GLIB_CHECK_VERSION (2, 23, 2) */
|
||||
|
||||
if (error)
|
||||
{
|
||||
|
@ -260,9 +260,7 @@ clutter_clock_source_new (ClutterMasterClock *master_clock)
|
||||
GSource *source = g_source_new (&clock_funcs, sizeof (ClutterClockSource));
|
||||
ClutterClockSource *clock_source = (ClutterClockSource *) source;
|
||||
|
||||
#if GLIB_CHECK_VERSION (2, 25, 8)
|
||||
g_source_set_name (source, "Clutter master clock");
|
||||
#endif
|
||||
clock_source->master_clock = master_clock;
|
||||
|
||||
return source;
|
||||
|
@ -759,14 +759,9 @@ clutter_state_set (ClutterState *state,
|
||||
if (pspec == NULL)
|
||||
break;
|
||||
|
||||
#if GLIB_CHECK_VERSION (2, 23, 2)
|
||||
G_VALUE_COLLECT_INIT (&value, G_PARAM_SPEC_VALUE_TYPE (pspec),
|
||||
args, 0,
|
||||
&error);
|
||||
#else
|
||||
g_value_init (&value, G_PARAM_SPEC_VALUE_TYPE (pspec));
|
||||
G_VALUE_COLLECT (&value, args, 0, &error);
|
||||
#endif /* GLIB_CHECK_VERSION */
|
||||
|
||||
if (error != NULL)
|
||||
{
|
||||
|
@ -377,9 +377,7 @@ clutter_timeout_pool_new (gint priority)
|
||||
if (!source)
|
||||
return NULL;
|
||||
|
||||
#if GLIB_CHECK_VERSION (2, 25, 8)
|
||||
g_source_set_name (source, "Clutter timeout pool");
|
||||
#endif
|
||||
|
||||
if (priority != G_PRIORITY_DEFAULT)
|
||||
g_source_set_priority (source, priority);
|
||||
|
@ -144,10 +144,7 @@ clutter_event_source_new (ClutterBackend *backend)
|
||||
GSource *source = g_source_new (&event_funcs, sizeof (ClutterEventSource));
|
||||
ClutterEventSource *event_source = (ClutterEventSource *) source;
|
||||
|
||||
#if GLIB_CHECK_VERSION (2, 25, 8)
|
||||
g_source_set_name (source, "Clutter X11 Event");
|
||||
#endif
|
||||
|
||||
event_source->backend = backend;
|
||||
|
||||
return source;
|
||||
|
Loading…
Reference in New Issue
Block a user