diff --git a/ChangeLog b/ChangeLog
index e343295994..98240ecd0c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Mon Jun  4 12:41:25 2001  Owen Taylor  <otaylor@redhat.com>
+
+	* gtk/gtkwidget.h: Deprecate gtk_widget_set().
+
+	* tests/testgtk.c (create_tooltips): Remove usage of
+	gtk_widget_set().
+
 2001-06-05  Havoc Pennington  <hp@redhat.com>
 
 	* gtk/gtkcolorsel.c: Use new mnemonic convenience functions
diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index e343295994..98240ecd0c 100644
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,10 @@
+Mon Jun  4 12:41:25 2001  Owen Taylor  <otaylor@redhat.com>
+
+	* gtk/gtkwidget.h: Deprecate gtk_widget_set().
+
+	* tests/testgtk.c (create_tooltips): Remove usage of
+	gtk_widget_set().
+
 2001-06-05  Havoc Pennington  <hp@redhat.com>
 
 	* gtk/gtkcolorsel.c: Use new mnemonic convenience functions
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index e343295994..98240ecd0c 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,10 @@
+Mon Jun  4 12:41:25 2001  Owen Taylor  <otaylor@redhat.com>
+
+	* gtk/gtkwidget.h: Deprecate gtk_widget_set().
+
+	* tests/testgtk.c (create_tooltips): Remove usage of
+	gtk_widget_set().
+
 2001-06-05  Havoc Pennington  <hp@redhat.com>
 
 	* gtk/gtkcolorsel.c: Use new mnemonic convenience functions
diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index e343295994..98240ecd0c 100644
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,10 @@
+Mon Jun  4 12:41:25 2001  Owen Taylor  <otaylor@redhat.com>
+
+	* gtk/gtkwidget.h: Deprecate gtk_widget_set().
+
+	* tests/testgtk.c (create_tooltips): Remove usage of
+	gtk_widget_set().
+
 2001-06-05  Havoc Pennington  <hp@redhat.com>
 
 	* gtk/gtkcolorsel.c: Use new mnemonic convenience functions
diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index e343295994..98240ecd0c 100644
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,10 @@
+Mon Jun  4 12:41:25 2001  Owen Taylor  <otaylor@redhat.com>
+
+	* gtk/gtkwidget.h: Deprecate gtk_widget_set().
+
+	* tests/testgtk.c (create_tooltips): Remove usage of
+	gtk_widget_set().
+
 2001-06-05  Havoc Pennington  <hp@redhat.com>
 
 	* gtk/gtkcolorsel.c: Use new mnemonic convenience functions
diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index e343295994..98240ecd0c 100644
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,10 @@
+Mon Jun  4 12:41:25 2001  Owen Taylor  <otaylor@redhat.com>
+
+	* gtk/gtkwidget.h: Deprecate gtk_widget_set().
+
+	* tests/testgtk.c (create_tooltips): Remove usage of
+	gtk_widget_set().
+
 2001-06-05  Havoc Pennington  <hp@redhat.com>
 
 	* gtk/gtkcolorsel.c: Use new mnemonic convenience functions
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index e343295994..98240ecd0c 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,10 @@
+Mon Jun  4 12:41:25 2001  Owen Taylor  <otaylor@redhat.com>
+
+	* gtk/gtkwidget.h: Deprecate gtk_widget_set().
+
+	* tests/testgtk.c (create_tooltips): Remove usage of
+	gtk_widget_set().
+
 2001-06-05  Havoc Pennington  <hp@redhat.com>
 
 	* gtk/gtkcolorsel.c: Use new mnemonic convenience functions
diff --git a/gtk/gtkwidget.h b/gtk/gtkwidget.h
index 8bdc5d17be..2fa125fa50 100644
--- a/gtk/gtkwidget.h
+++ b/gtk/gtkwidget.h
@@ -419,9 +419,11 @@ void	   gtk_widget_unref		  (GtkWidget	       *widget);
 void	   gtk_widget_destroy		  (GtkWidget	       *widget);
 void	   gtk_widget_destroyed		  (GtkWidget	       *widget,
 					   GtkWidget	      **widget_pointer);
+#ifndef GTK_DISABLE_DEPRECATED
 void	   gtk_widget_set		  (GtkWidget	       *widget,
 					   const gchar         *first_property_name,
 					   ...);
+#endif /* GTK_DISABLE_DEPRECATED */
 void	   gtk_widget_unparent		  (GtkWidget	       *widget);
 void	   gtk_widget_show		  (GtkWidget	       *widget);
 void       gtk_widget_show_now            (GtkWidget           *widget);
diff --git a/tests/testgtk.c b/tests/testgtk.c
index 956392ae48..5f3611f1ac 100644
--- a/tests/testgtk.c
+++ b/tests/testgtk.c
@@ -2635,14 +2635,14 @@ create_tooltips (void)
 			    "ContextHelp/buttons/?");
       
       
-      gtk_widget_set (g_object_connect (tips_query,
-					"signal::widget_entered", tips_query_widget_entered, toggle,
-					"signal::widget_selected", tips_query_widget_selected, NULL,
-					NULL),
-		      "visible", TRUE,
-		      "parent", box3,
-		      "caller", button,
-		      NULL);
+      g_object_set (g_object_connect (tips_query,
+				      "signal::widget_entered", tips_query_widget_entered, toggle,
+				      "signal::widget_selected", tips_query_widget_selected, NULL,
+				      NULL),
+		    "visible", TRUE,
+		    "parent", box3,
+		    "caller", button,
+		    NULL);
       
       frame = gtk_widget_new (gtk_frame_get_type (),
 			      "label", "ToolTips Inspector",