gst_element_class_set_details => gst_element_class_set_details_simple

81 files changed, 339 insertions, 628 deletions

diff --git a/gst/adpcmdec/adpcmdec.c b/gst/adpcmdec/adpcmdec.c
index 905f3b772..34e4f3ae9 100644
--- a/gst/adpcmdec/adpcmdec.c
+++ b/gst/adpcmdec/adpcmdec.c
@@ -39,12 +39,6 @@
 #define GST_CAT_DEFAULT adpcmdec_debug
 GST_DEBUG_CATEGORY_STATIC (adpcmdec_debug);
 
-static const GstElementDetails adpcmdec_details =
-GST_ELEMENT_DETAILS ("ADPCM decoder",
-    "Codec/Decoder/Audio",
-    "Decode MS and IMA ADPCM audio",
-    "Pioneers of the Inevitable <songbird@songbirdnest.com");
-
 static GstStaticPadTemplate adpcmdec_sink_template =
     GST_STATIC_PAD_TEMPLATE ("sink",
     GST_PAD_SINK,
@@ -571,7 +565,10 @@ adpcmdec_base_init (gpointer klass)
       gst_static_pad_template_get (&adpcmdec_sink_template));
   gst_element_class_add_pad_template (element_class,
       gst_static_pad_template_get (&adpcmdec_src_template));
-  gst_element_class_set_details (element_class, &adpcmdec_details);
+  gst_element_class_set_details_simple (element_class, "ADPCM decoder",
+      "Codec/Decoder/Audio",
+      "Decode MS and IMA ADPCM audio",
+      "Pioneers of the Inevitable <songbird@songbirdnest.com");
 }
 
 static gboolean
diff --git a/gst/adpcmenc/adpcmenc.c b/gst/adpcmenc/adpcmenc.c
index d91d496c4..89b83341b 100644
--- a/gst/adpcmenc/adpcmenc.c
+++ b/gst/adpcmenc/adpcmenc.c
@@ -42,12 +42,6 @@
 #define GST_CAT_DEFAULT adpcmenc_debug
 GST_DEBUG_CATEGORY_STATIC (adpcmenc_debug);
 
-static const GstElementDetails adpcmenc_details =
-GST_ELEMENT_DETAILS ("ADPCM encoder",
-    "Codec/Encoder/Audio",
-    "Encode ADPCM audio",
-    "Pioneers of the Inevitable <songbird@songbirdnest.com");
-
 static GstStaticPadTemplate adpcmenc_sink_template =
 GST_STATIC_PAD_TEMPLATE ("sink",
     GST_PAD_SINK,
@@ -552,7 +546,10 @@ adpcmenc_base_init (gpointer klass)
       gst_static_pad_template_get (&adpcmenc_sink_template));
   gst_element_class_add_pad_template (element_class,
       gst_static_pad_template_get (&adpcmenc_src_template));
-  gst_element_class_set_details (element_class, &adpcmenc_details);
+  gst_element_class_set_details_simple (element_class, "ADPCM encoder",
+      "Codec/Encoder/Audio",
+      "Encode ADPCM audio",
+      "Pioneers of the Inevitable <songbird@songbirdnest.com");
 }
 
 static gboolean
diff --git a/gst/asfmux/gstasfmux.c b/gst/asfmux/gstasfmux.c
index 74424ff6d..0a6ad571b 100644
--- a/gst/asfmux/gstasfmux.c
+++ b/gst/asfmux/gstasfmux.c
@@ -127,12 +127,6 @@ typedef GstAsfExtContDescData GstAsfMetadataObjData;
 #define DEFAULT_PADDING 0
 #define DEFAULT_IS_LIVE FALSE
 
-static const GstElementDetails gst_asf_mux_details =
-GST_ELEMENT_DETAILS ("ASF muxer",
-    "Codec/Muxer",
-    "Muxes audio and video into an ASF stream",
-    "Thiago Santos <thiagoss@embedded.ufcg.edu.br>");
-
 static GstStaticPadTemplate src_factory = GST_STATIC_PAD_TEMPLATE ("src",
     GST_PAD_SRC,
     GST_PAD_ALWAYS,
@@ -249,7 +243,10 @@ gst_asf_mux_base_init (gpointer g_class)
   gst_element_class_add_pad_template (element_class,
       gst_static_pad_template_get (&video_sink_factory));
 
-  gst_element_class_set_details (element_class, &gst_asf_mux_details);
+  gst_element_class_set_details_simple (element_class, "ASF muxer",
+      "Codec/Muxer",
+      "Muxes audio and video into an ASF stream",
+      "Thiago Santos <thiagoss@embedded.ufcg.edu.br>");
 
   GST_DEBUG_CATEGORY_INIT (asfmux_debug, "asfmux", 0, "Muxer for ASF streams");
 }
diff --git a/gst/asfmux/gstasfparse.c b/gst/asfmux/gstasfparse.c
index 8e76a3ccc..44b2acbe9 100644
--- a/gst/asfmux/gstasfparse.c
+++ b/gst/asfmux/gstasfparse.c
@@ -35,12 +35,6 @@ enum
   PROP_0,
 };
 
-static const GstElementDetails gst_asf_parse_details =
-GST_ELEMENT_DETAILS ("ASF parser",
-    "Parser",
-    "Parses ASF",
-    "Thiago Santos <thiagoss@embedded.ufcg.edu.br>");
-
 static GstStaticPadTemplate src_factory = GST_STATIC_PAD_TEMPLATE ("src",
     GST_PAD_SRC,
     GST_PAD_ALWAYS,
@@ -490,7 +484,8 @@ gst_asf_parse_base_init (gpointer g_class)
   gst_element_class_add_pad_template (element_class,
       gst_static_pad_template_get (&sink_factory));
 
-  gst_element_class_set_details (element_class, &gst_asf_parse_details);
+  gst_element_class_set_details_simple (element_class, "ASF parser",
+      "Parser", "Parses ASF", "Thiago Santos <thiagoss@embedded.ufcg.edu.br>");
 
   GST_DEBUG_CATEGORY_INIT (asfparse_debug, "asfparse", 0,
       "Parser for ASF streams");
diff --git a/gst/asfmux/gstrtpasfpay.c b/gst/asfmux/gstrtpasfpay.c
index 302cf3e23..1e616546e 100644
--- a/gst/asfmux/gstrtpasfpay.c
+++ b/gst/asfmux/gstrtpasfpay.c
@@ -34,13 +34,6 @@
 GST_DEBUG_CATEGORY_STATIC (rtpasfpay_debug);
 #define GST_CAT_DEFAULT (rtpasfpay_debug)
 
-/* elementfactory information */
-static const GstElementDetails gst_rtp_asf_pay_details =
-GST_ELEMENT_DETAILS ("RTP ASF payloader",
-    "Codec/Payloader/Network",
-    "Payload-encodes ASF into RTP packets (MS_RTSP)",
-    "Thiago Santos <thiagoss@embedded.ufcg.edu.br>");
-
 static GstStaticPadTemplate gst_rtp_asf_pay_sink_template =
 GST_STATIC_PAD_TEMPLATE ("sink",
     GST_PAD_SINK,
@@ -96,7 +89,10 @@ gst_rtp_asf_pay_base_init (gpointer klass)
       gst_static_pad_template_get (&gst_rtp_asf_pay_sink_template));
   gst_element_class_add_pad_template (element_class,
       gst_static_pad_template_get (&gst_rtp_asf_pay_src_template));
-  gst_element_class_set_details (element_class, &gst_rtp_asf_pay_details);
+  gst_element_class_set_details_simple (element_class, "RTP ASF payloader",
+      "Codec/Payloader/Network",
+      "Payload-encodes ASF into RTP packets (MS_RTSP)",
+      "Thiago Santos <thiagoss@embedded.ufcg.edu.br>");
 }
 
 static void
diff --git a/gst/audiobuffer/gstaudioringbuffer.c b/gst/audiobuffer/gstaudioringbuffer.c
index 19a9c48bf..e3bc47a56 100644
--- a/gst/audiobuffer/gstaudioringbuffer.c
+++ b/gst/audiobuffer/gstaudioringbuffer.c
@@ -39,12 +39,6 @@
 
 #include <gst/audio/gstringbuffer.h>
 
-static const GstElementDetails gst_audio_ringbuffer_details =
-GST_ELEMENT_DETAILS ("AudioRingbuffer",
-    "Generic",
-    "Asynchronous Audio ringbuffer",
-    "Wim Taymans <wim.taymans@gmail.com>");
-
 static GstStaticPadTemplate sinktemplate = GST_STATIC_PAD_TEMPLATE ("sink",
     GST_PAD_SINK,
     GST_PAD_ALWAYS,
@@ -331,8 +325,9 @@ gst_audio_ringbuffer_class_init (GstAudioRingbufferClass * klass)
   gst_element_class_add_pad_template (gstelement_class,
       gst_static_pad_template_get (&sinktemplate));
 
-  gst_element_class_set_details (gstelement_class,
-      &gst_audio_ringbuffer_details);
+  gst_element_class_set_details_simple (gstelement_class, "AudioRingbuffer",
+      "Generic",
+      "Asynchronous Audio ringbuffer", "Wim Taymans <wim.taymans@gmail.com>");
 
   /* set several parent class virtual functions */
   gobject_class->finalize = GST_DEBUG_FUNCPTR (gst_audio_ringbuffer_finalize);
diff --git a/gst/audioparsers/gstaacparse.c b/gst/audioparsers/gstaacparse.c
index db63c5a51..d5a72d511 100644
--- a/gst/audioparsers/gstaacparse.c
+++ b/gst/audioparsers/gstaacparse.c
@@ -128,17 +128,15 @@ static void
 gst_aacparse_base_init (gpointer klass)
 {
   GstElementClass *element_class = GST_ELEMENT_CLASS (klass);
-  GstElementDetails details = GST_ELEMENT_DETAILS ("AAC audio stream parser",
-      "Codec/Parser/Audio",
-      "Advanced Audio Coding parser",
-      "Stefan Kost <stefan.kost@nokia.com>");
 
   gst_element_class_add_pad_template (element_class,
       gst_static_pad_template_get (&sink_template));
   gst_element_class_add_pad_template (element_class,
       gst_static_pad_template_get (&src_template));
 
-  gst_element_class_set_details (element_class, &details);
+  gst_element_class_set_details_simple (element_class,
+      "AAC audio stream parser", "Codec/Parser/Audio",
+      "Advanced Audio Coding parser", "Stefan Kost <stefan.kost@nokia.com>");
 }
 
 
diff --git a/gst/audioparsers/gstamrparse.c b/gst/audioparsers/gstamrparse.c
index 0266ee875..313c74dc5 100644
--- a/gst/audioparsers/gstamrparse.c
+++ b/gst/audioparsers/gstamrparse.c
@@ -105,17 +105,16 @@ static void
 gst_amrparse_base_init (gpointer klass)
 {
   GstElementClass *element_class = GST_ELEMENT_CLASS (klass);
-  GstElementDetails details = GST_ELEMENT_DETAILS ("AMR audio stream parser",
-      "Codec/Parser/Audio",
-      "Adaptive Multi-Rate audio parser",
-      "Ronald Bultje <rbultje@ronald.bitfreak.net>");
 
   gst_element_class_add_pad_template (element_class,
       gst_static_pad_template_get (&sink_template));
   gst_element_class_add_pad_template (element_class,
       gst_static_pad_template_get (&src_template));
 
-  gst_element_class_set_details (element_class, &details);
+  gst_element_class_set_details_simple (element_class,
+      "AMR audio stream parser", "Codec/Parser/Audio",
+      "Adaptive Multi-Rate audio parser",
+      "Ronald Bultje <rbultje@ronald.bitfreak.net>");
 }
 
 
diff --git a/gst/bayer/gstbayer2rgb.c b/gst/bayer/gstbayer2rgb.c
index ec2dadb1a..153846503 100644
--- a/gst/bayer/gstbayer2rgb.c
+++ b/gst/bayer/gstbayer2rgb.c
@@ -115,12 +115,6 @@ struct _GstBayer2RGBClass
   GstBaseTransformClass parent;
 };
 
-static const GstElementDetails element_details =
-GST_ELEMENT_DETAILS ("Bayer to RGB decoder for cameras",
-    "Filter/Converter/Video",
-    "Converts video/x-raw-bayer to video/x-raw-rgb",
-    "William Brack <wbrack@mmm.com.hk>");
-
 //#define SRC_CAPS GST_VIDEO_CAPS_RGBx
 #define	SRC_CAPS                                 \
   GST_VIDEO_CAPS_RGBx ";"                        \
