Merge remote-tracking branch 'upstream/master'

4 files changed, 8 insertions, 5 deletions

diff --git a/.travis.yml b/.travis.yml
index abfa4c3..6b68e6b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,5 +8,4 @@ install:
  - docker build -t sbs-build docker/
 
 script:
-# - docker run --rm -it -p 8080:8080 -v "$PWD":/mnt/serial-barcode-scanner sbs-build
- - true
+ - docker run --rm -it -p 8080:8080 -v "$PWD":/mnt/serial-barcode-scanner sbs-build
diff --git a/README.md b/README.md
index d027d13..c36c3ee 100644
--- a/README.md
+++ b/README.md
@@ -1,3 +1,7 @@
+<a href="https://travis-ci.org/ktt-ol/serial-barcode-scanner">
+	<img align="right" alt="Build Status" src="https://travis-ci.org/ktt-ol/serial-barcode-scanner.svg?branch=master" />
+</a>
+
 This is the Shop System of Oldenburg's Hackspace Mainframe.
 
 The software has been developed as a credit based system for members of the
diff --git a/debian/control b/debian/control
index 479528b..b704e7f 100644
--- a/debian/control
+++ b/debian/control
@@ -20,7 +20,7 @@ Build-Depends:
     libssl-dev,
     meson,
     udev,
-    valac
+    valac (>= 0.42~)
 Standards-Version: 4.1.5
 
 Package: shopsystem
diff --git a/src/pgp/pgp.vala b/src/pgp/pgp.vala
index 6d9bed0..9bff922 100644
--- a/src/pgp/pgp.vala
+++ b/src/pgp/pgp.vala
@@ -52,7 +52,7 @@ public class PGPKeyArchive {
 		archive.support_format_all();
 
 		/* load test archive for now */
-		if(archive.open_memory(data, data.length) != Archive.Result.OK)
+		if(archive.open_memory(data) != Archive.Result.OK)
 			return result;
 
 		while(archive.next_header(out entry) == Archive.Result.OK) {
@@ -68,7 +68,7 @@ public class PGPKeyArchive {
 			if(size > 50000)
 				continue;
 
-			if(archive.read_data((void*) content, (ssize_t) size) == size) {
+			if(archive.read_data(content) == size) {
 				if(!((string) content).has_prefix("-----BEGIN PGP PUBLIC KEY BLOCK-----"))
 					continue;