[Glade-devel] [PATCH 4/4] Backport c4c50ab2d1f436f61c4a46986dc7b598d562c99e.

kugel at rockbox.org kugel at rockbox.org
Wed Apr 23 18:52:48 UTC 2014


From: Juan Pablo Ugarte <juanpablougarte at gmail.com>

Ignore widgets that are not part of the project when generating edges
of directed graph used to sort objects by topological order.

Fixes bug 727992 "Editing UI and saving does not remove deleted Combo with Entry"
---
 gladeui/glade-project.c | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/gladeui/glade-project.c b/gladeui/glade-project.c
index 6f2b202..904af00 100644
--- a/gladeui/glade-project.c
+++ b/gladeui/glade-project.c
@@ -2483,7 +2483,13 @@ glade_project_get_graph_deps (GladeProject *project)
       for (ll = _glade_widget_peek_prop_refs (predecessor); ll; ll = g_list_next (ll))
         {
           GladeWidget *successor = glade_property_get_widget (ll->data);
-          GladeWidget *successor_top = glade_widget_get_toplevel (successor);
+          GladeWidget *successor_top;
+
+          /* Ignore widgets that are not part of this project. (ie removed ones) */
+          if (glade_widget_get_project (successor) != project)
+            continue;
+
+          successor_top = glade_widget_get_toplevel (successor);
 
           /* Ignore objects within the same toplevel */
           if (predecessor_top != successor_top)
-- 
1.9.2



More information about the Glade-devel mailing list