Index: gst/gstbin.c
===================================================================
RCS file: /cvs/gstreamer/gstreamer/gst/gstbin.c,v
retrieving revision 1.374
diff -u -p -a -u -p -r1.374 gstbin.c
--- gst/gstbin.c	22 Nov 2007 15:59:00 -0000	1.374
+++ gst/gstbin.c	9 Jan 2008 06:55:50 -0000
@@ -268,7 +268,6 @@ enum
       /* FILL ME */
 };
 
-static void gst_bin_base_init (gpointer g_class);
 static void gst_bin_class_init (GstBinClass * klass);
 static void gst_bin_init (GstBin * bin);
 static void gst_bin_child_proxy_init (gpointer g_iface, gpointer iface_data);
@@ -290,7 +289,7 @@ gst_bin_get_type (void)
   if (G_UNLIKELY (gst_bin_type == 0)) {
     static const GTypeInfo bin_info = {
       sizeof (GstBinClass),
-      gst_bin_base_init,
+      NULL,
       NULL,
       (GClassInitFunc) gst_bin_class_init,
       NULL,
@@ -327,14 +326,6 @@ gst_bin_get_type (void)
   return gst_bin_type;
 }
 
-static void
-gst_bin_base_init (gpointer g_class)
-{
-  GstElementClass *gstelement_class = GST_ELEMENT_CLASS (g_class);
-
-  gst_element_class_set_details (gstelement_class, &gst_bin_details);
-}
-
 static GstObject *
 gst_bin_child_proxy_get_child_by_index (GstChildProxy * child_proxy,
     guint index)
@@ -438,6 +429,8 @@ gst_bin_class_init (GstBinClass * klass)
       GST_DEBUG_FUNCPTR (gst_bin_restore_thyself);
 #endif
 
+  gst_element_class_set_details (gstelement_class, &gst_bin_details);
+
   gstelement_class->change_state =
       GST_DEBUG_FUNCPTR (gst_bin_change_state_func);
   gstelement_class->get_state = GST_DEBUG_FUNCPTR (gst_bin_get_state_func);
Index: gst/gstpipeline.c
===================================================================
RCS file: /cvs/gstreamer/gstreamer/gst/gstpipeline.c,v
retrieving revision 1.145
diff -u -p -a -u -p -r1.145 gstpipeline.c
--- gst/gstpipeline.c	13 Sep 2007 21:27:33 -0000	1.145
+++ gst/gstpipeline.c	9 Jan 2008 06:55:50 -0000
@@ -128,7 +128,6 @@ struct _GstPipelinePrivate
 };
 
 
-static void gst_pipeline_base_init (gpointer g_class);
 static void gst_pipeline_class_init (gpointer g_class, gpointer class_data);
 static void gst_pipeline_init (GTypeInstance * instance, gpointer g_class);
 
