From 8429aa8d755b268975c2870978f8d8484f584542 Mon Sep 17 00:00:00 2001 From: Emmanuele Bassi Date: Fri, 8 Oct 2010 15:47:00 +0100 Subject: [PATCH] Remove unnecessary GLib version checks We now depend on a newer version of GLib than those checks tested for. --- clutter/clutter-animation.c | 6 ------ clutter/clutter-animator.c | 5 ----- clutter/clutter-box.c | 5 ----- clutter/clutter-container.c | 5 ----- clutter/clutter-frame-source.c | 3 --- clutter/clutter-interval.c | 10 ---------- clutter/clutter-layout-manager.c | 5 ----- clutter/clutter-master-clock.c | 2 -- clutter/clutter-state.c | 5 ----- clutter/clutter-timeout-pool.c | 2 -- clutter/x11/clutter-event-x11.c | 3 --- 11 files changed, 51 deletions(-) diff --git a/clutter/clutter-animation.c b/clutter/clutter-animation.c index f6c9ec33d..e8b70d8ce 100644 --- a/clutter/clutter-animation.c +++ b/clutter/clutter-animation.c @@ -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) { diff --git a/clutter/clutter-animator.c b/clutter/clutter-animator.c index 61d930230..d9371907c 100644 --- a/clutter/clutter-animator.c +++ b/clutter/clutter-animator.c @@ -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) { diff --git a/clutter/clutter-box.c b/clutter/clutter-box.c index cbf9b517e..6dd6a1557 100644 --- a/clutter/clutter-box.c +++ b/clutter/clutter-box.c @@ -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) { diff --git a/clutter/clutter-container.c b/clutter/clutter-container.c index b1a0cf33c..037289e1d 100644 --- a/clutter/clutter-container.c +++ b/clutter/clutter-container.c @@ -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) { diff --git a/clutter/clutter-frame-source.c b/clutter/clutter-frame-source.c index ad7df04c1..517829e73 100644 --- a/clutter/clutter-frame-source.c +++ b/clutter/clutter-frame-source.c @@ -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); diff --git a/clutter/clutter-interval.c b/clutter/clutter-interval.c index 3a51944cd..ed383164f 100644 --- a/clutter/clutter-interval.c +++ b/clutter/clutter-interval.c @@ -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) { diff --git a/clutter/clutter-layout-manager.c b/clutter/clutter-layout-manager.c index 826586f09..2536763fb 100644 --- a/clutter/clutter-layout-manager.c +++ b/clutter/clutter-layout-manager.c @@ -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) { diff --git a/clutter/clutter-master-clock.c b/clutter/clutter-master-clock.c index 679db113a..f4ffb2b43 100644 --- a/clutter/clutter-master-clock.c +++ b/clutter/clutter-master-clock.c @@ -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; diff --git a/clutter/clutter-state.c b/clutter/clutter-state.c index f8381d19b..b11aef102 100644 --- a/clutter/clutter-state.c +++ b/clutter/clutter-state.c @@ -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) { diff --git a/clutter/clutter-timeout-pool.c b/clutter/clutter-timeout-pool.c index 5e25d86f9..0af82c6a1 100644 --- a/clutter/clutter-timeout-pool.c +++ b/clutter/clutter-timeout-pool.c @@ -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); diff --git a/clutter/x11/clutter-event-x11.c b/clutter/x11/clutter-event-x11.c index 7a27e9470..865d52c61 100644 --- a/clutter/x11/clutter-event-x11.c +++ b/clutter/x11/clutter-event-x11.c @@ -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;