third time I try commiting this today, let's hope I watch the result this time

Original commit message from CVS:
third time I try commiting this today, let's hope I watch the result this time

diff --git a/ChangeLog b/ChangeLog
index 203797d..0fdae53 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -15,6 +15,12 @@
        * gst/gstelement.h:
          make GST_ELEMENT_ERROR do a GST_ERROR_OBJECT
 
+2004-01-29  Thomas Vander Stichele  <thomas at apestaart dot org>
+
+       * gst/gstelement.c: (gst_element_error_full):
+       * gst/gstelement.h:
+          GST_ELEMENT_ERROR in enum -> _IN_ERROR
+
 2004-01-29  Julien MOUTTE  <julien@moutte.net>
 
        * gst/elements/gstfilesrc.c: (gst_filesrc_get),

diff --git a/docs/gst/tmpl/gstelement.sgml b/docs/gst/tmpl/gstelement.sgml
index bbbffaf..89b873c 100644 (file)
--- a/docs/gst/tmpl/gstelement.sgml
+++ b/docs/gst/tmpl/gstelement.sgml
@@ -852,7 +852,7 @@ This enum defines the standard flags that an element may have.
 @GST_ELEMENT_SCHEDULER_PRIVATE1: 
 @GST_ELEMENT_SCHEDULER_PRIVATE2: 
 @GST_ELEMENT_LOCKED_STATE: 
-@GST_ELEMENT_ERROR: 
+@GST_ELEMENT_IN_ERROR: 
 @GST_ELEMENT_FLAG_LAST: 
 
 <!-- ##### MACRO GST_ELEMENT_IS_THREAD_SUGGESTED ##### -->
@@ -981,6 +981,7 @@ Is triggered whenever an error occured.
 @:
 @:
 @:
+@:
 @: 
 
 <!-- ##### SIGNAL GstElement::found-tag ##### -->

diff --git a/docs/gst/tmpl/gstxml.sgml b/docs/gst/tmpl/gstxml.sgml
index 32d00bc..08450b2 100644 (file)
--- a/docs/gst/tmpl/gstxml.sgml
+++ b/docs/gst/tmpl/gstxml.sgml
@@ -110,6 +110,10 @@ All GstElements can be serialized to an XML presentation and subsequently loaded
 
 </para>
 
+@: 
+@: 
+@:
+
 @gstxml: the object which received the signal.
 @arg1: 
 @arg2: 
@@ -119,7 +123,7 @@ All GstElements can be serialized to an XML presentation and subsequently loaded
 
 </para>
 
-@: 
-@: 
-@: 
+@gstxml: the object which received the signal.
+@arg1: 
+@arg2: 
 

diff --git a/docs/upload.mak b/docs/upload.mak
index 5dbcde5..77e2e85 100644 (file)
--- a/docs/upload.mak
+++ b/docs/upload.mak
@@ -19,7 +19,7 @@ DOC_URL=$(DOC_SERVER):$(DOC_BASE)
 
 
 upload: $(FORMATS)
-       @if test "x$$GST_PLUGINS_VERSION_NANO" = x0; then \
+       @if test "x$(GST_VERSION_NANO)" = x0; then \
             export DOCVERSION=$(VERSION); \
         else export DOCVERSION=head; \
         fi; \