[msitools] wixl: Action can have children nodes



commit cdba1d64a84e41076fb999524f9e123e3bc9fa40
Author: Marc-Andrà Lureau <marcandre lureau gmail com>
Date:   Thu Jan 24 23:48:35 2013 +0100

    wixl: Action can have children nodes

 tools/wixl/wix.vala |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/tools/wixl/wix.vala b/tools/wixl/wix.vala
index c6897d8..29a85f7 100644
--- a/tools/wixl/wix.vala
+++ b/tools/wixl/wix.vala
@@ -196,7 +196,7 @@ namespace Wixl {
         }
 
         public virtual void load (Xml.Node *node) throws Wixl.Error {
-            if (node->name != name)
+            if (name != null && node->name != name)
                 throw new Error.FAILED ("%s: invalid node %s".printf (name, node->name));
 
             load_properties_from_node (node);
@@ -644,8 +644,8 @@ namespace Wixl {
         public string Suppress { get; set; }
 
         public override void load (Xml.Node *node) throws Wixl.Error {
+            base.load (node);
             name = node->name;
-            load_properties_from_node (node);
         }
 
         public override void accept (WixNodeVisitor visitor) throws GLib.Error {



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]