From 2add609936591c1eeb821a728e1aa951e1de20f5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Mon, 14 Dec 2015 05:55:12 +0100 Subject: Imported Upstream version 3.19.2 --- src/simple-scan.c | 148 +++++++++++++++++++++++++++--------------------------- 1 file changed, 74 insertions(+), 74 deletions(-) (limited to 'src/simple-scan.c') diff --git a/src/simple-scan.c b/src/simple-scan.c index 739fd00..07f8d96 100644 --- a/src/simple-scan.c +++ b/src/simple-scan.c @@ -1,4 +1,4 @@ -/* simple-scan.c generated by valac 0.28.1, the Vala compiler +/* simple-scan.c generated by valac 0.30.0, the Vala compiler * generated from simple-scan.vala, do not modify */ /* @@ -325,11 +325,11 @@ static void simple_scan_scanner_failed_cb (SimpleScan* self, Scanner* scanner, g static void _simple_scan_scanner_failed_cb_scanner_scan_failed (Scanner* _sender, gint error_code, const gchar* error_string, gpointer self); static void simple_scan_scanner_scanning_changed_cb (SimpleScan* self, Scanner* scanner); static void _simple_scan_scanner_scanning_changed_cb_scanner_scanning_changed (Scanner* _sender, gpointer self); -static void ___lambda20_ (SimpleScan* self); +static void ___lambda22_ (SimpleScan* self); void scanner_redetect (Scanner* self); -static void ____lambda20__g_usb_context_device_added (GUsbContext* _sender, GUsbDevice* device, gpointer self); -static void ___lambda21_ (SimpleScan* self); -static void ____lambda21__g_usb_context_device_removed (GUsbContext* _sender, GUsbDevice* device, gpointer self); +static void ____lambda22__g_usb_context_device_added (GUsbContext* _sender, GUsbDevice* device, gpointer self); +static void ___lambda23_ (SimpleScan* self); +static void ____lambda23__g_usb_context_device_removed (GUsbContext* _sender, GUsbDevice* device, gpointer self); void user_interface_set_scan_devices (UserInterface* self, GList* devices, const gchar* missing_driver); void user_interface_set_selected_device (UserInterface* self, const gchar* value); static void _scan_device_unref0_ (gpointer var); @@ -535,7 +535,7 @@ static void _simple_scan_scanner_scanning_changed_cb_scanner_scanning_changed (S } -static void ___lambda20_ (SimpleScan* self) { +static void ___lambda22_ (SimpleScan* self) { Scanner* _tmp0_ = NULL; #line 68 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala" _tmp0_ = self->priv->scanner; @@ -545,14 +545,14 @@ static void ___lambda20_ (SimpleScan* self) { } -static void ____lambda20__g_usb_context_device_added (GUsbContext* _sender, GUsbDevice* device, gpointer self) { +static void ____lambda22__g_usb_context_device_added (GUsbContext* _sender, GUsbDevice* device, gpointer self) { #line 68 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala" - ___lambda20_ ((SimpleScan*) self); + ___lambda22_ ((SimpleScan*) self); #line 552 "simple-scan.c" } -static void ___lambda21_ (SimpleScan* self) { +static void ___lambda23_ (SimpleScan* self) { Scanner* _tmp0_ = NULL; #line 69 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala" _tmp0_ = self->priv->scanner; @@ -562,9 +562,9 @@ static void ___lambda21_ (SimpleScan* self) { } -static void ____lambda21__g_usb_context_device_removed (GUsbContext* _sender, GUsbDevice* device, gpointer self) { +static void ____lambda23__g_usb_context_device_removed (GUsbContext* _sender, GUsbDevice* device, gpointer self) { #line 69 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala" - ___lambda21_ ((SimpleScan*) self); + ___lambda23_ ((SimpleScan*) self); #line 569 "simple-scan.c" } @@ -712,11 +712,11 @@ static void simple_scan_real_startup (GApplication* base) { #line 68 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala" _tmp21_ = self->priv->usb_context; #line 68 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala" - g_signal_connect_object (_tmp21_, "device-added", (GCallback) ____lambda20__g_usb_context_device_added, self, 0); + g_signal_connect_object (_tmp21_, "device-added", (GCallback) ____lambda22__g_usb_context_device_added, self, 0); #line 69 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala" _tmp22_ = self->priv->usb_context; #line 69 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala" - g_signal_connect_object (_tmp22_, "device-removed", (GCallback) ____lambda21__g_usb_context_device_removed, self, 0); + g_signal_connect_object (_tmp22_, "device-removed", (GCallback) ____lambda23__g_usb_context_device_removed, self, 0); #line 65 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala" _g_object_unref0 (_tmp18_); #line 723 "simple-scan.c" @@ -973,13 +973,13 @@ static void _g_free0_ (gpointer var) { static gint g_ptr_array_get_length (GPtrArray* self) { gint result; guint _tmp0_ = 0U; -#line 4428 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" +#line 4442 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" g_return_val_if_fail (self != NULL, 0); -#line 4428 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" +#line 4442 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" _tmp0_ = self->len; -#line 4428 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" +#line 4442 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" result = (gint) _tmp0_; -#line 4428 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" +#line 4442 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" return result; #line 985 "simple-scan.c" } @@ -987,11 +987,11 @@ static gint g_ptr_array_get_length (GPtrArray* self) { static void g_ptr_array_set_length (GPtrArray* self, gint value) { gint _tmp0_ = 0; -#line 4429 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" +#line 4443 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" g_return_if_fail (self != NULL); -#line 4429 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" +#line 4443 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" _tmp0_ = value; -#line 4429 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" +#line 4443 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" g_ptr_array_set_size (self, _tmp0_); #line 997 "simple-scan.c" } @@ -3022,37 +3022,37 @@ static glong string_strnlen (gchar* str, glong maxlen) { glong _tmp1_ = 0L; gchar* _tmp2_ = NULL; gchar* _tmp3_ = NULL; -#line 1197 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" +#line 1197 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" _tmp0_ = str; -#line 1197 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" +#line 1197 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" _tmp1_ = maxlen; -#line 1197 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" +#line 1197 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" _tmp2_ = memchr (_tmp0_, 0, (gsize) _tmp1_); -#line 1197 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" +#line 1197 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" end = _tmp2_; -#line 1198 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" +#line 1198 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" _tmp3_ = end; -#line 1198 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" +#line 1198 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" if (_tmp3_ == NULL) { #line 3037 "simple-scan.c" glong _tmp4_ = 0L; -#line 1199 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" +#line 1199 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" _tmp4_ = maxlen; -#line 1199 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" +#line 1199 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" result = _tmp4_; -#line 1199 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" +#line 1199 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" return result; #line 3045 "simple-scan.c" } else { gchar* _tmp5_ = NULL; gchar* _tmp6_ = NULL; -#line 1201 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" +#line 1201 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" _tmp5_ = end; -#line 1201 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" +#line 1201 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" _tmp6_ = str; -#line 1201 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" +#line 1201 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" result = (glong) (_tmp5_ - _tmp6_); -#line 1201 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" +#line 1201 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" return result; #line 3057 "simple-scan.c" } @@ -3072,112 +3072,112 @@ static gchar* string_substring (const gchar* self, glong offset, glong len) { glong _tmp20_ = 0L; glong _tmp21_ = 0L; gchar* _tmp22_ = NULL; -#line 1208 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" +#line 1208 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" g_return_val_if_fail (self != NULL, NULL); -#line 1210 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" +#line 1210 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" _tmp1_ = offset; -#line 1210 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" +#line 1210 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" if (_tmp1_ >= ((glong) 0)) { #line 3081 "simple-scan.c" glong _tmp2_ = 0L; -#line 1210 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" +#line 1210 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" _tmp2_ = len; -#line 1210 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" +#line 1210 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" _tmp0_ = _tmp2_ >= ((glong) 0); #line 3087 "simple-scan.c" } else { -#line 1210 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" +#line 1210 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" _tmp0_ = FALSE; #line 3091 "simple-scan.c" } -#line 1210 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" +#line 1210 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" if (_tmp0_) { #line 3095 "simple-scan.c" glong _tmp3_ = 0L; glong _tmp4_ = 0L; glong _tmp5_ = 0L; -#line 1212 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" +#line 1212 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" _tmp3_ = offset; -#line 1212 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" +#line 1212 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" _tmp4_ = len; -#line 1212 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" +#line 1212 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" _tmp5_ = string_strnlen ((gchar*) self, _tmp3_ + _tmp4_); -#line 1212 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" +#line 1212 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" string_length = _tmp5_; #line 3107 "simple-scan.c" } else { gint _tmp6_ = 0; gint _tmp7_ = 0; -#line 1214 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" +#line 1214 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" _tmp6_ = strlen (self); -#line 1214 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" +#line 1214 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" _tmp7_ = _tmp6_; -#line 1214 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" +#line 1214 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" string_length = (glong) _tmp7_; #line 3117 "simple-scan.c" } -#line 1217 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" +#line 1217 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" _tmp8_ = offset; -#line 1217 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" +#line 1217 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" if (_tmp8_ < ((glong) 0)) { #line 3123 "simple-scan.c" glong _tmp9_ = 0L; glong _tmp10_ = 0L; glong _tmp11_ = 0L; -#line 1218 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" +#line 1218 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" _tmp9_ = string_length; -#line 1218 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" +#line 1218 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" _tmp10_ = offset; -#line 1218 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" +#line 1218 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" offset = _tmp9_ + _tmp10_; -#line 1219 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" +#line 1219 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" _tmp11_ = offset; -#line 1219 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" +#line 1219 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" g_return_val_if_fail (_tmp11_ >= ((glong) 0), NULL); #line 3137 "simple-scan.c" } else { glong _tmp12_ = 0L; glong _tmp13_ = 0L; -#line 1221 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" +#line 1221 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" _tmp12_ = offset; -#line 1221 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" +#line 1221 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" _tmp13_ = string_length; -#line 1221 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" +#line 1221 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" g_return_val_if_fail (_tmp12_ <= _tmp13_, NULL); #line 3147 "simple-scan.c" } -#line 1223 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" +#line 1223 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" _tmp14_ = len; -#line 1223 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" +#line 1223 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" if (_tmp14_ < ((glong) 0)) { #line 3153 "simple-scan.c" glong _tmp15_ = 0L; glong _tmp16_ = 0L; -#line 1224 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" +#line 1224 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" _tmp15_ = string_length; -#line 1224 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" +#line 1224 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" _tmp16_ = offset; -#line 1224 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" +#line 1224 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" len = _tmp15_ - _tmp16_; #line 3162 "simple-scan.c" } -#line 1226 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" +#line 1226 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" _tmp17_ = offset; -#line 1226 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" +#line 1226 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" _tmp18_ = len; -#line 1226 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" +#line 1226 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" _tmp19_ = string_length; -#line 1226 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" +#line 1226 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" g_return_val_if_fail ((_tmp17_ + _tmp18_) <= _tmp19_, NULL); -#line 1227 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" +#line 1227 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" _tmp20_ = offset; -#line 1227 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" +#line 1227 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" _tmp21_ = len; -#line 1227 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" +#line 1227 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" _tmp22_ = g_strndup (((gchar*) self) + _tmp20_, (gsize) _tmp21_); -#line 1227 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" +#line 1227 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" result = _tmp22_; -#line 1227 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" +#line 1227 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" return result; #line 3182 "simple-scan.c" } @@ -3410,7 +3410,7 @@ static void simple_scan_fix_pdf (const gchar* filename, GError** error) { #line 575 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala" _tmp33_ = _tmp32_->str; #line 575 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala" - _tmp34_ = string_substring (_tmp33_, (glong) 1, (glong) (-1)); + _tmp34_ = string_substring (_tmp33_, (glong) 1, (glong) -1); #line 575 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala" _tmp35_ = _tmp34_; #line 575 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala" @@ -3462,7 +3462,7 @@ static void simple_scan_fix_pdf (const gchar* filename, GError** error) { #line 581 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala" _tmp43_ = _tmp42_->str; #line 581 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala" - _tmp44_ = string_substring (_tmp43_, (glong) 2, (glong) (-1)); + _tmp44_ = string_substring (_tmp43_, (glong) 2, (glong) -1); #line 581 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala" _tmp45_ = _tmp44_; #line 581 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala" @@ -3670,7 +3670,7 @@ static void simple_scan_fix_pdf (const gchar* filename, GError** error) { #line 599 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala" _tmp89_ = _tmp88_->str; #line 599 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala" - _tmp90_ = string_substring (_tmp89_, (glong) 2, (glong) (-1)); + _tmp90_ = string_substring (_tmp89_, (glong) 2, (glong) -1); #line 599 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala" _tmp91_ = _tmp90_; #line 599 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala" -- cgit v1.2.3