diff --git a/ChangeLog b/ChangeLog
index ef8876051..69331123a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2003-10-14  Mike Kestner  <mkestner@ximian.com>
+
+	* gtk/Gtk.metadata : rule for ClipboardGetFunc
+	* gtk/Clipboard.custom : comment out for now don't think any
+	of this is needed.
+	* gtk/ClipboardClearFunc.cs : gen'd now
+	* gtk/ClipboardGetFunc.cs : gen'd now
+	* gtk/GtkSharp.GtkClipboardClearFuncNative.cs : gen'd now
+	* gtk/GtkSharp.GtkClipboardGetFuncNative.cs : gen'd now
+	* gtk/gtk-api.xml : regenerated
+	* sources/Gtk.metadata : remove a couple clipboard hides
+	
 2003-10-14  Mike Kestner  <mkestner@ximian.com>
 
 	* gtk/gtk-api.xml : regenerated
diff --git a/gtk/Clipboard.custom b/gtk/Clipboard.custom
index 9e3f03fdd..6d3852d56 100644
--- a/gtk/Clipboard.custom
+++ b/gtk/Clipboard.custom
@@ -1,4 +1,5 @@
 
+/*
 		public static Hashtable clipboard_objects = new Hashtable ();
 		private static uint clipboard_object_next_id = 0;
 
@@ -50,4 +51,5 @@
 
 			return ret;
 		}
+*/
 
diff --git a/gtk/ClipboardClearFunc.cs b/gtk/ClipboardClearFunc.cs
deleted file mode 100644
index e09bc497a..000000000
--- a/gtk/ClipboardClearFunc.cs
+++ /dev/null
@@ -1,8 +0,0 @@
-// Generated File.  Do not modify.
-// <c> 2001-2002 Mike Kestner
-
-namespace Gtk {
-
-	public delegate void ClipboardClearFunc(Gtk.Clipboard clipboard, object o);
-
-}
diff --git a/gtk/ClipboardGetFunc.cs b/gtk/ClipboardGetFunc.cs
deleted file mode 100644
index a6118598c..000000000
--- a/gtk/ClipboardGetFunc.cs
+++ /dev/null
@@ -1,8 +0,0 @@
-// Generated File.  Do not modify.
-// <c> 2001-2002 Mike Kestner
-
-namespace Gtk {
-
-	public delegate void ClipboardGetFunc(Gtk.Clipboard clipboard, ref Gtk.SelectionData selection_data, uint info, object o);
-
-}
diff --git a/gtk/Gtk.metadata b/gtk/Gtk.metadata
index db93aece0..30084e3e3 100644
--- a/gtk/Gtk.metadata
+++ b/gtk/Gtk.metadata
@@ -1,5 +1,6 @@
 <?xml version="1.0"?>
 <metadata>
+  <attr path="//callback[@cname='GtkClipboardGetFunc']/*/*[@type='GtkSelectionData*']" name="pass_as">ref</attr>
   <attr path="//interface[@cname='GtkEditable']/method[@name='InsertText']/*/*[@name='position']" name="pass_as">ref</attr>
   <attr path="//interface[@cname='GtkTreeModel']/method[@name='GetIter']/*/*[@name='iter']" name="pass_as">out</attr>
   <attr path="//interface[@cname='GtkTreeModel']/method[@name='GetIterFirst']/*/*[@name='iter']" name="pass_as">out</attr>
