diff options
| author | Marc-André Lureau <marcandre.lureau@gmail.com> | 2013-01-24 23:48:35 +0100 |
|---|---|---|
| committer | Marc-André Lureau <marcandre.lureau@gmail.com> | 2013-01-24 23:50:31 +0100 |
| commit | cdba1d64a84e41076fb999524f9e123e3bc9fa40 (patch) | |
| tree | a5c80032f438e4c12d200e04a6893f7834439f6a /tools/wixl | |
| parent | 69f46f7a462fdba230b03191853cea5d641af8c7 (diff) | |
| download | msitools-cdba1d64a84e41076fb999524f9e123e3bc9fa40.tar.gz msitools-cdba1d64a84e41076fb999524f9e123e3bc9fa40.tar.xz msitools-cdba1d64a84e41076fb999524f9e123e3bc9fa40.zip | |
wixl: Action can have children nodes
Diffstat (limited to 'tools/wixl')
| -rw-r--r-- | 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 { |