From 7acd55bd99eda0045e5855e40bfc0ff50bb93095 Mon Sep 17 00:00:00 2001 From: Marc-André Lureau Date: Thu, 10 Jan 2013 02:49:54 +0100 Subject: wixl: use default actions values whenever referenced --- tools/wixl/msi-default.vala | 11 +++++++++++ tools/wixl/msi.vala | 4 ++++ 2 files changed, 15 insertions(+) (limited to 'tools/wixl') 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; } -- cgit