summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorMarc-André Lureau <marcandre.lureau@gmail.com>2013-04-12 04:06:30 +0200
committerMarc-André Lureau <marcandre.lureau@gmail.com>2013-04-12 05:16:29 +0200
commitd74e177d0b9bbdf3663ac0e53f6bd3f41832a720 (patch)
tree706b21fd89378fcba703bc6e66b9d6ce8d2dbef7 /tools
parent0a3d75677ffbb1164f29d22b6c4d866bb9920246 (diff)
downloadmsitools-d74e177d0b9bbdf3663ac0e53f6bd3f41832a720.zip
msitools-d74e177d0b9bbdf3663ac0e53f6bd3f41832a720.tar.gz
msitools-d74e177d0b9bbdf3663ac0e53f6bd3f41832a720.tar.xz
Keep package description > product name
Diffstat (limited to 'tools')
-rw-r--r--tools/wixl/builder.vala2
-rw-r--r--tools/wixl/msi.vala8
2 files changed, 9 insertions, 1 deletions
diff --git a/tools/wixl/builder.vala b/tools/wixl/builder.vala
index b3da2e9..9084bcb 100644
--- a/tools/wixl/builder.vala
+++ b/tools/wixl/builder.vala
@@ -259,7 +259,7 @@ namespace Wixl {
if (product.Codepage != null)
db.info.set_codepage (int.parse (product.Codepage));
- if (product.Name != null)
+ if (product.Name != null && db.info.get_subject () == null)
db.info.set_subject (product.Name);
db.info.set_author (product.Manufacturer);
diff --git a/tools/wixl/msi.vala b/tools/wixl/msi.vala
index f1de726..f6c9f58 100644
--- a/tools/wixl/msi.vala
+++ b/tools/wixl/msi.vala
@@ -667,6 +667,14 @@ namespace Wixl {
set_property (Libmsi.Property.SUBJECT, value);
}
+ public string? get_subject () {
+ try {
+ return properties.get_string (Libmsi.Property.SUBJECT);
+ } catch (GLib.Error err) {
+ return null;
+ }
+ }
+
public void set_comments (string value) throws GLib.Error {
set_property (Libmsi.Property.COMMENTS, value);
}