summaryrefslogtreecommitdiff
path: root/src/simple-scan.c
diff options
context:
space:
mode:
authorJörg Frings-Fürst <debian@jff-webhosting.net>2015-01-19 09:43:24 +0100
committerJörg Frings-Fürst <debian@jff-webhosting.net>2015-01-19 09:43:24 +0100
commit4a85dd832e768e0b229d2b6c63c66877c0b22b83 (patch)
tree63b0ca351f5d5e8df838d155a53ee0f80b72befe /src/simple-scan.c
parentd121b2edc89c31584f5858058269364db88c9494 (diff)
parentd8006d3987034f51ee84f034fb5c9cb33195600d (diff)
Merge tag 'upstream/3.15.4'
Upstream version 3.15.4
Diffstat (limited to 'src/simple-scan.c')
-rw-r--r--src/simple-scan.c448
1 files changed, 224 insertions, 224 deletions
diff --git a/src/simple-scan.c b/src/simple-scan.c
index 144a78d..3036fc9 100644
--- a/src/simple-scan.c
+++ b/src/simple-scan.c
@@ -1,4 +1,4 @@
-/* simple-scan.c generated by valac 0.24.0, the Vala compiler
+/* simple-scan.c generated by valac 0.26.1, the Vala compiler
* generated from simple-scan.vala, do not modify */
/*
@@ -580,7 +580,7 @@ static void simple_scan_real_startup (GApplication* base) {
#line 44 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
self = (SimpleScan*) base;
#line 46 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
- G_APPLICATION_CLASS (simple_scan_parent_class)->startup ((GApplication*) G_TYPE_CHECK_INSTANCE_CAST (self, GTK_TYPE_APPLICATION, GtkApplication));
+ G_APPLICATION_CLASS (simple_scan_parent_class)->startup ((GApplication*) G_TYPE_CHECK_INSTANCE_CAST (self, gtk_application_get_type (), GtkApplication));
#line 48 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
_tmp0_ = user_interface_new ();
#line 48 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
@@ -735,7 +735,7 @@ static void simple_scan_real_activate (GApplication* base) {
#line 79 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
self = (SimpleScan*) base;
#line 81 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
- G_APPLICATION_CLASS (simple_scan_parent_class)->activate ((GApplication*) G_TYPE_CHECK_INSTANCE_CAST (self, GTK_TYPE_APPLICATION, GtkApplication));
+ G_APPLICATION_CLASS (simple_scan_parent_class)->activate ((GApplication*) G_TYPE_CHECK_INSTANCE_CAST (self, gtk_application_get_type (), GtkApplication));
#line 82 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
_tmp0_ = self->priv->ui;
#line 82 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
@@ -754,7 +754,7 @@ static void simple_scan_real_shutdown (GApplication* base) {
#line 86 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
self = (SimpleScan*) base;
#line 88 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
- G_APPLICATION_CLASS (simple_scan_parent_class)->shutdown ((GApplication*) G_TYPE_CHECK_INSTANCE_CAST (self, GTK_TYPE_APPLICATION, GtkApplication));
+ G_APPLICATION_CLASS (simple_scan_parent_class)->shutdown ((GApplication*) G_TYPE_CHECK_INSTANCE_CAST (self, gtk_application_get_type (), GtkApplication));
#line 89 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
_book_unref0 (self->priv->book);
#line 89 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
@@ -1299,7 +1299,7 @@ static gchar* simple_scan_get_profile_for_device (SimpleScan* self, const gchar*
#line 193 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
cd_client_connect_sync (_tmp4_, NULL, &_inner_error_);
#line 193 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
- if (_inner_error_ != NULL) {
+ if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 1304 "simple-scan.c"
goto __catch4_g_error;
}
@@ -1334,7 +1334,7 @@ static gchar* simple_scan_get_profile_for_device (SimpleScan* self, const gchar*
}
__finally4:
#line 191 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
- if (_inner_error_ != NULL) {
+ if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 191 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
_g_object_unref0 (client);
#line 191 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
@@ -1362,7 +1362,7 @@ static gchar* simple_scan_get_profile_for_device (SimpleScan* self, const gchar*
#line 204 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
_tmp7_ = _tmp10_;
#line 204 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
- if (_inner_error_ != NULL) {
+ if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 1367 "simple-scan.c"
goto __catch5_g_error;
}
@@ -1413,7 +1413,7 @@ static gchar* simple_scan_get_profile_for_device (SimpleScan* self, const gchar*
}
__finally5:
#line 202 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
- if (_inner_error_ != NULL) {
+ if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 202 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
_g_object_unref0 (device);
#line 202 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
@@ -1435,7 +1435,7 @@ static gchar* simple_scan_get_profile_for_device (SimpleScan* self, const gchar*
#line 214 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
cd_device_connect_sync (_tmp15_, NULL, &_inner_error_);
#line 214 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
- if (_inner_error_ != NULL) {
+ if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 1440 "simple-scan.c"
goto __catch6_g_error;
}
@@ -1475,7 +1475,7 @@ static gchar* simple_scan_get_profile_for_device (SimpleScan* self, const gchar*
}
__finally6:
#line 212 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
- if (_inner_error_ != NULL) {
+ if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 212 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
_g_object_unref0 (device);
#line 212 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
@@ -1527,7 +1527,7 @@ static gchar* simple_scan_get_profile_for_device (SimpleScan* self, const gchar*
#line 231 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
cd_profile_connect_sync (_tmp23_, NULL, &_inner_error_);
#line 231 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
- if (_inner_error_ != NULL) {
+ if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 1532 "simple-scan.c"
goto __catch7_g_error;
}
@@ -1569,7 +1569,7 @@ static gchar* simple_scan_get_profile_for_device (SimpleScan* self, const gchar*
}
__finally7:
#line 229 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
- if (_inner_error_ != NULL) {
+ if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 229 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
_g_object_unref0 (profile);
#line 229 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
@@ -2056,7 +2056,7 @@ static gchar* simple_scan_get_temporary_filename (SimpleScan* self, const gchar*
#line 341 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
fd = _tmp5_;
#line 341 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
- if (_inner_error_ != NULL) {
+ if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 2060 "simple-scan.c"
goto __catch8_g_error;
}
@@ -2096,7 +2096,7 @@ static gchar* simple_scan_get_temporary_filename (SimpleScan* self, const gchar*
}
__finally8:
#line 339 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
- if (_inner_error_ != NULL) {
+ if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 339 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
_g_free0 (path);
#line 339 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
@@ -2188,7 +2188,7 @@ static void simple_scan_email_cb (SimpleScan* self, UserInterface* ui, const gch
#line 369 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
book_save (_tmp7_, "pdf", _tmp8_, _tmp9_, &_inner_error_);
#line 369 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
- if (_inner_error_ != NULL) {
+ if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 2192 "simple-scan.c"
goto __catch9_g_error;
}
@@ -2228,7 +2228,7 @@ static void simple_scan_email_cb (SimpleScan* self, UserInterface* ui, const gch
}
__finally9:
#line 367 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
- if (_inner_error_ != NULL) {
+ if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 367 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
_g_object_unref0 (file);
#line 367 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
@@ -2368,7 +2368,7 @@ static void simple_scan_email_cb (SimpleScan* self, UserInterface* ui, const gch
#line 394 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
_page_unref0 (_tmp31_);
#line 394 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
- if (_inner_error_ != NULL) {
+ if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 2372 "simple-scan.c"
goto __catch10_g_error;
}
@@ -2403,7 +2403,7 @@ static void simple_scan_email_cb (SimpleScan* self, UserInterface* ui, const gch
}
__finally10:
#line 392 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
- if (_inner_error_ != NULL) {
+ if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 392 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
_g_object_unref0 (file);
#line 392 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
@@ -2467,7 +2467,7 @@ static void simple_scan_email_cb (SimpleScan* self, UserInterface* ui, const gch
#line 411 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
g_spawn_command_line_async (_tmp43_, &_inner_error_);
#line 411 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
- if (_inner_error_ != NULL) {
+ if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 2471 "simple-scan.c"
goto __catch11_g_error;
}
@@ -2494,7 +2494,7 @@ static void simple_scan_email_cb (SimpleScan* self, UserInterface* ui, const gch
}
__finally11:
#line 409 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
- if (_inner_error_ != NULL) {
+ if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 409 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
_g_free0 (command_line);
#line 409 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
@@ -2697,37 +2697,37 @@ static glong string_strnlen (gchar* str, glong maxlen) {
glong _tmp1_ = 0L;
gchar* _tmp2_ = NULL;
gchar* _tmp3_ = NULL;
-#line 1193 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1197 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
_tmp0_ = str;
-#line 1193 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1197 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
_tmp1_ = maxlen;
-#line 1193 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1197 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
_tmp2_ = memchr (_tmp0_, 0, (gsize) _tmp1_);
-#line 1193 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1197 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
end = _tmp2_;
-#line 1194 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1198 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
_tmp3_ = end;
-#line 1194 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1198 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
if (_tmp3_ == NULL) {
#line 2712 "simple-scan.c"
glong _tmp4_ = 0L;
-#line 1195 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1199 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
_tmp4_ = maxlen;
-#line 1195 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1199 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
result = _tmp4_;
-#line 1195 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1199 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
return result;
#line 2720 "simple-scan.c"
} else {
gchar* _tmp5_ = NULL;
gchar* _tmp6_ = NULL;
-#line 1197 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1201 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
_tmp5_ = end;
-#line 1197 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1201 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
_tmp6_ = str;
-#line 1197 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1201 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
result = (glong) (_tmp5_ - _tmp6_);
-#line 1197 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1201 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
return result;
#line 2732 "simple-scan.c"
}
@@ -2747,112 +2747,112 @@ static gchar* string_substring (const gchar* self, glong offset, glong len) {
glong _tmp20_ = 0L;
glong _tmp21_ = 0L;
gchar* _tmp22_ = NULL;
-#line 1204 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1208 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
g_return_val_if_fail (self != NULL, NULL);
-#line 1206 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1210 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
_tmp1_ = offset;
-#line 1206 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1210 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
if (_tmp1_ >= ((glong) 0)) {
#line 2756 "simple-scan.c"
glong _tmp2_ = 0L;
-#line 1206 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1210 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
_tmp2_ = len;
-#line 1206 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1210 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
_tmp0_ = _tmp2_ >= ((glong) 0);
#line 2762 "simple-scan.c"
} else {
-#line 1206 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1210 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
_tmp0_ = FALSE;
#line 2766 "simple-scan.c"
}
-#line 1206 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1210 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
if (_tmp0_) {
#line 2770 "simple-scan.c"
glong _tmp3_ = 0L;
glong _tmp4_ = 0L;
glong _tmp5_ = 0L;
-#line 1208 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1212 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
_tmp3_ = offset;
-#line 1208 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1212 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
_tmp4_ = len;
-#line 1208 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1212 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
_tmp5_ = string_strnlen ((gchar*) self, _tmp3_ + _tmp4_);
-#line 1208 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1212 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
string_length = _tmp5_;
#line 2782 "simple-scan.c"
} else {
gint _tmp6_ = 0;
gint _tmp7_ = 0;
-#line 1210 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1214 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
_tmp6_ = strlen (self);
-#line 1210 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1214 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
_tmp7_ = _tmp6_;
-#line 1210 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1214 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
string_length = (glong) _tmp7_;
#line 2792 "simple-scan.c"
}
-#line 1213 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1217 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
_tmp8_ = offset;
-#line 1213 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1217 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
if (_tmp8_ < ((glong) 0)) {
#line 2798 "simple-scan.c"
glong _tmp9_ = 0L;
glong _tmp10_ = 0L;
glong _tmp11_ = 0L;
-#line 1214 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1218 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
_tmp9_ = string_length;
-#line 1214 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1218 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
_tmp10_ = offset;
-#line 1214 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1218 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
offset = _tmp9_ + _tmp10_;
-#line 1215 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1219 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
_tmp11_ = offset;
-#line 1215 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1219 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
g_return_val_if_fail (_tmp11_ >= ((glong) 0), NULL);
#line 2812 "simple-scan.c"
} else {
glong _tmp12_ = 0L;
glong _tmp13_ = 0L;
-#line 1217 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1221 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
_tmp12_ = offset;
-#line 1217 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1221 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
_tmp13_ = string_length;
-#line 1217 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1221 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
g_return_val_if_fail (_tmp12_ <= _tmp13_, NULL);
#line 2822 "simple-scan.c"
}
-#line 1219 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1223 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
_tmp14_ = len;
-#line 1219 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1223 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
if (_tmp14_ < ((glong) 0)) {
#line 2828 "simple-scan.c"
glong _tmp15_ = 0L;
glong _tmp16_ = 0L;
-#line 1220 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1224 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
_tmp15_ = string_length;
-#line 1220 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1224 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
_tmp16_ = offset;
-#line 1220 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1224 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
len = _tmp15_ - _tmp16_;
#line 2837 "simple-scan.c"
}
-#line 1222 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1226 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
_tmp17_ = offset;
-#line 1222 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1226 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
_tmp18_ = len;
-#line 1222 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1226 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
_tmp19_ = string_length;
-#line 1222 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1226 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
g_return_val_if_fail ((_tmp17_ + _tmp18_) <= _tmp19_, NULL);
-#line 1223 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1227 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
_tmp20_ = offset;
-#line 1223 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1227 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
_tmp21_ = len;
-#line 1223 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1227 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
_tmp22_ = g_strndup (((gchar*) self) + _tmp20_, (gsize) _tmp21_);
-#line 1223 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1227 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
result = _tmp22_;
-#line 1223 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1227 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
return result;
#line 2857 "simple-scan.c"
}
@@ -2901,7 +2901,7 @@ static void simple_scan_fix_pdf (const gchar* filename, GError** error) {
#line 461 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
_data_size_ = data_length1;
#line 461 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
- if (_inner_error_ != NULL) {
+ if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 461 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
g_propagate_error (error, _inner_error_);
#line 461 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
@@ -3470,7 +3470,7 @@ static void simple_scan_fix_pdf (const gchar* filename, GError** error) {
static void _simple_scan_log_cb_glog_func (const gchar* log_domain, GLogLevelFlags log_levels, const gchar* message, gpointer self) {
-#line 594 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 592 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
simple_scan_log_cb (log_domain, log_levels, message);
#line 3475 "simple-scan.c"
}
@@ -3514,33 +3514,31 @@ gint simple_scan_main (gchar** args, int args_length1) {
#line 538 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
textdomain (GETTEXT_PACKAGE);
#line 540 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
- gtk_init (&args_length1, &args);
-#line 542 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
_tmp0_ = _ ("[DEVICE...] - Scanning utility");
-#line 542 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 540 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
_tmp1_ = g_option_context_new (_tmp0_);
-#line 542 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 540 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
c = _tmp1_;
-#line 544 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 542 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
_tmp2_ = c;
-#line 544 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 542 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
g_option_context_add_main_entries (_tmp2_, SIMPLE_SCAN_options, GETTEXT_PACKAGE);
-#line 545 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 543 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
_tmp3_ = c;
-#line 545 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 543 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
_tmp4_ = gtk_get_option_group (TRUE);
-#line 545 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 543 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
g_option_context_add_group (_tmp3_, _tmp4_);
-#line 3534 "simple-scan.c"
+#line 3532 "simple-scan.c"
{
GOptionContext* _tmp5_ = NULL;
-#line 548 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 546 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
_tmp5_ = c;
-#line 548 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 546 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
g_option_context_parse (_tmp5_, &args_length1, &args, &_inner_error_);
-#line 548 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
- if (_inner_error_ != NULL) {
-#line 3543 "simple-scan.c"
+#line 546 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+ if (G_UNLIKELY (_inner_error_ != NULL)) {
+#line 3541 "simple-scan.c"
goto __catch12_g_error;
}
}
@@ -3557,103 +3555,103 @@ gint simple_scan_main (gchar** args, int args_length1) {
gint _tmp11__length1 = 0;
const gchar* _tmp12_ = NULL;
FILE* _tmp13_ = NULL;
-#line 546 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 544 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
e = _inner_error_;
-#line 546 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 544 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
_inner_error_ = NULL;
-#line 552 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 550 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
_tmp6_ = stderr;
-#line 552 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 550 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
_tmp7_ = e;
-#line 552 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 550 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
_tmp8_ = _tmp7_->message;
-#line 552 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 550 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
fprintf (_tmp6_, "%s\n", _tmp8_);
-#line 553 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 551 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
_tmp9_ = stderr;
-#line 553 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 551 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
_tmp10_ = _ ("Run '%s --help' to see a full list of available command line options.");
-#line 553 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 551 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
_tmp11_ = args;
-#line 553 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 551 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
_tmp11__length1 = args_length1;
-#line 553 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 551 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
_tmp12_ = _tmp11_[0];
-#line 553 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 551 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
fprintf (_tmp9_, _tmp10_, _tmp12_);
-#line 555 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 553 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
_tmp13_ = stderr;
-#line 555 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 553 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
fprintf (_tmp13_, "\n");
-#line 556 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 554 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
result = EXIT_FAILURE;
-#line 556 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 554 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
_g_error_free0 (e);
-#line 556 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 554 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
_g_option_context_free0 (c);
-#line 556 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 554 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
return result;
-#line 3596 "simple-scan.c"
+#line 3594 "simple-scan.c"
}
__finally12:
-#line 546 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
- if (_inner_error_ != NULL) {
-#line 546 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 544 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+ if (G_UNLIKELY (_inner_error_ != NULL)) {
+#line 544 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
_g_option_context_free0 (c);
-#line 546 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 544 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 546 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 544 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
g_clear_error (&_inner_error_);
-#line 546 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 544 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
return 0;
-#line 3609 "simple-scan.c"
+#line 3607 "simple-scan.c"
}
-#line 558 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 556 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
_tmp14_ = simple_scan_show_version;
-#line 558 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 556 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
if (_tmp14_) {
-#line 3615 "simple-scan.c"
+#line 3613 "simple-scan.c"
FILE* _tmp15_ = NULL;
-#line 561 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 559 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
_tmp15_ = stderr;
-#line 561 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 559 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
fprintf (_tmp15_, "simple-scan %s\n", VERSION);
-#line 562 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 560 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
result = EXIT_SUCCESS;
-#line 562 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 560 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
_g_option_context_free0 (c);
-#line 562 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 560 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
return result;
-#line 3627 "simple-scan.c"
+#line 3625 "simple-scan.c"
}
-#line 564 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 562 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
_tmp16_ = simple_scan_fix_pdf_filename;
-#line 564 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 562 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
if (_tmp16_ != NULL) {
-#line 3633 "simple-scan.c"
+#line 3631 "simple-scan.c"
{
const gchar* _tmp17_ = NULL;
-#line 568 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 566 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
_tmp17_ = simple_scan_fix_pdf_filename;
-#line 568 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 566 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
simple_scan_fix_pdf (_tmp17_, &_inner_error_);
-#line 568 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
- if (_inner_error_ != NULL) {
-#line 3642 "simple-scan.c"
+#line 566 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+ if (G_UNLIKELY (_inner_error_ != NULL)) {
+#line 3640 "simple-scan.c"
goto __catch13_g_error;
}
{
gint i = 0;
-#line 569 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 567 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
i = 1;
-#line 3649 "simple-scan.c"
+#line 3647 "simple-scan.c"
{
gboolean _tmp18_ = FALSE;
-#line 569 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 567 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
_tmp18_ = TRUE;
-#line 569 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 567 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
while (TRUE) {
-#line 3656 "simple-scan.c"
+#line 3654 "simple-scan.c"
gint _tmp20_ = 0;
gchar** _tmp21_ = NULL;
gint _tmp21__length1 = 0;
@@ -3661,43 +3659,43 @@ gint simple_scan_main (gchar** args, int args_length1) {
gint _tmp22__length1 = 0;
gint _tmp23_ = 0;
const gchar* _tmp24_ = NULL;
-#line 569 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 567 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
if (!_tmp18_) {
-#line 3666 "simple-scan.c"
+#line 3664 "simple-scan.c"
gint _tmp19_ = 0;
-#line 569 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 567 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
_tmp19_ = i;
-#line 569 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 567 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
i = _tmp19_ + 1;
-#line 3672 "simple-scan.c"
+#line 3670 "simple-scan.c"
}
-#line 569 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 567 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
_tmp18_ = FALSE;
-#line 569 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 567 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
_tmp20_ = i;
-#line 569 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 567 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
_tmp21_ = args;
-#line 569 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 567 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
_tmp21__length1 = args_length1;
-#line 569 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 567 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
if (!(_tmp20_ < _tmp21__length1)) {
-#line 569 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 567 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
break;
-#line 3686 "simple-scan.c"
+#line 3684 "simple-scan.c"
}
-#line 570 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 568 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
_tmp22_ = args;
-#line 570 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 568 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
_tmp22__length1 = args_length1;
-#line 570 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 568 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
_tmp23_ = i;
-#line 570 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 568 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
_tmp24_ = _tmp22_[_tmp23_];
-#line 570 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 568 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
simple_scan_fix_pdf (_tmp24_, &_inner_error_);
-#line 570 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
- if (_inner_error_ != NULL) {
-#line 3700 "simple-scan.c"
+#line 568 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+ if (G_UNLIKELY (_inner_error_ != NULL)) {
+#line 3698 "simple-scan.c"
goto __catch13_g_error;
}
}
@@ -3711,58 +3709,58 @@ gint simple_scan_main (gchar** args, int args_length1) {
FILE* _tmp25_ = NULL;
GError* _tmp26_ = NULL;
const gchar* _tmp27_ = NULL;
-#line 566 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 564 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
e = _inner_error_;
-#line 566 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 564 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
_inner_error_ = NULL;
-#line 574 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 572 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
_tmp25_ = stderr;
-#line 574 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 572 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
_tmp26_ = e;
-#line 574 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 572 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
_tmp27_ = _tmp26_->message;
-#line 574 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 572 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
fprintf (_tmp25_, "Error fixing PDF file: %s", _tmp27_);
-#line 575 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 573 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
result = EXIT_FAILURE;
-#line 575 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 573 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
_g_error_free0 (e);
-#line 575 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 573 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
_g_option_context_free0 (c);
-#line 575 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 573 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
return result;
-#line 3734 "simple-scan.c"
+#line 3732 "simple-scan.c"
}
__finally13:
-#line 566 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
- if (_inner_error_ != NULL) {
-#line 566 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 564 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+ if (G_UNLIKELY (_inner_error_ != NULL)) {
+#line 564 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
_g_option_context_free0 (c);
-#line 566 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 564 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 566 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 564 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
g_clear_error (&_inner_error_);
-#line 566 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 564 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
return 0;
-#line 3747 "simple-scan.c"
+#line 3745 "simple-scan.c"
}
-#line 577 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 575 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
result = EXIT_SUCCESS;
-#line 577 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 575 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
_g_option_context_free0 (c);
-#line 577 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 575 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
return result;
-#line 3755 "simple-scan.c"
+#line 3753 "simple-scan.c"
}
-#line 580 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 578 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
device = NULL;
-#line 581 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 579 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
_tmp28_ = args;
-#line 581 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 579 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
_tmp28__length1 = args_length1;
-#line 581 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 579 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
if (_tmp28__length1 > 1) {
-#line 3765 "simple-scan.c"
+#line 3763 "simple-scan.c"
ScanDevice* _tmp29_ = NULL;
ScanDevice* _tmp30_ = NULL;
gchar** _tmp31_ = NULL;
@@ -3774,80 +3772,82 @@ gint simple_scan_main (gchar** args, int args_length1) {
gint _tmp35__length1 = 0;
const gchar* _tmp36_ = NULL;
gchar* _tmp37_ = NULL;
-#line 583 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 581 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
_tmp29_ = scan_device_new ();
-#line 583 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 581 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
_scan_device_unref0 (device);
-#line 583 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 581 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
device = _tmp29_;
-#line 584 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 582 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
_tmp30_ = device;
-#line 584 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 582 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
_tmp31_ = args;
-#line 584 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 582 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
_tmp31__length1 = args_length1;
-#line 584 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 582 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
_tmp32_ = _tmp31_[1];
-#line 584 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 582 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
_tmp33_ = g_strdup (_tmp32_);
-#line 584 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 582 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
_g_free0 (_tmp30_->name);
-#line 584 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 582 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
_tmp30_->name = _tmp33_;
-#line 585 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 583 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
_tmp34_ = device;
-#line 585 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 583 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
_tmp35_ = args;
-#line 585 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 583 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
_tmp35__length1 = args_length1;
-#line 585 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 583 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
_tmp36_ = _tmp35_[1];
-#line 585 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 583 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
_tmp37_ = g_strdup (_tmp36_);
-#line 585 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 583 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
_g_free0 (_tmp34_->label);
-#line 585 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 583 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
_tmp34_->label = _tmp37_;
-#line 3811 "simple-scan.c"
+#line 3809 "simple-scan.c"
}
-#line 589 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 587 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
_tmp38_ = g_timer_new ();
-#line 589 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 587 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
_g_timer_destroy0 (simple_scan_log_timer);
-#line 589 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 587 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
simple_scan_log_timer = _tmp38_;
-#line 590 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 588 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
_tmp39_ = g_get_user_cache_dir ();
-#line 590 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 588 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
_tmp40_ = g_build_filename (_tmp39_, "simple-scan", NULL, NULL);
-#line 590 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 588 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
path = _tmp40_;
-#line 591 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 589 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
_tmp41_ = path;
-#line 591 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 589 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
g_mkdir_with_parents (_tmp41_, 0700);
-#line 592 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 590 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
_tmp42_ = g_get_user_cache_dir ();
-#line 592 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 590 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
_tmp43_ = g_build_filename (_tmp42_, "simple-scan", "simple-scan.log", NULL, NULL);
-#line 592 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 590 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
_g_free0 (path);
-#line 592 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 590 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
path = _tmp43_;
-#line 593 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 591 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
_tmp44_ = path;
-#line 593 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 591 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
_tmp45_ = g_fopen (_tmp44_, "w");
-#line 593 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 591 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
_fclose0 (simple_scan_log_file);
-#line 593 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 591 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
simple_scan_log_file = _tmp45_;
-#line 594 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 592 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
g_log_set_default_handler (_simple_scan_log_cb_glog_func, NULL);
-#line 596 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 594 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
_tmp46_ = getpid ();
+#line 594 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+ g_debug ("simple-scan.vala:594: Starting Simple Scan %s, PID=%i", VERSION, (gint) _tmp46_);
#line 596 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
- g_debug ("simple-scan.vala:596: Starting Simple Scan %s, PID=%i", VERSION, (gint) _tmp46_);
+ gtk_init (&args_length1, &args);
#line 598 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
_tmp47_ = device;
#line 598 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
@@ -3890,11 +3890,11 @@ 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"
- G_APPLICATION_CLASS (klass)->startup = simple_scan_real_startup;
+ ((GApplicationClass *) klass)->startup = simple_scan_real_startup;
#line 12 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
- G_APPLICATION_CLASS (klass)->activate = simple_scan_real_activate;
+ ((GApplicationClass *) klass)->activate = simple_scan_real_activate;
#line 12 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
- G_APPLICATION_CLASS (klass)->shutdown = simple_scan_real_shutdown;
+ ((GApplicationClass *) klass)->shutdown = 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 3900 "simple-scan.c"
@@ -3937,7 +3937,7 @@ GType simple_scan_get_type (void) {
if (g_once_init_enter (&simple_scan_type_id__volatile)) {
static const GTypeInfo g_define_type_info = { sizeof (SimpleScanClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) simple_scan_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (SimpleScan), 0, (GInstanceInitFunc) simple_scan_instance_init, NULL };
GType simple_scan_type_id;
- simple_scan_type_id = g_type_register_static (GTK_TYPE_APPLICATION, "SimpleScan", &g_define_type_info, 0);
+ simple_scan_type_id = g_type_register_static (gtk_application_get_type (), "SimpleScan", &g_define_type_info, 0);
g_once_init_leave (&simple_scan_type_id__volatile, simple_scan_type_id);
}
return simple_scan_type_id__volatile;