--- gtkuimanager.c.orig	2005-07-31 16:01:34.778553000 -0700
+++ gtkuimanager.c	2005-07-31 16:03:59.452080000 -0700
@@ -2520,12 +2520,6 @@
 	      
 	      gtk_toolbar_insert (GTK_TOOLBAR (toolbar),
 				  GTK_TOOL_ITEM (info->proxy), pos);
-	      
-	      /* FIXME: we must trigger the notify::tooltip handler, since 
-	       * tooltips on toolitems can't be set before the toolitem 
-	       * is added to the toolbar.
-	       */
-	      g_object_notify (G_OBJECT (action), "tooltip");
 	    }
 	}
       else
@@ -2535,6 +2529,13 @@
 						NULL);
 	  gtk_action_connect_proxy (action, info->proxy);
 	}
+
+      /* FIXME: we must trigger the notify::tooltip handler, since 
+       * tooltips on toolitems can't be set before the toolitem 
+       * is added to the toolbar.
+       */
+      g_object_notify (G_OBJECT (action), "tooltip");
+
       g_signal_connect (info->proxy, "notify::visible",
 			G_CALLBACK (update_smart_separators), NULL);
       break;
