Index: gst/gstxml.c
===================================================================
RCS file: /cvs/gstreamer/gstreamer/gst/gstxml.c,v
retrieving revision 1.50
diff -a -u -r1.50 gstxml.c
--- gst/gstxml.c	14 Nov 2005 15:15:43 -0000	1.50
+++ gst/gstxml.c	4 Dec 2005 16:37:51 -0000
@@ -226,7 +226,7 @@
  * gst_xml_parse_doc:
  * @xml: a pointer to a GstXML object
  * @doc: a pointer to an xml document to parse
- * @root: The name of the root object to build
+ * @root: The name of the root object to build (mot implemented)
  *
  * Fills the GstXML object with the elements from the
  * xmlDocPtr.
@@ -234,7 +234,7 @@
  * Returns: TRUE on success, FALSE otherwise
  */
 gboolean
-gst_xml_parse_doc (GstXML * xml, xmlDocPtr doc, const guchar * root)
+gst_xml_parse_doc (GstXML * xml, xmlDocPtr doc, const gchar * root)
 {
   xmlNodePtr field, cur;
   xmlNsPtr ns;
@@ -278,12 +278,11 @@
   return TRUE;
 }
 
-/* FIXME 0.9: Why guchar*? */
 /**
  * gst_xml_parse_file:
  * @xml: a pointer to a GstXML object
  * @fname: The filename with the xml description
- * @root: The name of the root object to build
+ * @root: The name of the root object to build  (mot implemented)
  *
  * Fills the GstXML object with the corresponding elements from
  * the XML file fname. Optionally it will only build the element from
@@ -291,19 +290,19 @@
  * if you only want to build a specific element from an XML file
  * but not the pipeline it is embedded in.
  *
- * Pass "-" as fname to read from stdin. You can also pass a URI
+ * Pass "-" as fname to read from stdin. You can also pass an URI
  * of any format that libxml supports, including http.
  *
  * Returns: TRUE on success, FALSE otherwise
  */
 gboolean
-gst_xml_parse_file (GstXML * xml, const guchar * fname, const guchar * root)
+gst_xml_parse_file (GstXML * xml, const gchar * fname, const gchar * root)
 {
   xmlDocPtr doc;
 
   g_return_val_if_fail (fname != NULL, FALSE);
 
-  doc = xmlParseFile ((char *) fname);
+  doc = xmlParseFile (fname);
 
   if (!doc) {
     g_warning ("gstxml: XML file \"%s\" could not be read\n", fname);
@@ -313,30 +312,29 @@
   return gst_xml_parse_doc (xml, doc, root);
 }
 
-/* FIXME 0.9: guchar* */
 /**
  * gst_xml_parse_memory:
  * @xml: a pointer to a GstXML object
  * @buffer: a pointer to the in memory XML buffer
  * @size: the size of the buffer
- * @root: the name of the root objects to build
+ * @root: the name of the root objects to build (mot implemented)
  *
  * Fills the GstXML object with the corresponding elements from
  * an in memory XML buffer.
  *
- * Returns: TRUE on success
+ * Returns: TRUE on success, FALSE otherwise
  */
 gboolean
-gst_xml_parse_memory (GstXML * xml, guchar * buffer, guint size,
+gst_xml_parse_memory (GstXML * xml, gchar * buffer, guint size,
     const gchar * root)
 {
   xmlDocPtr doc;
 
   g_return_val_if_fail (buffer != NULL, FALSE);
 
-  doc = xmlParseMemory ((char *) buffer, size);
+  doc = xmlParseMemory (buffer, size);
 
-  return gst_xml_parse_doc (xml, doc, (const xmlChar *) root);
+  return gst_xml_parse_doc (xml, doc, root);
 }
 
 static void
@@ -366,7 +364,6 @@
   return xml->topelements;
 }
 
-/* FIXME 0.9: why is the arg guchar* instead of gchar*? */
 /**
  * gst_xml_get_element:
  * @xml: The GstXML to get the element from
@@ -379,7 +376,7 @@
  * Returns: a pointer to a new GstElement
  */
 GstElement *
-gst_xml_get_element (GstXML * xml, const guchar * name)
+gst_xml_get_element (GstXML * xml, const gchar * name)
 {
   GstElement *element;
   GList *topelements;
@@ -395,7 +392,7 @@
     GstElement *top = GST_ELEMENT (topelements->data);
 
     GST_DEBUG ("gstxml: getting element \"%s\"", name);
-    if (!strcmp (GST_ELEMENT_NAME (top), (char *) name)) {
+    if (!strcmp (GST_ELEMENT_NAME (top), name)) {
       return top;
     } else {
       if (GST_IS_BIN (top)) {
Index: gst/gstxml.h
===================================================================
RCS file: /cvs/gstreamer/gstreamer/gst/gstxml.h,v
retrieving revision 1.32
diff -a -u -r1.32 gstxml.h
--- gst/gstxml.h	27 Sep 2005 20:40:35 -0000	1.32
+++ gst/gstxml.h	4 Dec 2005 16:37:51 -0000
@@ -79,12 +79,12 @@
 
 GstXML*		gst_xml_new		(void);
 
-gboolean	gst_xml_parse_doc	(GstXML *xml, xmlDocPtr doc, const guchar *root);
-gboolean	gst_xml_parse_file	(GstXML *xml, const guchar *fname, const guchar *root);
-gboolean	gst_xml_parse_memory	(GstXML *xml, guchar *buffer, guint size, const gchar *root);
+gboolean	gst_xml_parse_doc	(GstXML *xml, xmlDocPtr doc, const gchar *root);
+gboolean	gst_xml_parse_file	(GstXML *xml, const gchar *fname, const gchar *root);
+gboolean	gst_xml_parse_memory	(GstXML *xml, gchar *buffer, guint size, const gchar *root);
 
 
-GstElement*	gst_xml_get_element	(GstXML *xml, const guchar *name);
+GstElement*	gst_xml_get_element	(GstXML *xml, const gchar *name);
 GList*		gst_xml_get_topelements (GstXML *xml);
 
 GstElement*	gst_xml_make_element	(xmlNodePtr cur, GstObject *parent);
Index: tools/gst-launch.c
===================================================================
RCS file: /cvs/gstreamer/gstreamer/tools/gst-launch.c,v
retrieving revision 1.102
diff -a -u -r1.102 gst-launch.c
--- tools/gst-launch.c	28 Nov 2005 09:55:19 -0000	1.102
+++ tools/gst-launch.c	4 Dec 2005 16:37:53 -0000
@@ -85,7 +85,7 @@
 
   xml = gst_xml_new ();
   /* FIXME guchar from gstxml.c */
-  err = gst_xml_parse_file (xml, (guchar *) arg, NULL);
+  err = gst_xml_parse_file (xml, arg, NULL);
 
   if (err != TRUE) {
     fprintf (stderr, _("ERROR: parse of xml file '%s' failed.\n"), arg);
