summaryrefslogtreecommitdiff
path: root/src/nautilus-canvas-container.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/nautilus-canvas-container.c')
-rw-r--r--src/nautilus-canvas-container.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/src/nautilus-canvas-container.c b/src/nautilus-canvas-container.c
index b85a2adc2..fa28051ff 100644
--- a/src/nautilus-canvas-container.c
+++ b/src/nautilus-canvas-container.c
@@ -6965,6 +6965,7 @@ nautilus_canvas_container_add (NautilusCanvasContainer *container,
void
nautilus_canvas_container_layout_now (NautilusCanvasContainer *container)
{
+ container->details->in_layout_now = TRUE;
if (container->details->idle_id != 0)
{
unschedule_redo_layout (container);
@@ -6975,6 +6976,7 @@ nautilus_canvas_container_layout_now (NautilusCanvasContainer *container)
* newly added files may trigger a change in the size allocation and
* thus toggle scrollbars on */
gtk_container_check_resize (GTK_CONTAINER (gtk_widget_get_parent (GTK_WIDGET (container))));
+ container->details->in_layout_now = FALSE;
}
/**
@@ -8241,6 +8243,10 @@ nautilus_canvas_container_accessible_icon_added_cb (NautilusCanvasContainer *con
AtkObject *atk_parent;
AtkObject *atk_child;
+ /* We don't want to emit children_changed signals during the initial load. */
+ if (!container->details->in_layout_now)
+ return;
+
icon = g_hash_table_lookup (container->details->icon_set, icon_data);
if (icon)
{