diff --git a/ChangeLog b/ChangeLog
index 1ccb1f2026..d045030e85 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,9 +1,14 @@
 2007-07-24  Matthias Clasen  <mclasen@redhat.com>
 
-	* gtkcolorsel.c:
-	* gtkfilechooserdefault.c:
-	* gtkpagesetupunixdialog.c:
-	* gtkprintunixdialog.c: Port to use new tooltips API.  
+	* gtk/gtkmenutoolbutton.c: Remove obsolete set-tooltip 
+	handler.  (#458280, Christian Persch)
+
+2007-07-24  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/gtkcolorsel.c:
+	* gtk/gtkfilechooserdefault.c:
+	* gtk/gtkpagesetupunixdialog.c:
+	* gtk/gtkprintunixdialog.c: Port to use new tooltips API.  
 	(#451397, Jan Arne Petersen)
 
 2007-07-24  Tor Lillqvist  <tml@novell.com>
diff --git a/gtk/gtkmenutoolbutton.c b/gtk/gtkmenutoolbutton.c
index fd43b7e971..8b20766871 100644
--- a/gtk/gtkmenutoolbutton.c
+++ b/gtk/gtkmenutoolbutton.c
@@ -65,22 +65,6 @@ static gint signals[LAST_SIGNAL];
 
 G_DEFINE_TYPE (GtkMenuToolButton, gtk_menu_tool_button, GTK_TYPE_TOOL_BUTTON)
 
-static gboolean
-gtk_menu_tool_button_set_tooltip (GtkToolItem *tool_item,
-                                  GtkTooltips *tooltips,
-                                  const char  *tip_text,
-                                  const char  *tip_private)
-{
-  GtkMenuToolButton *button;
-
-  g_return_val_if_fail (GTK_IS_MENU_TOOL_BUTTON (tool_item), FALSE);
-
-  button = GTK_MENU_TOOL_BUTTON (tool_item);
-  gtk_tooltips_set_tip (tooltips, button->priv->button, tip_text, tip_private);
-
-  return TRUE;
-}
-
 static void
 gtk_menu_tool_button_construct_contents (GtkMenuToolButton *button)
 {
@@ -218,7 +202,6 @@ gtk_menu_tool_button_class_init (GtkMenuToolButtonClass *klass)
   object_class->get_property = gtk_menu_tool_button_get_property;
   gtk_object_class->destroy = gtk_menu_tool_button_destroy;
   widget_class->state_changed = gtk_menu_tool_button_state_changed;
-  toolitem_class->set_tooltip = gtk_menu_tool_button_set_tooltip;
   toolitem_class->toolbar_reconfigured = gtk_menu_tool_button_toolbar_reconfigured;
 
   signals[SHOW_MENU] =