Index: gtk/gtkuimanager.c
===================================================================
--- gtk/gtkuimanager.c	(révision 18431)
+++ gtk/gtkuimanager.c	(copie de travail)
@@ -2613,16 +2613,6 @@ update_node (GtkUIManager *self, 
 
       if (info->proxy)
         {
-          /* FIXME: we must re-set the tooltip, since tooltips on 
-           * toolitems can't be set before the toolitem is added 
-           * to the toolbar.
-           */
-	  gchar *tooltip;
-
-	  g_object_get (G_OBJECT (action), "tooltip", &tooltip, NULL);
-	  g_object_set (G_OBJECT (action), "tooltip", tooltip, NULL);
-	  g_free (tooltip);
-     
           g_signal_connect (info->proxy, "notify::visible",
 			    G_CALLBACK (update_smart_separators), NULL);
         }
Index: gtk/gtkaction.c
===================================================================
--- gtk/gtkaction.c	(révision 18431)
+++ gtk/gtkaction.c	(copie de travail)
@@ -1451,13 +1444,8 @@ static void 
 gtk_action_sync_tooltip (GtkAction *action,
 			 GtkWidget *proxy)
 {
-  GtkWidget *parent;
-
-  parent = gtk_widget_get_parent (proxy);
-  
-  if (GTK_IS_TOOL_ITEM (proxy) && GTK_IS_TOOLBAR (parent))
-    gtk_tool_item_set_tooltip_text (GTK_TOOL_ITEM (proxy),
-				    action->private_data->tooltip);
+  gtk_tool_item_set_tooltip_text (GTK_TOOL_ITEM (proxy),
+				  action->private_data->tooltip);
 }
 
 static void 