@@ -168,7 +162,10 @@ gst_bayer2rgb_base_init (gpointer klass)
 {
   GstElementClass *element_class = GST_ELEMENT_CLASS (klass);
 
-  gst_element_class_set_details (element_class, &element_details);
+  gst_element_class_set_details_simple (element_class,
+      "Bayer to RGB decoder for cameras", "Filter/Converter/Video",
+      "Converts video/x-raw-bayer to video/x-raw-rgb",
+      "William Brack <wbrack@mmm.com.hk>");
 
   gst_element_class_add_pad_template (element_class,
       gst_pad_template_new ("src", GST_PAD_SRC, GST_PAD_ALWAYS,
diff --git a/gst/camerabin/camerabinimage.c b/gst/camerabin/camerabinimage.c
index 0defb6367..95a74dbfb 100644
--- a/gst/camerabin/camerabinimage.c
+++ b/gst/camerabin/camerabinimage.c
@@ -85,13 +85,6 @@ static void gst_camerabin_image_get_property (GObject * object, guint prop_id,
 
 GST_BOILERPLATE (GstCameraBinImage, gst_camerabin_image, GstBin, GST_TYPE_BIN);
 
-static const GstElementDetails gst_camerabin_image_details =
-GST_ELEMENT_DETAILS ("Image capture bin for camerabin",
-    "Bin/Image",
-    "Process and store image data",
-    "Edgard Lima <edgard.lima@indt.org.br>\n"
-    "Nokia Corporation <multimedia@maemo.org>");
-
 static GstStaticPadTemplate sink_template = GST_STATIC_PAD_TEMPLATE ("sink",
     GST_PAD_SINK,
     GST_PAD_ALWAYS,
@@ -111,7 +104,11 @@ gst_camerabin_image_base_init (gpointer klass)
       gst_static_pad_template_get (&sink_template));
   gst_element_class_add_pad_template (eklass,
       gst_static_pad_template_get (&src_template));
-  gst_element_class_set_details (eklass, &gst_camerabin_image_details);
+  gst_element_class_set_details_simple (eklass,
+      "Image capture bin for camerabin", "Bin/Image",
+      "Process and store image data",
+      "Edgard Lima <edgard.lima@indt.org.br>, "
+      "Nokia Corporation <multimedia@maemo.org>");
 }
 
 static void
diff --git a/gst/camerabin/camerabinvideo.c b/gst/camerabin/camerabinvideo.c
index 4796fc835..e88f2aafc 100644
--- a/gst/camerabin/camerabinvideo.c
+++ b/gst/camerabin/camerabinvideo.c
@@ -102,13 +102,6 @@ static void gst_camerabin_video_destroy_elements (GstCameraBinVideo * vid);
 
 GST_BOILERPLATE (GstCameraBinVideo, gst_camerabin_video, GstBin, GST_TYPE_BIN);
 
-static const GstElementDetails gst_camerabin_video_details =
-GST_ELEMENT_DETAILS ("Video capture bin for camerabin",
-    "Bin/Video",
-    "Process and store video data",
-    "Edgard Lima <edgard.lima@indt.org.br>\n"
-    "Nokia Corporation <multimedia@maemo.org>");
-
 static GstStaticPadTemplate sink_template = GST_STATIC_PAD_TEMPLATE ("sink",
     GST_PAD_SINK,
     GST_PAD_ALWAYS,
@@ -131,7 +124,11 @@ gst_camerabin_video_base_init (gpointer klass)
       gst_static_pad_template_get (&sink_template));
   gst_element_class_add_pad_template (eklass,
       gst_static_pad_template_get (&src_template));
-  gst_element_class_set_details (eklass, &gst_camerabin_video_details);
+  gst_element_class_set_details_simple (eklass,
+      "Video capture bin for camerabin", "Bin/Video",
+      "Process and store video data",
+      "Edgard Lima <edgard.lima@indt.org.br>, "
+      "Nokia Corporation <multimedia@maemo.org>");
 }
 
 static void
diff --git a/gst/camerabin/gstcamerabin.c b/gst/camerabin/gstcamerabin.c
index cf02ad075..1b1929d81 100644
--- a/gst/camerabin/gstcamerabin.c
+++ b/gst/camerabin/gstcamerabin.c
@@ -2346,16 +2346,13 @@ gst_camerabin_adapt_image_capture (GstCameraBin * camera, GstCaps * in_caps)
 static void
 gst_camerabin_base_init (gpointer gclass)
 {
-  static GstElementDetails element_details = {
-    "Camera Bin",
-    "Generic/Bin/Camera",
-    "Handle lot of features present in DSC",
-    "Nokia Corporation <multimedia@maemo.org>\n"
-        "Edgard Lima <edgard.lima@indt.org.br>"
-  };
   GstElementClass *element_class = GST_ELEMENT_CLASS (gclass);
 
-  gst_element_class_set_details (element_class, &element_details);
+  gst_element_class_set_details_simple (element_class, "Camera Bin",
+      "Generic/Bin/Camera",
+      "Handle lot of features present in DSC",
+      "Nokia Corporation <multimedia@maemo.org>, "
+      "Edgard Lima <edgard.lima@indt.org.br>");
 }
 
 static void
diff --git a/gst/cdxaparse/gstcdxaparse.c b/gst/cdxaparse/gstcdxaparse.c
index 466e287f9..dda0d4ff1 100644
--- a/gst/cdxaparse/gstcdxaparse.c
+++ b/gst/cdxaparse/gstcdxaparse.c
@@ -65,14 +65,12 @@ static void
 gst_cdxa_parse_base_init (gpointer g_class)
 {
   GstElementClass *element_class = GST_ELEMENT_CLASS (g_class);
-  static const GstElementDetails gst_cdxa_parse_details =
-      GST_ELEMENT_DETAILS ("(S)VCD parser",
+
+  gst_element_class_set_details_simple (element_class, "(S)VCD parser",
       "Codec/Parser",
       "Parse a .dat file from (S)VCD into raw MPEG-1",
       "Wim Taymans <wim.taymans@tvd.be>");
 
-  gst_element_class_set_details (element_class, &gst_cdxa_parse_details);
-
   /* register src pads */
   gst_element_class_add_pad_template (element_class,
       gst_static_pad_template_get (&sink_template_factory));
diff --git a/gst/chart/gstchart.c b/gst/chart/gstchart.c
index 775e37cc6..4e818b62a 100644
--- a/gst/chart/gstchart.c
+++ b/gst/chart/gstchart.c
@@ -62,14 +62,6 @@ struct _GstChartClass
 
 GType gst_chart_get_type (void);
 
-
-/* elementfactory information */
-static const GstElementDetails gst_chart_details =
-GST_ELEMENT_DETAILS ("Chart drawer",
-    "Visualization",
-    "Takes frames of data and outputs video frames of a chart of data",
-    "Richard Boulton <richard@tartarus.org>");
-
 /* signals and args */
 enum
 {
@@ -150,7 +142,10 @@ gst_chart_base_init (gpointer g_class)
       gst_static_pad_template_get (&src_factory));
   gst_element_class_add_pad_template (element_class,
       gst_static_pad_template_get (&sink_factory));
-  gst_element_class_set_details (element_class, &gst_chart_details);
+  gst_element_class_set_details_simple (element_class, "Chart drawer",
+      "Visualization",
+      "Takes frames of data and outputs video frames of a chart of data",
+      "Richard Boulton <richard@tartarus.org>");
 }
 
 static void
diff --git a/gst/colorspace/gstcolorspace.c b/gst/colorspace/gstcolorspace.c
index 59339bf61..9c07644f3 100644
--- a/gst/colorspace/gstcolorspace.c
+++ b/gst/colorspace/gstcolorspace.c
@@ -44,12 +44,6 @@ static GstColorspaceConverter gst_colorspace_converters[] = {
   {GST_COLORSPACE_YV12, GST_COLORSPACE_RGB16, gst_colorspace_YV12_to_rgb16},
 };
 
-static const GstElementDetails colorspace_details =
-GST_ELEMENT_DETAILS ("Colorspace converter",
-    "Filter/Converter/Video",
-    "Converts video from YUV to RGB",
-    "Wim Taymans <wim.taymans@chello.be>");
-
 static GstStaticPadTemplate gst_colorspace_sink_template =
 GST_STATIC_PAD_TEMPLATE ("sink",
     GST_PAD_SINK,
@@ -490,7 +484,9 @@ gst_colorspace_base_init (gpointer g_class)
   gst_element_class_add_pad_template (element_class,
       gst_static_pad_template_get (&gst_colorspace_sink_template));
 
-  gst_element_class_set_details (element_class, &colorspace_details);
+  gst_element_class_set_details_simple (element_class, "Colorspace converter",
+      "Filter/Converter/Video",
+      "Converts video from YUV to RGB", "Wim Taymans <wim.taymans@chello.be>");
 }
 
 static void
diff --git a/gst/dccp/gstdccpclientsink.c b/gst/dccp/gstdccpclientsink.c
index 4c1fd50f0..ed7f462a9 100644
--- a/gst/dccp/gstdccpclientsink.c
+++ b/gst/dccp/gstdccpclientsink.c
@@ -76,12 +76,6 @@ static GstFlowReturn gst_dccp_client_sink_render (GstBaseSink * bsink,
 
 GST_DEBUG_CATEGORY_STATIC (dccpclientsink_debug);
 
-static const GstElementDetails gst_dccp_client_sink_details =
-GST_ELEMENT_DETAILS ("DCCP client sink",
-    "Sink/Network",
-    "Send data as a client over the network via DCCP",
-    "E-Phone Team at Federal University of Campina Grande <leandroal@gmail.com>");
-
 static GstStaticPadTemplate sinktemplate = GST_STATIC_PAD_TEMPLATE ("sink",
     GST_PAD_SINK,
     GST_PAD_ALWAYS,
@@ -237,7 +231,10 @@ gst_dccp_client_sink_base_init (gpointer g_class)
   gst_element_class_add_pad_template (element_class,
       gst_static_pad_template_get (&sinktemplate));
 
-  gst_element_class_set_details (element_class, &gst_dccp_client_sink_details);
+  gst_element_class_set_details_simple (element_class, "DCCP client sink",
+      "Sink/Network",
+      "Send data as a client over the network via DCCP",
+      "E-Phone Team at Federal University of Campina Grande <leandroal@gmail.com>");
 }
 
 static void
diff --git a/gst/dccp/gstdccpclientsrc.c b/gst/dccp/gstdccpclientsrc.c
index 4cb33e7c7..a07d5e59d 100644
--- a/gst/dccp/gstdccpclientsrc.c
+++ b/gst/dccp/gstdccpclientsrc.c
@@ -81,12 +81,6 @@ static gboolean gst_dccp_client_src_stop (GstBaseSrc * bsrc);
 
 GST_DEBUG_CATEGORY_STATIC (dccpclientsrc_debug);
 
-static const GstElementDetails gst_dccp_client_src_details =
-GST_ELEMENT_DETAILS ("DCCP client source",
-    "Source/Network",
-    "Receive data as a client over the network via DCCP",
-    "E-Phone Team at Federal University of Campina Grande <leandroal@gmail.com>");
-
 static GstStaticPadTemplate srctemplate = GST_STATIC_PAD_TEMPLATE ("src",
     GST_PAD_SRC,
     GST_PAD_ALWAYS,
@@ -281,7 +275,10 @@ gst_dccp_client_src_base_init (gpointer g_class)
   gst_element_class_add_pad_template (element_class,
       gst_static_pad_template_get (&srctemplate));
 
-  gst_element_class_set_details (element_class, &gst_dccp_client_src_details);
+  gst_element_class_set_details_simple (element_class, "DCCP client source",
+      "Source/Network",
+      "Receive data as a client over the network via DCCP",
+      "E-Phone Team at Federal University of Campina Grande <leandroal@gmail.com>");
 }
 
 static void
diff --git a/gst/dccp/gstdccpserversink.c b/gst/dccp/gstdccpserversink.c
index e8f8a04f5..23282b1eb 100644
--- a/gst/dccp/gstdccpserversink.c
+++ b/gst/dccp/gstdccpserversink.c
@@ -78,13 +78,6 @@ static gboolean gst_dccp_server_sink_stop (GstBaseSink * bsink);
 
 GST_DEBUG_CATEGORY_STATIC (dccpserversink_debug);
 
-static const GstElementDetails gst_dccp_server_sink_details =
-GST_ELEMENT_DETAILS ("DCCP server sink",
-    "Sink/Network",
-    "Send data as a server over the network via DCCP",
-    "E-Phone Team at Federal University of Campina Grande <leandroal@gmail.com>");
-
-
 static GstStaticPadTemplate sinktemplate = GST_STATIC_PAD_TEMPLATE ("sink",
     GST_PAD_SINK,
     GST_PAD_ALWAYS,
@@ -337,7 +330,10 @@ gst_dccp_server_sink_base_init (gpointer g_class)
   gst_element_class_add_pad_template (element_class,
       gst_static_pad_template_get (&sinktemplate));
 
-  gst_element_class_set_details (element_class, &gst_dccp_server_sink_details);
+  gst_element_class_set_details_simple (element_class, "DCCP server sink",
+      "Sink/Network",
+      "Send data as a server over the network via DCCP",
+      "E-Phone Team at Federal University of Campina Grande <leandroal@gmail.com>");
 }
 
 /*
diff --git a/gst/dccp/gstdccpserversrc.c b/gst/dccp/gstdccpserversrc.c
index 4c344e422..16cd38241 100644
--- a/gst/dccp/gstdccpserversrc.c
+++ b/gst/dccp/gstdccpserversrc.c
@@ -76,12 +76,6 @@ static gboolean gst_dccp_server_src_stop (GstBaseSrc * bsrc);
 
 GST_DEBUG_CATEGORY_STATIC (dccpserversrc_debug);
 
-static const GstElementDetails gst_dccp_server_src_details =
-GST_ELEMENT_DETAILS ("DCCP server source",
-    "Source/Network",
-    "Receive data as a server over the network via DCCP",
-    "E-Phone Team at Federal University of Campina Grande <leandroal@gmail.com>");
-
 static GstStaticPadTemplate srctemplate = GST_STATIC_PAD_TEMPLATE ("src",
     GST_PAD_SRC,
     GST_PAD_ALWAYS,
@@ -271,7 +265,10 @@ gst_dccp_server_src_base_init (gpointer g_class)
   gst_element_class_add_pad_template (element_class,
       gst_static_pad_template_get (&srctemplate));
 
-  gst_element_class_set_details (element_class, &gst_dccp_server_src_details);
+  gst_element_class_set_details_simple (element_class, "DCCP server source",
+      "Source/Network",
+      "Receive data as a server over the network via DCCP",
+      "E-Phone Team at Federal University of Campina Grande <leandroal@gmail.com>");
 }
 
 
diff --git a/gst/debugutils/fpsdisplaysink.c b/gst/debugutils/fpsdisplaysink.c
index 2521ca637..7c97dfb13 100644
--- a/gst/debugutils/fpsdisplaysink.c
+++ b/gst/debugutils/fpsdisplaysink.c
@@ -56,13 +56,6 @@
 #define FPS_DISPLAY_INTERVAL_MS 500     /* 500 ms */
 #define DEFAULT_FONT "Sans 20"
 
-static GstElementDetails fps_display_sink_details = {
-  "Measure and show framerate on videosink",
-  "Sink/Video",
-  "Shows the current frame-rate and drop-rate of the videosink as overlay or text on stdout",
-  "Zeeshan Ali <zeeshan.ali@nokia.com>, Stefan Kost <stefan.kost@nokia.com>"
-};
-
 /* generic templates */
 static GstStaticPadTemplate fps_display_sink_template =
 GST_STATIC_PAD_TEMPLATE ("sink",
@@ -127,7 +120,10 @@ fps_display_sink_class_init (GstFPSDisplaySinkClass * klass)
   gst_element_class_add_pad_template (gstelement_klass,
       gst_static_pad_template_get (&fps_display_sink_template));
 
-  gst_element_class_set_details (gstelement_klass, &fps_display_sink_details);
+  gst_element_class_set_details_simple (gstelement_klass,
+      "Measure and show framerate on videosink", "Sink/Video",
+      "Shows the current frame-rate and drop-rate of the videosink as overlay or text on stdout",
+      "Zeeshan Ali <zeeshan.ali@nokia.com>, Stefan Kost <stefan.kost@nokia.com>");
 }
 
 static gboolean
diff --git a/gst/debugutils/gstcapssetter.c b/gst/debugutils/gstcapssetter.c
index 12077c0de..9489268ce 100644
--- a/gst/debugutils/gstcapssetter.c
+++ b/gst/debugutils/gstcapssetter.c
@@ -83,12 +83,6 @@ enum
 #define DEFAULT_JOIN              TRUE
 #define DEFAULT_REPLACE           FALSE
 
-static GstElementDetails caps_setter_details =
-GST_ELEMENT_DETAILS ("CapsSetter",
-    "Generic",
-    "Set/merge caps on stream",
-    "Mark Nauwelaerts <mnauw@users.sourceforge.net>");
-
 static GstStaticPadTemplate gst_caps_setter_src_template =
 GST_STATIC_PAD_TEMPLATE (GST_BASE_TRANSFORM_SRC_NAME,
     GST_PAD_SRC,
@@ -125,7 +119,10 @@ gst_caps_setter_base_init (gpointer g_class)
 {
   GstElementClass *element_class = GST_ELEMENT_CLASS (g_class);
 
-  gst_element_class_set_details (element_class, &caps_setter_details);
+  gst_element_class_set_details_simple (element_class, "CapsSetter",
+      "Generic",
+      "Set/merge caps on stream",
+      "Mark Nauwelaerts <mnauw@users.sourceforge.net>");
 
   gst_element_class_add_pad_template (element_class,
       gst_static_pad_template_get (&gst_caps_setter_sink_template));
diff --git a/gst/dtmf/gstdtmfdetect.c b/gst/dtmf/gstdtmfdetect.c
index 5cb7c2cab..cf8c058b1 100644
--- a/gst/dtmf/gstdtmfdetect.c
+++ b/gst/dtmf/gstdtmfdetect.c
@@ -84,14 +84,6 @@
 GST_DEBUG_CATEGORY (dtmf_detect_debug);
 #define GST_CAT_DEFAULT (dtmf_detect_debug)
 
-/* elementfactory information */
-static const GstElementDetails gst_dtmf_detect_details =
-GST_ELEMENT_DETAILS ("DTMF detector element",
-    "Detect",
-    "This element detects DTMF tones",
-    "Olivier Crete <olivier.crete@collabora.co.uk>");
-
-
 static GstStaticPadTemplate sinktemplate = GST_STATIC_PAD_TEMPLATE ("sink",
     GST_PAD_SINK,
     GST_PAD_ALWAYS,
@@ -148,7 +140,10 @@ gst_dtmf_detect_base_init (gpointer klass)
   gst_element_class_add_pad_template (element_class,
       gst_static_pad_template_get (&sinktemplate));
 
-  gst_element_class_set_details (element_class, &gst_dtmf_detect_details);
+  gst_element_class_set_details_simple (element_class, "DTMF detector element",
+      "Detect",
+      "This element detects DTMF tones",
+      "Olivier Crete <olivier.crete@collabora.co.uk>");
 }
 
 static void
diff --git a/gst/dtmf/gstdtmfsrc.c b/gst/dtmf/gstdtmfsrc.c
index 39699d840..f1244b62b 100644
--- a/gst/dtmf/gstdtmfsrc.c
+++ b/gst/dtmf/gstdtmfsrc.c
@@ -194,13 +194,6 @@ enum
   DTMF_KEY_EVENT_D = 15,
 };
 
-/* elementfactory information */
-static const GstElementDetails gst_dtmf_src_details =
-GST_ELEMENT_DETAILS ("DTMF tone generator",
-    "Source/Audio",
-    "Generates DTMF tones",
-    "Youness Alaoui <youness.alaoui@collabora.co.uk>");
-
 GST_DEBUG_CATEGORY_STATIC (gst_dtmf_src_debug);
 #define GST_CAT_DEFAULT gst_dtmf_src_debug
 
@@ -253,7 +246,10 @@ gst_dtmf_src_base_init (gpointer g_class)
   gst_element_class_add_pad_template (element_class,
       gst_static_pad_template_get (&gst_dtmf_src_template));
 
-  gst_element_class_set_details (element_class, &gst_dtmf_src_details);
+  gst_element_class_set_details_simple (element_class, "DTMF tone generator",
+      "Source/Audio",
+      "Generates DTMF tones",
+      "Youness Alaoui <youness.alaoui@collabora.co.uk>");
 }
 
 static void
diff --git a/gst/dtmf/gstrtpdtmfdepay.c b/gst/dtmf/gstrtpdtmfdepay.c
index 7cdfabfe7..9f5ae9278 100644
--- a/gst/dtmf/gstrtpdtmfdepay.c
+++ b/gst/dtmf/gstrtpdtmfdepay.c
@@ -164,13 +164,6 @@ enum
   DTMF_KEY_EVENT_D = 15,
 };
 
-/* elementfactory information */
-static const GstElementDetails gst_rtp_dtmfdepay_details =
-GST_ELEMENT_DETAILS ("RTP DTMF packet depayloader",
-    "Codec/Depayloader/Network",
-    "Generates DTMF Sound from telephone-event RTP packets",
-    "Youness Alaoui <youness.alaoui@collabora.co.uk>");
-
 GST_DEBUG_CATEGORY_STATIC (gst_rtp_dtmf_depay_debug);
 #define GST_CAT_DEFAULT gst_rtp_dtmf_depay_debug
 
@@ -242,7 +235,10 @@ gst_rtp_dtmf_depay_base_init (gpointer klass)
 
   GST_DEBUG_CATEGORY_INIT (gst_rtp_dtmf_depay_debug,
       "rtpdtmfdepay", 0, "rtpdtmfdepay element");
-  gst_element_class_set_details (element_class, &gst_rtp_dtmfdepay_details);
+  gst_element_class_set_details_simple (element_class,
+      "RTP DTMF packet depayloader", "Codec/Depayloader/Network",
+      "Generates DTMF Sound from telephone-event RTP packets",
+      "Youness Alaoui <youness.alaoui@collabora.co.uk>");
 }
 
 static void
diff --git a/gst/dtmf/gstrtpdtmfsrc.c b/gst/dtmf/gstrtpdtmfsrc.c
index 65d0ce8c1..0018cb2b9 100644
--- a/gst/dtmf/gstrtpdtmfsrc.c
+++ b/gst/dtmf/gstrtpdtmfsrc.c
@@ -144,13 +144,6 @@
 #define MIN_PACKET_REDUNDANCY 1
 #define MAX_PACKET_REDUNDANCY 5
 
-/* elementfactory information */
-static const GstElementDetails gst_rtp_dtmf_src_details =
-GST_ELEMENT_DETAILS ("RTP DTMF packet generator",
-    "Source/Network",
-    "Generates RTP DTMF packets",
-    "Zeeshan Ali <zeeshan.ali@nokia.com>");
-
 GST_DEBUG_CATEGORY_STATIC (gst_rtp_dtmf_src_debug);
 #define GST_CAT_DEFAULT gst_rtp_dtmf_src_debug
 
@@ -228,7 +221,9 @@ gst_rtp_dtmf_src_base_init (gpointer g_class)
   gst_element_class_add_pad_template (element_class,
       gst_static_pad_template_get (&gst_rtp_dtmf_src_template));
 
-  gst_element_class_set_details (element_class, &gst_rtp_dtmf_src_details);
+  gst_element_class_set_details_simple (element_class,
+      "RTP DTMF packet generator", "Source/Network",
+      "Generates RTP DTMF packets", "Zeeshan Ali <zeeshan.ali@nokia.com>");
 }
 
 static void
diff --git a/gst/dvdspu/gstdvdspu.c b/gst/dvdspu/gstdvdspu.c
index fd51e262d..e4ded0535 100644
--- a/gst/dvdspu/gstdvdspu.c
+++ b/gst/dvdspu/gstdvdspu.c
@@ -116,12 +116,6 @@ static void gst_dvd_spu_handle_dvd_event (GstDVDSpu * dvdspu, GstEvent * event);
 static void
 gst_dvd_spu_base_init (gpointer gclass)
 {
-  static GstElementDetails element_details =
-      GST_ELEMENT_DETAILS ("GStreamer Sub-picture Overlay",
-      "Mixer/Video/Overlay/SubPicture/DVD/Bluray",
-      "Parses Sub-Picture command streams and renders the SPU overlay "
-      "onto the video as it passes through",
-      "Jan Schmidt <thaytan@noraisin.net>");
   GstElementClass *element_class = GST_ELEMENT_CLASS (gclass);
 
   gst_element_class_add_pad_template (element_class,
@@ -130,7 +124,11 @@ gst_dvd_spu_base_init (gpointer gclass)
       gst_static_pad_template_get (&video_sink_factory));
   gst_element_class_add_pad_template (element_class,
       gst_static_pad_template_get (&subpic_sink_factory));
-  gst_element_class_set_details (element_class, &element_details);
+  gst_element_class_set_details_simple (element_class, "Sub-picture Overlay",
+      "Mixer/Video/Overlay/SubPicture/DVD/Bluray",
+      "Parses Sub-Picture command streams and renders the SPU overlay "
+      "onto the video as it passes through",
+      "Jan Schmidt <thaytan@noraisin.net>");
 
   element_class->change_state = gst_dvd_spu_change_state;
 }
diff --git a/gst/festival/gstfestival.c b/gst/festival/gstfestival.c
index 7d919b90f..de76a5826 100644
--- a/gst/festival/gstfestival.c
+++ b/gst/festival/gstfestival.c
@@ -122,13 +122,6 @@ static FT_Info *festival_default_info (void);
 static char *socket_receive_file_to_buff (int fd, int *size);
 static char *client_accept_s_expr (int fd);
 
-/* elementfactory information */
-static const GstElementDetails gst_festival_details =
-GST_ELEMENT_DETAILS ("Festival Text-to-Speech synthesizer",
-    "Filter/Effect/Audio",
-    "Synthesizes plain text into audio",
-    "Wim Taymans <wim.taymans@chello.be>");
-
 static GstStaticPadTemplate sink_template_factory =
 GST_STATIC_PAD_TEMPLATE ("sink",
     GST_PAD_SINK,
@@ -196,7 +189,10 @@ gst_festival_base_init (gpointer g_class)
   gst_element_class_add_pad_template (element_class,
       gst_static_pad_template_get (&src_template_factory));
 
-  gst_element_class_set_details (element_class, &gst_festival_details);
+  gst_element_class_set_details_simple (element_class,
+      "Festival Text-to-Speech synthesizer", "Filter/Effect/Audio",
+      "Synthesizes plain text into audio",
+      "Wim Taymans <wim.taymans@chello.be>");
 }
 
 static void
diff --git a/gst/filter/gstiir.c b/gst/filter/gstiir.c
index cf37256ca..a341a9496 100644
--- a/gst/filter/gstiir.c
+++ b/gst/filter/gstiir.c
@@ -35,14 +35,6 @@
 #define GST_CAT_DEFAULT gst_iir_debug
 GST_DEBUG_CATEGORY_STATIC (GST_CAT_DEFAULT);
 
-static const GstElementDetails iir_details =
-GST_ELEMENT_DETAILS ("Infinite Impulse Response (IIR) filter",
-    "Filter/Effect/Audio",
-    "IIR filter based on vorbis code",
-    "Monty <monty@xiph.org>, "
-    "Thomas Vander Stichele <thomas at apestaart dot org>, "
-    "Dreamlab Technologies Ltd. <mathis.hofer@dreamlab.net>");
-
 /* Filter signals and args */
 enum
 {
@@ -110,7 +102,12 @@ gst_iir_base_init (gpointer g_class)
       gst_static_pad_template_get (&iir_src_template));
   gst_element_class_add_pad_template (element_class,
       gst_static_pad_template_get (&iir_sink_template));
-  gst_element_class_set_details (element_class, &iir_details);
+  gst_element_class_set_details_simple (element_class,
+      "Infinite Impulse Response (IIR) filter", "Filter/Effect/Audio",
+      "IIR filter based on vorbis code",
+      "Monty <monty@xiph.org>, "
+      "Thomas Vander Stichele <thomas at apestaart dot org>, "
+      "Dreamlab Technologies Ltd. <mathis.hofer@dreamlab.net>");
 }
 
 static void