diff --git a/gtk/GtkSharp.GtkClipboardClearFuncNative.cs b/gtk/GtkSharp.GtkClipboardClearFuncNative.cs
deleted file mode 100644
index bcb2af846..000000000
--- a/gtk/GtkSharp.GtkClipboardClearFuncNative.cs
+++ /dev/null
@@ -1,31 +0,0 @@
-
-namespace GtkSharp {
-
-	using System;
-	using System.Collections;
-	public delegate void GtkClipboardClearFuncNative(IntPtr clipboard, uint objid);
-
-	public class GtkClipboardClearFuncWrapper : GLib.DelegateWrapper {
-
-		public void NativeCallback (IntPtr clipboard, uint objid)
-		{
-			object[] _args = new object[2];
-			_args[0] = (Gtk.Clipboard) GLib.Object.GetObject(clipboard, false);
-			if (_args[0] == null)
-				_args[0] = new Gtk.Clipboard(clipboard);
-                        _args[1] = Gtk.Clipboard.clipboard_objects[objid];
-			_managed ((Gtk.Clipboard) _args[0], _args[1]);
-                        Gtk.Clipboard.clipboard_objects.Remove (objid);
-		}
-
-		public GtkClipboardClearFuncNative NativeDelegate;
-		protected Gtk.ClipboardClearFunc _managed;
-
-		public GtkClipboardClearFuncWrapper (Gtk.ClipboardClearFunc managed, object o) : base (o)
-		{
-			NativeDelegate = new GtkClipboardClearFuncNative (NativeCallback);
-			_managed = managed;
-		}
-	}
-
-}
diff --git a/gtk/GtkSharp.GtkClipboardGetFuncNative.cs b/gtk/GtkSharp.GtkClipboardGetFuncNative.cs
deleted file mode 100644
index 4a52573f8..000000000
--- a/gtk/GtkSharp.GtkClipboardGetFuncNative.cs
+++ /dev/null
@@ -1,33 +0,0 @@
-
-namespace GtkSharp {
-
-	using System;
-	using System.Collections;
-	public delegate void GtkClipboardGetFuncNative(IntPtr clipboard, ref Gtk.SelectionData selection_data, uint info, uint obj_id);
-
-	public class GtkClipboardGetFuncWrapper : GLib.DelegateWrapper {
-
-		public void NativeCallback (IntPtr clipboard, ref Gtk.SelectionData selection_data, uint info, uint obj_id)
-		{
-			object[] _args = new object[4];
-			_args[0] = (Gtk.Clipboard) GLib.Object.GetObject(clipboard, false);
-			if (_args[0] == null)
-				_args[0] = new Gtk.Clipboard(clipboard);
-			_args[1] = selection_data;
-			_args[2] = info;
-                        _args[3] = Gtk.Clipboard.clipboard_objects[obj_id];
-
-			_managed ((Gtk.Clipboard) _args[0], ref selection_data, (uint) _args[2], _args[3]);
-		}
-
-		public GtkClipboardGetFuncNative NativeDelegate;
-		protected Gtk.ClipboardGetFunc _managed;
-
-		public GtkClipboardGetFuncWrapper (Gtk.ClipboardGetFunc managed, object o) : base (o)
-		{
-			NativeDelegate = new GtkClipboardGetFuncNative (NativeCallback);
-			_managed = managed;
-		}
-	}
-
-}
diff --git a/gtk/gtk-api.xml b/gtk/gtk-api.xml
index 314dc1431..ee7cf41ba 100644
--- a/gtk/gtk-api.xml
+++ b/gtk/gtk-api.xml
@@ -533,18 +533,18 @@
         <parameter type="GtkArg*" name="args" />
       </parameters>
     </callback>
-    <callback name="ClipboardClearFunc" cname="GtkClipboardClearFunc" hidden="1">
+    <callback name="ClipboardClearFunc" cname="GtkClipboardClearFunc">
       <return-type type="void" />
       <parameters>
         <parameter type="GtkClipboard*" name="clipboard" />
         <parameter type="gpointer" name="user_data_or_owner" />
       </parameters>
     </callback>
-    <callback name="ClipboardGetFunc" cname="GtkClipboardGetFunc" hidden="1">
+    <callback name="ClipboardGetFunc" cname="GtkClipboardGetFunc">
       <return-type type="void" />
       <parameters>
         <parameter type="GtkClipboard*" name="clipboard" />
-        <parameter type="GtkSelectionData*" name="selection_data" />
+        <parameter type="GtkSelectionData*" name="selection_data" pass_as="ref" />
         <parameter type="guint" name="info" />
         <parameter type="gpointer" name="user_data_or_owner" />
       </parameters>
diff --git a/sources/Gtk.metadata b/sources/Gtk.metadata
index 041d10375..362c7ec1e 100644
--- a/sources/Gtk.metadata
+++ b/sources/Gtk.metadata
@@ -1183,8 +1183,6 @@
   <class name="GtkBindingSet"/>
   <class name="GtkBorder"/>
   <class name="GtkBoxChild"/>
-  <class name="GtkClipboardClearFunc"/>
-  <class name="GtkClipboardGetFunc"/>
   <class name="GtkDebugFlag"/>
   <class name="GtkDestDefaults"/>
   <class name="GtkExpanderStyle"/>