reverting error patch before making a branch.BRANCH-ERROR-ROOTBRANCH-ERROR

Original commit message from CVS:
reverting error patch before making a branch.

24 files changed, 57 insertions, 124 deletions

diff --git a/ext/aalib/gstaasink.c b/ext/aalib/gstaasink.c
index 0ba7e4dfb..537cfd54d 100644
--- a/ext/aalib/gstaasink.c
+++ b/ext/aalib/gstaasink.c
@@ -489,9 +489,8 @@ gst_aasink_open (GstAASink *aasink)
 
   aasink->context = aa_autoinit (&aasink->ascii_surf);
   if (aasink->context == NULL) {
-    gst_element_gerror(GST_ELEMENT (aasink), GST_ERROR_UNKNOWN,
-      g_strdup ("unconverted error, file a bug"),
-      g_strdup ("opening aalib context"));
+    gst_element_error (GST_ELEMENT (aasink), 
+		    g_strdup("opening aalib context"));
     return FALSE;
   }
   aa_autoinitkbd(aasink->context, 0);
diff --git a/ext/dv/gstdvdec.c b/ext/dv/gstdvdec.c
index a33b78294..e28f8362f 100644
--- a/ext/dv/gstdvdec.c
+++ b/ext/dv/gstdvdec.c
@@ -798,9 +798,7 @@ gst_dvdec_loop (GstElement *element)
     }
     /* oops list exhausted an nothing was found... */
     if (!trylist) {
-      gst_element_gerror(element, GST_ERROR_UNKNOWN,
-        g_strdup ("unconverted error, file a bug"),
-        g_strdup_printf("could not negotiate"));
+      gst_element_error (element, "could not negotiate");
       return;
     }
   }
diff --git a/ext/esd/esdmon.c b/ext/esd/esdmon.c
index ab85c151c..ae8d4fd44 100644
--- a/ext/esd/esdmon.c
+++ b/ext/esd/esdmon.c
@@ -266,9 +266,7 @@ gst_esdmon_get (GstPad *pad)
                           "channels",   GST_PROPS_INT (esdmon->channels)
                    )) <= 0)
     {
-      gst_element_gerror(GST_ELEMENT (esdmon), GST_ERROR_UNKNOWN,
-        g_strdup ("unconverted error, file a bug"),
-        g_strdup_printf("could not set caps"));
+      gst_element_error (GST_ELEMENT (esdmon), "could not set caps");
       return NULL;
     }
   }
diff --git a/ext/esd/esdsink.c b/ext/esd/esdsink.c
index f9be01c61..f45573835 100644
--- a/ext/esd/esdsink.c
+++ b/ext/esd/esdsink.c
@@ -266,9 +266,7 @@ gst_esdsink_chain (GstPad *pad, GstBuffer *buf)
   esdsink = GST_ESDSINK (gst_pad_get_parent (pad));
 
   if (!esdsink->negotiated) {
-    gst_element_gerror(GST_ELEMENT (esdsink), GST_ERROR_UNKNOWN,
-      g_strdup ("unconverted error, file a bug"),
-      g_strdup_printf("not negotiated"));
+    gst_element_error (GST_ELEMENT (esdsink), "not negotiated");
     goto done;
   }
 
diff --git a/ext/flac/gstflacdec.c b/ext/flac/gstflacdec.c
index 5431a84fc..c11be9f6e 100644
--- a/ext/flac/gstflacdec.c
+++ b/ext/flac/gstflacdec.c
@@ -291,9 +291,7 @@ gst_flacdec_error_callback (const FLAC__SeekableStreamDecoder *decoder,
 
   GST_DEBUG (error);
 				  
-  gst_element_gerror(GST_ELEMENT (flacdec), GST_ERROR_UNKNOWN,
-    g_strdup ("unconverted error, file a bug"),
-    g_strdup_printf(error));
+  gst_element_error (GST_ELEMENT (flacdec), error);
 }
 
 static FLAC__SeekableStreamDecoderSeekStatus 	
