summaryrefslogtreecommitdiff
path: root/gtk/gtktoolitem.c
diff options
context:
space:
mode:
authorMatthias Clasen <mclasen@redhat.com>2007-01-28 03:16:30 +0000
committerMatthias Clasen <matthiasc@src.gnome.org>2007-01-28 03:16:30 +0000
commitd465fbeda745525485098815a5a702d7d6b031d7 (patch)
tree143f19f67ca1ff1ecf768e8ebd031168d584481a /gtk/gtktoolitem.c
parent0030448e265e50dea73a772e61f558183519fbf7 (diff)
downloadgtk+-d465fbeda745525485098815a5a702d7d6b031d7.tar.gz
Rearrange things so that setting multiple properties causes not more than
2007-01-27 Matthias Clasen <mclasen@redhat.com> * gtk/gtktoolbar.c: * gtk/gtktoolitem.c: * gtk/gtktoolbutton.c: Rearrange things so that setting multiple properties causes not more than a single reconstruction of the contents. * gtk/gtkaction.c (connect_proxy): Set all tool button properties in one go. svn path=/trunk/; revision=17227
Diffstat (limited to 'gtk/gtktoolitem.c')
-rw-r--r--gtk/gtktoolitem.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/gtk/gtktoolitem.c b/gtk/gtktoolitem.c
index c48b7dfe0f..2bd8370ce8 100644
--- a/gtk/gtktoolitem.c
+++ b/gtk/gtktoolitem.c
@@ -265,10 +265,11 @@ gtk_tool_item_finalize (GObject *object)
}
static void
-gtk_tool_item_parent_set (GtkWidget *toolitem,
- GtkWidget *prev_parent)
+gtk_tool_item_parent_set (GtkWidget *toolitem,
+ GtkWidget *prev_parent)
{
- _gtk_tool_item_toolbar_reconfigured (GTK_TOOL_ITEM (toolitem));
+ if (GTK_WIDGET (toolitem)->parent != NULL)
+ _gtk_tool_item_toolbar_reconfigured (GTK_TOOL_ITEM (toolitem));
}
static void