[gtk+/gtk-2-18] Position new ui nodes correctly when existing dirty dead nodes exist

[Alexander Larsson <alexl src gnome org>]

commit f17f4cace49f14012aa803fe3b483bae988a329c
Author: Alexander Larsson <alexl redhat com>
Date:   Fri Nov 27 11:32:59 2009 +0100

    Position new ui nodes correctly when existing dirty dead nodes exist
    
    If you add a new ui node that was recently removed it will still be
    in the tree, but marked dirty. In this case we previously just used
    the old node, which meant it wouldn't get the same position as if
    the dirty nodes had been processed first (and deleted) before the
    new node was added.
    
    We handle this by detecting this case and reposition the node as if
    it was new.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=603128
    (cherry picked from commit 7b19640d8f579da5d802d2a6f72128a6f29a5f33)

 gtk/gtkuimanager.c |   41 ++++++++++++++++++++++++++++++++++-------
 1 files changed, 34 insertions(+), 7 deletions(-)
---
diff --git a/gtk/gtkuimanager.c b/gtk/gtkuimanager.c
index 24267a6..7bd3349 100644
--- a/gtk/gtkuimanager.c
+++ b/gtk/gtkuimanager.c
@@ -939,6 +939,23 @@ gtk_ui_manager_get_action (GtkUIManager *self,
   return GTK_UI_MANAGER_GET_CLASS (self)->get_action (self, path);
 }
 
+static gboolean
+node_is_dead (GNode *node)
+{
+  GNode *child;
+
+  if (NODE_INFO (node)->uifiles != NULL)
+    return FALSE;
+
+  for (child = node->children; child != NULL; child = child->next)
+    {
+      if (!node_is_dead (child))
+	return FALSE;
+    }
+
+  return TRUE;
+}
+
 static GNode *
 get_child_node (GtkUIManager *self, 
 		GNode        *parent,
@@ -973,7 +990,17 @@ get_child_node (GtkUIManager *self,
 			       node_type, 
 			       NODE_INFO (child)->name,
 			       NODE_INFO (child)->type);
-		  
+
+		  if (node_is_dead (child))
+		    {
+		      /* This node was removed but is still dirty so
+			 it was not removed yet. We want to treat this
+			 as if it didn't exist, which means we move it
+			 to the position it would have been created at */
+		      g_node_unlink (child);
+		      goto insert_child;
+		    }
+
 		  return child;
 		}
 	    }
@@ -986,21 +1013,21 @@ get_child_node (GtkUIManager *self,
 	  mnode->type = node_type;
 	  mnode->name = g_strndup (childname, childname_length);
 
+	  child = g_node_new (mnode);
+	insert_child:
 	  if (sibling)
 	    {
 	      if (top)
-		child = g_node_insert_before (parent, sibling, 
-					      g_node_new (mnode));
+		g_node_insert_before (parent, sibling, child);
 	      else
-		child = g_node_insert_after (parent, sibling, 
-					     g_node_new (mnode));
+		g_node_insert_after (parent, sibling, child);
 	    }
 	  else
 	    {
 	      if (top)
-		child = g_node_prepend_data (parent, mnode);
+		g_node_prepend (parent, child);
 	      else
-		child = g_node_append_data (parent, mnode);
+		g_node_append (parent, child);
 	    }
 
 	  mark_node_dirty (child);