diff --git a/ChangeLog b/ChangeLog
index ceaec38d4..89d1b79b1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2004-05-07  Mike Kestner  <mkestner@ximian.com>
+
+	* gtk/Gtk.metadata : hide TextView with_buffer ctor. map some parms
+	to props.
+	* gtk/Makefile.am : add new custom.
+	* gtk/TextView.custom : implement with_buffer ctor for subclassing.
+
 2004-05-07  Todd Berman  <tberman@sevenl.net>
 
 	* gnome/Gnome.metadata: Hide Druid with_window ctor, map About property.
diff --git a/gtk/Gtk.metadata b/gtk/Gtk.metadata
index 69e121401..3261e8ee1 100644
--- a/gtk/Gtk.metadata
+++ b/gtk/Gtk.metadata
@@ -174,6 +174,8 @@
   <attr path="/api/namespace/object[@cname='GtkSpinButton']/constructor[@cname='gtk_spin_button_new']/*/*[@type='GtkAdjustment*']" name="null_ok">1</attr>
   <attr path="/api/namespace/object[@cname='GtkSpinButton']/constructor[@cname='gtk_spin_button_new_with_range']" name="hidden">1</attr>
   <attr path="/api/namespace/object[@cname='GtkSpinButton']/method[@name='Configure']/*/*[@type='GtkAdjustment*']" name="null_ok">1</attr>
+  <attr path="/api/namespace/object[@cname='GtkTable']/constructor[@cname='gtk_table_new']/*/*[@name='columns']" name="property_name">n_columns</attr>
+  <attr path="/api/namespace/object[@cname='GtkTable']/constructor[@cname='gtk_table_new']/*/*[@name='rows']" name="property_name">n_rows</attr>
   <attr path="/api/namespace/object[@cname='GtkTable']/method[@name='AttachDefaults']" name="name">Attach</attr>
   <attr path="/api/namespace/object[@cname='GtkTable']/method[@name='SetColSpacings']" name="hidden">1</attr>
   <attr path="/api/namespace/object[@cname='GtkTable']/method[@name='SetRowSpacings']" name="hidden">1</attr>
@@ -206,6 +208,7 @@
   <attr path="/api/namespace/object[@cname='GtkTextTag']/method[@name='Event']" name="name">ProcessEvent</attr>
   <attr path="/api/namespace/object[@cname='GtkTextTag']/property[@name='Weight']" name="hidden">1</attr>
   <attr path="/api/namespace/object[@cname='GtkTextTag']/signal[@name='Event']" name="name">TextEvent</attr>
+  <attr path="/api/namespace/object[@cname='GtkTextView']/constructor[@cname='gtk_text_view_new_with_buffer']" name="hidden">1</attr>
   <attr path="/api/namespace/object[@cname='GtkTextView']/method[@name='GetIterAtLocation']/*/*[@type='GtkTextIter*']" name="pass_as">out</attr>
   <attr path="/api/namespace/object[@cname='GtkTextView']/method[@name='GetLineAtY']/*/*[@type='GtkTextIter*']" name="pass_as">out</attr>
   <attr path="/api/namespace/object[@cname='GtkTextView']/method[@name='GetIterLocation']/*/*[@type='GdkRectangle*']" name="pass_as">out</attr>
@@ -213,6 +216,7 @@
   <attr path="/api/namespace/object[@cname='GtkToggleButton']/constructor[@cname='gtk_toggle_button_new_with_mnemonic']" name="preferred">1</attr>
   <attr path="/api/namespace/object[@cname='GtkToggleButton']/method[@name='Toggled']" name="name">Toggle</attr>
   <attr path="/api/namespace/object[@cname='GtkToolbar']/method[@name='AppendItem']/*/*[@type='gpointer']" name="null_ok">1</attr>
+  <attr path="/api/namespace/object[@cname='GtkTreeModelSort']/constructor[@cname='gtk_tree_model_sort_new_with_model']/*/*[@name='child_model']" name="property_name">model</attr>
   <attr path="/api/namespace/object[@cname='GtkTreeModelSort']/method[@name='ConvertChildIterToIter']/*/*[@name='sort_iter']" name="pass_as">out</attr>
   <attr path="/api/namespace/object[@cname='GtkTreeModelSort']/method[@name='ConvertIterToChildIter']/*/*[@name='child_iter']" name="pass_as">out</attr>
   <attr path="/api/namespace/object[@cname='GtkTreeSelection']/method[@name='GetSelected']/*/*" name="pass_as">out</attr>
diff --git a/gtk/TextView.custom b/gtk/TextView.custom
index 8b1378917..b1aba6d9c 100644
--- a/gtk/TextView.custom
+++ b/gtk/TextView.custom
@@ -1 +1,22 @@
+// Gtk.TextView.custom - Gtk TextView class customizations
+//
+// Author: Mike Kestner <mkestner@ximian.com> 
+//
+// Copyright (C) 2004 Novell, Inc.
+//
+// This code is inserted after the automatically generated code.
+		
+		[DllImport ("libgtk-win32-2.0-0.dll")]
+		static extern IntPtr gtk_text_view_new_with_buffer (IntPtr buffer);
+
+		public TextView (TextBuffer buffer) : base (IntPtr.Zero)
+		{
+			if (GetType() != typeof (TextView)) {
+				CreateNativeObject (new string [0], new GLib.Value [0]);
+				Buffer = buffer;
+				return;
+			}
+
+			Raw = gtk_text_view_new_with_buffer (buffer.Handle);
+		}