diff --git a/ChangeLog b/ChangeLog
index 743b90dcb..1b4077e7d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,14 @@
 2005-02-11  Dan Winship  <danw@novell.com>
 
+	* gtk/Gtk.metadata: Hide StyleGetProperty and StyleGetValist since
+	they're generated wrong, and StyleGet to avoid an ellipsis
+	warning. (Also hide the deprecated ellipsis method "Set".)
+
+	* gtk/Widget.custom (StyleGetProperty): implement manually, a la
+	Gtk.Container.ChildGetProperty.
+
+	* gtk/glue/widget.c (gtksharp_widget_style_get_property): glue for that
+
 	* generator/MethodBase.cs (Validate): use CName rather than always
 	saying "in ctor"
 
diff --git a/doc/ChangeLog b/doc/ChangeLog
index 0bff51465..ec9bdf1dd 100644
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,3 +1,7 @@
+2005-02-11  Dan Winship  <danw@novell.com>
+
+	* en/Gtk/Widget.xml (StyleGetValist, StyleGetProperty): update
+
 2005-02-07  Ben Maurer  <bmaurer@ximian.com>
 
 	* en/Gdk/Point.xml, en/Gdk/Rectangle.xml: Document new
diff --git a/doc/en/Gtk/Widget.xml b/doc/en/Gtk/Widget.xml
index 1f1f0122e..20a96e5fe 100644
--- a/doc/en/Gtk/Widget.xml
+++ b/doc/en/Gtk/Widget.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Type Name="Widget" FullName="Gtk.Widget">
   <TypeSignature Language="C#" Value="public class Widget : Gtk.Object, Implementor, IWrapper, IWrapper, IDisposable" Maintainer="Hector Gomez M" />
   <AssemblyInfo>
@@ -17,7 +17,7 @@
       Style properties are set in resource files. This mechanism is used for configuring such things as the location of the scrollbar arrows through the theme, giving theme authors more control over the look of applications without the need to write a theme engine in C.
      </para>
       <para>
-      Use <see cref="M:Gtk.Widget.StyleGetProperty" />, <see cref="P:Gtk.Widget.Style" /> or <see cref="M:Gtk.Widget.StyleGetValist" /> to obtain the value of a style property.
+      Use <see cref="M:Gtk.Widget.StyleGetProperty" /> to obtain the value of a style property.
      </para>
     </remarks>
   </Docs><Base>
@@ -312,27 +312,6 @@
         </remarks>
       </Docs>
     </Member>
-    <Member MemberName="StyleGetValist">
-      <MemberSignature Language="C#" Value="public void StyleGetValist (string first_property_name, IntPtr var_args);" />
-      <MemberType>Method</MemberType>
-      <ReturnValue>
-        <ReturnType>System.Void</ReturnType>
-      </ReturnValue>
-      <Parameters>
-        <Parameter Name="first_property_name" Type="System.String" />
-        <Parameter Name="var_args" Type="System.IntPtr" />
-      </Parameters>
-      <Docs>
-        <summary>Gets the values of a multiple style properties of <paramref name="widgets" />.</summary>
-        <param name="first_property_name">The name of the first property to get.</param>
-        <param name="var_args">A va_list of pairs of property names and locations to return the property values, starting with the location for <paramref name="first_property_name" />.</param>
-        <remarks>
-          <para>
-          Gets the values of a multiple style properties of <paramref name="widget" />. Used primarily by language bindings.
-         </para>
-        </remarks>
-      </Docs>
-    </Member>
     <Member MemberName="ShowAll">
       <MemberSignature Language="C#" Value="public void ShowAll ();" />
       <MemberType>Method</MemberType>
@@ -2602,19 +2581,17 @@ handle focus grabs.</returns>
       </Docs>
     </Member>
     <Member MemberName="StyleGetProperty">
-      <MemberSignature Language="C#" Value="public void StyleGetProperty (string property_name, GLib.Value value);" />
+      <MemberSignature Language="C#" Value="public object StyleGetProperty (string property_name);" />
       <MemberType>Method</MemberType>
       <ReturnValue>
-        <ReturnType>System.Void</ReturnType>
+        <ReturnType>System.Object</ReturnType>
       </ReturnValue>
       <Parameters>
         <Parameter Name="property_name" Type="System.String" />
-        <Parameter Name="value" Type="GLib.Value" />
       </Parameters>
       <Docs>
         <summary>Obtains the value of a style property of <paramref name="widget" />.</summary>
         <param name="property_name">The name of a style property.</param>
-        <param name="value">Location to return the property value.</param>
         <remarks />
       </Docs>
     </Member>
