Bugfix on Autoz::load_from_xml.

diff --git a/.gitignore b/.gitignore
index 2d297f1ea21393a8049fb039c4b8c15c55b5ba97..d08e9f991d884165cc654c507d0789131b1e59ad 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -47,3 +47,4 @@ mkinstalldirs
 stamp-it
 intltool-*
 Rules-quot
+*.exe

diff --git a/src/autoz.c b/src/autoz.c
index 13daaca2e492977c8b1e015642d9e6c9ded0076b..ea06b76c32b131f1ada123247cf5033bbc7ca839 100644 (file)
--- a/src/autoz.c
+++ b/src/autoz.c
@@ -365,7 +365,7 @@ autoz_add_parents_to_resource (Autoz *autoz, AutozIResource *iresource, ...)
                                                }
                                        else
                                                {
-                                                       resource_parent = g_hash_table_lookup (priv->roles, resource_id_parent);
+                                                       resource_parent = g_hash_table_lookup (priv->resources, resource_id_parent);
                                                        if (resource_parent != NULL)
                                                                {
                                                                        resource->parents = g_list_append (resource->parents, resource_parent);
@@ -944,13 +944,13 @@ autoz_load_from_xml (Autoz *autoz, xmlNodePtr xnode, gboolean replace)
                                                                                                {
                                                                                                        if (!xmlNodeIsText (current_parent) &&
                                                                                                            xmlStrcmp (current_parent->name, "parent") == 0)
-                                                                                                           {
-                                                                                                               prop = g_strstrip (g_strdup ((gchar *)xmlGetProp (current_parent, "id")));
-                                                                                                               if (g_strcmp0 (prop, "") != 0)
+                                                                                                               {
+                                                                                                                       prop = g_strstrip (g_strdup ((gchar *)xmlGetProp (current_parent, "id")));
+                                                                                                                       if (g_strcmp0 (prop, "") != 0)
                                                                                                                                {
                                                                                                                                        autoz_add_parent_to_role (autoz, irole,  autoz_get_role_from_id (autoz, prop));
                                                                                                                                }
-                                                                                                           }
+                                                                                                               }
                                                                                                        current_parent = current_parent->next;
                                                                                                }
                                                                                }
@@ -968,13 +968,13 @@ autoz_load_from_xml (Autoz *autoz, xmlNodePtr xnode, gboolean replace)
                                                                                                {
                                                                                                        if (!xmlNodeIsText (current_parent) &&
                                                                                                            xmlStrcmp (current_parent->name, "parent") == 0)
-                                                                                                           {
-                                                                                                               prop = g_strstrip (g_strdup ((gchar *)xmlGetProp (current_parent, "id")));
-                                                                                                               if (g_strcmp0 (prop, "") != 0)
+                                                                                                               {
+                                                                                                                       prop = g_strstrip (g_strdup ((gchar *)xmlGetProp (current_parent, "id")));
+                                                                                                                       if (g_strcmp0 (prop, "") != 0)
                                                                                                                                {
                                                                                                                                        autoz_add_parent_to_resource (autoz, iresource, autoz_get_resource_from_id (autoz, prop));
                                                                                                                                }
-                                                                                                           }
+                                                                                                               }
                                                                                                        current_parent = current_parent->next;
                                                                                                }
                                                                                }