when creating a new box, be sure to transfer a possible tooltip from the

2007-09-10  Kristian Rietveld  <kris@imendio.com>

	* gtk/gtkmenutoolbutton.c (gtk_menu_tool_button_construct_contents):
	when creating a new box, be sure to transfer a possible tooltip from
	the old to the new box. (Fixes #458283, reported by Christian Persch).

svn path=/trunk/; revision=18785

diff --git a/ChangeLog b/ChangeLog
index 8b6806e19c3042acb45e2070972c3e90fbce0cd8..61d830d644ae3e36f533e6343fc2f692b6df24da 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2007-09-10  Kristian Rietveld  <kris@imendio.com>
+
+       * gtk/gtkmenutoolbutton.c (gtk_menu_tool_button_construct_contents):
+       when creating a new box, be sure to transfer a possible tooltip from
+       the old to the new box. (Fixes #458283, reported by Christian Persch).
+
 2007-09-10  Kristian Rietveld  <kris@imendio.com>
 
        * gtk/gtktreeview.c (gtk_tree_view_key_press): only start

diff --git a/gtk/gtkmenutoolbutton.c b/gtk/gtkmenutoolbutton.c
index 8b20766871e9a4f7d5f4cb99b4881a16e8cf57ff..8d7f611ea5afe4a58c190cdbd4e1d893591cbd14 100644 (file)
--- a/gtk/gtkmenutoolbutton.c
+++ b/gtk/gtkmenutoolbutton.c
@@ -106,6 +106,17 @@ gtk_menu_tool_button_construct_contents (GtkMenuToolButton *button)
 
   if (priv->box)
     {
+      gchar *tmp;
+
+      /* Transfer a possible tooltip to the new box */
+      g_object_get (priv->box, "tooltip-markup", &tmp, NULL);
+
+      if (tmp)
+        {
+         g_object_set (box, "tooltip-markup", tmp, NULL);
+         g_free (tmp);
+       }
+
       /* Note: we are not destroying the button and the arrow_button
        * here because they were removed from their container above
        */