From 1f212d7a8f17dda5261056706a584ab97a8f9f75 Mon Sep 17 00:00:00 2001
From: Thomas Vander Stichele <thomas@apestaart.org>
Date: Mon, 12 Aug 2002 16:59:39 +0000
Subject: [PATCH] fixes bug http://bugzilla.gnome.org/show_bug.cgi?id=90333 and
 similar.

Original commit message from CVS:
fixes bug
http://bugzilla.gnome.org/show_bug.cgi?id=90333
and similar.
I'd like to also do s/guchar/gchar/ in the xml functions, any reason not to ?
please comment ;)
---
 gst/gst.c        | 4 ++--
 gst/gstelement.c | 6 +++---
 gst/gstelement.h | 2 +-
 gst/gstpad.c     | 2 +-
 gst/gsttrace.c   | 2 +-
 gst/gsttrace.h   | 2 +-
 6 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/gst/gst.c b/gst/gst.c
index 45749426a6..6eca091ca2 100644
--- a/gst/gst.c
+++ b/gst/gst.c
@@ -434,12 +434,12 @@ init_post (void)
 #ifndef GST_DISABLE_TRACE
   _gst_trace_on = 0;
   if (_gst_trace_on) {
-    gst_trace = gst_trace_new ("gst.trace",1024);
+    gst_trace = gst_trace_new ("gst.trace", 1024);
     gst_trace_set_default (gst_trace);
   }
 #endif /* GST_DISABLE_TRACE */
   if (_gst_progname == NULL) {
-    _gst_progname = g_strdup("gstprog");
+    _gst_progname = g_strdup ("gstprog");
   }
 }
 
diff --git a/gst/gstelement.c b/gst/gstelement.c
index cb88d40dac..225130a097 100644
--- a/gst/gstelement.c
+++ b/gst/gstelement.c
@@ -1252,7 +1252,7 @@ gst_element_get_pad_template_list (GstElement *element)
  * Returns: the padtemplate with the given name. No unreferencing is necessary.
  */
 GstPadTemplate*
-gst_element_get_pad_template (GstElement *element, const guchar *name)
+gst_element_get_pad_template (GstElement *element, const gchar *name)
 {
   GList *padlist;
 
@@ -2333,8 +2333,8 @@ gst_element_restore_thyself (GstObject *object, xmlNodePtr self)
 {
   xmlNodePtr children;
   GstElement *element;
-  guchar *name = NULL;
-  guchar *value = NULL;
+  gchar *name = NULL;
+  gchar *value = NULL;
 
   element = GST_ELEMENT (object);
   g_return_if_fail (element != NULL);
diff --git a/gst/gstelement.h b/gst/gstelement.h
index a5b7674f59..b439f85deb 100644
--- a/gst/gstelement.h
+++ b/gst/gstelement.h
@@ -245,7 +245,7 @@ GstPad*			gst_element_get_compatible_request_pad (GstElement *element, GstPadTem
 GstPad*			gst_element_get_compatible_static_pad (GstElement *element, GstPadTemplate *templ);
 */
 
-GstPadTemplate*		gst_element_get_pad_template		(GstElement *element, const guchar *name);
+GstPadTemplate*		gst_element_get_pad_template		(GstElement *element, const gchar *name);
 GList*			gst_element_get_pad_template_list	(GstElement *element);
 GstPadTemplate*		gst_element_get_compatible_pad_template (GstElement *element, GstPadTemplate *compattempl);
 
diff --git a/gst/gstpad.c b/gst/gstpad.c
index f61b671fa4..607d43c180 100644
--- a/gst/gstpad.c
+++ b/gst/gstpad.c
@@ -1880,7 +1880,7 @@ gst_pad_load_and_connect (xmlNodePtr self,
 {
   xmlNodePtr field = self->xmlChildrenNode;
   GstPad *pad = NULL, *targetpad;
-  guchar *peer = NULL;
+  gchar *peer = NULL;
   gchar **split;
   GstElement *target;
   GstObject *grandparent;
diff --git a/gst/gsttrace.c b/gst/gsttrace.c
index b792169cc4..4ff8aa2332 100644
--- a/gst/gsttrace.c
+++ b/gst/gsttrace.c
@@ -56,7 +56,7 @@ GstTrace *_gst_trace_default = NULL;
 gint _gst_trace_on = 1;
 
 GstTrace *
-gst_trace_new (guchar * filename, gint size)
+gst_trace_new (gchar * filename, gint size)
 {
   GstTrace *trace = g_malloc (sizeof (GstTrace));
 
diff --git a/gst/gsttrace.h b/gst/gsttrace.h
index d342e26549..410a530ce3 100644
--- a/gst/gsttrace.h
+++ b/gst/gsttrace.h
@@ -51,7 +51,7 @@ struct _GstTraceEntry {
   gchar message[112];
 };
 
-GstTrace*	gst_trace_new			(guchar *filename, gint size);
+GstTrace*	gst_trace_new			(gchar *filename, gint size);
 
 void 		gst_trace_destroy		(GstTrace *trace);
 void 		gst_trace_flush			(GstTrace *trace);