diff --git a/ext/flac/gstflacenc.c b/ext/flac/gstflacenc.c
index e217d9c78..ef9e53860 100644
--- a/ext/flac/gstflacenc.c
+++ b/ext/flac/gstflacenc.c
@@ -512,9 +512,8 @@ gst_flacenc_chain (GstPad *pad, GstBuffer *buf)
   }
 
   if (!flacenc->negotiated) {
-    gst_element_gerror(GST_ELEMENT (flacenc), GST_ERROR_UNKNOWN,
-      g_strdup ("unconverted error, file a bug"),
-      g_strdup_printf("format not negotiated"));
+    gst_element_error (GST_ELEMENT (flacenc),
+		    "format not negotiated");
     return;
   }
 
@@ -531,9 +530,8 @@ gst_flacenc_chain (GstPad *pad, GstBuffer *buf)
     gst_flacenc_set_metadata (flacenc, flacenc->metadata);
     state = FLAC__seekable_stream_encoder_init (flacenc->encoder);
     if (state != FLAC__STREAM_ENCODER_OK) {
-      gst_element_gerror(GST_ELEMENT (flacenc), GST_ERROR_UNKNOWN,
-        g_strdup ("unconverted error, file a bug"),
-        g_strdup_printf("could not initialize encoder (wrong parameters?)"));
+      gst_element_error (GST_ELEMENT (flacenc),
+		         "could not initialize encoder (wrong parameters?)");
       return;
     }
   }
@@ -567,9 +565,8 @@ gst_flacenc_chain (GstPad *pad, GstBuffer *buf)
   flacenc->data = NULL;
 
   if (!res) {
-    gst_element_gerror(GST_ELEMENT (flacenc), GST_ERROR_UNKNOWN,
-      g_strdup ("unconverted error, file a bug"),
-      g_strdup_printf ("encoding error"));
+    gst_element_error (GST_ELEMENT (flacenc),
+		         "encoding error");
   }
 }
 
