From cbdff26c106d2adb06dd149769f4955d8fbec1fc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tim-Philipp=20M=C3=BCller?= <tim.muller@collabora.co.uk>
Date: Thu, 6 Jan 2011 19:21:56 +0000
Subject: [PATCH] Revert "padtemplate: allow disablinbg the template name
 conformance checks"

This reverts commit f9039c22040e1a38a3691bc4d299af427c963255.

We use -DG_DISABLE_ASSERTS for releases and pre-releases, but
don't want to disable pad name checking for releases in general,
I think. Need a better solution here. Fixes pad unit test in
pre-release/release mode.
---
 gst/gstpadtemplate.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/gst/gstpadtemplate.c b/gst/gstpadtemplate.c
index ca2f949653..8bf5ae0fee 100644
--- a/gst/gstpadtemplate.c
+++ b/gst/gstpadtemplate.c
@@ -256,10 +256,9 @@ gst_pad_template_dispose (GObject * object)
  * 'sink%d' template is automatically selected), so we need to restrict their
  * naming.
  */
-static inline gboolean
+static gboolean
 name_is_valid (const gchar * name, GstPadPresence presence)
 {
-#ifndef G_DISABLE_ASSERT
   const gchar *str;
 
   if (presence == GST_PAD_ALWAYS) {
@@ -285,7 +284,7 @@ name_is_valid (const gchar * name, GstPadPresence presence)
       return FALSE;
     }
   }
-#endif
+
   return TRUE;
 }