From 0039418001baf82e740c636e1f3ef29850219c44 Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen@redhat.com>
Date: Sat, 27 Aug 2011 11:45:01 -0400
Subject: [PATCH] GtkToolbar: partial fix for toolbar editing

When using an editable toolbar in evince, we can end up
in gtk_toolbar_get_visible() position with item being the
highlight_tool_item, but not one of the regular children.
So, handle that.
---
 gtk/gtktoolbar.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/gtk/gtktoolbar.c b/gtk/gtktoolbar.c
index d9f93fc8b4..9bbbe94f5c 100644
--- a/gtk/gtktoolbar.c
+++ b/gtk/gtktoolbar.c
@@ -3896,6 +3896,9 @@ gtk_toolbar_get_visible_position (GtkToolbar *toolbar,
 {
   CountingData count = { child, FALSE, 0, 0 };
 
+  if (child == (GtkWidget*)toolbar->priv->highlight_tool_item)
+    return 0;
+
   /* foreach iterates in visible order */
   gtk_container_forall (GTK_CONTAINER (toolbar),
                         count_widget_position,