diff --git a/ext/ladspa/gstladspa.c b/ext/ladspa/gstladspa.c
index 2611603fa..460bdf128 100644
--- a/ext/ladspa/gstladspa.c
+++ b/ext/ladspa/gstladspa.c
@@ -701,9 +701,7 @@ gst_ladspa_loop (GstElement *element)
   }
 
   if (!ladspa->bufpool) {
-    gst_element_gerror(element, "Caps were never set, GST_ERROR_UNKNOWN,
-      g_strdup ("unconverted error, file a bug"),
-      g_strdup_printf(bailing..."));
+    gst_element_error (element, "Caps were never set, bailing...");
     return;
   }
 
@@ -793,9 +791,7 @@ gst_ladspa_chain (GstPad *pad, GstBuffer *buffer_in)
   g_return_if_fail (GST_IS_BUFFER (buffer_in));
   
   if (!ladspa->bufpool) {
-    gst_element_gerror((GstElement*)ladspa, "Caps were never set, GST_ERROR_UNKNOWN,
-      g_strdup ("unconverted error, file a bug"),
-      g_strdup_printf(bailing..."));
+    gst_element_error ((GstElement*)ladspa, "Caps were never set, bailing...");
     return;
   }
 
diff --git a/ext/mikmod/gstmikmod.c b/ext/mikmod/gstmikmod.c
index 7767bcd95..6ef507c2e 100644
--- a/ext/mikmod/gstmikmod.c
+++ b/ext/mikmod/gstmikmod.c
@@ -310,9 +310,8 @@ gst_mikmod_loop (GstElement *element)
   
   if (!GST_PAD_CAPS (mikmod->srcpad)) {
     if (gst_mikmod_negotiate (mikmod) <= 0) {
-      gst_element_gerror(GST_ELEMENT (mikmod), GST_ERROR_UNKNOWN,
-        g_strdup ("unconverted error, file a bug"),
-        g_strdup_printf("Failed to negotiate with next element in mikmod"));
+      gst_element_error (GST_ELEMENT (mikmod),
+			 "Failed to negotiate with next element in mikmod");
       return;
     }
   }
diff --git a/ext/raw1394/gstdv1394src.c b/ext/raw1394/gstdv1394src.c
index 26ba4f1ef..97b2989e7 100644
--- a/ext/raw1394/gstdv1394src.c
+++ b/ext/raw1394/gstdv1394src.c
@@ -232,9 +232,7 @@ int gst_dv1394src_iso_receive(raw1394handle_t handle,int channel,size_t len,quad
                                       "format", GST_PROPS_STRING("PAL"),
                                       NULL)
               ) <= 0) {
-		gst_element_gerror(GST_ELEMENT(dv1394src), GST_ERROR_UNKNOWN,
-		  g_strdup ("unconverted error, file a bug"),
-		  g_strdup_printf("Could not set source caps for PAL"));
+		gst_element_error (GST_ELEMENT(dv1394src), "Could not set source caps for PAL");
                 return 0;
               }
             } else {
@@ -246,18 +244,14 @@ int gst_dv1394src_iso_receive(raw1394handle_t handle,int channel,size_t len,quad
                                       "format", GST_PROPS_STRING ("NTSC"),
                                       NULL)
               ) <= 0) {
-                gst_element_gerror(GST_ELEMENT(dv1394src), GST_ERROR_UNKNOWN,
-                  g_strdup ("unconverted error, file a bug"),
-                  g_strdup_printf("Could not set source caps for NTSC"));
+                gst_element_error (GST_ELEMENT(dv1394src), "Could not set source caps for NTSC");
                 return 0;
               }
             }
 
             dv1394src->pool = gst_buffer_pool_get_default( dv1394src->frameSize, N_BUFFERS_IN_POOL );
             if (dv1394src->pool == NULL) {
-              gst_element_gerror(GST_ELEMENT(dv1394src), GST_ERROR_UNKNOWN,
-                g_strdup ("unconverted error, file a bug"),
-                g_strdup_printf("gst_buffer_pool_get_default returned NULL"));
+              gst_element_error (GST_ELEMENT(dv1394src), "gst_buffer_pool_get_default returned NULL");
             }
           }
   
diff --git a/ext/speex/gstspeexenc.c b/ext/speex/gstspeexenc.c
index 188a729a0..dd4cb45f4 100644
--- a/ext/speex/gstspeexenc.c
+++ b/ext/speex/gstspeexenc.c
@@ -176,9 +176,7 @@ gst_speexenc_chain (GstPad *pad, GstBuffer *buf)
 			"channels", GST_PROPS_INT (1)
 		      )))
     {
-      gst_element_gerror(GST_ELEMENT (speexenc), GST_ERROR_UNKNOWN,
-        g_strdup ("unconverted error, file a bug"),
-        g_strdup_printf("could not negotiate"));
+      gst_element_error (GST_ELEMENT (speexenc), "could not negotiate");
       return;
     }
   }
diff --git a/gst/auparse/gstauparse.c b/gst/auparse/gstauparse.c
index 075f5f4d3..422ee1bab 100644
--- a/gst/auparse/gstauparse.c
+++ b/gst/auparse/gstauparse.c
@@ -287,9 +287,7 @@ gst_auparse_chain (GstPad *pad, GstBuffer *buf)
 
     if (gst_pad_try_set_caps (auparse->srcpad, tempcaps) <= 0) {
       gst_buffer_unref (buf);
-      gst_element_gerror(GST_ELEMENT (auparse), GST_ERROR_UNKNOWN,
-        g_strdup ("unconverted error, file a bug"),
-        g_strdup_printf("could not set audio caps"));
+      gst_element_error (GST_ELEMENT (auparse), "could not set audio caps");
       return;
     }
 
