gconf: Rename gconf.[ch] to gstgconf.[ch] to prevent name conflicts

4 files changed, 4 insertions, 4 deletions

diff --git a/ext/gconf/Makefile.am b/ext/gconf/Makefile.am
index 4f6f63ad..330cf29f 100644
--- a/ext/gconf/Makefile.am
+++ b/ext/gconf/Makefile.am
@@ -7,7 +7,7 @@ libgstgconfelements_la_SOURCES = \
 	gstgconfvideosink.c \
 	gstgconfvideosrc.c \
 	gstswitchsink.c \
-	gconf.c
+	gstgconf.c
 
 DIR_CFLAGS = -DGST_GCONF_DIR=\"/system/gstreamer/@GST_MAJORMINOR@\"
 libgstgconfelements_la_CFLAGS = $(GST_CFLAGS) $(GCONF_CFLAGS) $(DIR_CFLAGS)
@@ -22,4 +22,4 @@ noinst_HEADERS = \
 	gstgconfvideosink.h \
 	gstgconfvideosrc.h \
 	gstswitchsink.h \
-	gconf.h
+	gstgconf.h
diff --git a/ext/gconf/gconf.c b/ext/gconf/gstgconf.c
index e7214e2d..eee80c9d 100644
--- a/ext/gconf/gconf.c
+++ b/ext/gconf/gstgconf.c
@@ -29,7 +29,7 @@
 
 #include <gst/gst.h>
 
-#include "gconf.h"
+#include "gstgconf.h"
 #include "gstgconfelements.h"   /* for debug category */
 
 #ifndef GST_GCONF_DIR
diff --git a/ext/gconf/gconf.h b/ext/gconf/gstgconf.h
index b1153e93..b1153e93 100644
--- a/ext/gconf/gconf.h
+++ b/ext/gconf/gstgconf.h
diff --git a/ext/gconf/gstgconfelements.h b/ext/gconf/gstgconfelements.h
index 1b3efe3c..872b2f2d 100644
--- a/ext/gconf/gstgconfelements.h
+++ b/ext/gconf/gstgconfelements.h
@@ -20,7 +20,7 @@
 #ifndef __GST_GCONF_ELEMENTS_H__
 #define __GST_GCONF_ELEMENTS_H__
 
-#include <gconf.h>
+#include "gstgconf.h"
 
 GST_DEBUG_CATEGORY_EXTERN (gconf_debug);
 #define GST_CAT_DEFAULT gconf_debug