diff --git a/gst/freeze/gstfreeze.c b/gst/freeze/gstfreeze.c
index d55498839..a721eab2b 100644
--- a/gst/freeze/gstfreeze.c
+++ b/gst/freeze/gstfreeze.c
@@ -46,14 +46,6 @@ enum
   ARG_MAX_BUFFERS,
 };
 
-
-static const GstElementDetails freeze_details =
-GST_ELEMENT_DETAILS ("Stream freezer",
-    "Generic",
-    "Makes a stream from buffers of data",
-    "Gergely Nagy <gergely.nagy@neteyes.hu>,"
-    " Renato Filho <renato.filho@indt.org.br>");
-
 static GstStaticPadTemplate gst_freeze_src_template =
 GST_STATIC_PAD_TEMPLATE ("src",
     GST_PAD_SRC,
@@ -92,7 +84,11 @@ gst_freeze_base_init (gpointer klass)
 {
   GstElementClass *element_class = GST_ELEMENT_CLASS (klass);
 
-  gst_element_class_set_details (element_class, &freeze_details);
+  gst_element_class_set_details_simple (element_class, "Stream freezer",
+      "Generic",
+      "Makes a stream from buffers of data",
+      "Gergely Nagy <gergely.nagy@neteyes.hu>,"
+      " Renato Filho <renato.filho@indt.org.br>");
 
   gst_element_class_add_pad_template (element_class,
       gst_static_pad_template_get (&gst_freeze_sink_template));
diff --git a/gst/games/gstpuzzle.c b/gst/games/gstpuzzle.c
index 5283b6b76..9e35f0424 100644
--- a/gst/games/gstpuzzle.c
+++ b/gst/games/gstpuzzle.c
@@ -120,17 +120,16 @@ gst_puzzle_get_type (void)
 static void
 gst_puzzle_base_init (gpointer g_class)
 {
-  static const GstElementDetails puzzle_details =
-      GST_ELEMENT_DETAILS ("A simple puzzle",
-      "Filter/Effect/Video/Games",
-      "A simple puzzle, use arrow keys and space to restart/solve",
-      "Benjamin Otte <otte@gnome.org>");
+
   GstElementClass *element_class = GST_ELEMENT_CLASS (g_class);
   GstVideofilterClass *videofilter_class = GST_VIDEOFILTER_CLASS (g_class);
   int i;
   GstVideofilterFormat *f;
 
-  gst_element_class_set_details (element_class, &puzzle_details);
+  gst_element_class_set_details_simple (element_class, "A simple puzzle",
+      "Filter/Effect/Video/Games",
+      "A simple puzzle, use arrow keys and space to restart/solve",
+      "Benjamin Otte <otte@gnome.org>");
 
   for (i = 0; i < gst_video_format_count; i++) {
     f = g_new0 (GstVideofilterFormat, 1);
diff --git a/gst/h264parse/gsth264parse.c b/gst/h264parse/gsth264parse.c
index 66458ae58..806c5ab5a 100644
--- a/gst/h264parse/gsth264parse.c
+++ b/gst/h264parse/gsth264parse.c
@@ -46,13 +46,6 @@ static GstStaticPadTemplate srctemplate = GST_STATIC_PAD_TEMPLATE ("src",
 GST_DEBUG_CATEGORY_STATIC (h264_parse_debug);
 #define GST_CAT_DEFAULT h264_parse_debug
 
-static const GstElementDetails gst_h264_parse_details =
-GST_ELEMENT_DETAILS ("H264Parse",
-    "Codec/Parser/Video",
-    "Parses raw h264 stream",
-    "Michal Benes <michal.benes@itonis.tv>,"
-    "Wim Taymans <wim.taymans@gmail.com>");
-
 #define DEFAULT_SPLIT_PACKETIZED     FALSE
 #define DEFAULT_ACCESS_UNIT          FALSE
 #define DEFAULT_OUTPUT_FORMAT        GST_H264_PARSE_FORMAT_INPUT
@@ -896,7 +889,11 @@ gst_h264_parse_base_init (gpointer g_class)
       gst_static_pad_template_get (&srctemplate));
   gst_element_class_add_pad_template (gstelement_class,
       gst_static_pad_template_get (&sinktemplate));
-  gst_element_class_set_details (gstelement_class, &gst_h264_parse_details);
+  gst_element_class_set_details_simple (gstelement_class, "H264Parse",
+      "Codec/Parser/Video",
+      "Parses raw h264 stream",
+      "Michal Benes <michal.benes@itonis.tv>,"
+      "Wim Taymans <wim.taymans@gmail.com>");
 
   GST_DEBUG_CATEGORY_INIT (h264_parse_debug, "h264parse", 0, "h264 parser");
 }
diff --git a/gst/hdvparse/gsthdvparse.c b/gst/hdvparse/gsthdvparse.c
index 03b77747d..9a610f7cb 100644
--- a/gst/hdvparse/gsthdvparse.c
+++ b/gst/hdvparse/gsthdvparse.c
@@ -113,19 +113,16 @@ static GstCaps *gst_hdvparse_transform_caps (GstBaseTransform * trans,
 static void
 gst_hdvparse_base_init (gpointer klass)
 {
-  static GstElementDetails element_details = {
-    "HDVParser",
-    "Data/Parser",
-    "HDV private stream Parser",
-    "Edward Hervey <bilboed@bilboed.com>"
-  };
+
   GstElementClass *element_class = GST_ELEMENT_CLASS (klass);
 
   gst_element_class_add_pad_template (element_class,
       gst_static_pad_template_get (&src_template));
   gst_element_class_add_pad_template (element_class,
       gst_static_pad_template_get (&sink_template));
-  gst_element_class_set_details (element_class, &element_details);
+  gst_element_class_set_details_simple (element_class, "HDVParser",
+      "Data/Parser",
+      "HDV private stream Parser", "Edward Hervey <bilboed@bilboed.com>");
 }
 
 /* initialize the HDVParse's class */
diff --git a/gst/invtelecine/gstinvtelecine.c b/gst/invtelecine/gstinvtelecine.c
index be9d56a45..753957f10 100644
--- a/gst/invtelecine/gstinvtelecine.c
+++ b/gst/invtelecine/gstinvtelecine.c
@@ -144,14 +144,13 @@ gst_invtelecine_get_type (void)
 static void
 gst_invtelecine_base_init (gpointer g_class)
 {
-  static const GstElementDetails invtelecine_details =
-      GST_ELEMENT_DETAILS ("H.264 Decoder",
+
+  GstElementClass *element_class = GST_ELEMENT_CLASS (g_class);
+
+  gst_element_class_set_details_simple (element_class, "H.264 Decoder",
       "Codec/Decoder/Video",
       "Decode H.264/MPEG-4 AVC video streams",
       "Entropy Wave <ds@entropywave.com>");
-  GstElementClass *element_class = GST_ELEMENT_CLASS (g_class);
-
-  gst_element_class_set_details (element_class, &invtelecine_details);
 
   gst_element_class_add_pad_template (element_class,
       gst_static_pad_template_get (&gst_invtelecine_sink_template));
diff --git a/gst/legacyresample/gstlegacyresample.c b/gst/legacyresample/gstlegacyresample.c
index cbcd6fddc..95c924eae 100644
--- a/gst/legacyresample/gstlegacyresample.c
+++ b/gst/legacyresample/gstlegacyresample.c
@@ -51,13 +51,6 @@
 GST_DEBUG_CATEGORY_STATIC (legacyresample_debug);
 #define GST_CAT_DEFAULT legacyresample_debug
 
-/* elementfactory information */
-static const GstElementDetails gst_legacyresample_details =
-GST_ELEMENT_DETAILS ("Audio scaler",
-    "Filter/Converter/Audio",
-    "Resample audio",
-    "David Schleef <ds@schleef.org>");
-
 #define DEFAULT_FILTERLEN       16
 
 enum
@@ -147,7 +140,9 @@ gst_legacyresample_base_init (gpointer g_class)
   gst_element_class_add_pad_template (gstelement_class,
       gst_static_pad_template_get (&gst_legacyresample_sink_template));
 
-  gst_element_class_set_details (gstelement_class, &gst_legacyresample_details);
+  gst_element_class_set_details_simple (gstelement_class, "Audio scaler",
+      "Filter/Converter/Audio",
+      "Resample audio", "David Schleef <ds@schleef.org>");
 }
 
 static void
diff --git a/gst/librfb/gstrfbsrc.c b/gst/librfb/gstrfbsrc.c
index 5edd9f0a9..151aaa495 100644
--- a/gst/librfb/gstrfbsrc.c
+++ b/gst/librfb/gstrfbsrc.c
@@ -55,14 +55,6 @@ GST_DEBUG_CATEGORY_STATIC (rfbsrc_debug);
 GST_DEBUG_CATEGORY (rfbdecoder_debug);
 #define GST_CAT_DEFAULT rfbsrc_debug
 
-static const GstElementDetails gst_rfb_src_details =
-GST_ELEMENT_DETAILS ("Rfb source",
-    "Source/Video",
-    "Creates a rfb video stream",
-    "David A. Schleef <ds@schleef.org>, "
-    "Andre Moreira Magalhaes <andre.magalhaes@indt.org.br>, "
-    "Thijs Vermeir <thijsvermeir@gmail.com>");
-
 static GstStaticPadTemplate gst_rfb_src_template =
 GST_STATIC_PAD_TEMPLATE ("src",
     GST_PAD_SRC,
@@ -102,7 +94,12 @@ gst_rfb_src_base_init (gpointer g_class)
   gst_element_class_add_pad_template (element_class,
       gst_static_pad_template_get (&gst_rfb_src_template));
 
-  gst_element_class_set_details (element_class, &gst_rfb_src_details);
+  gst_element_class_set_details_simple (element_class, "Rfb source",
+      "Source/Video",
+      "Creates a rfb video stream",
+      "David A. Schleef <ds@schleef.org>, "
+      "Andre Moreira Magalhaes <andre.magalhaes@indt.org.br>, "
+      "Thijs Vermeir <thijsvermeir@gmail.com>");
 }
 
 static void
diff --git a/gst/liveadder/liveadder.c b/gst/liveadder/liveadder.c
index 25fa40639..cfd8055f5 100644
--- a/gst/liveadder/liveadder.c
+++ b/gst/liveadder/liveadder.c
@@ -53,14 +53,6 @@
 GST_DEBUG_CATEGORY_STATIC (live_adder_debug);
 #define GST_CAT_DEFAULT (live_adder_debug)
 
-/* elementfactory information */
-static const GstElementDetails gst_live_adder_details =
-GST_ELEMENT_DETAILS ("Live Adder element",
-    "Generic/Audio",
-    "Mixes live/discontinuous audio streams",
-    "Olivier Crete <olivier.crete@collabora.co.uk>");
-
-
 static GstStaticPadTemplate gst_live_adder_sink_template =
     GST_STATIC_PAD_TEMPLATE ("sink%d",
     GST_PAD_SINK,
@@ -181,7 +173,10 @@ gst_live_adder_class_init (GstLiveAdderClass * klass)
       gst_static_pad_template_get (&gst_live_adder_src_template));
   gst_element_class_add_pad_template (gstelement_class,
       gst_static_pad_template_get (&gst_live_adder_sink_template));
-  gst_element_class_set_details (gstelement_class, &gst_live_adder_details);
+  gst_element_class_set_details_simple (gstelement_class, "Live Adder element",
+      "Generic/Audio",
+      "Mixes live/discontinuous audio streams",
+      "Olivier Crete <olivier.crete@collabora.co.uk>");
 
   parent_class = g_type_class_peek_parent (klass);
 
diff --git a/gst/mixmatrix/mixmatrix.c b/gst/mixmatrix/mixmatrix.c
index 93ca2ab8f..f156da1a2 100644
--- a/gst/mixmatrix/mixmatrix.c
+++ b/gst/mixmatrix/mixmatrix.c
@@ -67,13 +67,6 @@ struct _GstMixMatrixClass
   void (*resize) (GstMixMatrix * mix);
 };
 
-/* elementfactory information */
-static const GstElementDetails mixmatrix_details =
-GST_ELEMENT_DETAILS ("Mixing Matrix",
-    "Filter/Editor/Audio",
-    "Mix N audio channels together into M channels",
-    "Erik Walthinsen <omega@temple-baptist.com>");
-
 enum
 {
   /* FILL ME */
@@ -122,6 +115,7 @@ static GstPadLinkReturn gst_mixmatrix_connect (GstPad * pad,
 static void gst_mixmatrix_loop (GstElement * element);
 
 static guint gst_mixmatrix_signals[LAST_SIGNAL] = { 0 };
+
 static GstElementClass *parent_class = NULL;
 
 GType
@@ -158,7 +152,10 @@ gst_mixmatrix_base_init (GstMixMatrixClass * klass)
       gst_static_pad_template_get (&mixmatrix_sink_template));
   gst_element_class_add_pad_template (element_class,
       gst_static_pad_template_get (&mixmatrix_src_template));
-  gst_element_class_set_details (element_class, &mixmatrix_details);
+  gst_element_class_set_details_simple (element_class, "Mixing Matrix",
+      "Filter/Editor/Audio",
+      "Mix N audio channels together into M channels",
+      "Erik Walthinsen <omega@temple-baptist.com>");
 }
 
 static void
diff --git a/gst/mpeg1sys/gstmpeg1systemencode.c b/gst/mpeg1sys/gstmpeg1systemencode.c
index 64089567e..db6c7a41b 100644
--- a/gst/mpeg1sys/gstmpeg1systemencode.c
+++ b/gst/mpeg1sys/gstmpeg1systemencode.c
@@ -28,15 +28,6 @@
 #include "gstmpeg1systemencode.h"
 #include "main.h"
 
-/*#define GST_DEBUG (b...) g_print (##b) */
-
-/* elementfactory information */
-static const GstElementDetails system_encode_details =
-GST_ELEMENT_DETAILS ("MPEG-1 muxer",
-    "Codec/Muxer",
-    "Multiplexes MPEG-1 Streams",
-    "Wim Taymans <wim.taymans@chello.be>");
-
 /* GstMPEG1SystemEncode signals and args */
 enum
 {
@@ -125,7 +116,9 @@ gst_system_encode_base_init (GstMPEG1SystemEncodeClass * klass)
       gst_static_pad_template_get (&audio_sink_factory));
   gst_element_class_add_pad_template (element_class,
       gst_static_pad_template_get (&video_sink_factory));
-  gst_element_class_set_details (element_class, &system_encode_details);
+  gst_element_class_set_details_simple (element_class, "MPEG-1 muxer",
+      "Codec/Muxer",
+      "Multiplexes MPEG-1 Streams", "Wim Taymans <wim.taymans@chello.be>");
 }
 
 static void
diff --git a/gst/mpeg4videoparse/mpeg4videoparse.c b/gst/mpeg4videoparse/mpeg4videoparse.c
index ceafd6f72..bfcf84516 100644
--- a/gst/mpeg4videoparse/mpeg4videoparse.c
+++ b/gst/mpeg4videoparse/mpeg4videoparse.c
@@ -29,13 +29,6 @@
 GST_DEBUG_CATEGORY_STATIC (mpeg4v_parse_debug);
 #define GST_CAT_DEFAULT mpeg4v_parse_debug
 
-/* elementfactory information */
-static GstElementDetails mpeg4vparse_details =
-GST_ELEMENT_DETAILS ("MPEG 4 video elementary stream parser",
-    "Codec/Parser/Video",
-    "Parses MPEG-4 Part 2 elementary video streams",
-    "Julien Moutte <julien@fluendo.com>");
-
 static GstStaticPadTemplate src_template =
 GST_STATIC_PAD_TEMPLATE ("src", GST_PAD_SRC,
     GST_PAD_ALWAYS,
@@ -859,7 +852,10 @@ gst_mpeg4vparse_base_init (gpointer klass)
   gst_element_class_add_pad_template (element_class,
       gst_static_pad_template_get (&sink_template));
 
-  gst_element_class_set_details (element_class, &mpeg4vparse_details);
+  gst_element_class_set_details_simple (element_class,
+      "MPEG 4 video elementary stream parser", "Codec/Parser/Video",
+      "Parses MPEG-4 Part 2 elementary video streams",
+      "Julien Moutte <julien@fluendo.com>");
 }
 
 static void
diff --git a/gst/mpegdemux/gstmpegdemux.c b/gst/mpegdemux/gstmpegdemux.c
index d80995ab7..0b4f242e0 100644
--- a/gst/mpegdemux/gstmpegdemux.c
+++ b/gst/mpegdemux/gstmpegdemux.c
@@ -77,14 +77,6 @@ typedef enum
 GST_DEBUG_CATEGORY_STATIC (gstflupsdemux_debug);
 #define GST_CAT_DEFAULT (gstflupsdemux_debug)
 
-/* elementfactory information */
-static GstElementDetails flups_demux_details = {
-  "The Fluendo MPEG Program Stream Demuxer",
-  "Codec/Demuxer",
-  "Demultiplexes MPEG Program Streams",
-  "Wim Taymans <wim@fluendo.com>"
-};
-
 #define GST_TYPE_FLUPS_DEMUX_SYNC          (gst_flups_demux_sync_get_type ())
 GType
 gst_flups_demux_sync_get_type (void)
@@ -241,7 +233,9 @@ gst_flups_demux_base_init (GstFluPSDemuxClass * klass)
   gst_element_class_add_pad_template (element_class, klass->private_template);
   gst_element_class_add_pad_template (element_class, klass->sink_template);
 
-  gst_element_class_set_details (element_class, &flups_demux_details);
+  gst_element_class_set_details_simple (element_class,
+      "The Fluendo MPEG Program Stream Demuxer", "Codec/Demuxer",
+      "Demultiplexes MPEG Program Streams", "Wim Taymans <wim@fluendo.com>");
 }
 
 static void
diff --git a/gst/mpegdemux/gstmpegtsdemux.c b/gst/mpegdemux/gstmpegtsdemux.c
index eb5a05a10..9578f784d 100644
--- a/gst/mpegdemux/gstmpegtsdemux.c
+++ b/gst/mpegdemux/gstmpegtsdemux.c
@@ -76,13 +76,6 @@ GST_DEBUG_CATEGORY_STATIC (gstmpegtsdemux_debug);
 #define FORCE_INLINE
 #endif
 
-static GstElementDetails mpegts_demux_details = {
-  "The Fluendo MPEG Transport stream demuxer",
-  "Codec/Demuxer",
-  "Demultiplexes MPEG2 Transport Streams",
-  "Wim Taymans <wim@fluendo.com>"
-};
-
 /* MPEG2Demux signals and args */
 enum
 {
@@ -257,7 +250,9 @@ gst_mpegts_demux_base_init (GstMpegTSDemuxClass * klass)
   gst_element_class_add_pad_template (element_class, klass->private_template);
   gst_element_class_add_pad_template (element_class, klass->sink_template);
 
-  gst_element_class_set_details (element_class, &mpegts_demux_details);
+  gst_element_class_set_details_simple (element_class,
+      "The Fluendo MPEG Transport stream demuxer", "Codec/Demuxer",
+      "Demultiplexes MPEG2 Transport Streams", "Wim Taymans <wim@fluendo.com>");
 }
 
 static void
@@ -1046,8 +1041,8 @@ gst_mpegts_demux_data_cb (GstPESFilter * filter, gboolean first,
        * to drop. */
       if (stream->PMT_pid <= MPEGTS_MAX_PID && demux->streams[stream->PMT_pid]
           && demux->streams[demux->streams[stream->PMT_pid]->PMT.PCR_PID]
-          && demux->streams[demux->streams[stream->PMT_pid]->PMT.PCR_PID]->
-          discont_PCR) {
+          && demux->streams[demux->streams[stream->PMT_pid]->PMT.
+              PCR_PID]->discont_PCR) {
         GST_WARNING_OBJECT (demux, "middle of discont, dropping");
         goto bad_timestamp;
       }
@@ -1069,8 +1064,8 @@ gst_mpegts_demux_data_cb (GstPESFilter * filter, gboolean first,
          */
         if (stream->PMT_pid <= MPEGTS_MAX_PID && demux->streams[stream->PMT_pid]
             && demux->streams[demux->streams[stream->PMT_pid]->PMT.PCR_PID]
-            && demux->streams[demux->streams[stream->PMT_pid]->PMT.PCR_PID]->
-            last_PCR > 0) {
+            && demux->streams[demux->streams[stream->PMT_pid]->PMT.
+                PCR_PID]->last_PCR > 0) {
           GST_DEBUG_OBJECT (demux, "timestamps wrapped before noticed in PCR");
           time = MPEGTIME_TO_GSTTIME (pts) + stream->base_time +
               MPEGTIME_TO_GSTTIME ((guint64) (1) << 33);
diff --git a/gst/mpegdemux/mpegtsparse.c b/gst/mpegdemux/mpegtsparse.c
index beacc451f..36608fb20 100644
--- a/gst/mpegdemux/mpegtsparse.c
+++ b/gst/mpegdemux/mpegtsparse.c
@@ -82,13 +82,6 @@ static GQuark QUARK_PCR_PID;
 static GQuark QUARK_STREAMS;
 static GQuark QUARK_STREAM_TYPE;
 
-static GstElementDetails mpegts_parse_details =
-GST_ELEMENT_DETAILS ("MPEG transport stream parser",
-    "Codec/Parser",
-    "Parses MPEG2 transport streams",
-    "Alessandro Decina <alessandro@nnva.org>\n"
-    "Zaheer Abbas Merali <zaheerabbas at merali dot org>");
-
 static GstStaticPadTemplate sink_template = GST_STATIC_PAD_TEMPLATE ("sink",
     GST_PAD_SINK,
     GST_PAD_ALWAYS,
@@ -228,7 +221,11 @@ mpegts_parse_base_init (gpointer klass)
   gst_element_class_add_pad_template (element_class,
       gst_static_pad_template_get (&program_template));
 
-  gst_element_class_set_details (element_class, &mpegts_parse_details);
+  gst_element_class_set_details_simple (element_class,
+      "MPEG transport stream parser", "Codec/Parser",
+      "Parses MPEG2 transport streams",
+      "Alessandro Decina <alessandro@nnva.org>, "
+      "Zaheer Abbas Merali <zaheerabbas at merali dot org>");
 }
 
 static void
diff --git a/gst/mpegpsmux/mpegpsmux.c b/gst/mpegpsmux/mpegpsmux.c
index 59c19aa5b..70f0213e0 100644
--- a/gst/mpegpsmux/mpegpsmux.c
+++ b/gst/mpegpsmux/mpegpsmux.c
@@ -107,12 +107,7 @@ GST_BOILERPLATE (MpegPsMux, mpegpsmux, GstElement, GST_TYPE_ELEMENT);
 static void
 mpegpsmux_base_init (gpointer g_class)
 {
-  const GstElementDetails mpegpsmux_details = {
-    "MPEG Program Stream Muxer",
-    "Codec/Muxer",
-    "Multiplexes media streams into an MPEG Program Stream",
-    "Lin YANG <oxcsnicho@gmail.com>"
-  };
+
   GstElementClass *element_class = GST_ELEMENT_CLASS (g_class);
 
   gst_element_class_add_pad_template (element_class,
@@ -120,7 +115,10 @@ mpegpsmux_base_init (gpointer g_class)
   gst_element_class_add_pad_template (element_class,
       gst_static_pad_template_get (&mpegpsmux_src_factory));
 
-  gst_element_class_set_details (element_class, &mpegpsmux_details);
+  gst_element_class_set_details_simple (element_class,
+      "MPEG Program Stream Muxer", "Codec/Muxer",
+      "Multiplexes media streams into an MPEG Program Stream",
+      "Lin YANG <oxcsnicho@gmail.com>");
 }
 
 static void
diff --git a/gst/mpegtsmux/mpegtsmux.c b/gst/mpegtsmux/mpegtsmux.c
index cb630848d..08148e1d7 100644
--- a/gst/mpegtsmux/mpegtsmux.c
+++ b/gst/mpegtsmux/mpegtsmux.c
@@ -155,12 +155,7 @@ GST_BOILERPLATE (MpegTsMux, mpegtsmux, GstElement, GST_TYPE_ELEMENT);
 static void
 mpegtsmux_base_init (gpointer g_class)
 {
-  const GstElementDetails mpegtsmux_details = {
-    "MPEG Transport Stream Muxer",
-    "Codec/Muxer",
-    "Multiplexes media streams into an MPEG Transport Stream",
-    "Fluendo <contact@fluendo.com>"
-  };
+
   GstElementClass *element_class = GST_ELEMENT_CLASS (g_class);
 
   gst_element_class_add_pad_template (element_class,
@@ -168,7 +163,10 @@ mpegtsmux_base_init (gpointer g_class)
   gst_element_class_add_pad_template (element_class,
       gst_static_pad_template_get (&mpegtsmux_src_factory));
 
-  gst_element_class_set_details (element_class, &mpegtsmux_details);
+  gst_element_class_set_details_simple (element_class,
+      "MPEG Transport Stream Muxer", "Codec/Muxer",
+      "Multiplexes media streams into an MPEG Transport Stream",
+      "Fluendo <contact@fluendo.com>");
 }
 
 static void
diff --git a/gst/mpegvideoparse/mpegvideoparse.c b/gst/mpegvideoparse/mpegvideoparse.c
index 43ffb4944..442183813 100644
--- a/gst/mpegvideoparse/mpegvideoparse.c
+++ b/gst/mpegvideoparse/mpegvideoparse.c
@@ -44,14 +44,6 @@
 GST_DEBUG_CATEGORY_STATIC (mpv_parse_debug);
 #define GST_CAT_DEFAULT mpv_parse_debug
 
-/* elementfactory information */
-static GstElementDetails mpegvideoparse_details =
-GST_ELEMENT_DETAILS ("MPEG video elementary stream parser",
-    "Codec/Parser/Video",
-    "Parses and frames MPEG-1 and MPEG-2 elementary video streams",
-    "Wim Taymans <wim.taymans@chello.be>\n"
-    "Jan Schmidt <thaytan@mad.scientist.com>");
-
 static GstStaticPadTemplate src_template =
 GST_STATIC_PAD_TEMPLATE ("src", GST_PAD_SRC,
     GST_PAD_ALWAYS,
@@ -140,7 +132,12 @@ gst_mpegvideoparse_base_init (MpegVideoParseClass * klass)
   gst_element_class_add_pad_template (element_class,
       gst_static_pad_template_get (&sink_template));
 
-  gst_element_class_set_details (element_class, &mpegvideoparse_details);
+  gst_element_class_set_details_simple (element_class,
+      "MPEG video elementary stream parser",
+      "Codec/Parser/Video",
+      "Parses and frames MPEG-1 and MPEG-2 elementary video streams",
+      "Wim Taymans <wim.taymans@chello.be>, "
+      "Jan Schmidt <thaytan@mad.scientist.com>");
 }
 
 static void
diff --git a/gst/mve/gstmvedemux.c b/gst/mve/gstmvedemux.c
index 76acc2dbc..816dc543b 100644
--- a/gst/mve/gstmvedemux.c
+++ b/gst/mve/gstmvedemux.c
@@ -1089,12 +1089,7 @@ gst_mve_demux_dispose (GObject * obj)
 static void
 gst_mve_demux_base_init (GstMveDemuxClass * klass)
 {
-  static const GstElementDetails mve_demux_details = {
-    "MVE Demuxer",
-    "Codec/Demuxer",
-    "Demultiplex an Interplay movie (MVE) stream into audio and video",
-    "Jens Granseuer <jensgr@gmx.net>"
-  };
+
   GstElementClass *element_class = GST_ELEMENT_CLASS (klass);
 
   gst_element_class_add_pad_template (element_class,
@@ -1103,7 +1098,10 @@ gst_mve_demux_base_init (GstMveDemuxClass * klass)
       gst_static_pad_template_get (&vidsrc_template));
   gst_element_class_add_pad_template (element_class,
       gst_static_pad_template_get (&audsrc_template));
-  gst_element_class_set_details (element_class, &mve_demux_details);
+  gst_element_class_set_details_simple (element_class, "MVE Demuxer",
+      "Codec/Demuxer",
+      "Demultiplex an Interplay movie (MVE) stream into audio and video",
+      "Jens Granseuer <jensgr@gmx.net>");
 }
 
 static void
diff --git a/gst/mve/gstmvemux.c b/gst/mve/gstmvemux.c
index 5282f8100..e54c4a153 100644
--- a/gst/mve/gstmvemux.c
+++ b/gst/mve/gstmvemux.c
@@ -1353,11 +1353,6 @@ gst_mve_mux_release_pad (GstElement * element, GstPad * pad)
 static void
 gst_mve_mux_base_init (GstMveMuxClass * klass)
 {
-  static const GstElementDetails gst_mve_mux_details =
-      GST_ELEMENT_DETAILS ("MVE Multiplexer",
-      "Codec/Muxer",
-      "Muxes audio and video into an MVE stream",
-      "Jens Granseuer <jensgr@gmx.net>");
 
   GstElementClass *element_class = GST_ELEMENT_CLASS (klass);
 
@@ -1368,7 +1363,10 @@ gst_mve_mux_base_init (GstMveMuxClass * klass)
   gst_element_class_add_pad_template (element_class,
       gst_static_pad_template_get (&video_sink_factory));
 
-  gst_element_class_set_details (element_class, &gst_mve_mux_details);
+  gst_element_class_set_details_simple (element_class, "MVE Multiplexer",
+      "Codec/Muxer",
+      "Muxes audio and video into an MVE stream",
+      "Jens Granseuer <jensgr@gmx.net>");
 }
 
 static void
diff --git a/gst/nsf/gstnsf.c b/gst/nsf/gstnsf.c
index 666aaf490..11e2a86ab 100644
--- a/gst/nsf/gstnsf.c
+++ b/gst/nsf/gstnsf.c
@@ -29,12 +29,6 @@
 #define GST_CAT_DEFAULT nsfdec_debug
 GST_DEBUG_CATEGORY_STATIC (GST_CAT_DEFAULT);
 
-static const GstElementDetails gst_nsfdec_details =
-GST_ELEMENT_DETAILS ("Nsf decoder",
-    "Codec/Decoder/Audio",
-    "Using nosefart to decode NSF audio tunes",
-    "Johan Dahlin <johan@gnome.org>");
-
 /* Nsfdec signals and args */
 enum
 {
@@ -142,7 +136,10 @@ gst_nsfdec_base_init (gpointer g_class)
 {
   GstElementClass *element_class = GST_ELEMENT_CLASS (g_class);
 
-  gst_element_class_set_details (element_class, &gst_nsfdec_details);
+  gst_element_class_set_details_simple (element_class, "Nsf decoder",
+      "Codec/Decoder/Audio",
+      "Using nosefart to decode NSF audio tunes",
+      "Johan Dahlin <johan@gnome.org>");
 
   gst_element_class_add_pad_template (element_class,
       gst_static_pad_template_get (&src_templ));
diff --git a/gst/nuvdemux/gstnuvdemux.c b/gst/nuvdemux/gstnuvdemux.c
index 4e1ef5a39..70e1e30a8 100644
--- a/gst/nuvdemux/gstnuvdemux.c
+++ b/gst/nuvdemux/gstnuvdemux.c
@@ -60,13 +60,6 @@ GST_DEBUG_CATEGORY_STATIC (nuvdemux_debug);
 
 GST_DEBUG_CATEGORY_EXTERN (GST_CAT_EVENT);
 
-static const GstElementDetails gst_nuv_demux_details =
-GST_ELEMENT_DETAILS ("Nuv demuxer",
-    "Codec/Demuxer",
-    "Demultiplex a MythTV NuppleVideo .nuv file into audio and video",
-    "Renato Araujo Oliveira Filho <renato.filho@indt.org.br>,"
-    "Rosfran Borges <rosfran.borges@indt.org.br>");
-
 static GstStaticPadTemplate sink_template = GST_STATIC_PAD_TEMPLATE ("sink",
     GST_PAD_SINK,
     GST_PAD_ALWAYS,
@@ -139,7 +132,11 @@ gst_nuv_demux_base_init (gpointer klass)
 
   gst_element_class_add_pad_template (element_class,
       gst_static_pad_template_get (&sink_template));
-  gst_element_class_set_details (element_class, &gst_nuv_demux_details);
+  gst_element_class_set_details_simple (element_class, "Nuv demuxer",
+      "Codec/Demuxer",
+      "Demultiplex a MythTV NuppleVideo .nuv file into audio and video",
+      "Renato Araujo Oliveira Filho <renato.filho@indt.org.br>,"
+      "Rosfran Borges <rosfran.borges@indt.org.br>");
 }
 
 static void
diff --git a/gst/overlay/gstoverlay.c b/gst/overlay/gstoverlay.c
index 2c6345a97..c900a6bd9 100644
--- a/gst/overlay/gstoverlay.c
+++ b/gst/overlay/gstoverlay.c
@@ -24,13 +24,6 @@
 #include "gstoverlay.h"
 #include <gst/video/video.h>
 
-/* elementfactory information */
-static const GstElementDetails overlay_details =
-GST_ELEMENT_DETAILS ("Video overlay",
-    "Filter/Editor/Video",
-    "Overlay multiple video streams",
-    "David Schleef <ds@schleef.org>");
-
 static GstStaticPadTemplate overlay_src_factory =
 GST_STATIC_PAD_TEMPLATE ("src",
     GST_PAD_SRC,
@@ -125,7 +118,9 @@ gst_overlay_base_init (GstOverlayClass * klass)
       gst_static_pad_template_get (&overlay_sink3_factory));
   gst_element_class_add_pad_template (element_class,
       gst_static_pad_template_get (&overlay_src_factory));
-  gst_element_class_set_details (element_class, &overlay_details);
+  gst_element_class_set_details_simple (element_class, "Video overlay",
+      "Filter/Editor/Video",
+      "Overlay multiple video streams", "David Schleef <ds@schleef.org>");
 }
 
 static void
diff --git a/gst/passthrough/gstpassthrough.c b/gst/passthrough/gstpassthrough.c
index 5ccfe1aa6..c0f009812 100644
--- a/gst/passthrough/gstpassthrough.c
+++ b/gst/passthrough/gstpassthrough.c
@@ -29,13 +29,6 @@
 #define PASSTHRU_BUF_SIZE 4096
 #define PASSTHRU_NUM_BUFS 4
 
-/* elementfactory information */
-static const GstElementDetails passthrough_details =
-GST_ELEMENT_DETAILS ("Passthrough",
-    "Filter/Effect/Audio",
-    "Transparent filter for audio/raw (boilerplate for effects)",
-    "Thomas <thomas@apestaart.org>, " "Andy Wingo <apwingo@eos.ncsu.edu>");
-
 enum
 {
   /* FILL ME */
@@ -169,7 +162,10 @@ passthrough_base_init (GstPassthroughClass * klass)
       gst_static_pad_template_get (&passthrough_src_template));
   gst_element_class_add_pad_template (element_class,
       gst_static_pad_template_get (&passthrough_sink_template));
-  gst_element_class_set_details (element_class, &passthrough_details);
+  gst_element_class_set_details_simple (element_class, "Passthrough",
+      "Filter/Effect/Audio",
+      "Transparent filter for audio/raw (boilerplate for effects)",
+      "Thomas <thomas@apestaart.org>, " "Andy Wingo <apwingo@eos.ncsu.edu>");
 }
 
 static void
diff --git a/gst/pcapparse/gstpcapparse.c b/gst/pcapparse/gstpcapparse.c
index 6e2021269..96ab3f20e 100644
--- a/gst/pcapparse/gstpcapparse.c
+++ b/gst/pcapparse/gstpcapparse.c
@@ -95,19 +95,16 @@ static void
 gst_pcap_parse_base_init (gpointer gclass)
 {
   GstElementClass *element_class = GST_ELEMENT_CLASS (gclass);
-  static GstElementDetails element_details = {
-    "PCapParse",
-    "Raw/Parser",
-    "Parses a raw pcap stream",
-    "Ole André Vadla Ravnås <ole.andre.ravnas@tandberg.com>"
-  };
 
   gst_element_class_add_pad_template (element_class,
       gst_static_pad_template_get (&sink_template));
   gst_element_class_add_pad_template (element_class,
       gst_static_pad_template_get (&src_template));
 
-  gst_element_class_set_details (element_class, &element_details);
+  gst_element_class_set_details_simple (element_class, "PCapParse",
+      "Raw/Parser",
+      "Parses a raw pcap stream",
+      "Ole André Vadla Ravnås <ole.andre.ravnas@tandberg.com>");
 }
 
 static void
diff --git a/gst/playondemand/gstplayondemand.c b/gst/playondemand/gstplayondemand.c
index 91eae05cc..f754b1580 100644
--- a/gst/playondemand/gstplayondemand.c
+++ b/gst/playondemand/gstplayondemand.c
@@ -40,14 +40,6 @@
 #define GST_POD_BUFPOOL_SIZE 4096
 #define GST_POD_BUFPOOL_NUM  6
 
-
-static const GstElementDetails play_on_demand_details =
-GST_ELEMENT_DETAILS ("Play On Demand",
-    "Filter/Editor/Audio",
-    "Schedule a stream to play at specific times, or when a signal is received",
-    "Leif Morgan Johnson <leif@ambient.2y.net>");
-
-
 static GstStaticPadTemplate play_on_demand_sink_template =
     GST_STATIC_PAD_TEMPLATE ("sink",
     GST_PAD_SINK,
@@ -152,7 +144,10 @@ play_on_demand_base_init (GstPlayOnDemandClass * klass)
       gst_static_pad_template_get (&play_on_demand_src_template));
   gst_element_class_add_pad_template (element_class,
       gst_static_pad_template_get (&play_on_demand_sink_template));
-  gst_element_class_set_details (element_class, &play_on_demand_details);
+  gst_element_class_set_details_simple (element_class, "Play On Demand",
+      "Filter/Editor/Audio",
+      "Schedule a stream to play at specific times, or when a signal is received",
+      "Leif Morgan Johnson <leif@ambient.2y.net>");
 }
 
 static void
diff --git a/gst/qtmux/gstqtmoovrecover.c b/gst/qtmux/gstqtmoovrecover.c
index 333ab6a8d..03bee5288 100644
--- a/gst/qtmux/gstqtmoovrecover.c
+++ b/gst/qtmux/gstqtmoovrecover.c
@@ -71,11 +71,6 @@
 GST_DEBUG_CATEGORY_STATIC (gst_qt_moov_recover_debug);
 #define GST_CAT_DEFAULT gst_qt_moov_recover_debug
 
-static GstElementDetails gst_qt_moov_recover_details =
-GST_ELEMENT_DETAILS ("QT Moov Recover",
-    "Util", "Recovers unfinished qtmux files",
-    "Thiago Santos <thiago.sousa.santos@collabora.co.uk>");
-
 /* QTMoovRecover signals and args */
 enum
 {
@@ -113,7 +108,9 @@ gst_qt_moov_recover_base_init (gpointer g_class)
 #if 0
   GstQTMoovRecoverClass *klass = (GstQTMoovRecoverClass *) g_class;
 #endif
-  gst_element_class_set_details (element_class, &gst_qt_moov_recover_details);
+  gst_element_class_set_details_simple (element_class, "QT Moov Recover",
+      "Util", "Recovers unfinished qtmux files",
+      "Thiago Santos <thiago.sousa.santos@collabora.co.uk>");
 }
 
 static void
diff --git a/gst/qtmux/gstqtmux.c b/gst/qtmux/gstqtmux.c
index 6035c61c8..9e00957c1 100644
--- a/gst/qtmux/gstqtmux.c
+++ b/gst/qtmux/gstqtmux.c
@@ -155,8 +155,8 @@ gst_qt_mux_base_init (gpointer g_class)
   GstElementClass *element_class = GST_ELEMENT_CLASS (g_class);
   GstQTMuxClass *klass = (GstQTMuxClass *) g_class;
   GstQTMuxClassParams *params;
-  GstElementDetails details;
   GstPadTemplate *videosinktempl, *audiosinktempl, *srctempl;
+  gchar *longname, *description;
 
   params =
       (GstQTMuxClassParams *) g_type_get_qdata (G_OBJECT_CLASS_TYPE (g_class),
@@ -164,16 +164,14 @@ gst_qt_mux_base_init (gpointer g_class)
   g_assert (params != NULL);
 
   /* construct the element details struct */
-  details.longname = g_strdup_printf ("%s Muxer", params->prop->long_name);
-  details.klass = g_strdup ("Codec/Muxer");
-  details.description =
-      g_strdup_printf ("Multiplex audio and video into a %s file",
+  longname = g_strdup_printf ("%s Muxer", params->prop->long_name);
+  description = g_strdup_printf ("Multiplex audio and video into a %s file",
       params->prop->long_name);
-  details.author = "Thiago Sousa Santos <thiagoss@embedded.ufcg.edu.br>";
-  gst_element_class_set_details (element_class, &details);
-  g_free (details.longname);
-  g_free (details.klass);
-  g_free (details.description);
+  gst_element_class_set_details_simple (element_class, longname,
+      "Codec/Muxer", description,
+      "Thiago Sousa Santos <thiagoss@embedded.ufcg.edu.br>");
+  g_free (longname);
+  g_free (description);
 
   /* pad templates */
   srctempl = gst_pad_template_new ("src", GST_PAD_SRC,
diff --git a/gst/real/gstrealaudiodec.c b/gst/real/gstrealaudiodec.c
index 7ccc1db77..b3f2ad52e 100644
--- a/gst/real/gstrealaudiodec.c
+++ b/gst/real/gstrealaudiodec.c
@@ -31,11 +31,6 @@
 GST_DEBUG_CATEGORY_STATIC (real_audio_dec_debug);
 #define GST_CAT_DEFAULT real_audio_dec_debug
 
-static GstElementDetails real_audio_dec_details =
-GST_ELEMENT_DETAILS ("RealAudio decoder",
-    "Codec/Decoder/Audio", "Decoder for RealAudio streams",
-    "Lutz Mueller <lutz@topfrose.de>");
-
 static GstStaticPadTemplate snk_t =
     GST_STATIC_PAD_TEMPLATE ("sink", GST_PAD_SINK, GST_PAD_ALWAYS,
     GST_STATIC_CAPS ("audio/x-pn-realaudio, "
@@ -568,7 +563,9 @@ gst_real_audio_dec_base_init (gpointer g_class)
 
   gst_element_class_add_pad_template (ec, gst_static_pad_template_get (&snk_t));
   gst_element_class_add_pad_template (ec, gst_static_pad_template_get (&src_t));
-  gst_element_class_set_details (ec, &real_audio_dec_details);
+  gst_element_class_set_details_simple (ec, "RealAudio decoder",
+      "Codec/Decoder/Audio", "Decoder for RealAudio streams",
+      "Lutz Mueller <lutz@topfrose.de>");
 }
 
 static GstStateChangeReturn
diff --git a/gst/real/gstrealvideodec.c b/gst/real/gstrealvideodec.c
index 313a99f2a..4485a312f 100644
--- a/gst/real/gstrealvideodec.c
+++ b/gst/real/gstrealvideodec.c
@@ -31,11 +31,6 @@
 GST_DEBUG_CATEGORY_STATIC (realvideode_debug);
 #define GST_CAT_DEFAULT realvideode_debug
 
-static GstElementDetails realvideode_details =
-GST_ELEMENT_DETAILS ("RealVideo decoder",
-    "Codec/Decoder/Video", "Decoder for RealVideo streams",
-    "Lutz Mueller <lutz@topfrose.de>");
-
 static GstStaticPadTemplate snk_t =
 GST_STATIC_PAD_TEMPLATE ("sink", GST_PAD_SINK, GST_PAD_ALWAYS,
     GST_STATIC_CAPS ("video/x-pn-realvideo, " "rmversion = (int) [ 2, 4 ]"));
@@ -635,7 +630,9 @@ gst_real_video_dec_base_init (gpointer g_class)
 
   gst_element_class_add_pad_template (ec, gst_static_pad_template_get (&snk_t));
   gst_element_class_add_pad_template (ec, gst_static_pad_template_get (&src_t));
-  gst_element_class_set_details (ec, &realvideode_details);
+  gst_element_class_set_details_simple (ec, "RealVideo decoder",
+      "Codec/Decoder/Video", "Decoder for RealVideo streams",
+      "Lutz Mueller <lutz@topfrose.de>");
 }
 
 static void
diff --git a/gst/rtjpeg/gstrtjpegdec.c b/gst/rtjpeg/gstrtjpegdec.c
index a11808f8a..66f91f7e7 100644
--- a/gst/rtjpeg/gstrtjpegdec.c
+++ b/gst/rtjpeg/gstrtjpegdec.c
@@ -23,15 +23,6 @@
 #endif
 #include "gstrtjpegdec.h"
 
-
-
-/* elementfactory information */
-static const GstElementDetails gst_rtjpegdec_details =
-GST_ELEMENT_DETAILS ("RTjpeg video decoder",
-    "Codec/Decoder/Video",
-    "Decodes video in RTjpeg format",
-    "Erik Walthinsen <omega@cse.ogi.edu>");
-
 /* GstRTJpegDec signals and args */
 enum
 {
@@ -86,7 +77,9 @@ gst_rtjpegdec_base_init (GstRTJpegDecClass * klass)
 {
   GstElementClass *element_class = GST_ELEMENT_CLASS (klass);
 
-  gst_element_class_set_details (element_class, &gst_rtjpegdec_details);
+  gst_element_class_set_details_simple (element_class, "RTjpeg video decoder",
+      "Codec/Decoder/Video",
+      "Decodes video in RTjpeg format", "Erik Walthinsen <omega@cse.ogi.edu>");
 }
 
 static void
diff --git a/gst/rtjpeg/gstrtjpegenc.c b/gst/rtjpeg/gstrtjpegenc.c
index f7d76a57e..50a4a0b2e 100644
--- a/gst/rtjpeg/gstrtjpegenc.c
+++ b/gst/rtjpeg/gstrtjpegenc.c
@@ -23,13 +23,6 @@
 #endif
 #include "gstrtjpegenc.h"
 
-/* elementfactory information */
-static const GstElementDetails gst_rtjpegenc_details =
-GST_ELEMENT_DETAILS ("RTjpeg video encoder",
-    "Codec/Encoder/Video",
-    "Encodes video in RTjpeg format",
-    "Erik Walthinsen <omega@cse.ogi.edu>");
-
 /* GstRTJpegEnc signals and args */
 enum
 {
@@ -84,7 +77,9 @@ gst_rtjpegenc_base_init (GstRTJpegEncClass * klass)
 {
   GstElementClass *element_class = GST_ELEMENT_CLASS (klass);
 
-  gst_element_class_set_details (element_class, &gst_rtjpegenc_details);
+  gst_element_class_set_details_simple (element_class, "RTjpeg video encoder",
+      "Codec/Encoder/Video",
+      "Encodes video in RTjpeg format", "Erik Walthinsen <omega@cse.ogi.edu>");
 }
 
 static void
diff --git a/gst/rtpmux/gstrtpdtmfmux.c b/gst/rtpmux/gstrtpdtmfmux.c
index 9622c2640..480d89d44 100644
--- a/gst/rtpmux/gstrtpdtmfmux.c
+++ b/gst/rtpmux/gstrtpdtmfmux.c
@@ -71,13 +71,6 @@
 GST_DEBUG_CATEGORY_STATIC (gst_rtp_dtmf_mux_debug);
 #define GST_CAT_DEFAULT gst_rtp_dtmf_mux_debug
 
-/* elementfactory information */
-static const GstElementDetails gst_rtp_dtmf_mux_details =
-GST_ELEMENT_DETAILS ("RTP muxer",
-    "Codec/Muxer",
-    "mixes RTP DTMF streams into other RTP streams",
-    "Zeeshan Ali <first.last@nokia.com>");
-
 enum
 {
   SIGNAL_LOCKING_STREAM,
@@ -106,7 +99,10 @@ gst_rtp_dtmf_mux_base_init (gpointer g_class)
 {
   GstElementClass *element_class = GST_ELEMENT_CLASS (g_class);
 
-  gst_element_class_set_details (element_class, &gst_rtp_dtmf_mux_details);
+  gst_element_class_set_details_simple (element_class, "RTP muxer",
+      "Codec/Muxer",
+      "mixes RTP DTMF streams into other RTP streams",
+      "Zeeshan Ali <first.last@nokia.com>");
 }
 
 static void
diff --git a/gst/rtpmux/gstrtpmux.c b/gst/rtpmux/gstrtpmux.c
index 77858895b..e5f49fc53 100644
--- a/gst/rtpmux/gstrtpmux.c
+++ b/gst/rtpmux/gstrtpmux.c
@@ -43,13 +43,6 @@
 GST_DEBUG_CATEGORY_STATIC (gst_rtp_mux_debug);
 #define GST_CAT_DEFAULT gst_rtp_mux_debug
 
-/* elementfactory information */
-static const GstElementDetails gst_rtp_mux_details =
-GST_ELEMENT_DETAILS ("RTP muxer",
-    "Codec/Muxer",
-    "multiplex N rtp streams into one",
-    "Zeeshan Ali <first.last@nokia.com>");
-
 enum
 {
   ARG_0,
@@ -111,7 +104,9 @@ gst_rtp_mux_base_init (gpointer g_class)
   gst_element_class_add_pad_template (element_class,
       gst_static_pad_template_get (&sink_factory));
 
-  gst_element_class_set_details (element_class, &gst_rtp_mux_details);
+  gst_element_class_set_details_simple (element_class, "RTP muxer",
+      "Codec/Muxer",
+      "multiplex N rtp streams into one", "Zeeshan Ali <first.last@nokia.com>");
 }
 
 static void
diff --git a/gst/scaletempo/gstscaletempo.c b/gst/scaletempo/gstscaletempo.c
index 7d72dba5c..53f454b18 100644
--- a/gst/scaletempo/gstscaletempo.c
+++ b/gst/scaletempo/gstscaletempo.c
@@ -676,19 +676,17 @@ gst_scaletempo_set_property (GObject * object,
 static void
 gst_scaletempo_base_init (gpointer klass)
 {
-  static GstElementDetails element_details = {
-    "Scaletempo",
-    "Filter/Effect/Rate",
-    "Sync audio tempo with playback rate",
-    "Rov Juvano <rovjuvano@users.sourceforge.net>"
-  };
+
   GstElementClass *element_class = GST_ELEMENT_CLASS (klass);
 
   gst_element_class_add_pad_template (element_class,
       gst_static_pad_template_get (&src_template));
   gst_element_class_add_pad_template (element_class,
       gst_static_pad_template_get (&sink_template));
-  gst_element_class_set_details (element_class, &element_details);
+  gst_element_class_set_details_simple (element_class, "Scaletempo",
+      "Filter/Effect/Rate",
+      "Sync audio tempo with playback rate",
+      "Rov Juvano <rovjuvano@users.sourceforge.net>");
 }
 
 static void
diff --git a/gst/sdp/gstsdpdemux.c b/gst/sdp/gstsdpdemux.c
index 3c543d0a1..4470a6ba6 100644
--- a/gst/sdp/gstsdpdemux.c
+++ b/gst/sdp/gstsdpdemux.c
@@ -84,13 +84,6 @@
 GST_DEBUG_CATEGORY_STATIC (sdpdemux_debug);
 #define GST_CAT_DEFAULT (sdpdemux_debug)
 
-/* elementfactory information */
-static const GstElementDetails gst_sdp_demux_details =
-GST_ELEMENT_DETAILS ("SDP session setup",
-    "Codec/Demuxer/Network/RTP",
-    "Receive data over the network via SDP",
-    "Wim Taymans <wim.taymans@gmail.com>");
-
 static GstStaticPadTemplate sinktemplate = GST_STATIC_PAD_TEMPLATE ("sink",
     GST_PAD_SINK,
     GST_PAD_ALWAYS,
@@ -162,7 +155,10 @@ gst_sdp_demux_base_init (gpointer g_class)
   gst_element_class_add_pad_template (element_class,
       gst_static_pad_template_get (&rtptemplate));
 
-  gst_element_class_set_details (element_class, &gst_sdp_demux_details);
+  gst_element_class_set_details_simple (element_class, "SDP session setup",
+      "Codec/Demuxer/Network/RTP",
+      "Receive data over the network via SDP",
+      "Wim Taymans <wim.taymans@gmail.com>");
 }
 
 static void
@@ -387,12 +383,12 @@ is_multicast_address (const gchar * host_name)
   for (ai = res; !ret && ai; ai = ai->ai_next) {
     if (ai->ai_family == AF_INET)
       ret =
-          IN_MULTICAST (ntohl (((struct sockaddr_in *) ai->ai_addr)->
-              sin_addr.s_addr));
+          IN_MULTICAST (ntohl (((struct sockaddr_in *) ai->ai_addr)->sin_addr.
+              s_addr));
     else
       ret =
-          IN6_IS_ADDR_MULTICAST (&((struct sockaddr_in6 *) ai->
-              ai_addr)->sin6_addr);
+          IN6_IS_ADDR_MULTICAST (&((struct sockaddr_in6 *) ai->ai_addr)->
+          sin6_addr);
   }
 
   freeaddrinfo (res);
diff --git a/gst/selector/gstinputselector.c b/gst/selector/gstinputselector.c
index e5dc12b70..0670493c7 100644
--- a/gst/selector/gstinputselector.c
+++ b/gst/selector/gstinputselector.c
@@ -41,14 +41,6 @@
 GST_DEBUG_CATEGORY_STATIC (input_selector_debug);
 #define GST_CAT_DEFAULT input_selector_debug
 
-static const GstElementDetails gst_input_selector_details =
-GST_ELEMENT_DETAILS ("Input selector",
-    "Generic",
-    "N-to-1 input stream selectoring",
-    "Julien Moutte <julien@moutte.net>\n"
-    "Jan Schmidt <thaytan@mad.scientist.com>\n"
-    "Wim Taymans <wim.taymans@gmail.com>");
-
 static GstStaticPadTemplate gst_input_selector_sink_factory =
 GST_STATIC_PAD_TEMPLATE ("sink%d",
     GST_PAD_SINK,
@@ -746,7 +738,11 @@ gst_input_selector_base_init (GstInputSelectorClass * klass)
 {
   GstElementClass *element_class = GST_ELEMENT_CLASS (klass);
 
-  gst_element_class_set_details (element_class, &gst_input_selector_details);
+  gst_element_class_set_details_simple (element_class, "Input selector",
+      "Generic", "N-to-1 input stream selectoring",
+      "Julien Moutte <julien@moutte.net>, "
+      "Jan Schmidt <thaytan@mad.scientist.com>, "
+      "Wim Taymans <wim.taymans@gmail.com>");
   gst_element_class_add_pad_template (element_class,
       gst_static_pad_template_get (&gst_input_selector_sink_factory));
   gst_element_class_add_pad_template (element_class,
diff --git a/gst/selector/gstoutputselector.c b/gst/selector/gstoutputselector.c
index e56cced5d..692cf50e4 100644
--- a/gst/selector/gstoutputselector.c
+++ b/gst/selector/gstoutputselector.c
@@ -35,12 +35,6 @@
 GST_DEBUG_CATEGORY_STATIC (output_selector_debug);
 #define GST_CAT_DEFAULT output_selector_debug
 
-static const GstElementDetails gst_output_selector_details =
-GST_ELEMENT_DETAILS ("Output selector",
-    "Generic",
-    "1-to-N output stream selectoring",
-    "Stefan Kost <stefan.kost@nokia.com>");
-
 static GstStaticPadTemplate gst_output_selector_sink_factory =
 GST_STATIC_PAD_TEMPLATE ("sink",
     GST_PAD_SINK,
@@ -86,7 +80,10 @@ gst_output_selector_base_init (gpointer g_class)
 {
   GstElementClass *element_class = GST_ELEMENT_CLASS (g_class);
 
-  gst_element_class_set_details (element_class, &gst_output_selector_details);
+  gst_element_class_set_details_simple (element_class, "Output selector",
+      "Generic",
+      "1-to-N output stream selectoring",
+      "Stefan Kost <stefan.kost@nokia.com>");
   gst_element_class_add_pad_template (element_class,
       gst_static_pad_template_get (&gst_output_selector_sink_factory));
   gst_element_class_add_pad_template (element_class,
diff --git a/gst/siren/gstsirendec.c b/gst/siren/gstsirendec.c
index 976a7adb5..2e517199f 100644
--- a/gst/siren/gstsirendec.c
+++ b/gst/siren/gstsirendec.c
@@ -42,14 +42,6 @@ GST_DEBUG_CATEGORY (sirendec_debug);
 
 #define FRAME_DURATION  (20 * GST_MSECOND)
 
-/* elementfactory information */
-static const GstElementDetails gst_siren_dec_details =
-GST_ELEMENT_DETAILS ("Siren Decoder element",
-    "Codec/Decoder/Audio ",
-    "Decode streams encoded with the Siren7 codec into 16bit PCM",
-    "Youness Alaoui <kakaroto@kakaroto.homelinux.net>");
-
-
 static GstStaticPadTemplate sinktemplate = GST_STATIC_PAD_TEMPLATE ("sink",
     GST_PAD_SINK,
     GST_PAD_ALWAYS,
@@ -105,7 +97,10 @@ gst_siren_dec_base_init (gpointer klass)
   gst_element_class_add_pad_template (element_class,
       gst_static_pad_template_get (&sinktemplate));
 
-  gst_element_class_set_details (element_class, &gst_siren_dec_details);
+  gst_element_class_set_details_simple (element_class, "Siren Decoder element",
+      "Codec/Decoder/Audio ",
+      "Decode streams encoded with the Siren7 codec into 16bit PCM",
+      "Youness Alaoui <kakaroto@kakaroto.homelinux.net>");
 }
 
 static void
diff --git a/gst/siren/gstsirenenc.c b/gst/siren/gstsirenenc.c
index 464950310..561d2689d 100644
--- a/gst/siren/gstsirenenc.c
+++ b/gst/siren/gstsirenenc.c
@@ -42,14 +42,6 @@ GST_DEBUG_CATEGORY (sirenenc_debug);
 
 #define FRAME_DURATION  (20 * GST_MSECOND)
 
-/* elementfactory information */
-static const GstElementDetails gst_siren_enc_details =
-GST_ELEMENT_DETAILS ("Siren Encoder element",
-    "Codec/Encoder/Audio ",
-    "Encode 16bit PCM streams into the Siren7 codec",
-    "Youness Alaoui <kakaroto@kakaroto.homelinux.net>");
-
-
 static GstStaticPadTemplate srctemplate = GST_STATIC_PAD_TEMPLATE ("src",
     GST_PAD_SRC,
     GST_PAD_ALWAYS,
@@ -108,7 +100,10 @@ gst_siren_enc_base_init (gpointer klass)
   gst_element_class_add_pad_template (element_class,
       gst_static_pad_template_get (&sinktemplate));
 
-  gst_element_class_set_details (element_class, &gst_siren_enc_details);
+  gst_element_class_set_details_simple (element_class, "Siren Encoder element",
+      "Codec/Encoder/Audio ",
+      "Encode 16bit PCM streams into the Siren7 codec",
+      "Youness Alaoui <kakaroto@kakaroto.homelinux.net>");
 }
 
 static void
diff --git a/gst/smooth/gstsmooth.c b/gst/smooth/gstsmooth.c
index b1af76a69..a4bd43af1 100644
--- a/gst/smooth/gstsmooth.c
+++ b/gst/smooth/gstsmooth.c
@@ -24,14 +24,6 @@
 #include "gstsmooth.h"
 #include <gst/video/video.h>
 
-/* elementfactory information */
-static const GstElementDetails smooth_details =
-GST_ELEMENT_DETAILS ("Smooth effect",
-    "Filter/Effect/Video",
-    "Apply a smooth filter to an image",
-    "Wim Taymans <wim.taymans@chello.be>");
-
-
 /* Smooth signals and args */
 enum
 {
@@ -114,7 +106,10 @@ gst_smooth_base_init (GstSmoothClass * klass)
       gst_static_pad_template_get (&gst_smooth_sink_template));
   gst_element_class_add_pad_template (element_class,
       gst_static_pad_template_get (&gst_smooth_src_template));
-  gst_element_class_set_details (element_class, &smooth_details);
+  gst_element_class_set_details_simple (element_class, "Smooth effect",
+      "Filter/Effect/Video",
+      "Apply a smooth filter to an image",
+      "Wim Taymans <wim.taymans@chello.be>");
 }
 
 static void
diff --git a/gst/smoothwave/gstsmoothwave.c b/gst/smoothwave/gstsmoothwave.c
index 3a2a23b0c..dbcd1a355 100644
--- a/gst/smoothwave/gstsmoothwave.c
+++ b/gst/smoothwave/gstsmoothwave.c
@@ -29,13 +29,6 @@
 
 #include "gstsmoothwave.h"
 
-static const GstElementDetails gst_smoothwave_details =
-GST_ELEMENT_DETAILS ("Smooth waveform",
-    "Visualization",
-    "Fading grayscale waveform display",
-    "Erik Walthinsen <omega@cse.ogi.edu>");
-
-
 /* SmoothWave signals and args */
 enum
 {
@@ -127,7 +120,10 @@ gst_smoothwave_base_init (gpointer g_class)
 {
   GstElementClass *element_class = GST_ELEMENT_CLASS (g_class);
 
-  gst_element_class_set_details (element_class, &gst_smoothwave_details);
+  gst_element_class_set_details_simple (element_class, "Smooth waveform",
+      "Visualization",
+      "Fading grayscale waveform display",
+      "Erik Walthinsen <omega@cse.ogi.edu>");
 }
 
 static void
diff --git a/gst/speed/gstspeed.c b/gst/speed/gstspeed.c
index 13466cb6e..c212f2e68 100644
--- a/gst/speed/gstspeed.c
+++ b/gst/speed/gstspeed.c
@@ -52,14 +52,6 @@
 GST_DEBUG_CATEGORY_STATIC (speed_debug);
 #define GST_CAT_DEFAULT speed_debug
 
-/* elementfactory information */
-static const GstElementDetails speed_details = GST_ELEMENT_DETAILS ("Speed",
-    "Filter/Effect/Audio",
-    "Set speed/pitch on audio/raw streams (resampler)",
-    "Andy Wingo <apwingo@eos.ncsu.edu>, "
-    "Tim-Philipp Müller <tim@centricular.net>");
-
-
 enum
 {
   ARG_0,
@@ -463,13 +455,18 @@ speed_base_init (gpointer g_class)
 {
   GstElementClass *element_class = GST_ELEMENT_CLASS (g_class);
 
-  gst_element_class_set_details (element_class, &speed_details);
+  gst_element_class_set_details_simple (element_class, "Speed",
+      "Filter/Effect/Audio",
+      "Set speed/pitch on audio/raw streams (resampler)",
+      "Andy Wingo <apwingo@eos.ncsu.edu>, "
+      "Tim-Philipp Müller <tim@centricular.net>");
 
   gst_element_class_add_pad_template (element_class,
       gst_static_pad_template_get (&gst_speed_src_template));
   gst_element_class_add_pad_template (element_class,
       gst_static_pad_template_get (&gst_speed_sink_template));
 }
+
 static void
 speed_class_init (GstSpeedClass * klass)
 {
diff --git a/gst/stereo/gststereo.c b/gst/stereo/gststereo.c
index 2dafc75f9..e782f93ce 100644
--- a/gst/stereo/gststereo.c
+++ b/gst/stereo/gststereo.c
@@ -45,15 +45,6 @@
 #include <gst/audio/gstaudiofilter.h>
 #include <gst/controller/gstcontroller.h>
 
-
-/* elementfactory information */
-static const GstElementDetails stereo_details =
-GST_ELEMENT_DETAILS ("Stereo effect",
-    "Filter/Effect/Audio",
-    "Muck with the stereo signal to enhance its 'stereo-ness'",
-    "Erik Walthinsen <omega@cse.ogi.edu>");
-
-
 #define ALLOWED_CAPS \
     "audio/x-raw-int,"                                                \
     " depth = (int) 16, "                                             \
@@ -95,7 +86,10 @@ gst_stereo_base_init (gpointer g_class)
   GstElementClass *element_class = GST_ELEMENT_CLASS (g_class);
   GstCaps *caps;
 
-  gst_element_class_set_details (element_class, &stereo_details);
+  gst_element_class_set_details_simple (element_class, "Stereo effect",
+      "Filter/Effect/Audio",
+      "Muck with the stereo signal to enhance its 'stereo-ness'",
+      "Erik Walthinsen <omega@cse.ogi.edu>");
 
   caps = gst_caps_from_string (ALLOWED_CAPS);
   gst_audio_filter_class_add_pad_templates (GST_AUDIO_FILTER_CLASS (g_class),
diff --git a/gst/tta/gstttadec.c b/gst/tta/gstttadec.c
index 880bc7367..7fdea3c2e 100644
--- a/gst/tta/gstttadec.c
+++ b/gst/tta/gstttadec.c
@@ -171,18 +171,16 @@ gst_tta_dec_get_type (void)
 static void
 gst_tta_dec_base_init (GstTtaDecClass * klass)
 {
-  static const GstElementDetails plugin_details =
-      GST_ELEMENT_DETAILS ("TTA audio decoder",
-      "Codec/Decoder/Audio",
-      "Decode TTA audio data",
-      "Arwed v. Merkatz <v.merkatz@gmx.net>");
+
   GstElementClass *element_class = GST_ELEMENT_CLASS (klass);
 
   gst_element_class_add_pad_template (element_class,
       gst_static_pad_template_get (&src_factory));
   gst_element_class_add_pad_template (element_class,
       gst_static_pad_template_get (&sink_factory));
-  gst_element_class_set_details (element_class, &plugin_details);
+  gst_element_class_set_details_simple (element_class, "TTA audio decoder",
+      "Codec/Decoder/Audio",
+      "Decode TTA audio data", "Arwed v. Merkatz <v.merkatz@gmx.net>");
 }
 
 static void
diff --git a/gst/tta/gstttaparse.c b/gst/tta/gstttaparse.c
index c9efbe564..82187a00a 100644
--- a/gst/tta/gstttaparse.c
+++ b/gst/tta/gstttaparse.c
@@ -85,18 +85,16 @@ gst_tta_parse_get_type (void)
 static void
 gst_tta_parse_base_init (GstTtaParseClass * klass)
 {
-  static const GstElementDetails plugin_details =
-      GST_ELEMENT_DETAILS ("TTA file parser",
-      "Codec/Demuxer/Audio",
-      "Parses TTA files",
-      "Arwed v. Merkatz <v.merkatz@gmx.net>");
+
   GstElementClass *element_class = GST_ELEMENT_CLASS (klass);
 
   gst_element_class_add_pad_template (element_class,
       gst_static_pad_template_get (&src_factory));
   gst_element_class_add_pad_template (element_class,
       gst_static_pad_template_get (&sink_factory));
-  gst_element_class_set_details (element_class, &plugin_details);
+  gst_element_class_set_details_simple (element_class, "TTA file parser",
+      "Codec/Demuxer/Audio",
+      "Parses TTA files", "Arwed v. Merkatz <v.merkatz@gmx.net>");
 }
 
 static void
diff --git a/gst/valve/gstvalve.c b/gst/valve/gstvalve.c
index 702b3e56b..3fc19089f 100644
--- a/gst/valve/gstvalve.c
+++ b/gst/valve/gstvalve.c
@@ -45,14 +45,6 @@
 GST_DEBUG_CATEGORY (valve_debug);
 #define GST_CAT_DEFAULT (valve_debug)
 
-/* elementfactory information */
-static const GstElementDetails gst_valve_details =
-GST_ELEMENT_DETAILS ("Valve element",
-    "Filter",
-    "This element drops all packets when drop is TRUE",
-    "Olivier Crete <olivier.crete@collabora.co.uk>");
-
-
 static GstStaticPadTemplate sinktemplate = GST_STATIC_PAD_TEMPLATE ("sink",
     GST_PAD_SINK,
     GST_PAD_ALWAYS,
@@ -109,7 +101,10 @@ gst_valve_base_init (gpointer klass)
   gst_element_class_add_pad_template (element_class,
       gst_static_pad_template_get (&sinktemplate));
 
-  gst_element_class_set_details (element_class, &gst_valve_details);
+  gst_element_class_set_details_simple (element_class, "Valve element",
+      "Filter",
+      "This element drops all packets when drop is TRUE",
+      "Olivier Crete <olivier.crete@collabora.co.uk>");
 }
 
 static void
diff --git a/gst/vbidec/gstvbidec.c b/gst/vbidec/gstvbidec.c
index 412d1ce2a..95b670e74 100644
--- a/gst/vbidec/gstvbidec.c
+++ b/gst/vbidec/gstvbidec.c
@@ -63,13 +63,6 @@ struct _GstVBIDecClass
 
 GType gst_vbidec_get_type (void);
 
-/* elementfactory information */
-static const GstElementDetails gst_vbidec_details =
-GST_ELEMENT_DETAILS ("VBI decoder",
-    "Codec/Decoder/Video",
-    "Decodes closed captions and XDS data from VBI data",
-    "David I. Lehn <dlehn@users.sourceforge.net>");
-
 /* VBIDec signals and args */
 enum
 {
@@ -168,13 +161,17 @@ gst_vbidec_base_init (gpointer g_class)
 {
   GstElementClass *element_class = GST_ELEMENT_CLASS (g_class);
 
-  gst_element_class_set_details (element_class, &gst_vbidec_details);
+  gst_element_class_set_details_simple (element_class, "VBI decoder",
+      "Codec/Decoder/Video",
+      "Decodes closed captions and XDS data from VBI data",
+      "David I. Lehn <dlehn@users.sourceforge.net>");
 
   gst_element_class_add_pad_template (element_class,
       gst_static_pad_template_get (&gst_vbidec_src_template));
   gst_element_class_add_pad_template (element_class,
       gst_static_pad_template_get (&gst_vbidec_sink_template));
 }
+
 static void
 gst_vbidec_class_init (GstVBIDecClass * klass)
 {
diff --git a/gst/videodrop/gstvideodrop.c b/gst/videodrop/gstvideodrop.c
index 9d6c33557..8cfc59633 100644
--- a/gst/videodrop/gstvideodrop.c
+++ b/gst/videodrop/gstvideodrop.c
@@ -24,13 +24,6 @@
 #include <gstvideodrop.h>
 #include <gst/video/video.h>
 
-/* elementfactory information */
-static const GstElementDetails videodrop_details =
-GST_ELEMENT_DETAILS ("Frame dropper",
-    "Filter/Effect/Video",
-    "Re-FPS'es video by dropping frames",
-    "Ronald Bultje <rbultje@ronald.bitfreak.net>");
-
 /* GstVideodrop signals and args */
 enum
 {
@@ -108,13 +101,17 @@ gst_videodrop_base_init (gpointer g_class)
 {
   GstElementClass *element_class = GST_ELEMENT_CLASS (g_class);
 
-  gst_element_class_set_details (element_class, &videodrop_details);
+  gst_element_class_set_details_simple (element_class, "Frame dropper",
+      "Filter/Effect/Video",
+      "Re-FPS'es video by dropping frames",
+      "Ronald Bultje <rbultje@ronald.bitfreak.net>");
 
   gst_element_class_add_pad_template (element_class,
       gst_static_pad_template_get (&gst_videodrop_sink_template));
   gst_element_class_add_pad_template (element_class,
       gst_static_pad_template_get (&gst_videodrop_src_template));
 }
+
 static void
 gst_videodrop_class_init (GstVideodropClass * klass)
 {
diff --git a/gst/videomeasure/gstvideomeasure_collector.c b/gst/videomeasure/gstvideomeasure_collector.c
index 5e87f1783..28c95ae54 100644
--- a/gst/videomeasure/gstvideomeasure_collector.c
+++ b/gst/videomeasure/gstvideomeasure_collector.c
@@ -54,12 +54,6 @@ enum
 GST_DEBUG_CATEGORY_STATIC (measure_collector_debug);
 #define GST_CAT_DEFAULT measure_collector_debug
 
-static const GstElementDetails measure_collector_details =
-GST_ELEMENT_DETAILS ("Video measure collector",
-    "Filter/Effect/Video",
-    "Collect measurements from a measuring element",
-    "Руслан Ижбулатов <lrn _at_ gmail _dot_ com>");
-
 static GstStaticPadTemplate gst_measure_collector_src_template =
 GST_STATIC_PAD_TEMPLATE ("src",
     GST_PAD_SRC,
@@ -327,7 +321,10 @@ gst_measure_collector_base_init (gpointer g_class)
 {
   GstElementClass *element_class = GST_ELEMENT_CLASS (g_class);
 
-  gst_element_class_set_details (element_class, &measure_collector_details);
+  gst_element_class_set_details_simple (element_class,
+      "Video measure collector", "Filter/Effect/Video",
+      "Collect measurements from a measuring element",
+      "Руслан Ижбулатов <lrn _at_ gmail _dot_ com>");
 
   gst_element_class_add_pad_template (element_class,
       gst_static_pad_template_get (&gst_measure_collector_sink_template));
diff --git a/gst/videosignal/gstvideoanalyse.c b/gst/videosignal/gstvideoanalyse.c
index 8f4ef6c6d..2d59b3125 100644
--- a/gst/videosignal/gstvideoanalyse.c
+++ b/gst/videosignal/gstvideoanalyse.c
@@ -104,12 +104,6 @@ enum
 GST_DEBUG_CATEGORY_STATIC (video_analyse_debug);
 #define GST_CAT_DEFAULT video_analyse_debug
 
-static const GstElementDetails video_analyse_details =
-GST_ELEMENT_DETAILS ("Video analyser",
-    "Filter/Effect/Video",
-    "Analyse video signal",
-    "Wim Taymans <wim@fluendo.com>");
-
 static GstStaticPadTemplate gst_video_analyse_src_template =
 GST_STATIC_PAD_TEMPLATE ("src",
     GST_PAD_SRC,
@@ -281,7 +275,9 @@ gst_video_analyse_base_init (gpointer g_class)
 {
   GstElementClass *element_class = GST_ELEMENT_CLASS (g_class);
 
-  gst_element_class_set_details (element_class, &video_analyse_details);
+  gst_element_class_set_details_simple (element_class, "Video analyser",
+      "Filter/Effect/Video",
+      "Analyse video signal", "Wim Taymans <wim@fluendo.com>");
 
   gst_element_class_add_pad_template (element_class,
       gst_static_pad_template_get (&gst_video_analyse_sink_template));
diff --git a/gst/videosignal/gstvideodetect.c b/gst/videosignal/gstvideodetect.c
index f97ae205c..fb64e6627 100644
--- a/gst/videosignal/gstvideodetect.c
+++ b/gst/videosignal/gstvideodetect.c
@@ -142,12 +142,6 @@ enum
 GST_DEBUG_CATEGORY_STATIC (video_detect_debug);
 #define GST_CAT_DEFAULT video_detect_debug
 
-static const GstElementDetails video_detect_details =
-GST_ELEMENT_DETAILS ("Video detecter",
-    "Filter/Effect/Video",
-    "Detect patterns in a video signal",
-    "Wim Taymans <wim@fluendo.com>");
-
 static GstStaticPadTemplate gst_video_detect_src_template =
 GST_STATIC_PAD_TEMPLATE ("src",
     GST_PAD_SRC,
@@ -440,7 +434,9 @@ gst_video_detect_base_init (gpointer g_class)
 {
   GstElementClass *element_class = GST_ELEMENT_CLASS (g_class);
 
-  gst_element_class_set_details (element_class, &video_detect_details);
+  gst_element_class_set_details_simple (element_class, "Video detecter",
+      "Filter/Effect/Video",
+      "Detect patterns in a video signal", "Wim Taymans <wim@fluendo.com>");
 
   gst_element_class_add_pad_template (element_class,
       gst_static_pad_template_get (&gst_video_detect_sink_template));
diff --git a/gst/videosignal/gstvideomark.c b/gst/videosignal/gstvideomark.c
index 3e73d8594..46b4c1f77 100644
--- a/gst/videosignal/gstvideomark.c
+++ b/gst/videosignal/gstvideomark.c
@@ -83,12 +83,6 @@ enum
 GST_DEBUG_CATEGORY_STATIC (video_mark_debug);
 #define GST_CAT_DEFAULT video_mark_debug
 
-static const GstElementDetails video_mark_details =
-GST_ELEMENT_DETAILS ("Video marker",
-    "Filter/Effect/Video",
-    "Marks a video signal with a pattern",
-    "Wim Taymans <wim@fluendo.com>");
-
 static GstStaticPadTemplate gst_video_mark_src_template =
 GST_STATIC_PAD_TEMPLATE ("src",
     GST_PAD_SRC,
@@ -327,7 +321,9 @@ gst_video_mark_base_init (gpointer g_class)
 {
   GstElementClass *element_class = GST_ELEMENT_CLASS (g_class);
 
-  gst_element_class_set_details (element_class, &video_mark_details);
+  gst_element_class_set_details_simple (element_class, "Video marker",
+      "Filter/Effect/Video",
+      "Marks a video signal with a pattern", "Wim Taymans <wim@fluendo.com>");
 
   gst_element_class_add_pad_template (element_class,
       gst_static_pad_template_get (&gst_video_mark_sink_template));
diff --git a/gst/vmnc/vmncdec.c b/gst/vmnc/vmncdec.c
index bbf1b3a3e..f2332c7c8 100644
--- a/gst/vmnc/vmncdec.c
+++ b/gst/vmnc/vmncdec.c
@@ -134,12 +134,6 @@ typedef struct
   GstElementClass parent_class;
 } GstVMncDecClass;
 
-static const GstElementDetails vmnc_dec_details =
-GST_ELEMENT_DETAILS ("VMnc video decoder",
-    "Codec/Decoder/Video",
-    "Decode VmWare video to raw (RGB) video",
-    "Michael Smith <msmith@xiph.org>");
-
 static GstStaticPadTemplate vmnc_dec_src_factory =
 GST_STATIC_PAD_TEMPLATE ("src",
     GST_PAD_SRC,
@@ -177,7 +171,10 @@ gst_vmnc_dec_base_init (gpointer g_class)
       gst_static_pad_template_get (&vmnc_dec_src_factory));
   gst_element_class_add_pad_template (element_class,
       gst_static_pad_template_get (&vmnc_dec_sink_factory));
-  gst_element_class_set_details (element_class, &vmnc_dec_details);
+  gst_element_class_set_details_simple (element_class, "VMnc video decoder",
+      "Codec/Decoder/Video",
+      "Decode VmWare video to raw (RGB) video",
+      "Michael Smith <msmith@xiph.org>");
 }
 
 static void