diff --git a/gst/avi/gstavidemux.c b/gst/avi/gstavidemux.c
index e79d707e2..ed605935a 100644
--- a/gst/avi/gstavidemux.c
+++ b/gst/avi/gstavidemux.c
@@ -1691,9 +1691,7 @@ gst_avi_demux_loop (GstElement *element)
     case GST_AVI_DEMUX_START:
       if (chunk.id != GST_RIFF_TAG_RIFF && 
           chunk.type != GST_RIFF_RIFF_AVI) {
-        gst_element_gerror(element, GST_ERROR_UNKNOWN,
-          g_strdup ("unconverted error, file a bug"),
-          g_strdup_printf("This doesn't appear to be an AVI file %08x %08x", chunk.id, chunk.type));
+        gst_element_error (element, "This doesn't appear to be an AVI file %08x %08x", chunk.id, chunk.type);
 	return;
       }
       avi_demux->state = GST_AVI_DEMUX_HEADER;
diff --git a/gst/avi/gstavimux.c b/gst/avi/gstavimux.c
index 68105d917..4a980a138 100644
--- a/gst/avi/gstavimux.c
+++ b/gst/avi/gstavimux.c
@@ -1062,9 +1062,7 @@ gst_avimux_stop_file (GstAviMux *avimux)
       if (avimux->audio_time) {
         avimux->auds_hdr.rate = (GST_SECOND * avimux->audio_size) / avimux->audio_time;
       } else {
-        gst_element_gerror(GST_ELEMENT (avimux), GST_ERROR_UNKNOWN,
-          g_strdup ("unconverted error, file a bug"),
-          g_strdup ("Audio stream availablebut no audio data transferred (or data with invalid timestamps). Resulting AVI will be corrupt"));
+        gst_element_error (GST_ELEMENT (avimux), "Audio stream available, but no audio data transferred (or data with invalid timestamps). Resulting AVI will be corrupt");
         avimux->auds_hdr.rate = 0;
       }
       avimux->auds.av_bps = avimux->auds_hdr.rate * avimux->auds_hdr.scale;
diff --git a/gst/flx/gstflxdec.c b/gst/flx/gstflxdec.c
index fe2044393..c20327a70 100644
--- a/gst/flx/gstflxdec.c
+++ b/gst/flx/gstflxdec.c
@@ -499,9 +499,7 @@ gst_flxdec_loop (GstElement *element)
     if (flxh->type != FLX_MAGICHDR_FLI &&
       flxh->type != FLX_MAGICHDR_FLC &&
       flxh->type != FLX_MAGICHDR_FLX) {
-      gst_element_gerror(element, GST_ERROR_UNKNOWN,
-        g_strdup ("unconverted error, file a bug"),
-        g_strdup_printf("not a flx file (type %d)\n", flxh->type));
+      gst_element_error (element, "not a flx file (type %d)\n", flxh->type);
       return;
     }
   
diff --git a/gst/goom/gstgoom.c b/gst/goom/gstgoom.c
index 8a4a5eb9e..bbf49bbdb 100644
--- a/gst/goom/gstgoom.c
+++ b/gst/goom/gstgoom.c
@@ -300,9 +300,7 @@ gst_goom_chain (GstPad *pad, GstBuffer *bufin)
   }
 
   if (goom->channels == 0) {
-    gst_element_gerror(GST_ELEMENT (goom), GST_ERROR_UNKNOWN,
-      g_strdup ("unconverted error, file a bug"),
-      g_strdup_printf("sink format not negotiated"));
+    gst_element_error (GST_ELEMENT (goom), "sink format not negotiated");
     goto done;
   }
 
@@ -311,9 +309,7 @@ gst_goom_chain (GstPad *pad, GstBuffer *bufin)
 
   if (!goom->srcnegotiated) {
     if (!gst_goom_negotiate_default (goom)) {
-      gst_element_gerror(GST_ELEMENT (goom), GST_ERROR_UNKNOWN,
-        g_strdup ("unconverted error, file a bug"),
-        g_strdup_printf("could not negotiate src format"));
+      gst_element_error (GST_ELEMENT (goom), "could not negotiate src format");
       goto done;
     }
   }