diff --git a/gtk/Gtk.metadata b/gtk/Gtk.metadata
index 0f3f6a385..c4a0d72bf 100644
--- a/gtk/Gtk.metadata
+++ b/gtk/Gtk.metadata
@@ -417,8 +417,13 @@
   <attr path="/api/namespace/object[@cname='GtkWidget']/method[@name='SetEvents']/*/*[@type='gint']" name="type">GdkEventMask</attr>
   <attr path="/api/namespace/object[@cname='GtkWidget']/method[@name='ModifyFont']/parameters/parameter[@type='PangoFontDescription*']" name="null_ok">1</attr>
   <attr path="/api/namespace/object[@cname='GtkWidget']/method[@name='SetScrollAdjustments']/*/*[@type='GtkAdjustment*']" name="null_ok">1</attr>
+  <attr path="/api/namespace/object[@cname='GtkWidget']/method[@name='Set']" name="hidden">1</attr>
+  <attr path="/api/namespace/object[@cname='GtkWidget']/method[@name='SetState']" name="hidden">1</attr>
   <attr path="/api/namespace/object[@cname='GtkWidget']/method[@name='SetStyle']/*/*[@type='GtkStyle*']" name="null_ok">1</attr>
   <attr path="/api/namespace/object[@cname='GtkWidget']/method[@name='SizeRequest']/*/*[@name='requisition']" name="pass_as">out</attr>
+  <attr path="/api/namespace/object[@cname='GtkWidget']/method[@name='StyleGet']" name="hidden">1</attr>
+  <attr path="/api/namespace/object[@cname='GtkWidget']/method[@name='StyleGetProperty']" name="hidden">1</attr>
+  <attr path="/api/namespace/object[@cname='GtkWidget']/method[@name='StyleGetValist']" name="hidden">1</attr>
   <attr path="/api/namespace/object[@cname='GtkWidget']/method[@name='Unref']" name="hidden">1</attr>
   <attr path="/api/namespace/object[@cname='GtkWidget']/signal[@name='CanActivateAccel']" name="name">AccelCanActivate</attr>
   <attr path="/api/namespace/object[@cname='GtkWidget']/signal[@name='ChildNotify']" name="name">ChildNotified</attr>
@@ -436,7 +441,6 @@
   <attr path="/api/namespace/object[@cname='GtkWidget']/signal[@name='SizeRequested']/*/*[@name='requisition']" name="pass_as">ref</attr>
   <attr path="/api/namespace/object[@cname='GtkWidget']/signal[@name='Unmap']" name="name">Unmapped</attr>
   <attr path="/api/namespace/object[@cname='GtkWidget']/signal[@name='Unrealize']" name="name">Unrealized</attr>
-  <attr path="/api/namespace/object[@cname='GtkWidget']/method[@name='SetState']" name="hidden">1</attr>
   <attr path="/api/namespace/object[@cname='GtkWindow']/method[@name='GetDefaultIconList']" name="hidden">1</attr>
   <attr path="/api/namespace/object[@cname='GtkWindow']/method[@name='GetDefaultSize']/*/*[@type='gint*']" name="pass_as">out</attr>
   <attr path="/api/namespace/object[@cname='GtkWindow']/method[@name='GetIconList']" name="hidden">1</attr>
diff --git a/gtk/Widget.custom b/gtk/Widget.custom
index 76b92b74d..16210748c 100644
--- a/gtk/Widget.custom
+++ b/gtk/Widget.custom
@@ -294,3 +294,15 @@ static void ClassInit (GLib.GType gtype, Type t)
 	}
 }
 
+[DllImport("gtksharpglue-2")]
+static extern void gtksharp_widget_style_get_property (IntPtr widget, string property, ref GLib.Value value);
+
+public object StyleGetProperty (string property_name) {
+	GLib.Value value = new GLib.Value ();
+	object ret;
+
+	gtksharp_widget_style_get_property (Handle, property_name, ref value);
+	ret = value.Val;
+	value.Dispose ();
+	return ret;
+}
diff --git a/gtk/glue/widget.c b/gtk/glue/widget.c
index a235b88d2..a562d187a 100644
--- a/gtk/glue/widget.c
+++ b/gtk/glue/widget.c
@@ -38,6 +38,7 @@ void gtksharp_gtk_widget_set_flags (GtkWidget *widget, int flags);
 int gtksharp_gtk_widget_style_get_int (GtkWidget *widget, const char *name);
 void gtksharp_widget_add_binding_signal (GType gtype, const char *sig_name, GCallback cb);
 void gtksharp_widget_register_binding (GType gtype, const char *sig_name, guint key, int mod, gpointer data);
+void gtksharp_widget_style_get_property (GtkWidget *widget, const gchar* property, GValue *value);
 /* */
 
 GdkRectangle*
@@ -160,3 +161,11 @@ gtksharp_widget_register_binding (GType gtype, const gchar *signame, guint key,
 	gtk_binding_entry_add_signal (set, key, mod, signame, 1, G_TYPE_LONG, data);
 }
 
+void
+gtksharp_widget_style_get_property (GtkWidget *widget, const gchar* property, GValue *value)
+{
+	GParamSpec *spec = gtk_widget_class_find_style_property (GTK_WIDGET_GET_CLASS (widget), property);
+	g_value_init (value, spec->value_type);
+	gtk_widget_style_get_property (widget, property, value);
+}
+