summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorMarc-André Lureau <marcandre.lureau@gmail.com>2013-01-10 02:49:54 +0100
committerMarc-André Lureau <marcandre.lureau@gmail.com>2013-01-10 02:49:54 +0100
commit7acd55bd99eda0045e5855e40bfc0ff50bb93095 (patch)
treeae440a1d164e1c4e8b8044995fd32cd80052e72e /tools
parent48b09d7fd654b6d2211f7583d13966f020e0146d (diff)
downloadmsitools-7acd55bd99eda0045e5855e40bfc0ff50bb93095.tar.gz
msitools-7acd55bd99eda0045e5855e40bfc0ff50bb93095.tar.xz
msitools-7acd55bd99eda0045e5855e40bfc0ff50bb93095.zip
wixl: use default actions values whenever referenced
Diffstat (limited to 'tools')
-rw-r--r--tools/wixl/msi-default.vala11
-rw-r--r--tools/wixl/msi.vala4
2 files changed, 15 insertions, 0 deletions
diff --git a/tools/wixl/msi-default.vala b/tools/wixl/msi-default.vala
index 77f955d..e800b72 100644
--- a/tools/wixl/msi-default.vala
+++ b/tools/wixl/msi-default.vala
@@ -168,6 +168,17 @@ namespace Wixl {
public static ActionInfo get_action (Action action) {
return actions[action];
}
+
+ public static ActionInfo? get_action_by_name (string name) {
+ ActionInfo? action = null;
+
+ try {
+ action = actions[enum_from_string (typeof (Action), name.down ())];
+ } catch (GLib.Error error) {
+ }
+
+ return action;
+ }
}
} // Wixl \ No newline at end of file
diff --git a/tools/wixl/msi.vala b/tools/wixl/msi.vala
index 54428a8..b0cf423 100644
--- a/tools/wixl/msi.vala
+++ b/tools/wixl/msi.vala
@@ -144,6 +144,10 @@ namespace Wixl {
actions.insert (name, action);
action.name = name;
+ var default = MSIDefault.get_action_by_name (name);
+ if (default != null)
+ action.sequence = default.sequence;
+
return action;
}