diff --git a/gst/monoscope/gstmonoscope.c b/gst/monoscope/gstmonoscope.c
index 0b94604db..9eb8bb432 100644
--- a/gst/monoscope/gstmonoscope.c
+++ b/gst/monoscope/gstmonoscope.c
@@ -285,9 +285,7 @@ gst_monoscope_chain (GstPad *pad, GstBuffer *bufin)
     GST_DEBUG ("making new pad");
     if (!GST_PAD_CAPS (monoscope->srcpad)) {
       if (gst_monoscope_negotiate (monoscope) <= 0) {
-        gst_element_gerror(GST_ELEMENT (monoscope), GST_ERROR_UNKNOWN,
-          g_strdup ("unconverted error, file a bug"),
-          g_strdup_printf("could not set caps"));
+        gst_element_error (GST_ELEMENT (monoscope), "could not set caps");
         return;
       }
     }
diff --git a/gst/smpte/gstsmpte.c b/gst/smpte/gstsmpte.c
index 9b203fe17..bf042e4c1 100644
--- a/gst/smpte/gstsmpte.c
+++ b/gst/smpte/gstsmpte.c
@@ -364,9 +364,7 @@ gst_smpte_loop (GstElement *element)
                       "framerate", GST_PROPS_FLOAT (smpte->fps)
 		    )))
       {
-        gst_element_gerror(element, GST_ERROR_UNKNOWN,
-          g_strdup ("unconverted error, file a bug"),
-          g_strdup_printf("cannot set caps"));
+        gst_element_error (element, "cannot set caps");
         return;
       }
     }
diff --git a/gst/videocrop/gstvideocrop.c b/gst/videocrop/gstvideocrop.c
index 54702e5cf..d96061a05 100644
--- a/gst/videocrop/gstvideocrop.c
+++ b/gst/videocrop/gstvideocrop.c
@@ -380,9 +380,7 @@ gst_video_crop_chain (GstPad *pad, GstBuffer *buffer)
                                          "framerate", GST_PROPS_FLOAT (video_crop->fps)
 				       )) <= 0)
     {
-      gst_element_gerror(GST_ELEMENT (video_crop), GST_ERROR_UNKNOWN,
-        g_strdup ("unconverted error, file a bug"),
-        g_strdup_printf("could not negotiate pads"));
+      gst_element_error (GST_ELEMENT (video_crop), "could not negotiate pads");
       return;
     }
   }
diff --git a/gst/wavenc/gstwavenc.c b/gst/wavenc/gstwavenc.c
index 08f2c99c3..2dde7c6c3 100644
--- a/gst/wavenc/gstwavenc.c
+++ b/gst/wavenc/gstwavenc.c
@@ -322,9 +322,7 @@ gst_wavenc_chain (GstPad *pad,
 
   if (!wavenc->setup) {
     gst_buffer_unref (buf);
-    gst_element_gerror(GST_ELEMENT (wavenc), GST_ERROR_UNKNOWN,
-      g_strdup ("unconverted error, file a bug"),
-      g_strdup_printf("encoder not initialised (input is not audio?)"));
+    gst_element_error (GST_ELEMENT (wavenc), "encoder not initialised (input is not audio?)");
     return;
   }
 
diff --git a/gst/wavparse/gstwavparse.c b/gst/wavparse/gstwavparse.c
index af995123c..c2e6063cc 100644
--- a/gst/wavparse/gstwavparse.c
+++ b/gst/wavparse/gstwavparse.c
@@ -292,16 +292,12 @@ static void wav_new_chunk_callback(GstRiffChunk *chunk, gpointer data)
 	break;
 
       default:
-	gst_element_gerror(GST_ELEMENT (wavparse), GST_ERROR_UNKNOWN,
-	  g_strdup ("unconverted error, file a bug"),
-	  g_strdup_printf("wavparse: format %d not handled", wavparse->format));
+	gst_element_error (GST_ELEMENT (wavparse), "wavparse: format %d not handled", wavparse->format);
 	return;
     }
 
     if (gst_pad_try_set_caps (wavparse->srcpad, caps) <= 0) {
-      gst_element_gerror(GST_ELEMENT (wavparse), GST_ERROR_UNKNOWN,
-        g_strdup ("unconverted error, file a bug"),
-        g_strdup_printf("Could not set caps"));
+      gst_element_error (GST_ELEMENT (wavparse), "Could not set caps");
       return;
     }
 