@@ -156,7 +155,7 @@ gst_pipeline_get_type (void)
   if (G_UNLIKELY (pipeline_type == 0)) {
     static const GTypeInfo pipeline_info = {
       sizeof (GstPipelineClass),
-      gst_pipeline_base_init,
+      NULL,
       NULL,
       (GClassInitFunc) gst_pipeline_class_init,
       NULL,
@@ -177,14 +176,6 @@ gst_pipeline_get_type (void)
 }
 
 static void
-gst_pipeline_base_init (gpointer g_class)
-{
-  GstElementClass *gstelement_class = GST_ELEMENT_CLASS (g_class);
-
-  gst_element_class_set_details (gstelement_class, &gst_pipeline_details);
-}
-
-static void
 gst_pipeline_class_init (gpointer g_class, gpointer class_data)
 {
   GObjectClass *gobject_class = G_OBJECT_CLASS (g_class);
@@ -231,6 +222,8 @@ gst_pipeline_class_init (gpointer g_clas
 
   gobject_class->dispose = GST_DEBUG_FUNCPTR (gst_pipeline_dispose);
 
+  gst_element_class_set_details (gstelement_class, &gst_pipeline_details);
+
   gstelement_class->change_state =
       GST_DEBUG_FUNCPTR (gst_pipeline_change_state);
   gstelement_class->provide_clock =
Index: libs/gst/base/gstbasesink.c
===================================================================
RCS file: /cvs/gstreamer/gstreamer/libs/gst/base/gstbasesink.c,v
retrieving revision 1.196
diff -u -p -a -u -p -r1.196 gstbasesink.c
--- libs/gst/base/gstbasesink.c	13 Dec 2007 16:49:53 -0000	1.196
+++ libs/gst/base/gstbasesink.c	9 Jan 2008 06:55:51 -0000
@@ -36,12 +36,12 @@
  *
  * #GstBaseSink provides support for exactly one sink pad, which should be
  * named "sink". A sink implementation (subclass of #GstBaseSink) should
- * install a pad template in its base_init function, like so:
+ * install a pad template in its class_init function, like so:
  * <programlisting>
  * static void
- * my_element_base_init (gpointer g_class)
+ * my_element_class_init (GstMyElementClass *klass)
  * {
- *   GstElementClass *gstelement_class = GST_ELEMENT_CLASS (g_class);
+ *   GstElementClass *gstelement_class = GST_ELEMENT_CLASS (klass);
  *   
  *   // sinktemplate should be a #GstStaticPadTemplate with direction
  *   // #GST_PAD_SINK and name "sink"
@@ -251,7 +251,6 @@ enum
 
 static GstElementClass *parent_class = NULL;
 
-static void gst_base_sink_base_init (gpointer g_class);
 static void gst_base_sink_class_init (GstBaseSinkClass * klass);
 static void gst_base_sink_init (GstBaseSink * trans, gpointer g_class);
 static void gst_base_sink_finalize (GObject * object);
@@ -264,7 +263,7 @@ gst_base_sink_get_type (void)
   if (G_UNLIKELY (base_sink_type == 0)) {
     static const GTypeInfo base_sink_info = {
       sizeof (GstBaseSinkClass),
-      (GBaseInitFunc) gst_base_sink_base_init,
+      NULL,
       NULL,
       (GClassInitFunc) gst_base_sink_class_init,
       NULL,
@@ -317,13 +316,6 @@ static gboolean gst_base_sink_is_too_lat
     GstClockReturn status, GstClockTimeDiff jitter);
 
 static void
-gst_base_sink_base_init (gpointer g_class)
-{
-  GST_DEBUG_CATEGORY_INIT (gst_base_sink_debug, "basesink", 0,
-      "basesink element");
-}
-
-static void
 gst_base_sink_class_init (GstBaseSinkClass * klass)
 {
   GObjectClass *gobject_class;
@@ -331,6 +323,9 @@ gst_base_sink_class_init (GstBaseSinkCla
 
   gobject_class = G_OBJECT_CLASS (klass);
   gstelement_class = GST_ELEMENT_CLASS (klass);
+  
+  GST_DEBUG_CATEGORY_INIT (gst_base_sink_debug, "basesink", 0,
+      "basesink element");
 
   g_type_class_add_private (klass, sizeof (GstBaseSinkPrivate));
 
Index: libs/gst/base/gstbasesrc.c
===================================================================
RCS file: /cvs/gstreamer/gstreamer/libs/gst/base/gstbasesrc.c,v
retrieving revision 1.150
diff -u -p -a -u -p -r1.150 gstbasesrc.c
--- libs/gst/base/gstbasesrc.c	19 Dec 2007 17:49:38 -0000	1.150
+++ libs/gst/base/gstbasesrc.c	9 Jan 2008 06:55:52 -0000
@@ -125,14 +125,14 @@
  * <para>
  * There is only support in #GstBaseSrc for exactly one source pad, which 
  * should be named "src". A source implementation (subclass of #GstBaseSrc) 
- * should install a pad template in its base_init function, like so:
+ * should install a pad template in its class_init function, like so:
  * </para>
  * <para>
  * <programlisting>
  * static void
- * my_element_base_init (gpointer g_class)
+ * my_element_class_init (GstMyElementClass *klass)
  * {
- *   GstElementClass *gstelement_class = GST_ELEMENT_CLASS (g_class);
+ *   GstElementClass *gstelement_class = GST_ELEMENT_CLASS (klass);
  *   // srctemplate should be a #GstStaticPadTemplate with direction
  *   // #GST_PAD_SRC and name "src"
  *   gst_element_class_add_pad_template (gstelement_class,
@@ -250,7 +250,6 @@ struct _GstBaseSrcPrivate
 
 static GstElementClass *parent_class = NULL;
 
-static void gst_base_src_base_init (gpointer g_class);
 static void gst_base_src_class_init (GstBaseSrcClass * klass);
 static void gst_base_src_init (GstBaseSrc * src, gpointer g_class);
 static void gst_base_src_finalize (GObject * object);
@@ -264,7 +263,7 @@ gst_base_src_get_type (void)
   if (G_UNLIKELY (base_src_type == 0)) {
     static const GTypeInfo base_src_info = {
       sizeof (GstBaseSrcClass),
-      (GBaseInitFunc) gst_base_src_base_init,
+      NULL,
       NULL,
       (GClassInitFunc) gst_base_src_class_init,
       NULL,
@@ -320,12 +319,6 @@ static GstFlowReturn gst_base_src_get_ra
     guint length, GstBuffer ** buf);
 
 static void
-gst_base_src_base_init (gpointer g_class)
-{
-  GST_DEBUG_CATEGORY_INIT (gst_base_src_debug, "basesrc", 0, "basesrc element");
-}
-
-static void
 gst_base_src_class_init (GstBaseSrcClass * klass)
 {
   GObjectClass *gobject_class;
@@ -333,6 +326,8 @@ gst_base_src_class_init (GstBaseSrcClass
 
   gobject_class = G_OBJECT_CLASS (klass);
   gstelement_class = GST_ELEMENT_CLASS (klass);
+  
+  GST_DEBUG_CATEGORY_INIT (gst_base_src_debug, "basesrc", 0, "basesrc element");
 
   g_type_class_add_private (klass, sizeof (GstBaseSrcPrivate));
 
Index: libs/gst/base/gstbasetransform.c
===================================================================
RCS file: /cvs/gstreamer/gstreamer/libs/gst/base/gstbasetransform.c,v
retrieving revision 1.104
diff -u -p -a -u -p -r1.104 gstbasetransform.c
--- libs/gst/base/gstbasetransform.c	14 Dec 2007 16:52:38 -0000	1.104
+++ libs/gst/base/gstbasetransform.c	9 Jan 2008 06:55:52 -0000
@@ -240,7 +240,6 @@ struct _GstBaseTransformPrivate
 
 static GstElementClass *parent_class = NULL;
 
-static void gst_base_transform_base_init (gpointer g_class);
 static void gst_base_transform_class_init (GstBaseTransformClass * klass);
 static void gst_base_transform_init (GstBaseTransform * trans,
     GstBaseTransformClass * klass);
@@ -255,7 +254,7 @@ gst_base_transform_get_type (void)
   if (!base_transform_type) {
     static const GTypeInfo base_transform_info = {
       sizeof (GstBaseTransformClass),
-      (GBaseInitFunc) gst_base_transform_base_init,
+      NULL,
       NULL,
       (GClassInitFunc) gst_base_transform_class_init,
       NULL,
@@ -304,13 +303,6 @@ static GstFlowReturn gst_base_transform_
 /* static guint gst_base_transform_signals[LAST_SIGNAL] = { 0 }; */
 
 static void
-gst_base_transform_base_init (gpointer g_class)
-{
-  GST_DEBUG_CATEGORY_INIT (gst_base_transform_debug, "basetransform", 0,
-      "basetransform element");
-}
-
-static void
 gst_base_transform_finalize (GObject * object)
 {
   GstBaseTransform *trans;
@@ -328,6 +320,9 @@ gst_base_transform_class_init (GstBaseTr
   GObjectClass *gobject_class;
 
   gobject_class = G_OBJECT_CLASS (klass);
+  
+  GST_DEBUG_CATEGORY_INIT (gst_base_transform_debug, "basetransform", 0,
+      "basetransform element");
 
   g_type_class_add_private (klass, sizeof (GstBaseTransformPrivate));
 
Index: libs/gst/base/gstcollectpads.c
===================================================================
RCS file: /cvs/gstreamer/gstreamer/libs/gst/base/gstcollectpads.c,v
retrieving revision 1.51
diff -u -p -a -u -p -r1.51 gstcollectpads.c
--- libs/gst/base/gstcollectpads.c	17 Sep 2007 17:17:29 -0000	1.51
+++ libs/gst/base/gstcollectpads.c	9 Jan 2008 06:55:52 -0000
@@ -92,14 +92,16 @@ static void unref_data (GstCollectData *
 static void
 gst_collect_pads_base_init (gpointer g_class)
 {
-  GST_DEBUG_CATEGORY_INIT (collect_pads_debug, "collectpads", 0,
-      "GstCollectPads");
+  /* Do nothing here */
 }
 
 static void
 gst_collect_pads_class_init (GstCollectPadsClass * klass)
 {
   GObjectClass *gobject_class = (GObjectClass *) klass;
+  
+  GST_DEBUG_CATEGORY_INIT (collect_pads_debug, "collectpads", 0,
+      "GstCollectPads");
 
   gobject_class->finalize = GST_DEBUG_FUNCPTR (gst_collect_pads_finalize);
 }
Index: libs/gst/base/gstdataqueue.c
===================================================================
RCS file: /cvs/gstreamer/gstreamer/libs/gst/base/gstdataqueue.c,v
retrieving revision 1.4
diff -u -p -a -u -p -r1.4 gstdataqueue.c
--- libs/gst/base/gstdataqueue.c	15 Jun 2007 11:00:32 -0000	1.4
+++ libs/gst/base/gstdataqueue.c	9 Jan 2008 06:55:52 -0000
@@ -87,7 +87,9 @@ enum
                q->cur_level.time,                                       \
                q->queue->length)
 
+#if 0
 static void gst_data_queue_base_init (GstDataQueueClass * klass);
+#endif
 static void gst_data_queue_class_init (GstDataQueueClass * klass);
 static void gst_data_queue_init (GstDataQueue * queue);
 static void gst_data_queue_finalize (GObject * object);
@@ -108,7 +110,11 @@ gst_data_queue_get_type (void)
   if (!queue_type) {
     static const GTypeInfo queue_info = {
       sizeof (GstDataQueueClass),
+#if 0      
       (GBaseInitFunc) gst_data_queue_base_init,
+#else
+      NULL,
+#endif
       NULL,
       (GClassInitFunc) gst_data_queue_class_init,
       NULL,
@@ -130,12 +136,14 @@ gst_data_queue_get_type (void)
   return queue_type;
 }
 
+#if 0
 static void
 gst_data_queue_base_init (GstDataQueueClass * klass)
 {
   /* Do we need anything here ?? */
   return;
 }
+#endif
 
 static void
 gst_data_queue_class_init (GstDataQueueClass * klass)
Index: libs/gst/net/gstnettimeprovider.c
===================================================================
RCS file: /cvs/gstreamer/gstreamer/libs/gst/net/gstnettimeprovider.c,v
retrieving revision 1.14
diff -u -p -a -u -p -r1.14 gstnettimeprovider.c
--- libs/gst/net/gstnettimeprovider.c	31 Oct 2007 22:01:03 -0000	1.14
+++ libs/gst/net/gstnettimeprovider.c	9 Jan 2008 06:55:52 -0000
@@ -136,7 +136,7 @@ inet_aton (const char *c, struct in_addr
 static void
 gst_net_time_provider_base_init (gpointer g_class)
 {
-  g_assert (sizeof (GstClockTime) == 8);
+  /* Do nothing here */
 }
 
 static void
@@ -146,6 +146,8 @@ gst_net_time_provider_class_init (GstNet
 
   gobject_class = G_OBJECT_CLASS (klass);
 
+  g_assert (sizeof (GstClockTime) == 8);
+
   gobject_class->finalize = gst_net_time_provider_finalize;
   gobject_class->set_property = gst_net_time_provider_set_property;
   gobject_class->get_property = gst_net_time_provider_get_property;
