Index: gst/Makefile.am
===================================================================
RCS file: /cvs/gstreamer/gstreamer/gst/Makefile.am,v
retrieving revision 1.218
diff -u -p -r1.218 Makefile.am
--- gst/Makefile.am	16 Aug 2006 11:47:54 -0000	1.218
+++ gst/Makefile.am	4 Oct 2006 17:54:34 -0000
@@ -9,7 +9,7 @@ endif
 if GST_DISABLE_REGISTRY
 GST_REGISTRY_SRC = 
 else
-GST_REGISTRY_SRC = gstregistryxml.c
+GST_REGISTRY_SRC = gstregistrybinary.c
 endif
 
 if GST_DISABLE_PARSE
Index: gst/gst.c
===================================================================
RCS file: /cvs/gstreamer/gstreamer/gst/gst.c,v
retrieving revision 1.225
diff -u -p -r1.225 gst.c
--- gst/gst.c	3 Oct 2006 15:10:51 -0000	1.225
+++ gst/gst.c	4 Oct 2006 17:54:35 -0000
@@ -587,7 +587,7 @@ scan_and_update_registry (GstRegistry * 
   GList *l;
 
   GST_DEBUG ("reading registry cache: %s", registry_file);
-  gst_registry_xml_read_cache (default_registry, registry_file);
+  gst_registry_binary_read_cache (default_registry, registry_file);
 
   /* scan paths specified via --gst-plugin-path */
   GST_DEBUG ("scanning paths added via --gst-plugin-path");
@@ -661,7 +661,7 @@ scan_and_update_registry (GstRegistry * 
   }
 
   GST_INFO ("Registry cache changed. Writing new registry cache");
-  if (!gst_registry_xml_write_cache (default_registry, registry_file)) {
+  if (!gst_registry_binary_write_cache (default_registry, registry_file)) {
     g_set_error (error, GST_CORE_ERROR, GST_CORE_ERROR_FAILED,
         _("Error writing registry cache to %s: %s"),
         registry_file, g_strerror (errno));
@@ -767,7 +767,7 @@ ensure_current_registry_forking (GstRegi
 
     if (res_byte == '1') {
       GST_DEBUG ("Child succeeded. Parent reading registry cache");
-      gst_registry_xml_read_cache (default_registry, registry_file);
+      gst_registry_binary_read_cache (default_registry, registry_file);
     } else {
       GST_DEBUG ("Child failed. Parent re-scanning registry, ignoring errors.");
       scan_and_update_registry (default_registry, registry_file, FALSE, NULL);
@@ -789,7 +789,7 @@ ensure_current_registry (GError ** error
   registry_file = g_strdup (g_getenv ("GST_REGISTRY"));
   if (registry_file == NULL) {
     registry_file = g_build_filename (g_get_home_dir (),
-        ".gstreamer-" GST_MAJORMINOR, "registry." HOST_CPU ".xml", NULL);
+        ".gstreamer-" GST_MAJORMINOR, "registry." HOST_CPU ".bin", NULL);
   }
 
   /* first see if forking is enabled */
Index: gst/gstregistry.h
===================================================================
RCS file: /cvs/gstreamer/gstreamer/gst/gstregistry.h,v
retrieving revision 1.37
diff -u -p -r1.37 gstregistry.h
--- gst/gstregistry.h	28 Sep 2006 14:00:43 -0000	1.37
+++ gst/gstregistry.h	4 Oct 2006 17:54:36 -0000
@@ -106,8 +106,8 @@ GstPluginFeature*	gst_registry_find_feat
 GstPlugin * 		gst_registry_lookup 		(GstRegistry *registry, const char *filename);
 GstPluginFeature * 	gst_registry_lookup_feature 	(GstRegistry *registry, const char *name);
 
-gboolean 		gst_registry_xml_read_cache 	(GstRegistry * registry, const char *location);
-gboolean 		gst_registry_xml_write_cache 	(GstRegistry * registry, const char *location);
+gboolean 		gst_registry_binary_read_cache 	(GstRegistry * registry, const char *location);
+gboolean 		gst_registry_binary_write_cache	(GstRegistry * registry, const char *location);
 
 /* convinience defines for the default registry */
 
