diff --git a/ChangeLog b/ChangeLog
index 6a015dd89..07b3af5d1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2003-02-28  Gonzalo Paniagua Javier <gonzalo@ximian.com>
+
+	* api/gdk-api.xml:
+	* sources/Gdk.metadata: hide GdkColormap.AllocColor.
+
+	* gdk/Colormap.custom: AllocColor is here.
+
+	* gconf/tools/schemagen.cs: XmlDocument.Load (string) takes an Uri.
+
 2003-02-28  Miguel de Icaza  <miguel@ximian.com>
 
 	* gdk/Color.custom: Added constructors from System.Drawing.Color
diff --git a/api/gdk-api.xml b/api/gdk-api.xml
index 1611ccb92..df38420a6 100644
--- a/api/gdk-api.xml
+++ b/api/gdk-api.xml
@@ -490,7 +490,7 @@
       <field cname="colors" type="GdkColor*"/>
       <field cname="visual" type="GdkVisual*"/>
       <field cname="windowing_data" type="gpointer"/>
-      <method name="AllocColor" cname="gdk_colormap_alloc_color">
+      <method name="AllocColor" cname="gdk_colormap_alloc_color" hidden="1">
         <return-type type="gboolean"/>
         <parameters>
           <parameter type="GdkColor*" name="color"/>
diff --git a/gconf/tools/schemagen.cs b/gconf/tools/schemagen.cs
index 9bcf1e73f..a7e206b98 100644
--- a/gconf/tools/schemagen.cs
+++ b/gconf/tools/schemagen.cs
@@ -27,7 +27,9 @@ namespace GConf.Tools
 		{
 			XmlDocument doc = new XmlDocument ();
 			try {
-				doc.Load (filename);
+				Stream stream = File.OpenRead (filename);
+				doc.Load (stream);
+				stream.Close ();
 			} catch (XmlException e) {
 				Die ("Could not parse " + filename);
 			}
diff --git a/gdk/Colormap.custom b/gdk/Colormap.custom
index 941f1b692..774f5b3c4 100644
--- a/gdk/Colormap.custom
+++ b/gdk/Colormap.custom
@@ -1,9 +1,18 @@
-[DllImport("libgdk-win32-2.0-0.dll", EntryPoint="gdk_colormap_alloc_color")]
-static extern bool _gdk_colormap_alloc_color(IntPtr raw, ref Gdk.Color color, bool writeable, bool best_match);
+// Gdk.Color.custom - Gdk Color class customizations
+//
+// Authors:
+// 	Gonzalo Paniagua Javier (gonzalo@ximian.com)
+//
+// (c) 2003 Ximian, Inc. (gonzalo@ximian.com)
+//
+// This code is inserted after the automatically generated code.
 
-public bool AllocColor(ref Gdk.Color color, bool writeable, bool best_match) 
+
+[DllImport("libgdk-win32-2.0-0.dll")]
+static extern bool gdk_colormap_alloc_color(IntPtr raw, ref Gdk.Color color, bool writeable, bool best_match);
+
+public bool AllocColor (ref Gdk.Color color, bool writeable, bool best_match)
 {
-	bool raw_ret = _gdk_colormap_alloc_color(Handle, ref color, writeable, best_match);
-	bool ret = raw_ret;
-	return ret;
+	return gdk_colormap_alloc_color (Handle, ref color, writeable, best_match);
 }
+
diff --git a/sources/Gdk.metadata b/sources/Gdk.metadata
index 0e46ffcbf..ee6c48913 100644
--- a/sources/Gdk.metadata
+++ b/sources/Gdk.metadata
@@ -148,6 +148,17 @@
   </data>
 
 </rule>
+<rule>
+  <class name="GdkColormap">
+    <method>AllocColor</method>
+  </class>
+  <data>
+    <attribute target="method">
+      <name>hidden</name>
+      <value>1</value>
+    </attribute>
+  </data>
+</rule>
 
 <rule>
   <class name="GdkPixbufLoader">
@@ -160,5 +171,4 @@
     </attribute>
   </data>
 </rule>
-
 </metadata>