Index: gtk/gtkaction.c
===================================================================
RCS file: /cvs/gnome/gtk+/gtk/gtkaction.c,v
retrieving revision 1.37.2.4
diff -u -p -r1.37.2.4 gtkaction.c
--- gtk/gtkaction.c	7 Apr 2005 02:53:11 -0000	1.37.2.4
+++ gtk/gtkaction.c	17 Apr 2005 17:26:23 -0000
@@ -888,6 +888,8 @@ connect_proxy (GtkAction     *action, 
     }
   else if (GTK_IS_TOOL_ITEM (proxy))
     {
+      GParamSpec *pspec;
+
       /* toolbar item specific synchronisers ... */
 
       g_object_set (proxy,
@@ -895,9 +897,11 @@ connect_proxy (GtkAction     *action, 
 		    "visible_vertical",	  action->private_data->visible_vertical,
 		    "is_important", action->private_data->is_important,
 		    NULL);
-      /* FIXME: we should set the tooltip here, but the current api
-       * doesn't allow it before the item is added to a toolbar. 
-       */
+
+      pspec = g_object_class_find_property (G_OBJECT_GET_CLASS (action),
+                                            "tooltip");
+      gtk_action_sync_tooltip (action, pspec, proxy);
+
       g_signal_connect_object (action, "notify::visible-horizontal",
 			       G_CALLBACK (gtk_action_sync_property), 
 			       proxy, 0);
@@ -925,9 +929,7 @@ connect_proxy (GtkAction     *action, 
 			"use_underline", TRUE,
 			"stock_id", action->private_data->stock_id,
 			NULL);
-	  /* FIXME: we should set the tooltip here, but the current api
-	   * doesn't allow it before the item is added to a toolbar. 
-	   */
+
 	  g_signal_connect_object (action, "notify::short-label",
 				   G_CALLBACK (gtk_action_sync_short_label),
 				   proxy, 0);      
Index: gtk/gtkuimanager.c
===================================================================
RCS file: /cvs/gnome/gtk+/gtk/gtkuimanager.c,v
retrieving revision 1.69.2.4
diff -u -p -r1.69.2.4 gtkuimanager.c
--- gtk/gtkuimanager.c	7 Apr 2005 04:45:31 -0000	1.69.2.4
+++ gtk/gtkuimanager.c	17 Apr 2005 17:26:24 -0000
@@ -2056,7 +2056,6 @@ update_node (GtkUIManager *self, 
   Node *info;
   GNode *child;
   GtkAction *action;
-  gchar *tooltip;
   const gchar *action_name;
   NodeUIReference *ref;
   
@@ -2441,9 +2440,7 @@ update_node (GtkUIManager *self, 
 	       * tooltips on toolitems can't be set before the toolitem 
 	       * is added to the toolbar.
 	       */
-	      g_object_get (action, "tooltip", &tooltip, NULL);
-	      g_object_set (action, "tooltip", tooltip, NULL);
-	      g_free (tooltip);
+              g_object_notify (G_OBJECT (action), "tooltip");
 	    }
 	}
       else
