From d74e177d0b9bbdf3663ac0e53f6bd3f41832a720 Mon Sep 17 00:00:00 2001
From: Marc-André Lureau <marcandre.lureau@gmail.com>
Date: Fri, 12 Apr 2013 04:06:30 +0200
Subject: Keep package description > product name

---
 tools/wixl/builder.vala | 2 +-
 tools/wixl/msi.vala     | 8 ++++++++
 2 files changed, 9 insertions(+), 1 deletion(-)

(limited to 'tools')

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);
         }
-- 
cgit