summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarc-André Lureau <marcandre.lureau@gmail.com>2013-01-09 14:34:05 +0100
committerMarc-André Lureau <marcandre.lureau@gmail.com>2013-01-09 14:34:05 +0100
commitb57de2196e111605812cc3aff4d6dcb53ec8965d (patch)
treeda2ba8d77fb58df5dbbb4faa05d6f56f7dd129e7
parentf7ae4ddeb93334130294b1dda92efac5ccaa635b (diff)
downloadmsitools-b57de2196e111605812cc3aff4d6dcb53ec8965d.tar.gz
msitools-b57de2196e111605812cc3aff4d6dcb53ec8965d.tar.xz
msitools-b57de2196e111605812cc3aff4d6dcb53ec8965d.zip
Fix a few warnings
-rw-r--r--src/builder.vala9
-rw-r--r--src/msi.vala2
-rw-r--r--src/wixl.vala2
3 files changed, 6 insertions, 7 deletions
diff --git a/src/builder.vala b/src/builder.vala
index 6331d70..80c2ff6 100644
--- a/src/builder.vala
+++ b/src/builder.vala
@@ -71,9 +71,6 @@ namespace Wixl {
return elems;
}
- public void add_custom_actions<G> (MsiTableSequence table) {
- }
-
delegate void AddSequence (string action, int sequence) throws GLib.Error;
private void sequence_actions () throws GLib.Error {
@@ -205,8 +202,10 @@ namespace Wixl {
string[] secureProperties;
public void property_update () throws GLib.Error {
- var prop = string.joinv (";", secureProperties);
- db.table_property.add ("SecureCustomProperties", prop);
+ if (secureProperties.length != 0) {
+ var prop = string.joinv (";", secureProperties);
+ db.table_property.add ("SecureCustomProperties", prop);
+ }
}
public MsiDatabase build () throws GLib.Error {
diff --git a/src/msi.vala b/src/msi.vala
index ec2da88..b8700b0 100644
--- a/src/msi.vala
+++ b/src/msi.vala
@@ -120,7 +120,7 @@ namespace Wixl {
}
}
- public void add_sorted_actions () {
+ public void add_sorted_actions () throws GLib.Error {
add_implicit_deps ();
var sorted = sort_topological ();
diff --git a/src/wixl.vala b/src/wixl.vala
index 0f9eac5..057749d 100644
--- a/src/wixl.vala
+++ b/src/wixl.vala
@@ -78,7 +78,7 @@ namespace Wixl {
return 0;
if (verbose)
- print ("Building %s...\n", files[0]);
+ print ("Building %s...\n", output);
var msi = builder.build ();
msi.build (output);
} catch (GLib.Error error) {