diff --git a/sys/oss/gstosselement.c b/sys/oss/gstosselement.c
index 6ad1c21ca..f43799868 100644
--- a/sys/oss/gstosselement.c
+++ b/sys/oss/gstosselement.c
@@ -429,43 +429,37 @@ gst_osselement_open_audio (GstOssElement *oss)
   if (oss->fd < 0) {
     switch (errno) {
       case EBUSY:
-	gst_element_gerror(GST_ELEMENT (oss), GST_ERROR_UNKNOWN,
-	  g_strdup ("unconverted error, file a bug"),
-	  g_strdup_printf("osselement: Unable to open %s (in use ?)",
-			   oss->device));
+	gst_element_error (GST_ELEMENT (oss),
+			   "osselement: Unable to open %s (in use ?)",
+			   oss->device);
 	break;
       case EISDIR:
-	gst_element_gerror(GST_ELEMENT (oss), GST_ERROR_UNKNOWN,
-	  g_strdup ("unconverted error, file a bug"),
-	  g_strdup_printf("osselement: Device %s is a directory",
-			   oss->device));
+	gst_element_error (GST_ELEMENT (oss),
+			   "osselement: Device %s is a directory",
+			   oss->device);
 	break;
       case EACCES:
       case ETXTBSY:
-	gst_element_gerror(GST_ELEMENT (oss), GST_ERROR_UNKNOWN,
-	  g_strdup ("unconverted error, file a bug"),
-	  g_strdup_printf("osselement: Cannot access %s, check permissions",
-			   oss->device));
+	gst_element_error (GST_ELEMENT (oss),
+			   "osselement: Cannot access %s, check permissions",
+			   oss->device);
 	break;
       case ENXIO:
       case ENODEV:
       case ENOENT:
-	gst_element_gerror(GST_ELEMENT (oss), GST_ERROR_UNKNOWN,
-	  g_strdup ("unconverted error, file a bug"),
-	  g_strdup_printf("osselement: Cannot access %s, does it exist ?",
-			   oss->device));
+	gst_element_error (GST_ELEMENT (oss),
+			   "osselement: Cannot access %s, does it exist ?",
+			   oss->device);
 	break;
       case EROFS:
-	gst_element_gerror(GST_ELEMENT (oss), GST_ERROR_UNKNOWN,
-	  g_strdup ("unconverted error, file a bug"),
-	  g_strdup_printf("osselement: Cannot access %s, read-only filesystem ?",
-			   oss->device));
+	gst_element_error (GST_ELEMENT (oss),
+			   "osselement: Cannot access %s, read-only filesystem ?",
+			   oss->device);
       default:
 	/* FIXME: strerror is not threadsafe */
-	gst_element_gerror(GST_ELEMENT (oss), GST_ERROR_UNKNOWN,
-	  g_strdup ("unconverted error, file a bug"),
-	  g_strdup_printf("osselement: Cannot open %s, generic error: %s",
-			   oss->device, strerror (errno)));
+	gst_element_error (GST_ELEMENT (oss),
+			   "osselement: Cannot open %s, generic error: %s",
+			   oss->device, strerror (errno));
 	break;
     }
     return FALSE;
diff --git a/sys/oss/gstossgst.c b/sys/oss/gstossgst.c
index a680518c3..070c693aa 100644
--- a/sys/oss/gstossgst.c
+++ b/sys/oss/gstossgst.c
@@ -382,9 +382,7 @@ gst_ossgst_spawn_process (GstOssGst *ossgst)
   if((ossgst->childpid = fork()) == -1)
   {
     perror("fork");
-    gst_element_gerror(GST_ELEMENT(ossgst), GST_ERROR_UNKNOWN,
-      g_strdup ("unconverted error, file a bug"),
-      g_strdup_printf("forking"));
+    gst_element_error(GST_ELEMENT(ossgst),"forking");
     return FALSE;
   }
   GST_DEBUG ("forked %d", ossgst->childpid);
@@ -417,9 +415,7 @@ gst_ossgst_spawn_process (GstOssGst *ossgst)
 
     /* will only reach if error */
     perror("exec");
-    gst_element_gerror(GST_ELEMENT(ossgst), GST_ERROR_UNKNOWN,
-      g_strdup ("unconverted error, file a bug"),
-      g_strdup_printf("starting child process"));
+    gst_element_error(GST_ELEMENT(ossgst),"starting child process");
     return FALSE;
 
   }
