New upstream version 3.24.0upstream/3.24.0

1 files changed, 136 insertions, 132 deletions

diff --git a/src/simple-scan.c b/src/simple-scan.c
index 4ffc5a0..9b84313 100644
--- a/src/simple-scan.c
+++ b/src/simple-scan.c
@@ -1,4 +1,4 @@
-/* simple-scan.c generated by valac 0.34.2, the Vala compiler
+/* simple-scan.c generated by valac 0.34.6, the Vala compiler
  * generated from simple-scan.vala, do not modify */
 
 /*
@@ -16,10 +16,10 @@
 #include <glib-object.h>
 #include <gtk/gtk.h>
 #include <gusb.h>
+#include <gio/gio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <stdio.h>
-#include <gio/gio.h>
 #include "colord.h"
 #include <float.h>
 #include <math.h>
@@ -3809,26 +3809,26 @@ gint simple_scan_main (gchar** args, int args_length1) {
 	GOptionContext* _tmp2_ = NULL;
 	GOptionContext* _tmp3_ = NULL;
 	GOptionGroup* _tmp4_ = NULL;
-	gboolean _tmp14_ = FALSE;
-	const gchar* _tmp16_ = NULL;
+	gboolean _tmp15_ = FALSE;
+	const gchar* _tmp17_ = NULL;
 	ScanDevice* device = NULL;
-	gchar** _tmp28_ = NULL;
-	gint _tmp28__length1 = 0;
-	GTimer* _tmp38_ = NULL;
+	gchar** _tmp30_ = NULL;
+	gint _tmp30__length1 = 0;
+	GTimer* _tmp40_ = NULL;
 	gchar* path = NULL;
-	const gchar* _tmp39_ = NULL;
-	gchar* _tmp40_ = NULL;
 	const gchar* _tmp41_ = NULL;
-	const gchar* _tmp42_ = NULL;
-	gchar* _tmp43_ = NULL;
+	gchar* _tmp42_ = NULL;
+	const gchar* _tmp43_ = NULL;
 	const gchar* _tmp44_ = NULL;
-	FILE* _tmp45_ = NULL;
-	pid_t _tmp46_ = 0;
+	gchar* _tmp45_ = NULL;
+	const gchar* _tmp46_ = NULL;
+	FILE* _tmp47_ = NULL;
+	pid_t _tmp48_ = 0;
 	SimpleScan* app = NULL;
-	ScanDevice* _tmp47_ = NULL;
-	SimpleScan* _tmp48_ = NULL;
-	SimpleScan* _tmp49_ = NULL;
-	gint _tmp50_ = 0;
+	ScanDevice* _tmp49_ = NULL;
+	SimpleScan* _tmp50_ = NULL;
+	SimpleScan* _tmp51_ = NULL;
+	gint _tmp52_ = 0;
 	GError * _inner_error_ = NULL;
 #line 615 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	setlocale (LC_ALL, "");
@@ -3921,6 +3921,8 @@ gint simple_scan_main (gchar** args, int args_length1) {
 	__finally13:
 #line 624 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
+#line 3924 "simple-scan.c"
+		gint _tmp14_ = 0;
 #line 624 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_g_option_context_free0 (c);
 #line 624 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
@@ -3928,99 +3930,99 @@ gint simple_scan_main (gchar** args, int args_length1) {
 #line 624 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		g_clear_error (&_inner_error_);
 #line 624 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		return 0;
-#line 3932 "simple-scan.c"
+		return _tmp14_;
+#line 3934 "simple-scan.c"
 	}
 #line 636 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	_tmp14_ = simple_scan_show_version;
+	_tmp15_ = simple_scan_show_version;
 #line 636 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	if (_tmp14_) {
-#line 3938 "simple-scan.c"
-		FILE* _tmp15_ = NULL;
+	if (_tmp15_) {
+#line 3940 "simple-scan.c"
+		FILE* _tmp16_ = NULL;
 #line 639 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		_tmp15_ = stderr;
+		_tmp16_ = stderr;
 #line 639 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		fprintf (_tmp15_, "simple-scan %s\n", VERSION);
+		fprintf (_tmp16_, "simple-scan %s\n", VERSION);
 #line 640 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		result = EXIT_SUCCESS;
 #line 640 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_g_option_context_free0 (c);
 #line 640 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		return result;
-#line 3950 "simple-scan.c"
+#line 3952 "simple-scan.c"
 	}
 #line 642 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	_tmp16_ = simple_scan_fix_pdf_filename;
+	_tmp17_ = simple_scan_fix_pdf_filename;
 #line 642 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	if (_tmp16_ != NULL) {
-#line 3956 "simple-scan.c"
+	if (_tmp17_ != NULL) {
+#line 3958 "simple-scan.c"
 		{
-			const gchar* _tmp17_ = NULL;
+			const gchar* _tmp18_ = NULL;
 #line 646 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-			_tmp17_ = simple_scan_fix_pdf_filename;
+			_tmp18_ = simple_scan_fix_pdf_filename;
 #line 646 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-			simple_scan_fix_pdf (_tmp17_, &_inner_error_);
+			simple_scan_fix_pdf (_tmp18_, &_inner_error_);
 #line 646 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 3965 "simple-scan.c"
+#line 3967 "simple-scan.c"
 				goto __catch14_g_error;
 			}
 			{
 				gint i = 0;
 #line 647 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 				i = 1;
-#line 3972 "simple-scan.c"
+#line 3974 "simple-scan.c"
 				{
-					gboolean _tmp18_ = FALSE;
+					gboolean _tmp19_ = FALSE;
 #line 647 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-					_tmp18_ = TRUE;
+					_tmp19_ = TRUE;
 #line 647 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 					while (TRUE) {
-#line 3979 "simple-scan.c"
-						gint _tmp20_ = 0;
-						gchar** _tmp21_ = NULL;
-						gint _tmp21__length1 = 0;
+#line 3981 "simple-scan.c"
+						gint _tmp21_ = 0;
 						gchar** _tmp22_ = NULL;
 						gint _tmp22__length1 = 0;
-						gint _tmp23_ = 0;
-						const gchar* _tmp24_ = NULL;
+						gchar** _tmp23_ = NULL;
+						gint _tmp23__length1 = 0;
+						gint _tmp24_ = 0;
+						const gchar* _tmp25_ = NULL;
 #line 647 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-						if (!_tmp18_) {
-#line 3989 "simple-scan.c"
-							gint _tmp19_ = 0;
+						if (!_tmp19_) {
+#line 3991 "simple-scan.c"
+							gint _tmp20_ = 0;
 #line 647 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-							_tmp19_ = i;
+							_tmp20_ = i;
 #line 647 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-							i = _tmp19_ + 1;
-#line 3995 "simple-scan.c"
+							i = _tmp20_ + 1;
+#line 3997 "simple-scan.c"
 						}
 #line 647 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-						_tmp18_ = FALSE;
+						_tmp19_ = FALSE;
 #line 647 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-						_tmp20_ = i;
+						_tmp21_ = i;
 #line 647 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-						_tmp21_ = args;
+						_tmp22_ = args;
 #line 647 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-						_tmp21__length1 = args_length1;
+						_tmp22__length1 = args_length1;
 #line 647 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-						if (!(_tmp20_ < _tmp21__length1)) {
+						if (!(_tmp21_ < _tmp22__length1)) {
 #line 647 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 							break;
-#line 4009 "simple-scan.c"
+#line 4011 "simple-scan.c"
 						}
 #line 648 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-						_tmp22_ = args;
+						_tmp23_ = args;
 #line 648 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-						_tmp22__length1 = args_length1;
+						_tmp23__length1 = args_length1;
 #line 648 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-						_tmp23_ = i;
+						_tmp24_ = i;
 #line 648 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-						_tmp24_ = _tmp22_[_tmp23_];
+						_tmp25_ = _tmp23_[_tmp24_];
 #line 648 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-						simple_scan_fix_pdf (_tmp24_, &_inner_error_);
+						simple_scan_fix_pdf (_tmp25_, &_inner_error_);
 #line 648 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 						if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 4023 "simple-scan.c"
+#line 4025 "simple-scan.c"
 							goto __catch14_g_error;
 						}
 					}
@@ -4031,21 +4033,21 @@ gint simple_scan_main (gchar** args, int args_length1) {
 		__catch14_g_error:
 		{
 			GError* e = NULL;
-			FILE* _tmp25_ = NULL;
-			GError* _tmp26_ = NULL;
-			const gchar* _tmp27_ = NULL;
+			FILE* _tmp26_ = NULL;
+			GError* _tmp27_ = NULL;
+			const gchar* _tmp28_ = NULL;
 #line 644 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			e = _inner_error_;
 #line 644 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			_inner_error_ = NULL;
 #line 652 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-			_tmp25_ = stderr;
+			_tmp26_ = stderr;
 #line 652 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-			_tmp26_ = e;
+			_tmp27_ = e;
 #line 652 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-			_tmp27_ = _tmp26_->message;
+			_tmp28_ = _tmp27_->message;
 #line 652 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-			fprintf (_tmp25_, "Error fixing PDF file: %s", _tmp27_);
+			fprintf (_tmp26_, "Error fixing PDF file: %s", _tmp28_);
 #line 653 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			result = EXIT_FAILURE;
 #line 653 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
@@ -4054,11 +4056,13 @@ gint simple_scan_main (gchar** args, int args_length1) {
 			_g_option_context_free0 (c);
 #line 653 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			return result;
-#line 4057 "simple-scan.c"
+#line 4059 "simple-scan.c"
 		}
 		__finally14:
 #line 644 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
+#line 4064 "simple-scan.c"
+			gint _tmp29_ = 0;
 #line 644 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			_g_option_context_free0 (c);
 #line 644 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
@@ -4066,8 +4070,8 @@ gint simple_scan_main (gchar** args, int args_length1) {
 #line 644 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			g_clear_error (&_inner_error_);
 #line 644 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-			return 0;
-#line 4070 "simple-scan.c"
+			return _tmp29_;
+#line 4074 "simple-scan.c"
 		}
 #line 655 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		result = EXIT_SUCCESS;
@@ -4075,116 +4079,116 @@ gint simple_scan_main (gchar** args, int args_length1) {
 		_g_option_context_free0 (c);
 #line 655 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		return result;
-#line 4078 "simple-scan.c"
+#line 4082 "simple-scan.c"
 	}
 #line 658 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	device = NULL;
 #line 659 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	_tmp28_ = args;
+	_tmp30_ = args;
 #line 659 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	_tmp28__length1 = args_length1;
+	_tmp30__length1 = args_length1;
 #line 659 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	if (_tmp28__length1 > 1) {
-#line 4088 "simple-scan.c"
-		ScanDevice* _tmp29_ = NULL;
-		ScanDevice* _tmp30_ = NULL;
-		gchar** _tmp31_ = NULL;
-		gint _tmp31__length1 = 0;
-		const gchar* _tmp32_ = NULL;
-		gchar* _tmp33_ = NULL;
-		ScanDevice* _tmp34_ = NULL;
-		gchar** _tmp35_ = NULL;
-		gint _tmp35__length1 = 0;
-		const gchar* _tmp36_ = NULL;
-		gchar* _tmp37_ = NULL;
+	if (_tmp30__length1 > 1) {
+#line 4092 "simple-scan.c"
+		ScanDevice* _tmp31_ = NULL;
+		ScanDevice* _tmp32_ = NULL;
+		gchar** _tmp33_ = NULL;
+		gint _tmp33__length1 = 0;
+		const gchar* _tmp34_ = NULL;
+		gchar* _tmp35_ = NULL;
+		ScanDevice* _tmp36_ = NULL;
+		gchar** _tmp37_ = NULL;
+		gint _tmp37__length1 = 0;
+		const gchar* _tmp38_ = NULL;
+		gchar* _tmp39_ = NULL;
 #line 661 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		_tmp29_ = scan_device_new ();
+		_tmp31_ = scan_device_new ();
 #line 661 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_scan_device_unref0 (device);
 #line 661 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		device = _tmp29_;
+		device = _tmp31_;
 #line 662 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		_tmp30_ = device;
+		_tmp32_ = device;
 #line 662 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		_tmp31_ = args;
+		_tmp33_ = args;
 #line 662 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		_tmp31__length1 = args_length1;
+		_tmp33__length1 = args_length1;
 #line 662 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		_tmp32_ = _tmp31_[1];
+		_tmp34_ = _tmp33_[1];
 #line 662 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		_tmp33_ = g_strdup (_tmp32_);
+		_tmp35_ = g_strdup (_tmp34_);
 #line 662 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		_g_free0 (_tmp30_->name);
+		_g_free0 (_tmp32_->name);
 #line 662 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		_tmp30_->name = _tmp33_;
+		_tmp32_->name = _tmp35_;
 #line 663 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		_tmp34_ = device;
+		_tmp36_ = device;
 #line 663 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		_tmp35_ = args;
+		_tmp37_ = args;
 #line 663 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		_tmp35__length1 = args_length1;
+		_tmp37__length1 = args_length1;
 #line 663 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		_tmp36_ = _tmp35_[1];
+		_tmp38_ = _tmp37_[1];
 #line 663 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		_tmp37_ = g_strdup (_tmp36_);
+		_tmp39_ = g_strdup (_tmp38_);
 #line 663 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		_g_free0 (_tmp34_->label);
+		_g_free0 (_tmp36_->label);
 #line 663 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		_tmp34_->label = _tmp37_;
-#line 4134 "simple-scan.c"
+		_tmp36_->label = _tmp39_;
+#line 4138 "simple-scan.c"
 	}
 #line 667 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	_tmp38_ = g_timer_new ();
+	_tmp40_ = g_timer_new ();
 #line 667 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_g_timer_destroy0 (simple_scan_log_timer);
 #line 667 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	simple_scan_log_timer = _tmp38_;
+	simple_scan_log_timer = _tmp40_;
 #line 668 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	_tmp39_ = g_get_user_cache_dir ();
+	_tmp41_ = g_get_user_cache_dir ();
 #line 668 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	_tmp40_ = g_build_filename (_tmp39_, "simple-scan", NULL, NULL);
+	_tmp42_ = g_build_filename (_tmp41_, "simple-scan", NULL, NULL);
 #line 668 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	path = _tmp40_;
+	path = _tmp42_;
 #line 669 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	_tmp41_ = path;
+	_tmp43_ = path;
 #line 669 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	g_mkdir_with_parents (_tmp41_, 0700);
+	g_mkdir_with_parents (_tmp43_, 0700);
 #line 670 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	_tmp42_ = g_get_user_cache_dir ();
+	_tmp44_ = g_get_user_cache_dir ();
 #line 670 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	_tmp43_ = g_build_filename (_tmp42_, "simple-scan", "simple-scan.log", NULL, NULL);
+	_tmp45_ = g_build_filename (_tmp44_, "simple-scan", "simple-scan.log", NULL, NULL);
 #line 670 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_g_free0 (path);
 #line 670 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	path = _tmp43_;
+	path = _tmp45_;
 #line 671 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	_tmp44_ = path;
+	_tmp46_ = path;
 #line 671 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	_tmp45_ = g_fopen (_tmp44_, "w");
+	_tmp47_ = g_fopen (_tmp46_, "w");
 #line 671 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_fclose0 (simple_scan_log_file);
 #line 671 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	simple_scan_log_file = _tmp45_;
+	simple_scan_log_file = _tmp47_;
 #line 672 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	g_log_set_default_handler (_simple_scan_log_cb_glog_func, NULL);
 #line 674 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	_tmp46_ = getpid ();
+	_tmp48_ = getpid ();
 #line 674 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	g_debug ("simple-scan.vala:674: Starting Simple Scan %s, PID=%i", VERSION, (gint) _tmp46_);
+	g_debug ("simple-scan.vala:674: Starting Simple Scan %s, PID=%i", VERSION, (gint) _tmp48_);
 #line 676 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	gtk_init (&args_length1, &args);
 #line 678 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	_tmp47_ = device;
+	_tmp49_ = device;
 #line 678 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	_tmp48_ = simple_scan_new (_tmp47_);
+	_tmp50_ = simple_scan_new (_tmp49_);
 #line 678 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	app = _tmp48_;
+	app = _tmp50_;
 #line 679 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	_tmp49_ = app;
+	_tmp51_ = app;
 #line 679 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	_tmp50_ = g_application_run ((GApplication*) _tmp49_, 0, NULL);
+	_tmp52_ = g_application_run ((GApplication*) _tmp51_, 0, NULL);
 #line 679 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	result = _tmp50_;
+	result = _tmp52_;
 #line 679 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_g_object_unref0 (app);
 #line 679 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
@@ -4195,7 +4199,7 @@ gint simple_scan_main (gchar** args, int args_length1) {
 	_g_option_context_free0 (c);
 #line 679 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	return result;
-#line 4198 "simple-scan.c"
+#line 4202 "simple-scan.c"
 }
 
 
@@ -4205,7 +4209,7 @@ int main (int argc, char ** argv) {
 #endif
 #line 613 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	return simple_scan_main (argv, argc);
-#line 4208 "simple-scan.c"
+#line 4212 "simple-scan.c"
 }
 
 
@@ -4215,14 +4219,14 @@ static void simple_scan_class_init (SimpleScanClass * klass) {
 #line 12 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	g_type_class_add_private (klass, sizeof (SimpleScanPrivate));
 #line 12 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	((GApplicationClass *) klass)->startup = simple_scan_real_startup;
+	((GApplicationClass *) klass)->startup = (void (*)(GApplication*)) simple_scan_real_startup;
 #line 12 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	((GApplicationClass *) klass)->activate = simple_scan_real_activate;
+	((GApplicationClass *) klass)->activate = (void (*)(GApplication*)) simple_scan_real_activate;
 #line 12 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	((GApplicationClass *) klass)->shutdown = simple_scan_real_shutdown;
+	((GApplicationClass *) klass)->shutdown = (void (*)(GApplication*)) simple_scan_real_shutdown;
 #line 12 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	G_OBJECT_CLASS (klass)->finalize = simple_scan_finalize;
-#line 4225 "simple-scan.c"
+#line 4229 "simple-scan.c"
 }
 
 
@@ -4233,7 +4237,7 @@ static void simple_scan_instance_init (SimpleScan * self) {
 	self->priv->default_device = NULL;
 #line 33 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	self->priv->have_devices = FALSE;
-#line 4236 "simple-scan.c"
+#line 4240 "simple-scan.c"
 }
 
 
@@ -4253,7 +4257,7 @@ static void simple_scan_finalize (GObject* obj) {
 	_book_unref0 (self->priv->book);
 #line 12 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	G_OBJECT_CLASS (simple_scan_parent_class)->finalize (obj);
-#line 4256 "simple-scan.c"
+#line 4260 "simple-scan.c"
 }