[msitools: 1/2] Remove default UI actions from AdminUISequence/InstallUISequence
- From: Marc-André Lureau <malureau src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [msitools: 1/2] Remove default UI actions from AdminUISequence/InstallUISequence
- Date: Tue, 15 Mar 2022 11:17:38 +0000 (UTC)
commit 17fa07371c57839f18647a12bf2413719533571b
Author: Hendrik Eckardt <hendrik eckardt gdata-adan de>
Date: Fri Jan 28 16:42:49 2022 +0100
Remove default UI actions from AdminUISequence/InstallUISequence
ALl of these actions are defined in the respective dialog wxs files
such as WelcomeDlg, ExitDialog etc., so there is no need to
hardcode them.
Hardcoding causes issues with custom UIs that don't reference
all of the predefined dialogs, since there will be actions
in the sequence that don't exist.
tools/wixl/builder.vala | 16 ----------------
1 file changed, 16 deletions(-)
---
diff --git a/tools/wixl/builder.vala b/tools/wixl/builder.vala
index 26e172d..a9d682e 100644
--- a/tools/wixl/builder.vala
+++ b/tools/wixl/builder.vala
@@ -187,11 +187,6 @@ namespace Wixl {
add (MSIDefault.Action.FileCost);
add (MSIDefault.Action.CostFinalize);
add (MSIDefault.Action.ExecuteAction);
- if (Extension.UI in extensions) {
- add (MSIDefault.Action.FatalError);
- add (MSIDefault.Action.UserExit);
- add (MSIDefault.Action.ExitDialog);
- }
table.add_sorted_actions ();
// AdvtExecuteSequence
@@ -270,17 +265,6 @@ namespace Wixl {
add (MSIDefault.Action.FileCost);
add (MSIDefault.Action.CostFinalize);
add (MSIDefault.Action.ExecuteAction);
- if (Extension.UI in extensions) {
- add (MSIDefault.Action.FatalError);
- add (MSIDefault.Action.UserExit);
- add (MSIDefault.Action.ExitDialog);
- add (MSIDefault.Action.PrepareDlg);
- add (MSIDefault.Action.ProgressDlg);
- add (MSIDefault.Action.ResumeDlg);
- add (MSIDefault.Action.WelcomeDlg);
- add (MSIDefault.Action.WelcomeEulaDlg);
- add (MSIDefault.Action.MaintenanceWelcomeDlg);
- }
if (db.table_upgrade.records.length () > 0) {
add (MSIDefault.Action.FindRelatedProducts);
add (MSIDefault.Action.MigrateFeatureStates);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]