diff --git a/sys/oss/gstosssink.c b/sys/oss/gstosssink.c
index eb5203bc1..067f69ceb 100644
--- a/sys/oss/gstosssink.c
+++ b/sys/oss/gstosssink.c
@@ -356,9 +356,7 @@ gst_osssink_chain (GstPad *pad, GstBuffer *buf)
 
   if (!GST_OSSELEMENT (osssink)->bps) {
     gst_buffer_unref (buf);
-    gst_element_gerror(GST_ELEMENT (osssink), GST_ERROR_UNKNOWN,
-      g_strdup ("unconverted error, file a bug"),
-      g_strdup_printf("capsnego was never performed, unknown data type"));
+    gst_element_error (GST_ELEMENT (osssink), "capsnego was never performed, unknown data type");
     return;
   }
 
diff --git a/sys/oss/gstosssrc.c b/sys/oss/gstosssrc.c
index 8a5e0bb3a..c2ff00259 100644
--- a/sys/oss/gstosssrc.c
+++ b/sys/oss/gstosssrc.c
@@ -315,17 +315,13 @@ gst_osssrc_get (GstPad *pad)
     /* nothing was negotiated, we can decide on a format */
     if (!gst_osssrc_negotiate (pad)) {
       gst_buffer_unref (buf);
-      gst_element_gerror(GST_ELEMENT (src), GST_ERROR_UNKNOWN,
-        g_strdup ("unconverted error, file a bug"),
-        g_strdup_printf("could not negotiate format"));
+      gst_element_error (GST_ELEMENT (src), "could not negotiate format");
       return GST_BUFFER (gst_event_new (GST_EVENT_INTERRUPT));
     }
   }
   if (GST_OSSELEMENT (src)->bps == 0) {
     gst_buffer_unref (buf);
-    gst_element_gerror(GST_ELEMENT (src), GST_ERROR_UNKNOWN,
-      g_strdup ("unconverted error, file a bug"),
-      g_strdup_printf("no format negotiated"));
+    gst_element_error (GST_ELEMENT (src), "no format negotiated");
     return GST_BUFFER (gst_event_new (GST_EVENT_INTERRUPT));
   }
 
@@ -333,10 +329,8 @@ gst_osssrc_get (GstPad *pad)
                     src->buffersize);
   if (readbytes < 0) {
     gst_buffer_unref (buf);
-    gst_element_gerror(GST_ELEMENT (src), GST_ERROR_UNKNOWN,
-      g_strdup ("unconverted error, file a bug"),
-      g_strdup_printf("error reading data (%s)",
-		    strerror (errno)));
+    gst_element_error (GST_ELEMENT (src), "error reading data (%s)",
+		    strerror (errno));
     return GST_BUFFER (gst_event_new (GST_EVENT_INTERRUPT));
   }