Update tooltips when reconnecting toolitems. (#312173, Alex Graveley)

2005-08-01  Matthias Clasen  <mclasen@redhat.com>

	* gtk/gtkuimanager.c (update_node): Update tooltips when
	reconnecting toolitems.  (#312173, Alex Graveley)
This commit is contained in:
Matthias Clasen
2005-08-01 16:24:30 +00:00
committed by Matthias Clasen
parent 6bd98ba0f9
commit b9abf2e40e
4 changed files with 16 additions and 6 deletions

View File

@ -1,5 +1,8 @@
2005-08-01 Matthias Clasen <mclasen@redhat.com> 2005-08-01 Matthias Clasen <mclasen@redhat.com>
* gtk/gtkuimanager.c (update_node): Update tooltips when
reconnecting toolitems. (#312173, Alex Graveley)
* gdk/x11/gdkxftdefaults.c: Define the hint styles to make * gdk/x11/gdkxftdefaults.c: Define the hint styles to make
building against fc < 2.2.92 work. (#311839, Damien Carbery) building against fc < 2.2.92 work. (#311839, Damien Carbery)

View File

@ -1,5 +1,8 @@
2005-08-01 Matthias Clasen <mclasen@redhat.com> 2005-08-01 Matthias Clasen <mclasen@redhat.com>
* gtk/gtkuimanager.c (update_node): Update tooltips when
reconnecting toolitems. (#312173, Alex Graveley)
* gdk/x11/gdkxftdefaults.c: Define the hint styles to make * gdk/x11/gdkxftdefaults.c: Define the hint styles to make
building against fc < 2.2.92 work. (#311839, Damien Carbery) building against fc < 2.2.92 work. (#311839, Damien Carbery)

View File

@ -1,5 +1,8 @@
2005-08-01 Matthias Clasen <mclasen@redhat.com> 2005-08-01 Matthias Clasen <mclasen@redhat.com>
* gtk/gtkuimanager.c (update_node): Update tooltips when
reconnecting toolitems. (#312173, Alex Graveley)
* gdk/x11/gdkxftdefaults.c: Define the hint styles to make * gdk/x11/gdkxftdefaults.c: Define the hint styles to make
building against fc < 2.2.92 work. (#311839, Damien Carbery) building against fc < 2.2.92 work. (#311839, Damien Carbery)

View File

@ -2520,12 +2520,6 @@ update_node (GtkUIManager *self,
gtk_toolbar_insert (GTK_TOOLBAR (toolbar), gtk_toolbar_insert (GTK_TOOLBAR (toolbar),
GTK_TOOL_ITEM (info->proxy), pos); 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 else
@ -2535,6 +2529,13 @@ update_node (GtkUIManager *self,
NULL); NULL);
gtk_action_connect_proxy (action, info->proxy); 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_signal_connect (info->proxy, "notify::visible",
G_CALLBACK (update_smart_separators), NULL); G_CALLBACK (update_smart_separators), NULL);
break; break;