From 235910e2278040d070769aa8cbc0a2fcf95ea3af Mon Sep 17 00:00:00 2001
From: =?utf8?q?Tim-Philipp=20M=C3=BCller?= <tim.muller@collabora.co.uk>
Date: Tue, 16 Mar 2010 17:56:13 +0000
Subject: [PATCH] gst: use #if GLIB_CHECK_VERSION instead of #ifndef GLIBMACRO

for better greppability at the time we bump GLib version requirements.
---
 gst/gstcaps.c       | 6 +++---
 gst/gstchildproxy.c | 8 ++++----
 gst/gststructure.c  | 6 +++---
 gst/gsttaglist.c    | 6 +++---
 4 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/gst/gstcaps.c b/gst/gstcaps.c
index c2ca2bc..9c0c0e8 100644
--- a/gst/gstcaps.c
+++ b/gst/gstcaps.c
@@ -940,11 +940,11 @@ gst_caps_set_simple_valist (GstCaps * caps, const char *field, va_list varargs)
       g_warning ("Don't use G_TYPE_DATE, use GST_TYPE_DATE instead\n");
       type = GST_TYPE_DATE;
     }
-#ifndef G_VALUE_COLLECT_INIT
+#if GLIB_CHECK_VERSION(2,23,3)
+    G_VALUE_COLLECT_INIT (&value, type, varargs, 0, &err);
+#else
     g_value_init (&value, type);
     G_VALUE_COLLECT (&value, varargs, 0, &err);
-#else
-    G_VALUE_COLLECT_INIT (&value, type, varargs, 0, &err);
 #endif
     if (G_UNLIKELY (err)) {
       g_critical ("%s", err);
diff --git a/gst/gstchildproxy.c b/gst/gstchildproxy.c
index faa0f07..13aa71b 100644
--- a/gst/gstchildproxy.c
+++ b/gst/gstchildproxy.c
@@ -388,12 +388,12 @@ gst_child_proxy_set_valist (GstObject * object,
     if (!gst_child_proxy_lookup (object, name, &target, &pspec))
       goto not_found;
 
-#ifndef G_VALUE_COLLECT_INIT
-    g_value_init (&value, G_PARAM_SPEC_VALUE_TYPE (pspec));
-    G_VALUE_COLLECT (&value, var_args, G_VALUE_NOCOPY_CONTENTS, &error);
-#else
+#if GLIB_CHECK_VERSION(2,23,3)
     G_VALUE_COLLECT_INIT (&value, pspec->value_type, var_args,
         G_VALUE_NOCOPY_CONTENTS, &error);
+#else
+    g_value_init (&value, G_PARAM_SPEC_VALUE_TYPE (pspec));
+    G_VALUE_COLLECT (&value, var_args, G_VALUE_NOCOPY_CONTENTS, &error);
 #endif
     if (error)
       goto cant_copy;
diff --git a/gst/gststructure.c b/gst/gststructure.c
index a82accb..e030446 100644
--- a/gst/gststructure.c
+++ b/gst/gststructure.c
@@ -517,11 +517,11 @@ gst_structure_set_valist (GstStructure * structure,
       g_warning ("Don't use G_TYPE_DATE, use GST_TYPE_DATE instead\n");
       type = GST_TYPE_DATE;
     }
-#ifndef G_VALUE_COLLECT_INIT
+#if GLIB_CHECK_VERSION(2,23,3)
+    G_VALUE_COLLECT_INIT (&field.value, type, varargs, 0, &err);
+#else
     g_value_init (&field.value, type);
     G_VALUE_COLLECT (&field.value, varargs, 0, &err);
-#else
-    G_VALUE_COLLECT_INIT (&field.value, type, varargs, 0, &err);
 #endif
     if (G_UNLIKELY (err)) {
       g_critical ("%s", err);
diff --git a/gst/gsttaglist.c b/gst/gsttaglist.c
index 8afbc6f..5fb9d8c 100644
--- a/gst/gsttaglist.c
+++ b/gst/gsttaglist.c
@@ -957,11 +957,11 @@ gst_tag_list_add_valist (GstTagList * list, GstTagMergeMode mode,
       g_warning ("unknown tag '%s'", tag);
       return;
     }
-#ifndef G_VALUE_COLLECT_INIT
+#if GLIB_CHECK_VERSION(2,23,3)
+    G_VALUE_COLLECT_INIT (&value, info->type, var_args, 0, &error);
+#else
     g_value_init (&value, info->type);
     G_VALUE_COLLECT (&value, var_args, 0, &error);
-#else
-    G_VALUE_COLLECT_INIT (&value, info->type, var_args, 0, &error);
 #endif
     if (error) {
       g_warning ("%s: %s", G_STRLOC, error);
-- 
2.7.4