diff options
Diffstat (limited to 'src/camera')
| -rw-r--r-- | src/camera/Branch.c | 2 | ||||
| -rw-r--r-- | src/camera/Camera.c | 2 | ||||
| -rw-r--r-- | src/camera/CameraTable.c | 218 | ||||
| -rw-r--r-- | src/camera/GPhoto.c | 108 | ||||
| -rw-r--r-- | src/camera/GPhoto.vala | 2 | ||||
| -rw-r--r-- | src/camera/ImportPage.c | 7961 | ||||
| -rw-r--r-- | src/camera/ImportPage.vala | 48 |
7 files changed, 4259 insertions, 4082 deletions
diff --git a/src/camera/Branch.c b/src/camera/Branch.c index 7f2836e..74b5c60 100644 --- a/src/camera/Branch.c +++ b/src/camera/Branch.c @@ -1,4 +1,4 @@ -/* Branch.c generated by valac 0.32.1, the Vala compiler +/* Branch.c generated by valac 0.34.4, the Vala compiler * generated from Branch.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. diff --git a/src/camera/Camera.c b/src/camera/Camera.c index 71768fa..f39dba0 100644 --- a/src/camera/Camera.c +++ b/src/camera/Camera.c @@ -1,4 +1,4 @@ -/* Camera.c generated by valac 0.32.1, the Vala compiler +/* Camera.c generated by valac 0.34.4, the Vala compiler * generated from Camera.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. diff --git a/src/camera/CameraTable.c b/src/camera/CameraTable.c index 6a49bcf..926608c 100644 --- a/src/camera/CameraTable.c +++ b/src/camera/CameraTable.c @@ -1,4 +1,4 @@ -/* CameraTable.c generated by valac 0.32.1, the Vala compiler +/* CameraTable.c generated by valac 0.34.4, the Vala compiler * generated from CameraTable.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -672,7 +672,7 @@ static gboolean camera_table_delayed_init (CameraTable* self) { #line 63 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" if (_inner_error_->domain == GPHOTO_ERROR) { #line 675 "CameraTable.c" - goto __catch54_gphoto_error; + goto __catch56_gphoto_error; } #line 63 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); @@ -683,8 +683,8 @@ static gboolean camera_table_delayed_init (CameraTable* self) { #line 684 "CameraTable.c" } } - goto __finally54; - __catch54_gphoto_error: + goto __finally56; + __catch56_gphoto_error: { GError* err = NULL; GError* _tmp2_ = NULL; @@ -707,7 +707,7 @@ static gboolean camera_table_delayed_init (CameraTable* self) { return result; #line 709 "CameraTable.c" } - __finally54: + __finally56: #line 62 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 62 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" @@ -726,7 +726,7 @@ static gboolean camera_table_delayed_init (CameraTable* self) { #line 71 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" if (_inner_error_->domain == GPHOTO_ERROR) { #line 729 "CameraTable.c" - goto __catch55_gphoto_error; + goto __catch57_gphoto_error; } #line 71 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); @@ -737,8 +737,8 @@ static gboolean camera_table_delayed_init (CameraTable* self) { #line 738 "CameraTable.c" } } - goto __finally55; - __catch55_gphoto_error: + goto __finally57; + __catch57_gphoto_error: { GError* err = NULL; GError* _tmp4_ = NULL; @@ -757,7 +757,7 @@ static gboolean camera_table_delayed_init (CameraTable* self) { _g_error_free0 (err); #line 759 "CameraTable.c" } - __finally55: + __finally57: #line 70 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 70 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" @@ -1545,37 +1545,37 @@ static glong string_strnlen (gchar* str, glong maxlen) { glong _tmp1_ = 0L; gchar* _tmp2_ = NULL; gchar* _tmp3_ = NULL; -#line 1295 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1295 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp0_ = str; -#line 1295 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1295 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp1_ = maxlen; -#line 1295 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1295 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp2_ = memchr (_tmp0_, 0, (gsize) _tmp1_); -#line 1295 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1295 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" end = _tmp2_; -#line 1296 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1296 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp3_ = end; -#line 1296 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1296 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" if (_tmp3_ == NULL) { #line 1559 "CameraTable.c" glong _tmp4_ = 0L; -#line 1297 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1297 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp4_ = maxlen; -#line 1297 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1297 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" result = _tmp4_; -#line 1297 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1297 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" return result; #line 1567 "CameraTable.c" } else { gchar* _tmp5_ = NULL; gchar* _tmp6_ = NULL; -#line 1299 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1299 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp5_ = end; -#line 1299 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1299 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp6_ = str; -#line 1299 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1299 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" result = (glong) (_tmp5_ - _tmp6_); -#line 1299 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1299 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" return result; #line 1579 "CameraTable.c" } @@ -1595,112 +1595,112 @@ static gchar* string_substring (const gchar* self, glong offset, glong len) { glong _tmp20_ = 0L; glong _tmp21_ = 0L; gchar* _tmp22_ = NULL; -#line 1306 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1306 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" g_return_val_if_fail (self != NULL, NULL); -#line 1308 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp1_ = offset; -#line 1308 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" if (_tmp1_ >= ((glong) 0)) { #line 1603 "CameraTable.c" glong _tmp2_ = 0L; -#line 1308 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp2_ = len; -#line 1308 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp0_ = _tmp2_ >= ((glong) 0); #line 1609 "CameraTable.c" } else { -#line 1308 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp0_ = FALSE; #line 1613 "CameraTable.c" } -#line 1308 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" if (_tmp0_) { #line 1617 "CameraTable.c" glong _tmp3_ = 0L; glong _tmp4_ = 0L; glong _tmp5_ = 0L; -#line 1310 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1310 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp3_ = offset; -#line 1310 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1310 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp4_ = len; -#line 1310 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1310 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp5_ = string_strnlen ((gchar*) self, _tmp3_ + _tmp4_); -#line 1310 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1310 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" string_length = _tmp5_; #line 1629 "CameraTable.c" } else { gint _tmp6_ = 0; gint _tmp7_ = 0; -#line 1312 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1312 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp6_ = strlen (self); -#line 1312 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1312 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp7_ = _tmp6_; -#line 1312 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1312 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" string_length = (glong) _tmp7_; #line 1639 "CameraTable.c" } -#line 1315 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1315 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp8_ = offset; -#line 1315 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1315 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" if (_tmp8_ < ((glong) 0)) { #line 1645 "CameraTable.c" glong _tmp9_ = 0L; glong _tmp10_ = 0L; glong _tmp11_ = 0L; -#line 1316 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1316 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp9_ = string_length; -#line 1316 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1316 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp10_ = offset; -#line 1316 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1316 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" offset = _tmp9_ + _tmp10_; -#line 1317 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1317 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp11_ = offset; -#line 1317 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1317 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" g_return_val_if_fail (_tmp11_ >= ((glong) 0), NULL); #line 1659 "CameraTable.c" } else { glong _tmp12_ = 0L; glong _tmp13_ = 0L; -#line 1319 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1319 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp12_ = offset; -#line 1319 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1319 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp13_ = string_length; -#line 1319 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1319 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" g_return_val_if_fail (_tmp12_ <= _tmp13_, NULL); #line 1669 "CameraTable.c" } -#line 1321 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1321 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp14_ = len; -#line 1321 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1321 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" if (_tmp14_ < ((glong) 0)) { #line 1675 "CameraTable.c" glong _tmp15_ = 0L; glong _tmp16_ = 0L; -#line 1322 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1322 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp15_ = string_length; -#line 1322 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1322 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp16_ = offset; -#line 1322 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1322 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" len = _tmp15_ - _tmp16_; #line 1684 "CameraTable.c" } -#line 1324 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1324 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp17_ = offset; -#line 1324 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1324 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp18_ = len; -#line 1324 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1324 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp19_ = string_length; -#line 1324 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1324 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" g_return_val_if_fail ((_tmp17_ + _tmp18_) <= _tmp19_, NULL); -#line 1325 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp20_ = offset; -#line 1325 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp21_ = len; -#line 1325 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp22_ = g_strndup (((gchar*) self) + _tmp20_, (gsize) _tmp21_); -#line 1325 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" result = _tmp22_; -#line 1325 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" return result; #line 1704 "CameraTable.c" } @@ -1709,11 +1709,11 @@ static gchar* string_substring (const gchar* self, glong offset, glong len) { static gchar* string_replace (const gchar* self, const gchar* old, const gchar* replacement) { gchar* result = NULL; GError * _inner_error_ = NULL; -#line 1380 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1380 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" g_return_val_if_fail (self != NULL, NULL); -#line 1380 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1380 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" g_return_val_if_fail (old != NULL, NULL); -#line 1380 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1380 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" g_return_val_if_fail (replacement != NULL, NULL); #line 1717 "CameraTable.c" { @@ -1728,98 +1728,98 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar* const gchar* _tmp7_ = NULL; gchar* _tmp8_ = NULL; gchar* _tmp9_ = NULL; -#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp0_ = old; -#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp1_ = g_regex_escape_string (_tmp0_, -1); -#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp2_ = _tmp1_; -#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp3_ = g_regex_new (_tmp2_, 0, 0, &_inner_error_); -#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp4_ = _tmp3_; -#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _g_free0 (_tmp2_); -#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" regex = _tmp4_; -#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" if (_inner_error_->domain == G_REGEX_ERROR) { #line 1748 "CameraTable.c" - goto __catch56_g_regex_error; + goto __catch58_g_regex_error; } -#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); -#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" g_clear_error (&_inner_error_); -#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" return NULL; #line 1757 "CameraTable.c" } -#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp6_ = regex; -#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp7_ = replacement; -#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp8_ = g_regex_replace_literal (_tmp6_, self, (gssize) -1, 0, _tmp7_, 0, &_inner_error_); -#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp5_ = _tmp8_; -#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _g_regex_unref0 (regex); -#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" if (_inner_error_->domain == G_REGEX_ERROR) { #line 1773 "CameraTable.c" - goto __catch56_g_regex_error; + goto __catch58_g_regex_error; } -#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _g_regex_unref0 (regex); -#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); -#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" g_clear_error (&_inner_error_); -#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" return NULL; #line 1784 "CameraTable.c" } -#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp9_ = _tmp5_; -#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp5_ = NULL; -#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" result = _tmp9_; -#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _g_free0 (_tmp5_); -#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _g_regex_unref0 (regex); -#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" return result; #line 1798 "CameraTable.c" } - goto __finally56; - __catch56_g_regex_error: + goto __finally58; + __catch58_g_regex_error: { GError* e = NULL; -#line 1381 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" e = _inner_error_; -#line 1381 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _inner_error_ = NULL; -#line 1385 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1385 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" g_assert_not_reached (); -#line 1381 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _g_error_free0 (e); #line 1812 "CameraTable.c" } - __finally56: -#line 1381 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" + __finally58: +#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1381 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" 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 1381 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" g_clear_error (&_inner_error_); -#line 1381 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" return NULL; #line 1823 "CameraTable.c" } @@ -4170,7 +4170,7 @@ static void camera_table_on_update_cameras (CameraTable* self) { #line 399 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" if (_inner_error_->domain == GPHOTO_ERROR) { #line 4171 "CameraTable.c" - goto __catch57_gphoto_error; + goto __catch59_gphoto_error; } #line 399 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); @@ -4181,8 +4181,8 @@ static void camera_table_on_update_cameras (CameraTable* self) { #line 4180 "CameraTable.c" } } - goto __finally57; - __catch57_gphoto_error: + goto __finally59; + __catch59_gphoto_error: { GError* err = NULL; GError* _tmp2_ = NULL; @@ -4201,7 +4201,7 @@ static void camera_table_on_update_cameras (CameraTable* self) { _g_error_free0 (err); #line 4201 "CameraTable.c" } - __finally57: + __finally59: #line 398 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 398 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" diff --git a/src/camera/GPhoto.c b/src/camera/GPhoto.c index a703945..b21ac78 100644 --- a/src/camera/GPhoto.c +++ b/src/camera/GPhoto.c @@ -1,4 +1,4 @@ -/* GPhoto.c generated by valac 0.32.1, the Vala compiler +/* GPhoto.c generated by valac 0.34.4, the Vala compiler * generated from GPhoto.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -1032,103 +1032,103 @@ static gchar* string_slice (const gchar* self, glong start, glong end) { glong _tmp19_ = 0L; glong _tmp20_ = 0L; gchar* _tmp21_ = NULL; -#line 1328 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1328 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" g_return_val_if_fail (self != NULL, NULL); -#line 1329 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1329 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp0_ = strlen (self); -#line 1329 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1329 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp1_ = _tmp0_; -#line 1329 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1329 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" string_length = (glong) _tmp1_; -#line 1330 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1330 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp2_ = start; -#line 1330 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1330 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" if (_tmp2_ < ((glong) 0)) { #line 1048 "GPhoto.c" glong _tmp3_ = 0L; glong _tmp4_ = 0L; -#line 1331 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1331 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp3_ = string_length; -#line 1331 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1331 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp4_ = start; -#line 1331 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1331 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" start = _tmp3_ + _tmp4_; #line 1057 "GPhoto.c" } -#line 1333 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1333 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp5_ = end; -#line 1333 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1333 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" if (_tmp5_ < ((glong) 0)) { #line 1063 "GPhoto.c" glong _tmp6_ = 0L; glong _tmp7_ = 0L; -#line 1334 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1334 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp6_ = string_length; -#line 1334 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1334 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp7_ = end; -#line 1334 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1334 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" end = _tmp6_ + _tmp7_; #line 1072 "GPhoto.c" } -#line 1336 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp9_ = start; -#line 1336 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" if (_tmp9_ >= ((glong) 0)) { #line 1078 "GPhoto.c" glong _tmp10_ = 0L; glong _tmp11_ = 0L; -#line 1336 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp10_ = start; -#line 1336 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp11_ = string_length; -#line 1336 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp8_ = _tmp10_ <= _tmp11_; #line 1087 "GPhoto.c" } else { -#line 1336 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp8_ = FALSE; #line 1091 "GPhoto.c" } -#line 1336 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" g_return_val_if_fail (_tmp8_, NULL); -#line 1337 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1337 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp13_ = end; -#line 1337 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1337 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" if (_tmp13_ >= ((glong) 0)) { #line 1099 "GPhoto.c" glong _tmp14_ = 0L; glong _tmp15_ = 0L; -#line 1337 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1337 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp14_ = end; -#line 1337 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1337 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp15_ = string_length; -#line 1337 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1337 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp12_ = _tmp14_ <= _tmp15_; #line 1108 "GPhoto.c" } else { -#line 1337 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1337 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp12_ = FALSE; #line 1112 "GPhoto.c" } -#line 1337 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1337 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" g_return_val_if_fail (_tmp12_, NULL); -#line 1338 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1338 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp16_ = start; -#line 1338 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1338 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp17_ = end; -#line 1338 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1338 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" g_return_val_if_fail (_tmp16_ <= _tmp17_, NULL); -#line 1339 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1339 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp18_ = start; -#line 1339 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1339 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp19_ = end; -#line 1339 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1339 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp20_ = start; -#line 1339 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1339 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp21_ = g_strndup (((gchar*) self) + _tmp18_, (gsize) (_tmp19_ - _tmp20_)); -#line 1339 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1339 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" result = _tmp21_; -#line 1339 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1339 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" return result; #line 1134 "GPhoto.c" } @@ -1295,11 +1295,11 @@ PhotoMetadata* gp_get_fallback_metadata (Camera* camera, GPContext* context, con #line 140 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 1298 "GPhoto.c" - goto __catch58_g_error; + goto __catch60_g_error; } } - goto __finally58; - __catch58_g_error: + goto __finally60; + __catch60_g_error: { #line 139 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" g_clear_error (&_inner_error_); @@ -1311,7 +1311,7 @@ PhotoMetadata* gp_get_fallback_metadata (Camera* camera, GPContext* context, con metadata = NULL; #line 1313 "GPhoto.c" } - __finally58: + __finally60: #line 139 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 139 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" @@ -1420,7 +1420,7 @@ GdkPixbuf* gp_load_preview (GPContext* context, Camera* camera, const gchar* fol #line 154 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 1423 "GPhoto.c" - goto __catch59_g_error; + goto __catch61_g_error; } #line 154 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" _tmp7_ = _tmp0_; @@ -1440,8 +1440,8 @@ GdkPixbuf* gp_load_preview (GPContext* context, Camera* camera, const gchar* fol _tmp0_ = (g_free (_tmp0_), NULL); #line 1442 "GPhoto.c" } - goto __finally59; - __catch59_g_error: + goto __finally61; + __catch61_g_error: { PhotoMetadata* metadata = NULL; Camera* _tmp8_ = NULL; @@ -1578,7 +1578,7 @@ GdkPixbuf* gp_load_preview (GPContext* context, Camera* camera, const gchar* fol #line 162 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" _media_metadata_unref0 (metadata); #line 1581 "GPhoto.c" - goto __finally59; + goto __finally61; } #line 162 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" _tmp24_ = _tmp20_; @@ -1602,7 +1602,7 @@ GdkPixbuf* gp_load_preview (GPContext* context, Camera* camera, const gchar* fol _media_metadata_unref0 (metadata); #line 1604 "GPhoto.c" } - __finally59: + __finally61: #line 153 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 153 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" @@ -1769,7 +1769,7 @@ GdkPixbuf* gp_load_preview (GPContext* context, Camera* camera, const gchar* fol #line 187 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" _tmp46_ = mins; #line 187 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" - _tmp47_ = gdk_pixbuf_new_from_stream_at_scale (G_TYPE_CHECK_INSTANCE_CAST (_tmp46_, G_TYPE_INPUT_STREAM, GInputStream), IMPORT_PREVIEW_MAX_SCALE, IMPORT_PREVIEW_MAX_SCALE, TRUE, NULL, &_inner_error_); + _tmp47_ = gdk_pixbuf_new_from_stream_at_scale (G_TYPE_CHECK_INSTANCE_CAST (_tmp46_, g_input_stream_get_type (), GInputStream), IMPORT_PREVIEW_MAX_SCALE, IMPORT_PREVIEW_MAX_SCALE, TRUE, NULL, &_inner_error_); #line 187 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" _tmp45_ = _tmp47_; #line 187 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" @@ -2145,7 +2145,7 @@ PhotoMetadata* gp_load_metadata (GPContext* context, Camera* camera, const gchar #line 221 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 2148 "GPhoto.c" - goto __catch60_g_error; + goto __catch62_g_error; } #line 221 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" _tmp7_ = _tmp0_; @@ -2167,8 +2167,8 @@ PhotoMetadata* gp_load_metadata (GPContext* context, Camera* camera, const gchar _tmp0_ = (g_free (_tmp0_), NULL); #line 2169 "GPhoto.c" } - goto __finally60; - __catch60_g_error: + goto __finally62; + __catch62_g_error: { Camera* _tmp8_ = NULL; GPContext* _tmp9_ = NULL; @@ -2197,7 +2197,7 @@ PhotoMetadata* gp_load_metadata (GPContext* context, Camera* camera, const gchar return result; #line 2199 "GPhoto.c" } - __finally60: + __finally62: #line 220 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 220 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" @@ -2472,7 +2472,7 @@ GInputStream* gp_load_file_into_stream (GPContext* context, Camera* camera, cons #line 259 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" _tmp31_ = (GMemoryInputStream*) g_memory_input_stream_new_from_data (_tmp30_, _tmp30__length1, _gp_on_mins_destroyed_gdestroy_notify); #line 259 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" - result = G_TYPE_CHECK_INSTANCE_CAST (_tmp31_, G_TYPE_INPUT_STREAM, GInputStream); + result = G_TYPE_CHECK_INSTANCE_CAST (_tmp31_, g_input_stream_get_type (), GInputStream); #line 259 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" buffer = (g_free (buffer), NULL); #line 259 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" @@ -2577,7 +2577,7 @@ GInputStream* gp_load_file_into_stream (GPContext* context, Camera* camera, cons #line 269 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" _tmp51_ = NULL; #line 269 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" - result = G_TYPE_CHECK_INSTANCE_CAST (_tmp54_, G_TYPE_INPUT_STREAM, GInputStream); + result = G_TYPE_CHECK_INSTANCE_CAST (_tmp54_, g_input_stream_get_type (), GInputStream); #line 269 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" _g_object_unref0 (_tmp51_); #line 269 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" diff --git a/src/camera/GPhoto.vala b/src/camera/GPhoto.vala index b16e32b..3616cb2 100644 --- a/src/camera/GPhoto.vala +++ b/src/camera/GPhoto.vala @@ -115,7 +115,7 @@ namespace GPhoto { return true; } - // Libgphoto will in some instances refuse to get metadata from a camera, but the camera is accessable as a + // Libgphoto will in some instances refuse to get metadata from a camera, but the camera is accessible as a // filesystem. In these cases shotwell can access the file directly. See: // http://redmine.yorba.org/issues/2959 public PhotoMetadata? get_fallback_metadata(Camera camera, Context context, string folder, string filename) { diff --git a/src/camera/ImportPage.c b/src/camera/ImportPage.c index 928a456..5e7cfb2 100644 --- a/src/camera/ImportPage.c +++ b/src/camera/ImportPage.c @@ -1,4 +1,4 @@ -/* ImportPage.c generated by valac 0.32.1, the Vala compiler +/* ImportPage.c generated by valac 0.34.4, the Vala compiler * generated from ImportPage.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -349,6 +349,46 @@ typedef struct _MediaSourceCollectionClass MediaSourceCollectionClass; typedef struct _LibraryPhotoSourceCollection LibraryPhotoSourceCollection; typedef struct _LibraryPhotoSourceCollectionClass LibraryPhotoSourceCollectionClass; +#define TYPE_MEDIA_SOURCE (media_source_get_type ()) +#define MEDIA_SOURCE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_MEDIA_SOURCE, MediaSource)) +#define MEDIA_SOURCE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_MEDIA_SOURCE, MediaSourceClass)) +#define IS_MEDIA_SOURCE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_MEDIA_SOURCE)) +#define IS_MEDIA_SOURCE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_MEDIA_SOURCE)) +#define MEDIA_SOURCE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_MEDIA_SOURCE, MediaSourceClass)) + +typedef struct _MediaSource MediaSource; +typedef struct _MediaSourceClass MediaSourceClass; + +#define TYPE_PHOTO_SOURCE (photo_source_get_type ()) +#define PHOTO_SOURCE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_PHOTO_SOURCE, PhotoSource)) +#define PHOTO_SOURCE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_PHOTO_SOURCE, PhotoSourceClass)) +#define IS_PHOTO_SOURCE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_PHOTO_SOURCE)) +#define IS_PHOTO_SOURCE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_PHOTO_SOURCE)) +#define PHOTO_SOURCE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_PHOTO_SOURCE, PhotoSourceClass)) + +typedef struct _PhotoSource PhotoSource; +typedef struct _PhotoSourceClass PhotoSourceClass; + +#define TYPE_PHOTO (photo_get_type ()) +#define PHOTO(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_PHOTO, Photo)) +#define PHOTO_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_PHOTO, PhotoClass)) +#define IS_PHOTO(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_PHOTO)) +#define IS_PHOTO_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_PHOTO)) +#define PHOTO_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_PHOTO, PhotoClass)) + +typedef struct _Photo Photo; +typedef struct _PhotoClass PhotoClass; + +#define TYPE_LIBRARY_PHOTO (library_photo_get_type ()) +#define LIBRARY_PHOTO(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_LIBRARY_PHOTO, LibraryPhoto)) +#define LIBRARY_PHOTO_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_LIBRARY_PHOTO, LibraryPhotoClass)) +#define IS_LIBRARY_PHOTO(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_LIBRARY_PHOTO)) +#define IS_LIBRARY_PHOTO_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_LIBRARY_PHOTO)) +#define LIBRARY_PHOTO_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_LIBRARY_PHOTO, LibraryPhotoClass)) + +typedef struct _LibraryPhoto LibraryPhoto; +typedef struct _LibraryPhotoClass LibraryPhotoClass; + #define TYPE_VIDEO_SOURCE_COLLECTION (video_source_collection_get_type ()) #define VIDEO_SOURCE_COLLECTION(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_VIDEO_SOURCE_COLLECTION, VideoSourceCollection)) #define VIDEO_SOURCE_COLLECTION_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_VIDEO_SOURCE_COLLECTION, VideoSourceCollectionClass)) @@ -609,6 +649,7 @@ typedef struct _BatchImportJobClass BatchImportJobClass; typedef struct _ImportPageCameraImportJob ImportPageCameraImportJob; typedef struct _ImportPageCameraImportJobClass ImportPageCameraImportJobClass; +#define _g_variant_unref0(var) ((var == NULL) ? NULL : (var = (g_variant_unref (var), NULL))) #define TYPE_APP_WINDOW (app_window_get_type ()) #define APP_WINDOW(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_APP_WINDOW, AppWindow)) @@ -619,17 +660,6 @@ typedef struct _ImportPageCameraImportJobClass ImportPageCameraImportJobClass; typedef struct _AppWindow AppWindow; typedef struct _AppWindowClass AppWindowClass; -#define _g_variant_unref0(var) ((var == NULL) ? NULL : (var = (g_variant_unref (var), NULL))) - -#define TYPE_MEDIA_SOURCE (media_source_get_type ()) -#define MEDIA_SOURCE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_MEDIA_SOURCE, MediaSource)) -#define MEDIA_SOURCE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_MEDIA_SOURCE, MediaSourceClass)) -#define IS_MEDIA_SOURCE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_MEDIA_SOURCE)) -#define IS_MEDIA_SOURCE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_MEDIA_SOURCE)) -#define MEDIA_SOURCE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_MEDIA_SOURCE, MediaSourceClass)) - -typedef struct _MediaSource MediaSource; -typedef struct _MediaSourceClass MediaSourceClass; #define _gp_list_unref0(var) ((var == NULL) ? NULL : (var = (gp_list_unref (var), NULL))) #define TYPE_SORTED_LIST (sorted_list_get_type ()) @@ -740,26 +770,6 @@ typedef struct _BackingPhotoRowPrivate BackingPhotoRowPrivate; #define TYPE_BACKING_PHOTO_ID (backing_photo_id_get_type ()) typedef struct _BackingPhotoID BackingPhotoID; - -#define TYPE_PHOTO_SOURCE (photo_source_get_type ()) -#define PHOTO_SOURCE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_PHOTO_SOURCE, PhotoSource)) -#define PHOTO_SOURCE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_PHOTO_SOURCE, PhotoSourceClass)) -#define IS_PHOTO_SOURCE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_PHOTO_SOURCE)) -#define IS_PHOTO_SOURCE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_PHOTO_SOURCE)) -#define PHOTO_SOURCE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_PHOTO_SOURCE, PhotoSourceClass)) - -typedef struct _PhotoSource PhotoSource; -typedef struct _PhotoSourceClass PhotoSourceClass; - -#define TYPE_PHOTO (photo_get_type ()) -#define PHOTO(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_PHOTO, Photo)) -#define PHOTO_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_PHOTO, PhotoClass)) -#define IS_PHOTO(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_PHOTO)) -#define IS_PHOTO_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_PHOTO)) -#define PHOTO_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_PHOTO, PhotoClass)) - -typedef struct _Photo Photo; -typedef struct _PhotoClass PhotoClass; typedef struct _ViewFilterPrivate ViewFilterPrivate; typedef struct _SearchViewFilterPrivate SearchViewFilterPrivate; typedef struct _ImportPageImportPageSearchViewFilterPrivate ImportPageImportPageSearchViewFilterPrivate; @@ -1172,7 +1182,8 @@ struct _PageClass { void (*ready) (Page* self); void (*switching_to_fullscreen) (Page* self, FullscreenWindow* fsw); void (*returning_from_fullscreen) (Page* self, FullscreenWindow* fsw); - void (*add_actions) (Page* self); + void (*add_actions) (Page* self, GActionMap* map); + void (*remove_actions) (Page* self, GActionMap* map); void (*init_collect_ui_filenames) (Page* self, GeeList* ui_filenames); InjectionGroup** (*init_collect_injection_groups) (Page* self, int* result_length1); void (*init_actions) (Page* self, gint selected_count, gint count); @@ -1705,8 +1716,14 @@ void library_photo_get_nontrash_duplicate (GFile* file, const gchar* thumbnail_m GType database_source_collection_get_type (void) G_GNUC_CONST; GType media_source_collection_get_type (void) G_GNUC_CONST; GType library_photo_source_collection_get_type (void) G_GNUC_CONST; -gboolean library_photo_source_collection_has_basename_filesize_duplicate (LibraryPhotoSourceCollection* self, const gchar* basename, gint64 filesize); void library_photo_source_collection_get_basename_filesize_duplicate (LibraryPhotoSourceCollection* self, const gchar* basename, gint64 filesize, PhotoID* result); +gboolean photo_id_is_valid (PhotoID *self); +GType media_source_get_type (void) G_GNUC_CONST; +GType photo_source_get_type (void) G_GNUC_CONST; +GType photo_get_type (void) G_GNUC_CONST; +GType library_photo_get_type (void) G_GNUC_CONST; +LibraryPhoto* library_photo_source_collection_fetch (LibraryPhotoSourceCollection* self, PhotoID* photo_id); +time_t media_source_get_exposure_time (MediaSource* self); GType video_source_collection_get_type (void) G_GNUC_CONST; gboolean video_source_collection_has_basename_filesize_duplicate (VideoSourceCollection* self, const gchar* basename, guint64 filesize); GType video_id_get_type (void) G_GNUC_CONST; @@ -1858,8 +1875,6 @@ GType configuration_facade_get_type (void) G_GNUC_CONST; GType config_facade_get_type (void) G_GNUC_CONST; ConfigFacade* config_facade_get_instance (void); gboolean configuration_facade_get_hide_photos_already_imported (ConfigurationFacade* self); -#define RESOURCES_IMPORT "shotwell-import" -#define RESOURCES_IMPORT_ALL "shotwell-import-all" static void import_page_update_toolbar_state (ImportPage* self); static CoreViewTracker* import_page_real_get_view_tracker (CheckerboardPage* base); static gchar* import_page_real_get_view_empty_message (CheckerboardPage* base); @@ -1877,13 +1892,13 @@ static GType import_page_camera_import_job_get_type (void) G_GNUC_CONST G_GNUC_U static time_t import_page_camera_import_job_get_exposure_time (ImportPageCameraImportJob* self); static void import_page_real_init_collect_ui_filenames (Page* base, GeeList* ui_filenames); void page_init_collect_ui_filenames (Page* self, GeeList* ui_filenames); -static void import_page_real_add_actions (Page* base); -void page_add_actions (Page* self); -GType app_window_get_type (void) G_GNUC_CONST; -AppWindow* app_window_get_instance (void); +static void import_page_real_add_actions (Page* base, GActionMap* map); +void page_add_actions (Page* self, GActionMap* map); GAction* page_get_action (Page* self, const gchar* name); gboolean configuration_facade_get_display_photo_titles (ConfigurationFacade* self); static GVariant* _variant_new15 (gboolean value); +static void import_page_real_remove_actions (Page* base, GActionMap* map); +void page_remove_actions (Page* self, GActionMap* map); Camera* import_page_get_camera (ImportPage* self); gchar* import_page_get_uri (ImportPage* self); gboolean import_page_is_busy (ImportPage* self); @@ -1905,6 +1920,8 @@ static void import_page_real_ready (Page* base); static void import_page_try_refreshing_camera (ImportPage* self, gboolean fail_on_locked); static ImportPageRefreshResult import_page_refresh_camera (ImportPage* self); void app_window_error_message (const gchar* message, GtkWindow* parent); +GType app_window_get_type (void) G_GNUC_CONST; +AppWindow* app_window_get_instance (void); #define RESOURCES_APP_TITLE "Shotwell" void checkerboard_page_set_page_message (CheckerboardPage* self, const gchar* message); gboolean import_page_unmount_camera (ImportPage* self, GMount* mount); @@ -1915,7 +1932,6 @@ static void _import_page_on_unmount_finished_gasync_ready_callback (GObject* sou static void import_page_clear_all_import_sources (ImportPage* self); Marker* data_collection_start_marking (DataCollection* self); void marker_mark_all (Marker* self); -GType media_source_get_type (void) G_GNUC_CONST; gint source_collection_destroy_marked (SourceCollection* self, Marker* marker, gboolean delete_backing, ProgressMonitor monitor, void* monitor_target, GeeList* not_removed); static gboolean import_page_check_directory_exists (ImportPage* self, gint fsid, const gchar* dir, const gchar* search_target); static gboolean import_page_enumerate_files (ImportPage* self, gint fsid, const gchar* dir, GeeArrayList* import_list); @@ -2050,8 +2066,6 @@ GType backing_photo_id_get_type (void) G_GNUC_CONST; BackingPhotoID* backing_photo_id_dup (const BackingPhotoID* self); void backing_photo_id_free (BackingPhotoID* self); static gboolean import_page_camera_import_job_real_complete (BatchImportJob* base, MediaSource* source, BatchImportRoll* import_roll, GError** error); -GType photo_source_get_type (void) G_GNUC_CONST; -GType photo_get_type (void) G_GNUC_CONST; void photo_add_backing_photo_for_development (Photo* self, RawDeveloper d, BackingPhotoRow* bpr, GError** error); void photo_set_raw_developer (Photo* self, RawDeveloper d); RawDeveloper configuration_facade_get_default_raw_developer (ConfigurationFacade* self); @@ -2090,14 +2104,14 @@ ImportSourceCollection* import_source_collection_construct (GType object_type, c self = (ImportSourceCollection*) source_collection_construct (object_type, _tmp0_); #line 8 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return self; -#line 2093 "ImportPage.c" +#line 2107 "ImportPage.c" } ImportSourceCollection* import_source_collection_new (const gchar* name) { #line 8 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return import_source_collection_construct (TYPE_IMPORT_SOURCE_COLLECTION, name); -#line 2100 "ImportPage.c" +#line 2114 "ImportPage.c" } @@ -2115,7 +2129,7 @@ static gboolean import_source_collection_real_holds_type_of_source (SourceCollec result = G_TYPE_CHECK_INSTANCE_TYPE (_tmp0_, TYPE_IMPORT_SOURCE); #line 13 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return result; -#line 2118 "ImportPage.c" +#line 2132 "ImportPage.c" } @@ -2124,7 +2138,7 @@ static void import_source_collection_class_init (ImportSourceCollectionClass * k import_source_collection_parent_class = g_type_class_peek_parent (klass); #line 7 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" ((SourceCollectionClass *) klass)->holds_type_of_source = import_source_collection_real_holds_type_of_source; -#line 2127 "ImportPage.c" +#line 2141 "ImportPage.c" } @@ -2147,7 +2161,7 @@ GType import_source_collection_get_type (void) { static gpointer _GPHOTO_REF_CAMERA0 (gpointer self) { #line 31 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return self ? GPHOTO_REF_CAMERA (self) : NULL; -#line 2150 "ImportPage.c" +#line 2164 "ImportPage.c" } @@ -2230,14 +2244,14 @@ ImportSource* import_source_construct (GType object_type, const gchar* camera_na self->priv->indexable_keywords = _tmp12_; #line 28 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return self; -#line 2233 "ImportPage.c" +#line 2247 "ImportPage.c" } static gpointer _g_object_ref0 (gpointer self) { #line 41 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return self ? g_object_ref (self) : NULL; -#line 2240 "ImportPage.c" +#line 2254 "ImportPage.c" } @@ -2256,7 +2270,7 @@ void import_source_set_preview (ImportSource* self, GdkPixbuf* preview) { _g_object_unref0 (self->priv->preview); #line 41 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" self->priv->preview = _tmp1_; -#line 2259 "ImportPage.c" +#line 2273 "ImportPage.c" } @@ -2274,7 +2288,7 @@ gchar* import_source_get_camera_name (ImportSource* self) { result = _tmp1_; #line 45 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return result; -#line 2277 "ImportPage.c" +#line 2291 "ImportPage.c" } @@ -2292,7 +2306,7 @@ Camera* import_source_get_camera (ImportSource* self) { result = _tmp1_; #line 49 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return result; -#line 2295 "ImportPage.c" +#line 2309 "ImportPage.c" } @@ -2307,7 +2321,7 @@ gint import_source_get_fsid (ImportSource* self) { result = _tmp0_; #line 53 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return result; -#line 2310 "ImportPage.c" +#line 2324 "ImportPage.c" } @@ -2325,7 +2339,7 @@ gchar* import_source_get_folder (ImportSource* self) { result = _tmp1_; #line 57 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return result; -#line 2328 "ImportPage.c" +#line 2342 "ImportPage.c" } @@ -2343,7 +2357,7 @@ gchar* import_source_get_filename (ImportSource* self) { result = _tmp1_; #line 61 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return result; -#line 2346 "ImportPage.c" +#line 2360 "ImportPage.c" } @@ -2358,7 +2372,7 @@ gulong import_source_get_filesize (ImportSource* self) { result = _tmp0_; #line 65 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return result; -#line 2361 "ImportPage.c" +#line 2375 "ImportPage.c" } @@ -2373,7 +2387,7 @@ time_t import_source_get_modification_time (ImportSource* self) { result = _tmp0_; #line 69 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return result; -#line 2376 "ImportPage.c" +#line 2390 "ImportPage.c" } @@ -2389,7 +2403,7 @@ static GdkPixbuf* import_source_real_get_preview (ImportSource* self) { result = _tmp1_; #line 73 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return result; -#line 2392 "ImportPage.c" +#line 2406 "ImportPage.c" } @@ -2398,7 +2412,7 @@ GdkPixbuf* import_source_get_preview (ImportSource* self) { g_return_val_if_fail (IS_IMPORT_SOURCE (self), NULL); #line 72 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return IMPORT_SOURCE_GET_CLASS (self)->get_preview (self); -#line 2401 "ImportPage.c" +#line 2415 "ImportPage.c" } @@ -2411,7 +2425,7 @@ static time_t import_source_real_get_exposure_time (ImportSource* self) { result = _tmp0_; #line 77 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return result; -#line 2414 "ImportPage.c" +#line 2428 "ImportPage.c" } @@ -2420,7 +2434,7 @@ time_t import_source_get_exposure_time (ImportSource* self) { g_return_val_if_fail (IS_IMPORT_SOURCE (self), 0); #line 76 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return IMPORT_SOURCE_GET_CLASS (self)->get_exposure_time (self); -#line 2423 "ImportPage.c" +#line 2437 "ImportPage.c" } @@ -2465,7 +2479,7 @@ gchar* import_source_get_fulldir (ImportSource* self) { result = _tmp8_; #line 81 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return result; -#line 2468 "ImportPage.c" +#line 2482 "ImportPage.c" } @@ -2508,7 +2522,7 @@ static gchar* import_source_real_to_string (DataObject* base) { result = _tmp7_; #line 85 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return result; -#line 2511 "ImportPage.c" +#line 2525 "ImportPage.c" } @@ -2524,7 +2538,7 @@ static gchar* gp_result_to_full_string (int self) { result = _tmp1_; #line 480 "/home/jens/Source/shotwell/vapi/libgphoto2.vapi" return result; -#line 2527 "ImportPage.c" +#line 2541 "ImportPage.c" } @@ -2572,7 +2586,7 @@ static gboolean import_source_real_internal_delete_backing (DataSource* base, GE _tmp4_ = fulldir; #line 92 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" if (_tmp4_ == NULL) { -#line 2575 "ImportPage.c" +#line 2589 "ImportPage.c" gchar* _tmp5_ = NULL; gchar* _tmp6_ = NULL; const gchar* _tmp7_ = NULL; @@ -2600,7 +2614,7 @@ static gboolean import_source_real_internal_delete_backing (DataSource* base, GE _g_free0 (fulldir); #line 95 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return FALSE; -#line 2603 "ImportPage.c" +#line 2617 "ImportPage.c" } #line 95 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" result = _tmp8_; @@ -2608,7 +2622,7 @@ static gboolean import_source_real_internal_delete_backing (DataSource* base, GE _g_free0 (fulldir); #line 95 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return result; -#line 2611 "ImportPage.c" +#line 2625 "ImportPage.c" } #line 98 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp10_ = import_source_get_camera (self); @@ -2638,7 +2652,7 @@ static gboolean import_source_real_internal_delete_backing (DataSource* base, GE _tmp19_ = _result_; #line 100 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" if (_tmp19_ != GP_OK) { -#line 2641 "ImportPage.c" +#line 2655 "ImportPage.c" gchar* _tmp20_ = NULL; gchar* _tmp21_ = NULL; const gchar* _tmp22_ = NULL; @@ -2663,7 +2677,7 @@ static gboolean import_source_real_internal_delete_backing (DataSource* base, GE _g_free0 (_tmp25_); #line 101 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_free0 (_tmp21_); -#line 2666 "ImportPage.c" +#line 2680 "ImportPage.c" } #line 103 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp28_ = DATA_SOURCE_CLASS (import_source_parent_class)->internal_delete_backing (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_THUMBNAIL_SOURCE, ThumbnailSource), TYPE_DATA_SOURCE, DataSource), &_inner_error_); @@ -2677,21 +2691,21 @@ static gboolean import_source_real_internal_delete_backing (DataSource* base, GE _g_free0 (fulldir); #line 103 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return FALSE; -#line 2680 "ImportPage.c" +#line 2694 "ImportPage.c" } #line 103 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" if (_tmp27_) { -#line 2684 "ImportPage.c" +#line 2698 "ImportPage.c" int _tmp29_ = 0; #line 103 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp29_ = _result_; #line 103 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp26_ = _tmp29_ == GP_OK; -#line 2690 "ImportPage.c" +#line 2704 "ImportPage.c" } else { #line 103 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp26_ = FALSE; -#line 2694 "ImportPage.c" +#line 2708 "ImportPage.c" } #line 103 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" result = _tmp26_; @@ -2699,7 +2713,7 @@ static gboolean import_source_real_internal_delete_backing (DataSource* base, GE _g_free0 (fulldir); #line 103 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return result; -#line 2702 "ImportPage.c" +#line 2716 "ImportPage.c" } @@ -2715,7 +2729,7 @@ static const gchar* import_source_real_get_indexable_keywords (Indexable* base) result = _tmp0_; #line 107 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return result; -#line 2718 "ImportPage.c" +#line 2732 "ImportPage.c" } @@ -2734,7 +2748,7 @@ static void import_source_class_init (ImportSourceClass * klass) { ((DataSourceClass *) klass)->internal_delete_backing = import_source_real_internal_delete_backing; #line 17 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" G_OBJECT_CLASS (klass)->finalize = import_source_finalize; -#line 2737 "ImportPage.c" +#line 2751 "ImportPage.c" } @@ -2743,7 +2757,7 @@ static void import_source_indexable_interface_init (IndexableIface * iface) { import_source_indexable_parent_iface = g_type_interface_peek_parent (iface); #line 17 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" iface->get_indexable_keywords = (const gchar* (*)(Indexable*)) import_source_real_get_indexable_keywords; -#line 2746 "ImportPage.c" +#line 2760 "ImportPage.c" } @@ -2754,7 +2768,7 @@ static void import_source_instance_init (ImportSource * self) { self->priv->preview = NULL; #line 26 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" self->priv->indexable_keywords = NULL; -#line 2757 "ImportPage.c" +#line 2771 "ImportPage.c" } @@ -2776,7 +2790,7 @@ static void import_source_finalize (GObject* obj) { _g_free0 (self->priv->indexable_keywords); #line 17 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" G_OBJECT_CLASS (import_source_parent_class)->finalize (obj); -#line 2779 "ImportPage.c" +#line 2793 "ImportPage.c" } @@ -2829,14 +2843,14 @@ VideoImportSource* video_import_source_construct (GType object_type, const gchar self = (VideoImportSource*) import_source_construct (object_type, _tmp0_, _tmp1_, _tmp2_, _tmp3_, _tmp4_, _tmp5_, _tmp6_); #line 112 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return self; -#line 2832 "ImportPage.c" +#line 2846 "ImportPage.c" } VideoImportSource* video_import_source_new (const gchar* camera_name, Camera* camera, gint fsid, const gchar* folder, const gchar* filename, gulong file_size, time_t modification_time) { #line 112 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return video_import_source_construct (TYPE_VIDEO_IMPORT_SOURCE, camera_name, camera, fsid, folder, filename, file_size, modification_time); -#line 2839 "ImportPage.c" +#line 2853 "ImportPage.c" } @@ -2862,7 +2876,7 @@ static GdkPixbuf* video_import_source_real_get_thumbnail (ThumbnailSource* base, g_propagate_error (error, _inner_error_); #line 118 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return NULL; -#line 2865 "ImportPage.c" +#line 2879 "ImportPage.c" } #line 118 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp3_ = _tmp0_; @@ -2874,7 +2888,7 @@ static GdkPixbuf* video_import_source_real_get_thumbnail (ThumbnailSource* base, _g_object_unref0 (_tmp0_); #line 118 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return result; -#line 2877 "ImportPage.c" +#line 2891 "ImportPage.c" } @@ -2902,13 +2916,13 @@ static GdkPixbuf* video_import_source_real_create_thumbnail (ThumbnailSource* ba result = NULL; #line 123 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return result; -#line 2905 "ImportPage.c" +#line 2919 "ImportPage.c" } #line 127 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp4_ = scale; #line 127 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" if (_tmp4_ > 0) { -#line 2911 "ImportPage.c" +#line 2925 "ImportPage.c" GdkPixbuf* _tmp5_ = NULL; GdkPixbuf* _tmp6_ = NULL; gint _tmp7_ = 0; @@ -2927,7 +2941,7 @@ static GdkPixbuf* video_import_source_real_create_thumbnail (ThumbnailSource* ba _tmp3_ = _tmp8_; #line 127 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_object_unref0 (_tmp6_); -#line 2930 "ImportPage.c" +#line 2944 "ImportPage.c" } else { GdkPixbuf* _tmp9_ = NULL; #line 128 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" @@ -2936,13 +2950,13 @@ static GdkPixbuf* video_import_source_real_create_thumbnail (ThumbnailSource* ba _g_object_unref0 (_tmp3_); #line 128 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp3_ = _tmp9_; -#line 2939 "ImportPage.c" +#line 2953 "ImportPage.c" } #line 127 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" result = _tmp3_; #line 127 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return result; -#line 2945 "ImportPage.c" +#line 2959 "ImportPage.c" } @@ -2958,7 +2972,7 @@ static gchar* video_import_source_real_get_typename (DataSource* base) { result = _tmp0_; #line 132 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return result; -#line 2961 "ImportPage.c" +#line 2975 "ImportPage.c" } @@ -2974,7 +2988,7 @@ static gint64 video_import_source_real_get_instance_id (DataSource* base) { result = _tmp0_; #line 136 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return result; -#line 2977 "ImportPage.c" +#line 2991 "ImportPage.c" } @@ -2990,7 +3004,7 @@ static PhotoFileFormat video_import_source_real_get_preferred_thumbnail_format ( result = _tmp0_; #line 140 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return result; -#line 2993 "ImportPage.c" +#line 3007 "ImportPage.c" } @@ -3006,7 +3020,7 @@ static gchar* video_import_source_real_get_name (DataObject* base) { result = _tmp0_; #line 144 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return result; -#line 3009 "ImportPage.c" +#line 3023 "ImportPage.c" } @@ -3021,7 +3035,7 @@ void video_import_source_update (VideoImportSource* self, GdkPixbuf* preview) { _tmp1_ = preview; #line 148 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" if (_tmp1_ != NULL) { -#line 3024 "ImportPage.c" +#line 3038 "ImportPage.c" GdkPixbuf* _tmp2_ = NULL; GdkPixbuf* _tmp3_ = NULL; #line 148 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" @@ -3032,7 +3046,7 @@ void video_import_source_update (VideoImportSource* self, GdkPixbuf* preview) { _g_object_unref0 (_tmp0_); #line 148 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp0_ = _tmp3_; -#line 3035 "ImportPage.c" +#line 3049 "ImportPage.c" } else { GdkPixbuf* _tmp4_ = NULL; #line 148 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" @@ -3041,13 +3055,13 @@ void video_import_source_update (VideoImportSource* self, GdkPixbuf* preview) { _g_object_unref0 (_tmp0_); #line 148 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp0_ = _tmp4_; -#line 3044 "ImportPage.c" +#line 3058 "ImportPage.c" } #line 148 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" import_source_set_preview (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_IMPORT_SOURCE, ImportSource), _tmp0_); #line 147 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_object_unref0 (_tmp0_); -#line 3050 "ImportPage.c" +#line 3064 "ImportPage.c" } @@ -3066,7 +3080,7 @@ static void video_import_source_class_init (VideoImportSourceClass * klass) { ((ThumbnailSourceClass *) klass)->get_preferred_thumbnail_format = video_import_source_real_get_preferred_thumbnail_format; #line 111 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" ((DataObjectClass *) klass)->get_name = video_import_source_real_get_name; -#line 3069 "ImportPage.c" +#line 3083 "ImportPage.c" } @@ -3126,14 +3140,14 @@ PhotoImportSource* photo_import_source_construct (GType object_type, const gchar self->priv->file_format = _tmp7_; #line 161 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return self; -#line 3129 "ImportPage.c" +#line 3143 "ImportPage.c" } PhotoImportSource* photo_import_source_new (const gchar* camera_name, Camera* camera, gint fsid, const gchar* folder, const gchar* filename, gulong file_size, time_t modification_time, PhotoFileFormat file_format) { #line 161 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return photo_import_source_construct (TYPE_PHOTO_IMPORT_SOURCE, camera_name, camera, fsid, folder, filename, file_size, modification_time, file_format); -#line 3136 "ImportPage.c" +#line 3150 "ImportPage.c" } @@ -3157,7 +3171,7 @@ static gchar* photo_import_source_real_get_name (DataObject* base) { _tmp3_ = is_string_empty (_tmp2_); #line 170 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" if (!_tmp3_) { -#line 3160 "ImportPage.c" +#line 3174 "ImportPage.c" const gchar* _tmp4_ = NULL; gchar* _tmp5_ = NULL; #line 170 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" @@ -3168,7 +3182,7 @@ static gchar* photo_import_source_real_get_name (DataObject* base) { _g_free0 (_tmp1_); #line 170 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp1_ = _tmp5_; -#line 3171 "ImportPage.c" +#line 3185 "ImportPage.c" } else { gchar* _tmp6_ = NULL; #line 170 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" @@ -3177,7 +3191,7 @@ static gchar* photo_import_source_real_get_name (DataObject* base) { _g_free0 (_tmp1_); #line 170 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp1_ = _tmp6_; -#line 3180 "ImportPage.c" +#line 3194 "ImportPage.c" } #line 170 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" result = _tmp1_; @@ -3185,7 +3199,7 @@ static gchar* photo_import_source_real_get_name (DataObject* base) { _g_free0 (title); #line 170 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return result; -#line 3188 "ImportPage.c" +#line 3202 "ImportPage.c" } @@ -3201,7 +3215,7 @@ static gchar* photo_import_source_real_get_typename (DataSource* base) { result = _tmp0_; #line 174 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return result; -#line 3204 "ImportPage.c" +#line 3218 "ImportPage.c" } @@ -3217,7 +3231,7 @@ static gint64 photo_import_source_real_get_instance_id (DataSource* base) { result = _tmp0_; #line 178 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return result; -#line 3220 "ImportPage.c" +#line 3234 "ImportPage.c" } @@ -3235,26 +3249,26 @@ static PhotoFileFormat photo_import_source_real_get_preferred_thumbnail_format ( _tmp2_ = photo_file_format_can_write (_tmp1_); #line 182 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" if (_tmp2_) { -#line 3238 "ImportPage.c" +#line 3252 "ImportPage.c" PhotoFileFormat _tmp3_ = 0; #line 182 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp3_ = self->priv->file_format; #line 182 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp0_ = _tmp3_; -#line 3244 "ImportPage.c" +#line 3258 "ImportPage.c" } else { PhotoFileFormat _tmp4_ = 0; #line 183 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp4_ = photo_file_format_get_system_default_format (); #line 183 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp0_ = _tmp4_; -#line 3251 "ImportPage.c" +#line 3265 "ImportPage.c" } #line 182 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" result = _tmp0_; #line 182 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return result; -#line 3257 "ImportPage.c" +#line 3271 "ImportPage.c" } @@ -3282,13 +3296,13 @@ static GdkPixbuf* photo_import_source_real_create_thumbnail (ThumbnailSource* ba result = NULL; #line 188 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return result; -#line 3285 "ImportPage.c" +#line 3299 "ImportPage.c" } #line 192 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp4_ = scale; #line 192 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" if (_tmp4_ > 0) { -#line 3291 "ImportPage.c" +#line 3305 "ImportPage.c" GdkPixbuf* _tmp5_ = NULL; GdkPixbuf* _tmp6_ = NULL; gint _tmp7_ = 0; @@ -3307,7 +3321,7 @@ static GdkPixbuf* photo_import_source_real_create_thumbnail (ThumbnailSource* ba _tmp3_ = _tmp8_; #line 192 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_object_unref0 (_tmp6_); -#line 3310 "ImportPage.c" +#line 3324 "ImportPage.c" } else { GdkPixbuf* _tmp9_ = NULL; #line 192 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" @@ -3316,20 +3330,20 @@ static GdkPixbuf* photo_import_source_real_create_thumbnail (ThumbnailSource* ba _g_object_unref0 (_tmp3_); #line 192 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp3_ = _tmp9_; -#line 3319 "ImportPage.c" +#line 3333 "ImportPage.c" } #line 192 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" result = _tmp3_; #line 192 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return result; -#line 3325 "ImportPage.c" +#line 3339 "ImportPage.c" } static gpointer _media_metadata_ref0 (gpointer self) { #line 199 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return self ? media_metadata_ref (self) : NULL; -#line 3332 "ImportPage.c" +#line 3346 "ImportPage.c" } @@ -3375,7 +3389,7 @@ void photo_import_source_update (PhotoImportSource* self, GdkPixbuf* preview, co _g_free0 (self->priv->exif_md5); #line 200 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" self->priv->exif_md5 = _tmp6_; -#line 3378 "ImportPage.c" +#line 3392 "ImportPage.c" } @@ -3394,7 +3408,7 @@ static time_t photo_import_source_real_get_exposure_time (ImportSource* base) { _tmp0_ = self->priv->metadata; #line 204 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" if (_tmp0_ == NULL) { -#line 3397 "ImportPage.c" +#line 3411 "ImportPage.c" time_t _tmp1_ = 0; #line 205 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp1_ = import_source_get_modification_time (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_IMPORT_SOURCE, ImportSource)); @@ -3402,7 +3416,7 @@ static time_t photo_import_source_real_get_exposure_time (ImportSource* base) { result = _tmp1_; #line 205 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return result; -#line 3405 "ImportPage.c" +#line 3419 "ImportPage.c" } #line 207 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp2_ = self->priv->metadata; @@ -3414,7 +3428,7 @@ static time_t photo_import_source_real_get_exposure_time (ImportSource* base) { _tmp5_ = date_time; #line 209 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" if (_tmp5_ != NULL) { -#line 3417 "ImportPage.c" +#line 3431 "ImportPage.c" MetadataDateTime* _tmp6_ = NULL; time_t _tmp7_ = 0; #line 209 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" @@ -3423,14 +3437,14 @@ static time_t photo_import_source_real_get_exposure_time (ImportSource* base) { _tmp7_ = metadata_date_time_get_timestamp (_tmp6_); #line 209 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp4_ = _tmp7_; -#line 3426 "ImportPage.c" +#line 3440 "ImportPage.c" } else { time_t _tmp8_ = 0; #line 209 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp8_ = import_source_get_modification_time (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_IMPORT_SOURCE, ImportSource)); #line 209 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp4_ = _tmp8_; -#line 3433 "ImportPage.c" +#line 3447 "ImportPage.c" } #line 209 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" result = _tmp4_; @@ -3438,7 +3452,7 @@ static time_t photo_import_source_real_get_exposure_time (ImportSource* base) { _metadata_date_time_unref0 (date_time); #line 209 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return result; -#line 3441 "ImportPage.c" +#line 3455 "ImportPage.c" } @@ -3452,7 +3466,7 @@ gchar* photo_import_source_get_title (PhotoImportSource* self) { _tmp1_ = self->priv->metadata; #line 213 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" if (_tmp1_ != NULL) { -#line 3455 "ImportPage.c" +#line 3469 "ImportPage.c" PhotoMetadata* _tmp2_ = NULL; gchar* _tmp3_ = NULL; #line 213 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" @@ -3463,19 +3477,19 @@ gchar* photo_import_source_get_title (PhotoImportSource* self) { _g_free0 (_tmp0_); #line 213 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp0_ = _tmp3_; -#line 3466 "ImportPage.c" +#line 3480 "ImportPage.c" } else { #line 213 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_free0 (_tmp0_); #line 213 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp0_ = NULL; -#line 3472 "ImportPage.c" +#line 3486 "ImportPage.c" } #line 213 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" result = _tmp0_; #line 213 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return result; -#line 3478 "ImportPage.c" +#line 3492 "ImportPage.c" } @@ -3490,7 +3504,7 @@ PhotoMetadata* photo_import_source_get_metadata (PhotoImportSource* self) { _tmp0_ = self->priv->associated; #line 217 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" if (_tmp0_ != NULL) { -#line 3493 "ImportPage.c" +#line 3507 "ImportPage.c" PhotoImportSource* _tmp1_ = NULL; PhotoMetadata* _tmp2_ = NULL; #line 218 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" @@ -3501,7 +3515,7 @@ PhotoMetadata* photo_import_source_get_metadata (PhotoImportSource* self) { result = _tmp2_; #line 218 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return result; -#line 3504 "ImportPage.c" +#line 3518 "ImportPage.c" } #line 220 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp3_ = self->priv->metadata; @@ -3511,7 +3525,7 @@ PhotoMetadata* photo_import_source_get_metadata (PhotoImportSource* self) { result = _tmp4_; #line 220 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return result; -#line 3514 "ImportPage.c" +#line 3528 "ImportPage.c" } @@ -3528,7 +3542,7 @@ static GdkPixbuf* photo_import_source_real_get_preview (ImportSource* base) { _tmp0_ = self->priv->associated; #line 224 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" if (_tmp0_ != NULL) { -#line 3531 "ImportPage.c" +#line 3545 "ImportPage.c" PhotoImportSource* _tmp1_ = NULL; GdkPixbuf* _tmp2_ = NULL; #line 225 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" @@ -3539,7 +3553,7 @@ static GdkPixbuf* photo_import_source_real_get_preview (ImportSource* base) { result = _tmp2_; #line 225 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return result; -#line 3542 "ImportPage.c" +#line 3556 "ImportPage.c" } #line 227 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp3_ = IMPORT_SOURCE_CLASS (photo_import_source_parent_class)->get_preview (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_IMPORT_SOURCE, ImportSource)); @@ -3551,7 +3565,7 @@ static GdkPixbuf* photo_import_source_real_get_preview (ImportSource* base) { _g_object_unref0 (_tmp4_); #line 227 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" if (_tmp5_) { -#line 3554 "ImportPage.c" +#line 3568 "ImportPage.c" GdkPixbuf* _tmp6_ = NULL; #line 228 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp6_ = IMPORT_SOURCE_CLASS (photo_import_source_parent_class)->get_preview (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_IMPORT_SOURCE, ImportSource)); @@ -3559,13 +3573,13 @@ static GdkPixbuf* photo_import_source_real_get_preview (ImportSource* base) { result = _tmp6_; #line 228 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return result; -#line 3562 "ImportPage.c" +#line 3576 "ImportPage.c" } #line 230 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" result = NULL; #line 230 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return result; -#line 3568 "ImportPage.c" +#line 3582 "ImportPage.c" } @@ -3593,13 +3607,13 @@ static GdkPixbuf* photo_import_source_real_get_thumbnail (ThumbnailSource* base, result = NULL; #line 235 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return result; -#line 3596 "ImportPage.c" +#line 3610 "ImportPage.c" } #line 237 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp4_ = scale; #line 237 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" if (_tmp4_ > 0) { -#line 3602 "ImportPage.c" +#line 3616 "ImportPage.c" GdkPixbuf* _tmp5_ = NULL; GdkPixbuf* _tmp6_ = NULL; gint _tmp7_ = 0; @@ -3618,7 +3632,7 @@ static GdkPixbuf* photo_import_source_real_get_thumbnail (ThumbnailSource* base, _tmp3_ = _tmp8_; #line 237 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_object_unref0 (_tmp6_); -#line 3621 "ImportPage.c" +#line 3635 "ImportPage.c" } else { GdkPixbuf* _tmp9_ = NULL; #line 237 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" @@ -3627,13 +3641,13 @@ static GdkPixbuf* photo_import_source_real_get_thumbnail (ThumbnailSource* base, _g_object_unref0 (_tmp3_); #line 237 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp3_ = _tmp9_; -#line 3630 "ImportPage.c" +#line 3644 "ImportPage.c" } #line 237 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" result = _tmp3_; #line 237 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return result; -#line 3636 "ImportPage.c" +#line 3650 "ImportPage.c" } @@ -3648,7 +3662,7 @@ PhotoFileFormat photo_import_source_get_file_format (PhotoImportSource* self) { result = _tmp0_; #line 241 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return result; -#line 3651 "ImportPage.c" +#line 3665 "ImportPage.c" } @@ -3666,7 +3680,7 @@ gchar* photo_import_source_get_preview_md5 (PhotoImportSource* self) { result = _tmp1_; #line 245 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return result; -#line 3669 "ImportPage.c" +#line 3683 "ImportPage.c" } @@ -3685,7 +3699,7 @@ void photo_import_source_set_associated (PhotoImportSource* self, PhotoImportSou _g_object_unref0 (self->priv->associated); #line 249 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" self->priv->associated = _tmp1_; -#line 3688 "ImportPage.c" +#line 3702 "ImportPage.c" } @@ -3703,7 +3717,7 @@ PhotoImportSource* photo_import_source_get_associated (PhotoImportSource* self) result = _tmp1_; #line 253 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return result; -#line 3706 "ImportPage.c" +#line 3720 "ImportPage.c" } @@ -3726,13 +3740,13 @@ static gboolean photo_import_source_real_internal_delete_backing (DataSource* ba g_propagate_error (error, _inner_error_); #line 257 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return FALSE; -#line 3729 "ImportPage.c" +#line 3743 "ImportPage.c" } #line 258 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp1_ = self->priv->associated; #line 258 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" if (_tmp1_ != NULL) { -#line 3735 "ImportPage.c" +#line 3749 "ImportPage.c" gboolean _tmp2_ = FALSE; PhotoImportSource* _tmp3_ = NULL; gboolean _tmp4_ = FALSE; @@ -3749,19 +3763,19 @@ static gboolean photo_import_source_real_internal_delete_backing (DataSource* ba g_propagate_error (error, _inner_error_); #line 259 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return FALSE; -#line 3752 "ImportPage.c" +#line 3766 "ImportPage.c" } #line 259 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp5_ = ret; #line 259 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" ret = _tmp5_ & _tmp2_; -#line 3758 "ImportPage.c" +#line 3772 "ImportPage.c" } #line 260 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" result = ret; #line 260 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return result; -#line 3764 "ImportPage.c" +#line 3778 "ImportPage.c" } @@ -3790,7 +3804,7 @@ static void photo_import_source_class_init (PhotoImportSourceClass * klass) { ((DataSourceClass *) klass)->internal_delete_backing = photo_import_source_real_internal_delete_backing; #line 152 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" G_OBJECT_CLASS (klass)->finalize = photo_import_source_finalize; -#line 3793 "ImportPage.c" +#line 3807 "ImportPage.c" } @@ -3805,7 +3819,7 @@ static void photo_import_source_instance_init (PhotoImportSource * self) { self->priv->exif_md5 = NULL; #line 159 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" self->priv->associated = NULL; -#line 3808 "ImportPage.c" +#line 3822 "ImportPage.c" } @@ -3823,7 +3837,7 @@ static void photo_import_source_finalize (GObject* obj) { _g_object_unref0 (self->priv->associated); #line 152 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" G_OBJECT_CLASS (photo_import_source_parent_class)->finalize (obj); -#line 3826 "ImportPage.c" +#line 3840 "ImportPage.c" } @@ -3883,11 +3897,11 @@ ImportPreview* import_preview_construct (GType object_type, ImportSource* source if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp5_, TYPE_VIDEO_IMPORT_SOURCE)) { #line 278 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" media_source_item_set_enable_sprockets (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE_ITEM, MediaSourceItem), TRUE); -#line 3886 "ImportPage.c" +#line 3900 "ImportPage.c" } #line 281 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" pixbuf = NULL; -#line 3890 "ImportPage.c" +#line 3904 "ImportPage.c" { GdkPixbuf* _tmp6_ = NULL; ImportSource* _tmp7_ = NULL; @@ -3901,8 +3915,8 @@ ImportPreview* import_preview_construct (GType object_type, ImportSource* source _tmp6_ = _tmp8_; #line 283 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 3904 "ImportPage.c" - goto __catch61_g_error; +#line 3918 "ImportPage.c" + goto __catch63_g_error; } #line 283 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp9_ = _tmp6_; @@ -3914,10 +3928,10 @@ ImportPreview* import_preview_construct (GType object_type, ImportSource* source pixbuf = _tmp9_; #line 282 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_object_unref0 (_tmp6_); -#line 3917 "ImportPage.c" +#line 3931 "ImportPage.c" } - goto __finally61; - __catch61_g_error: + goto __finally63; + __catch63_g_error: { GError* err = NULL; gchar* _tmp10_ = NULL; @@ -3942,9 +3956,9 @@ ImportPreview* import_preview_construct (GType object_type, ImportSource* source _g_free0 (_tmp11_); #line 282 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_error_free0 (err); -#line 3945 "ImportPage.c" +#line 3959 "ImportPage.c" } - __finally61: + __finally63: #line 282 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 282 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" @@ -3955,7 +3969,7 @@ ImportPreview* import_preview_construct (GType object_type, ImportSource* source g_clear_error (&_inner_error_); #line 282 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return NULL; -#line 3958 "ImportPage.c" +#line 3972 "ImportPage.c" } #line 289 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp14_ = pixbuf; @@ -3965,7 +3979,7 @@ ImportPreview* import_preview_construct (GType object_type, ImportSource* source _tmp15_ = pixbuf; #line 290 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" if (_tmp15_ == NULL) { -#line 3968 "ImportPage.c" +#line 3982 "ImportPage.c" GdkPixbuf* _tmp16_ = NULL; GdkPixbuf* _tmp20_ = NULL; GdkPixbuf* _tmp21_ = NULL; @@ -3973,7 +3987,7 @@ ImportPreview* import_preview_construct (GType object_type, ImportSource* source _tmp16_ = import_preview_placeholder_preview; #line 291 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" if (_tmp16_ == NULL) { -#line 3976 "ImportPage.c" +#line 3990 "ImportPage.c" GdkPixbuf* _tmp17_ = NULL; GdkPixbuf* _tmp18_ = NULL; GdkPixbuf* _tmp19_ = NULL; @@ -3991,7 +4005,7 @@ ImportPreview* import_preview_construct (GType object_type, ImportSource* source _g_object_unref0 (import_preview_placeholder_preview); #line 293 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" import_preview_placeholder_preview = _tmp19_; -#line 3994 "ImportPage.c" +#line 4008 "ImportPage.c" } #line 297 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp20_ = import_preview_placeholder_preview; @@ -4001,7 +4015,7 @@ ImportPreview* import_preview_construct (GType object_type, ImportSource* source _g_object_unref0 (pixbuf); #line 297 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" pixbuf = _tmp21_; -#line 4004 "ImportPage.c" +#line 4018 "ImportPage.c" } #line 301 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp23_ = pixbuf; @@ -4011,7 +4025,7 @@ ImportPreview* import_preview_construct (GType object_type, ImportSource* source if (_tmp24_ > IMPORT_PREVIEW_MAX_SCALE) { #line 301 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp22_ = TRUE; -#line 4014 "ImportPage.c" +#line 4028 "ImportPage.c" } else { GdkPixbuf* _tmp25_ = NULL; gint _tmp26_ = 0; @@ -4021,11 +4035,11 @@ ImportPreview* import_preview_construct (GType object_type, ImportSource* source _tmp26_ = gdk_pixbuf_get_height (_tmp25_); #line 301 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp22_ = _tmp26_ > IMPORT_PREVIEW_MAX_SCALE; -#line 4024 "ImportPage.c" +#line 4038 "ImportPage.c" } #line 301 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" if (_tmp22_) { -#line 4028 "ImportPage.c" +#line 4042 "ImportPage.c" GdkPixbuf* _tmp27_ = NULL; GdkPixbuf* _tmp28_ = NULL; #line 302 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" @@ -4036,13 +4050,13 @@ ImportPreview* import_preview_construct (GType object_type, ImportSource* source _g_object_unref0 (pixbuf); #line 302 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" pixbuf = _tmp28_; -#line 4039 "ImportPage.c" +#line 4053 "ImportPage.c" } #line 304 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp29_ = source; #line 304 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp29_, TYPE_PHOTO_IMPORT_SOURCE)) { -#line 4045 "ImportPage.c" +#line 4059 "ImportPage.c" PhotoImportSource* photo_import_source = NULL; ImportSource* _tmp30_ = NULL; PhotoImportSource* _tmp31_ = NULL; @@ -4062,7 +4076,7 @@ ImportPreview* import_preview_construct (GType object_type, ImportSource* source _tmp33_ = using_placeholder; #line 307 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" if (!_tmp33_) { -#line 4065 "ImportPage.c" +#line 4079 "ImportPage.c" PhotoImportSource* _tmp34_ = NULL; PhotoMetadata* _tmp35_ = NULL; PhotoMetadata* _tmp36_ = NULL; @@ -4076,15 +4090,15 @@ ImportPreview* import_preview_construct (GType object_type, ImportSource* source _tmp32_ = _tmp36_ != NULL; #line 307 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _media_metadata_unref0 (_tmp36_); -#line 4079 "ImportPage.c" +#line 4093 "ImportPage.c" } else { #line 307 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp32_ = FALSE; -#line 4083 "ImportPage.c" +#line 4097 "ImportPage.c" } #line 307 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" if (_tmp32_) { -#line 4087 "ImportPage.c" +#line 4101 "ImportPage.c" PhotoImportSource* _tmp37_ = NULL; PhotoMetadata* _tmp38_ = NULL; PhotoMetadata* _tmp39_ = NULL; @@ -4109,7 +4123,7 @@ ImportPreview* import_preview_construct (GType object_type, ImportSource* source pixbuf = _tmp42_; #line 308 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _media_metadata_unref0 (_tmp39_); -#line 4112 "ImportPage.c" +#line 4126 "ImportPage.c" } #line 310 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp43_ = photo_import_source; @@ -4123,7 +4137,7 @@ ImportPreview* import_preview_construct (GType object_type, ImportSource* source _g_object_unref0 (_tmp45_); #line 310 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" if (_tmp46_) { -#line 4126 "ImportPage.c" +#line 4140 "ImportPage.c" const gchar* _tmp47_ = NULL; gchar* _tmp48_ = NULL; gchar* _tmp49_ = NULL; @@ -4137,11 +4151,11 @@ ImportPreview* import_preview_construct (GType object_type, ImportSource* source checkerboard_item_set_subtitle (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_ITEM, CheckerboardItem), _tmp49_, TRUE, PANGO_ALIGN_LEFT); #line 311 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_free0 (_tmp49_); -#line 4140 "ImportPage.c" +#line 4154 "ImportPage.c" } #line 304 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_object_unref0 (photo_import_source); -#line 4144 "ImportPage.c" +#line 4158 "ImportPage.c" } #line 315 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp50_ = pixbuf; @@ -4151,14 +4165,14 @@ ImportPreview* import_preview_construct (GType object_type, ImportSource* source _g_object_unref0 (pixbuf); #line 271 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return self; -#line 4154 "ImportPage.c" +#line 4168 "ImportPage.c" } ImportPreview* import_preview_new (ImportSource* source) { #line 271 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return import_preview_construct (TYPE_IMPORT_PREVIEW, source); -#line 4161 "ImportPage.c" +#line 4175 "ImportPage.c" } @@ -4169,9 +4183,9 @@ gboolean import_preview_is_already_imported (ImportPreview* self) { PhotoImportSource* _tmp1_ = NULL; PhotoImportSource* _tmp2_ = NULL; VideoImportSource* video_import_source = NULL; - ImportSource* _tmp39_ = NULL; - VideoImportSource* _tmp40_ = NULL; - VideoImportSource* _tmp41_ = NULL; + ImportSource* _tmp49_ = NULL; + VideoImportSource* _tmp50_ = NULL; + VideoImportSource* _tmp51_ = NULL; #line 318 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" g_return_val_if_fail (IS_IMPORT_PREVIEW (self), FALSE); #line 319 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" @@ -4182,7 +4196,7 @@ gboolean import_preview_is_already_imported (ImportPreview* self) { if (_tmp1_ == NULL) { #line 319 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_object_unref0 (_tmp0_); -#line 4185 "ImportPage.c" +#line 4199 "ImportPage.c" } #line 319 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" photo_import_source = _tmp1_; @@ -4190,7 +4204,7 @@ gboolean import_preview_is_already_imported (ImportPreview* self) { _tmp2_ = photo_import_source; #line 320 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" if (_tmp2_ != NULL) { -#line 4193 "ImportPage.c" +#line 4207 "ImportPage.c" gchar* preview_md5 = NULL; PhotoImportSource* _tmp3_ = NULL; gchar* _tmp4_ = NULL; @@ -4219,7 +4233,7 @@ gboolean import_preview_is_already_imported (ImportPreview* self) { _tmp9_ = is_string_empty (_tmp8_); #line 325 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" if (!_tmp9_) { -#line 4222 "ImportPage.c" +#line 4236 "ImportPage.c" const gchar* _tmp10_ = NULL; PhotoFileFormat _tmp11_ = 0; gboolean _tmp12_ = FALSE; @@ -4231,15 +4245,15 @@ gboolean import_preview_is_already_imported (ImportPreview* self) { _tmp12_ = library_photo_has_nontrash_duplicate (NULL, _tmp10_, NULL, _tmp11_); #line 326 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp7_ = _tmp12_; -#line 4234 "ImportPage.c" +#line 4248 "ImportPage.c" } else { #line 325 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp7_ = FALSE; -#line 4238 "ImportPage.c" +#line 4252 "ImportPage.c" } #line 325 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" if (_tmp7_) { -#line 4242 "ImportPage.c" +#line 4256 "ImportPage.c" const gchar* _tmp13_ = NULL; PhotoFileFormat _tmp14_ = 0; PhotoID _tmp15_ = {0}; @@ -4264,13 +4278,13 @@ gboolean import_preview_is_already_imported (ImportPreview* self) { _g_object_unref0 (photo_import_source); #line 331 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return result; -#line 4267 "ImportPage.c" +#line 4281 "ImportPage.c" } #line 337 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp17_ = file_format; #line 337 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" if (_tmp17_ == PHOTO_FILE_FORMAT_RAW) { -#line 4273 "ImportPage.c" +#line 4287 "ImportPage.c" guint64 filesize = 0ULL; ImportSource* _tmp18_ = NULL; ImportSource* _tmp19_ = NULL; @@ -4293,15 +4307,17 @@ gboolean import_preview_is_already_imported (ImportPreview* self) { _tmp22_ = filesize; #line 340 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" if (_tmp22_ <= ((guint64) G_MAXINT64)) { -#line 4296 "ImportPage.c" +#line 4310 "ImportPage.c" + PhotoID duplicated_photo_id = {0}; LibraryPhotoSourceCollection* _tmp23_ = NULL; ImportSource* _tmp24_ = NULL; ImportSource* _tmp25_ = NULL; gchar* _tmp26_ = NULL; gchar* _tmp27_ = NULL; guint64 _tmp28_ = 0ULL; - gboolean _tmp29_ = FALSE; - gboolean _tmp30_ = FALSE; + PhotoID _tmp29_ = {0}; + PhotoID _tmp30_ = {0}; + gboolean _tmp31_ = FALSE; #line 341 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp23_ = library_photo_global; #line 341 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" @@ -4315,7 +4331,7 @@ gboolean import_preview_is_already_imported (ImportPreview* self) { #line 341 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp28_ = filesize; #line 341 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp29_ = library_photo_source_collection_has_basename_filesize_duplicate (_tmp23_, _tmp27_, (gint64) _tmp28_); + library_photo_source_collection_get_basename_filesize_duplicate (_tmp23_, _tmp27_, (gint64) _tmp28_, &_tmp29_); #line 341 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp30_ = _tmp29_; #line 341 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" @@ -4323,167 +4339,216 @@ gboolean import_preview_is_already_imported (ImportPreview* self) { #line 341 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_object_unref0 (_tmp25_); #line 341 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - if (_tmp30_) { -#line 4327 "ImportPage.c" - LibraryPhotoSourceCollection* _tmp31_ = NULL; - ImportSource* _tmp32_ = NULL; - ImportSource* _tmp33_ = NULL; - gchar* _tmp34_ = NULL; - gchar* _tmp35_ = NULL; - guint64 _tmp36_ = 0ULL; - PhotoID _tmp37_ = {0}; - DuplicatedFile* _tmp38_ = NULL; -#line 344 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp31_ = library_photo_global; -#line 344 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp32_ = import_preview_get_import_source (self); -#line 344 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp33_ = _tmp32_; -#line 344 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp34_ = import_source_get_filename (_tmp33_); -#line 344 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp35_ = _tmp34_; -#line 344 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp36_ = filesize; -#line 344 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - library_photo_source_collection_get_basename_filesize_duplicate (_tmp31_, _tmp35_, (gint64) _tmp36_, &_tmp37_); -#line 344 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp38_ = duplicated_file_create_from_photo_id (&_tmp37_); -#line 344 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _g_object_unref0 (self->priv->duplicated_file); -#line 344 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - self->priv->duplicated_file = _tmp38_; + duplicated_photo_id = _tmp30_; #line 344 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _g_free0 (_tmp35_); + _tmp31_ = photo_id_is_valid (&duplicated_photo_id); #line 344 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _g_object_unref0 (_tmp33_); + if (_tmp31_) { +#line 4347 "ImportPage.c" + LibraryPhoto* duplicated_photo = NULL; + LibraryPhotoSourceCollection* _tmp32_ = NULL; + PhotoID _tmp33_ = {0}; + LibraryPhoto* _tmp34_ = NULL; + time_t photo_exposure_time = 0; + PhotoImportSource* _tmp35_ = NULL; + time_t _tmp36_ = 0; + time_t duplicated_photo_exposure_time = 0; + LibraryPhoto* _tmp37_ = NULL; + time_t _tmp38_ = 0; + time_t _tmp39_ = 0; + time_t _tmp40_ = 0; +#line 346 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" + _tmp32_ = library_photo_global; +#line 346 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" + _tmp33_ = duplicated_photo_id; +#line 346 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" + _tmp34_ = library_photo_source_collection_fetch (_tmp32_, &_tmp33_); +#line 346 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" + duplicated_photo = _tmp34_; +#line 347 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" + _tmp35_ = photo_import_source; +#line 347 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" + _tmp36_ = import_source_get_exposure_time (G_TYPE_CHECK_INSTANCE_CAST (_tmp35_, TYPE_IMPORT_SOURCE, ImportSource)); +#line 347 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" + photo_exposure_time = _tmp36_; #line 348 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - result = TRUE; -#line 348 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _g_free0 (preview_md5); + _tmp37_ = duplicated_photo; #line 348 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _g_object_unref0 (photo_import_source); + _tmp38_ = media_source_get_exposure_time (G_TYPE_CHECK_INSTANCE_CAST (_tmp37_, TYPE_MEDIA_SOURCE, MediaSource)); #line 348 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - return result; -#line 4368 "ImportPage.c" + duplicated_photo_exposure_time = _tmp38_; +#line 350 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" + _tmp39_ = photo_exposure_time; +#line 350 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" + _tmp40_ = duplicated_photo_exposure_time; +#line 350 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" + if (_tmp39_ == _tmp40_) { +#line 4386 "ImportPage.c" + LibraryPhotoSourceCollection* _tmp41_ = NULL; + ImportSource* _tmp42_ = NULL; + ImportSource* _tmp43_ = NULL; + gchar* _tmp44_ = NULL; + gchar* _tmp45_ = NULL; + guint64 _tmp46_ = 0ULL; + PhotoID _tmp47_ = {0}; + DuplicatedFile* _tmp48_ = NULL; +#line 351 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" + _tmp41_ = library_photo_global; +#line 351 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" + _tmp42_ = import_preview_get_import_source (self); +#line 351 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" + _tmp43_ = _tmp42_; +#line 351 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" + _tmp44_ = import_source_get_filename (_tmp43_); +#line 351 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" + _tmp45_ = _tmp44_; +#line 351 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" + _tmp46_ = filesize; +#line 351 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" + library_photo_source_collection_get_basename_filesize_duplicate (_tmp41_, _tmp45_, (gint64) _tmp46_, &_tmp47_); +#line 351 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" + _tmp48_ = duplicated_file_create_from_photo_id (&_tmp47_); +#line 351 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" + _g_object_unref0 (self->priv->duplicated_file); +#line 351 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" + self->priv->duplicated_file = _tmp48_; +#line 351 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" + _g_free0 (_tmp45_); +#line 351 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" + _g_object_unref0 (_tmp43_); +#line 355 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" + result = TRUE; +#line 355 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" + _g_object_unref0 (duplicated_photo); +#line 355 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" + _g_free0 (preview_md5); +#line 355 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" + _g_object_unref0 (photo_import_source); +#line 355 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" + return result; +#line 4429 "ImportPage.c" + } +#line 344 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" + _g_object_unref0 (duplicated_photo); +#line 4433 "ImportPage.c" } } } -#line 353 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 361 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" result = FALSE; -#line 353 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 361 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_free0 (preview_md5); -#line 353 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 361 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_object_unref0 (photo_import_source); -#line 353 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 361 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return result; -#line 4380 "ImportPage.c" - } -#line 356 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp39_ = import_preview_get_import_source (self); -#line 356 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp40_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp39_, TYPE_VIDEO_IMPORT_SOURCE) ? ((VideoImportSource*) _tmp39_) : NULL; -#line 356 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - if (_tmp40_ == NULL) { -#line 356 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _g_object_unref0 (_tmp39_); -#line 4390 "ImportPage.c" - } -#line 356 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - video_import_source = _tmp40_; -#line 357 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp41_ = video_import_source; -#line 357 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - if (_tmp41_ != NULL) { -#line 4398 "ImportPage.c" - VideoSourceCollection* _tmp42_ = NULL; - VideoImportSource* _tmp43_ = NULL; - gchar* _tmp44_ = NULL; - gchar* _tmp45_ = NULL; - VideoImportSource* _tmp46_ = NULL; - gulong _tmp47_ = 0UL; - gboolean _tmp48_ = FALSE; - gboolean _tmp49_ = FALSE; -#line 362 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp42_ = video_global; -#line 362 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp43_ = video_import_source; -#line 362 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp44_ = import_source_get_filename (G_TYPE_CHECK_INSTANCE_CAST (_tmp43_, TYPE_IMPORT_SOURCE, ImportSource)); -#line 362 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp45_ = _tmp44_; -#line 362 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp46_ = video_import_source; -#line 362 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp47_ = import_source_get_filesize (G_TYPE_CHECK_INSTANCE_CAST (_tmp46_, TYPE_IMPORT_SOURCE, ImportSource)); -#line 362 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp48_ = video_source_collection_has_basename_filesize_duplicate (_tmp42_, _tmp45_, (guint64) _tmp47_); -#line 362 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp49_ = _tmp48_; -#line 362 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _g_free0 (_tmp45_); -#line 362 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - if (_tmp49_) { -#line 4427 "ImportPage.c" - VideoSourceCollection* _tmp50_ = NULL; - VideoImportSource* _tmp51_ = NULL; - gchar* _tmp52_ = NULL; - gchar* _tmp53_ = NULL; - VideoImportSource* _tmp54_ = NULL; - gulong _tmp55_ = 0UL; - VideoID _tmp56_ = {0}; - DuplicatedFile* _tmp57_ = NULL; -#line 365 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp50_ = video_global; -#line 365 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp51_ = video_import_source; -#line 365 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp52_ = import_source_get_filename (G_TYPE_CHECK_INSTANCE_CAST (_tmp51_, TYPE_IMPORT_SOURCE, ImportSource)); -#line 365 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp53_ = _tmp52_; -#line 365 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp54_ = video_import_source; -#line 365 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp55_ = import_source_get_filesize (G_TYPE_CHECK_INSTANCE_CAST (_tmp54_, TYPE_IMPORT_SOURCE, ImportSource)); -#line 365 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - video_source_collection_get_basename_filesize_duplicate (_tmp50_, _tmp53_, (guint64) _tmp55_, &_tmp56_); -#line 365 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp57_ = duplicated_file_create_from_video_id (&_tmp56_); -#line 365 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _g_object_unref0 (self->priv->duplicated_file); +#line 4445 "ImportPage.c" + } +#line 364 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" + _tmp49_ = import_preview_get_import_source (self); +#line 364 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" + _tmp50_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp49_, TYPE_VIDEO_IMPORT_SOURCE) ? ((VideoImportSource*) _tmp49_) : NULL; +#line 364 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" + if (_tmp50_ == NULL) { +#line 364 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" + _g_object_unref0 (_tmp49_); +#line 4455 "ImportPage.c" + } +#line 364 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" + video_import_source = _tmp50_; #line 365 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - self->priv->duplicated_file = _tmp57_; + _tmp51_ = video_import_source; #line 365 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _g_free0 (_tmp53_); + if (_tmp51_ != NULL) { +#line 4463 "ImportPage.c" + VideoSourceCollection* _tmp52_ = NULL; + VideoImportSource* _tmp53_ = NULL; + gchar* _tmp54_ = NULL; + gchar* _tmp55_ = NULL; + VideoImportSource* _tmp56_ = NULL; + gulong _tmp57_ = 0UL; + gboolean _tmp58_ = FALSE; + gboolean _tmp59_ = FALSE; #line 370 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - result = TRUE; + _tmp52_ = video_global; #line 370 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _g_object_unref0 (video_import_source); + _tmp53_ = video_import_source; #line 370 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _g_object_unref0 (photo_import_source); + _tmp54_ = import_source_get_filename (G_TYPE_CHECK_INSTANCE_CAST (_tmp53_, TYPE_IMPORT_SOURCE, ImportSource)); +#line 370 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" + _tmp55_ = _tmp54_; +#line 370 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" + _tmp56_ = video_import_source; #line 370 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" + _tmp57_ = import_source_get_filesize (G_TYPE_CHECK_INSTANCE_CAST (_tmp56_, TYPE_IMPORT_SOURCE, ImportSource)); +#line 370 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" + _tmp58_ = video_source_collection_has_basename_filesize_duplicate (_tmp52_, _tmp55_, (guint64) _tmp57_); +#line 370 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" + _tmp59_ = _tmp58_; +#line 370 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" + _g_free0 (_tmp55_); +#line 370 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" + if (_tmp59_) { +#line 4492 "ImportPage.c" + VideoSourceCollection* _tmp60_ = NULL; + VideoImportSource* _tmp61_ = NULL; + gchar* _tmp62_ = NULL; + gchar* _tmp63_ = NULL; + VideoImportSource* _tmp64_ = NULL; + gulong _tmp65_ = 0UL; + VideoID _tmp66_ = {0}; + DuplicatedFile* _tmp67_ = NULL; +#line 373 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" + _tmp60_ = video_global; +#line 373 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" + _tmp61_ = video_import_source; +#line 373 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" + _tmp62_ = import_source_get_filename (G_TYPE_CHECK_INSTANCE_CAST (_tmp61_, TYPE_IMPORT_SOURCE, ImportSource)); +#line 373 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" + _tmp63_ = _tmp62_; +#line 373 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" + _tmp64_ = video_import_source; +#line 373 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" + _tmp65_ = import_source_get_filesize (G_TYPE_CHECK_INSTANCE_CAST (_tmp64_, TYPE_IMPORT_SOURCE, ImportSource)); +#line 373 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" + video_source_collection_get_basename_filesize_duplicate (_tmp60_, _tmp63_, (guint64) _tmp65_, &_tmp66_); +#line 373 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" + _tmp67_ = duplicated_file_create_from_video_id (&_tmp66_); +#line 373 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" + _g_object_unref0 (self->priv->duplicated_file); +#line 373 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" + self->priv->duplicated_file = _tmp67_; +#line 373 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" + _g_free0 (_tmp63_); +#line 378 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" + result = TRUE; +#line 378 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" + _g_object_unref0 (video_import_source); +#line 378 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" + _g_object_unref0 (photo_import_source); +#line 378 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return result; -#line 4466 "ImportPage.c" +#line 4531 "ImportPage.c" } -#line 373 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 381 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" result = FALSE; -#line 373 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 381 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_object_unref0 (video_import_source); -#line 373 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 381 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_object_unref0 (photo_import_source); -#line 373 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 381 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return result; -#line 4476 "ImportPage.c" +#line 4541 "ImportPage.c" } -#line 376 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 384 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" result = FALSE; -#line 376 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 384 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_object_unref0 (video_import_source); -#line 376 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 384 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_object_unref0 (photo_import_source); -#line 376 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 384 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return result; -#line 4486 "ImportPage.c" +#line 4551 "ImportPage.c" } @@ -4492,42 +4557,42 @@ DuplicatedFile* import_preview_get_duplicated_file (ImportPreview* self) { gboolean _tmp0_ = FALSE; DuplicatedFile* _tmp1_ = NULL; DuplicatedFile* _tmp2_ = NULL; -#line 379 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 387 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" g_return_val_if_fail (IS_IMPORT_PREVIEW (self), NULL); -#line 380 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 388 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp0_ = import_preview_is_already_imported (self); -#line 380 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 388 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" if (!_tmp0_) { -#line 381 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 389 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" result = NULL; -#line 381 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 389 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return result; -#line 4505 "ImportPage.c" +#line 4570 "ImportPage.c" } -#line 383 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 391 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp1_ = self->priv->duplicated_file; -#line 383 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 391 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp2_ = _g_object_ref0 (_tmp1_); -#line 383 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 391 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" result = _tmp2_; -#line 383 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 391 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return result; -#line 4515 "ImportPage.c" +#line 4580 "ImportPage.c" } ImportSource* import_preview_get_import_source (ImportPreview* self) { ImportSource* result = NULL; DataSource* _tmp0_ = NULL; -#line 386 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 394 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" g_return_val_if_fail (IS_IMPORT_PREVIEW (self), NULL); -#line 387 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 395 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp0_ = data_view_get_source (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_VIEW, DataView)); -#line 387 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 395 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" result = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_IMPORT_SOURCE, ImportSource); -#line 387 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 395 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return result; -#line 4530 "ImportPage.c" +#line 4595 "ImportPage.c" } @@ -4538,14 +4603,14 @@ static void import_preview_class_init (ImportPreviewClass * klass) { g_type_class_add_private (klass, sizeof (ImportPreviewPrivate)); #line 264 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" G_OBJECT_CLASS (klass)->finalize = import_preview_finalize; -#line 4541 "ImportPage.c" +#line 4606 "ImportPage.c" } static void import_preview_instance_init (ImportPreview * self) { #line 264 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" self->priv = IMPORT_PREVIEW_GET_PRIVATE (self); -#line 4548 "ImportPage.c" +#line 4613 "ImportPage.c" } @@ -4557,7 +4622,7 @@ static void import_preview_finalize (GObject* obj) { _g_object_unref0 (self->priv->duplicated_file); #line 264 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" G_OBJECT_CLASS (import_preview_parent_class)->finalize (obj); -#line 4560 "ImportPage.c" +#line 4625 "ImportPage.c" } @@ -4579,39 +4644,39 @@ CameraViewTracker* camera_view_tracker_construct (GType object_type, ViewCollect CameraAccumulator* _tmp1_ = NULL; CameraAccumulator* _tmp2_ = NULL; CameraAccumulator* _tmp3_ = NULL; -#line 396 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 404 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" g_return_val_if_fail (IS_VIEW_COLLECTION (collection), NULL); -#line 397 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 405 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp0_ = collection; -#line 397 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 405 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" self = (CameraViewTracker*) core_view_tracker_construct (object_type, _tmp0_); -#line 399 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 407 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp1_ = self->all; -#line 399 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 407 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp2_ = self->visible; -#line 399 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 407 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp3_ = self->selected; -#line 399 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 407 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" core_view_tracker_start (G_TYPE_CHECK_INSTANCE_CAST (self, CORE_TYPE_VIEW_TRACKER, CoreViewTracker), G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, CORE_TYPE_TRACKER_ACCUMULATOR, CoreTrackerAccumulator), G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, CORE_TYPE_TRACKER_ACCUMULATOR, CoreTrackerAccumulator), G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, CORE_TYPE_TRACKER_ACCUMULATOR, CoreTrackerAccumulator)); -#line 396 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 404 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return self; -#line 4598 "ImportPage.c" +#line 4663 "ImportPage.c" } CameraViewTracker* camera_view_tracker_new (ViewCollection* collection) { -#line 396 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 404 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return camera_view_tracker_construct (TYPE_CAMERA_VIEW_TRACKER, collection); -#line 4605 "ImportPage.c" +#line 4670 "ImportPage.c" } static void camera_view_tracker_class_init (CameraViewTrackerClass * klass) { -#line 391 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 399 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" camera_view_tracker_parent_class = g_type_class_peek_parent (klass); -#line 391 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 399 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" ((CoreTrackerClass *) klass)->finalize = camera_view_tracker_finalize; -#line 4614 "ImportPage.c" +#line 4679 "ImportPage.c" } @@ -4619,35 +4684,35 @@ static void camera_view_tracker_instance_init (CameraViewTracker * self) { CameraAccumulator* _tmp0_ = NULL; CameraAccumulator* _tmp1_ = NULL; CameraAccumulator* _tmp2_ = NULL; -#line 392 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 400 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp0_ = camera_accumulator_new (); -#line 392 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 400 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" self->all = _tmp0_; -#line 393 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 401 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp1_ = camera_accumulator_new (); -#line 393 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 401 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" self->visible = _tmp1_; -#line 394 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 402 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp2_ = camera_accumulator_new (); -#line 394 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 402 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" self->selected = _tmp2_; -#line 4634 "ImportPage.c" +#line 4699 "ImportPage.c" } static void camera_view_tracker_finalize (CoreTracker* obj) { CameraViewTracker * self; -#line 391 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 399 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_CAMERA_VIEW_TRACKER, CameraViewTracker); -#line 392 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 400 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_object_unref0 (self->all); -#line 393 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 401 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_object_unref0 (self->visible); -#line 394 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 402 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_object_unref0 (self->selected); -#line 391 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 399 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" CORE_TRACKER_CLASS (camera_view_tracker_parent_class)->finalize (obj); -#line 4650 "ImportPage.c" +#line 4715 "ImportPage.c" } @@ -4675,110 +4740,110 @@ static gboolean camera_accumulator_real_include (CoreTrackerAccumulator* base, D PhotoImportSource* _tmp4_ = NULL; gboolean _tmp5_ = FALSE; PhotoImportSource* _tmp6_ = NULL; -#line 409 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 417 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_CAMERA_ACCUMULATOR, CameraAccumulator); -#line 409 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 417 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" g_return_val_if_fail (IS_DATA_OBJECT (object), FALSE); -#line 410 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 418 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp0_ = object; -#line 410 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 418 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp1_ = data_view_get_source (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_DATA_VIEW, DataView)); -#line 410 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 418 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" source = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_IMPORT_SOURCE, ImportSource); -#line 412 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 420 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp2_ = self->priv->_total; -#line 412 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 420 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" camera_accumulator_set_total (self, _tmp2_ + 1); -#line 414 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 422 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp3_ = source; -#line 414 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 422 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp4_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp3_, TYPE_PHOTO_IMPORT_SOURCE) ? ((PhotoImportSource*) _tmp3_) : NULL); -#line 414 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 422 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" photo = _tmp4_; -#line 415 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 423 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp6_ = photo; -#line 415 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 423 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" if (_tmp6_ != NULL) { -#line 4702 "ImportPage.c" +#line 4767 "ImportPage.c" PhotoImportSource* _tmp7_ = NULL; PhotoFileFormat _tmp8_ = 0; -#line 415 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 423 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp7_ = photo; -#line 415 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 423 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp8_ = photo_import_source_get_file_format (_tmp7_); -#line 415 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 423 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp5_ = _tmp8_ != PHOTO_FILE_FORMAT_RAW; -#line 4711 "ImportPage.c" +#line 4776 "ImportPage.c" } else { -#line 415 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 423 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp5_ = FALSE; -#line 4715 "ImportPage.c" +#line 4780 "ImportPage.c" } -#line 415 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 423 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" if (_tmp5_) { -#line 4719 "ImportPage.c" +#line 4784 "ImportPage.c" gint _tmp9_ = 0; -#line 416 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 424 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp9_ = self->priv->_photos; -#line 416 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 424 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" camera_accumulator_set_photos (self, _tmp9_ + 1); -#line 4725 "ImportPage.c" +#line 4790 "ImportPage.c" } else { gboolean _tmp10_ = FALSE; PhotoImportSource* _tmp11_ = NULL; -#line 417 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 425 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp11_ = photo; -#line 417 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 425 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" if (_tmp11_ != NULL) { -#line 4733 "ImportPage.c" +#line 4798 "ImportPage.c" PhotoImportSource* _tmp12_ = NULL; PhotoFileFormat _tmp13_ = 0; -#line 417 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 425 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp12_ = photo; -#line 417 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 425 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp13_ = photo_import_source_get_file_format (_tmp12_); -#line 417 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 425 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp10_ = _tmp13_ == PHOTO_FILE_FORMAT_RAW; -#line 4742 "ImportPage.c" +#line 4807 "ImportPage.c" } else { -#line 417 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 425 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp10_ = FALSE; -#line 4746 "ImportPage.c" +#line 4811 "ImportPage.c" } -#line 417 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 425 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" if (_tmp10_) { -#line 4750 "ImportPage.c" +#line 4815 "ImportPage.c" gint _tmp14_ = 0; -#line 418 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 426 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp14_ = self->priv->_raw; -#line 418 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 426 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" camera_accumulator_set_raw (self, _tmp14_ + 1); -#line 4756 "ImportPage.c" +#line 4821 "ImportPage.c" } else { ImportSource* _tmp15_ = NULL; -#line 419 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 427 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp15_ = source; -#line 419 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 427 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp15_, TYPE_VIDEO_IMPORT_SOURCE)) { -#line 4763 "ImportPage.c" +#line 4828 "ImportPage.c" gint _tmp16_ = 0; -#line 420 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 428 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp16_ = self->priv->_videos; -#line 420 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 428 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" camera_accumulator_set_videos (self, _tmp16_ + 1); -#line 4769 "ImportPage.c" +#line 4834 "ImportPage.c" } } } -#line 423 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 431 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" result = TRUE; -#line 423 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 431 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_object_unref0 (photo); -#line 423 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 431 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_object_unref0 (source); -#line 423 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 431 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return result; -#line 4781 "ImportPage.c" +#line 4846 "ImportPage.c" } @@ -4794,142 +4859,142 @@ static gboolean camera_accumulator_real_uninclude (CoreTrackerAccumulator* base, PhotoImportSource* _tmp4_ = NULL; gboolean _tmp5_ = FALSE; PhotoImportSource* _tmp6_ = NULL; -#line 426 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 434 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_CAMERA_ACCUMULATOR, CameraAccumulator); -#line 426 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 434 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" g_return_val_if_fail (IS_DATA_OBJECT (object), FALSE); -#line 427 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 435 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp0_ = object; -#line 427 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 435 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp1_ = data_view_get_source (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_DATA_VIEW, DataView)); -#line 427 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 435 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" source = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_IMPORT_SOURCE, ImportSource); -#line 429 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 437 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp2_ = self->priv->_total; -#line 429 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 437 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" camera_accumulator_set_total (self, _tmp2_ + 1); -#line 431 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 439 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp3_ = source; -#line 431 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 439 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp4_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp3_, TYPE_PHOTO_IMPORT_SOURCE) ? ((PhotoImportSource*) _tmp3_) : NULL); -#line 431 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 439 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" photo = _tmp4_; -#line 432 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 440 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp6_ = photo; -#line 432 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 440 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" if (_tmp6_ != NULL) { -#line 4821 "ImportPage.c" +#line 4886 "ImportPage.c" PhotoImportSource* _tmp7_ = NULL; PhotoFileFormat _tmp8_ = 0; -#line 432 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 440 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp7_ = photo; -#line 432 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 440 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp8_ = photo_import_source_get_file_format (_tmp7_); -#line 432 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 440 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp5_ = _tmp8_ != PHOTO_FILE_FORMAT_RAW; -#line 4830 "ImportPage.c" +#line 4895 "ImportPage.c" } else { -#line 432 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 440 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp5_ = FALSE; -#line 4834 "ImportPage.c" +#line 4899 "ImportPage.c" } -#line 432 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 440 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" if (_tmp5_) { -#line 4838 "ImportPage.c" +#line 4903 "ImportPage.c" gint _tmp9_ = 0; gint _tmp10_ = 0; -#line 433 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 441 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp9_ = self->priv->_photos; -#line 433 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 441 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _vala_assert (_tmp9_ > 0, "photos > 0"); -#line 434 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 442 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp10_ = self->priv->_photos; -#line 434 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 442 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" camera_accumulator_set_photos (self, _tmp10_ - 1); -#line 4849 "ImportPage.c" +#line 4914 "ImportPage.c" } else { gboolean _tmp11_ = FALSE; PhotoImportSource* _tmp12_ = NULL; -#line 435 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 443 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp12_ = photo; -#line 435 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 443 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" if (_tmp12_ != NULL) { -#line 4857 "ImportPage.c" +#line 4922 "ImportPage.c" PhotoImportSource* _tmp13_ = NULL; PhotoFileFormat _tmp14_ = 0; -#line 435 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 443 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp13_ = photo; -#line 435 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 443 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp14_ = photo_import_source_get_file_format (_tmp13_); -#line 435 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 443 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp11_ = _tmp14_ == PHOTO_FILE_FORMAT_RAW; -#line 4866 "ImportPage.c" +#line 4931 "ImportPage.c" } else { -#line 435 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 443 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp11_ = FALSE; -#line 4870 "ImportPage.c" +#line 4935 "ImportPage.c" } -#line 435 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 443 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" if (_tmp11_) { -#line 4874 "ImportPage.c" +#line 4939 "ImportPage.c" gint _tmp15_ = 0; gint _tmp16_ = 0; -#line 436 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 444 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp15_ = self->priv->_raw; -#line 436 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 444 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _vala_assert (_tmp15_ > 0, "raw > 0"); -#line 437 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 445 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp16_ = self->priv->_raw; -#line 437 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 445 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" camera_accumulator_set_raw (self, _tmp16_ - 1); -#line 4885 "ImportPage.c" +#line 4950 "ImportPage.c" } else { ImportSource* _tmp17_ = NULL; -#line 438 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 446 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp17_ = source; -#line 438 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 446 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp17_, TYPE_VIDEO_IMPORT_SOURCE)) { -#line 4892 "ImportPage.c" +#line 4957 "ImportPage.c" gint _tmp18_ = 0; gint _tmp19_ = 0; -#line 439 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 447 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp18_ = self->priv->_videos; -#line 439 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 447 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _vala_assert (_tmp18_ > 0, "videos > 0"); -#line 440 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 448 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp19_ = self->priv->_videos; -#line 440 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 448 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" camera_accumulator_set_videos (self, _tmp19_ - 1); -#line 4903 "ImportPage.c" +#line 4968 "ImportPage.c" } } } -#line 444 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 452 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" result = TRUE; -#line 444 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 452 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_object_unref0 (photo); -#line 444 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 452 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_object_unref0 (source); -#line 444 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 452 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return result; -#line 4915 "ImportPage.c" +#line 4980 "ImportPage.c" } static gboolean camera_accumulator_real_altered (CoreTrackerAccumulator* base, DataObject* object, Alteration* alteration) { CameraAccumulator * self; gboolean result = FALSE; -#line 447 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 455 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_CAMERA_ACCUMULATOR, CameraAccumulator); -#line 447 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 455 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" g_return_val_if_fail (IS_DATA_OBJECT (object), FALSE); -#line 447 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 455 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" g_return_val_if_fail (IS_ALTERATION (alteration), FALSE); -#line 449 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 457 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" result = FALSE; -#line 449 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 457 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return result; -#line 4932 "ImportPage.c" +#line 4997 "ImportPage.c" } @@ -4940,217 +5005,217 @@ gchar* camera_accumulator_to_string (CameraAccumulator* self) { gint _tmp2_ = 0; gint _tmp3_ = 0; gchar* _tmp4_ = NULL; -#line 452 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 460 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" g_return_val_if_fail (IS_CAMERA_ACCUMULATOR (self), NULL); -#line 453 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 461 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp0_ = self->priv->_total; -#line 453 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 461 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp1_ = self->priv->_photos; -#line 453 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 461 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp2_ = self->priv->_videos; -#line 453 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 461 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp3_ = self->priv->_raw; -#line 453 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 461 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp4_ = g_strdup_printf ("%d total/%d photos/%d videos/%d raw", _tmp0_, _tmp1_, _tmp2_, _tmp3_); -#line 453 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 461 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" result = _tmp4_; -#line 453 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 461 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return result; -#line 4959 "ImportPage.c" +#line 5024 "ImportPage.c" } CameraAccumulator* camera_accumulator_construct (GType object_type) { CameraAccumulator * self = NULL; -#line 403 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 411 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" self = (CameraAccumulator*) g_object_new (object_type, NULL); -#line 403 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 411 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return self; -#line 4969 "ImportPage.c" +#line 5034 "ImportPage.c" } CameraAccumulator* camera_accumulator_new (void) { -#line 403 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 411 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return camera_accumulator_construct (TYPE_CAMERA_ACCUMULATOR); -#line 4976 "ImportPage.c" +#line 5041 "ImportPage.c" } gint camera_accumulator_get_total (CameraAccumulator* self) { gint result; gint _tmp0_ = 0; -#line 404 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 412 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" g_return_val_if_fail (IS_CAMERA_ACCUMULATOR (self), 0); -#line 404 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 412 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp0_ = self->priv->_total; -#line 404 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 412 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" result = _tmp0_; -#line 404 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 412 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return result; -#line 4991 "ImportPage.c" +#line 5056 "ImportPage.c" } static void camera_accumulator_set_total (CameraAccumulator* self, gint value) { gint _tmp0_ = 0; -#line 404 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 412 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" g_return_if_fail (IS_CAMERA_ACCUMULATOR (self)); -#line 404 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 412 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp0_ = value; -#line 404 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 412 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" self->priv->_total = _tmp0_; -#line 404 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 412 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" g_object_notify ((GObject *) self, "total"); -#line 5005 "ImportPage.c" +#line 5070 "ImportPage.c" } gint camera_accumulator_get_photos (CameraAccumulator* self) { gint result; gint _tmp0_ = 0; -#line 405 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 413 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" g_return_val_if_fail (IS_CAMERA_ACCUMULATOR (self), 0); -#line 405 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 413 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp0_ = self->priv->_photos; -#line 405 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 413 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" result = _tmp0_; -#line 405 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 413 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return result; -#line 5020 "ImportPage.c" +#line 5085 "ImportPage.c" } static void camera_accumulator_set_photos (CameraAccumulator* self, gint value) { gint _tmp0_ = 0; -#line 405 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 413 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" g_return_if_fail (IS_CAMERA_ACCUMULATOR (self)); -#line 405 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 413 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp0_ = value; -#line 405 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 413 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" self->priv->_photos = _tmp0_; -#line 405 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 413 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" g_object_notify ((GObject *) self, "photos"); -#line 5034 "ImportPage.c" +#line 5099 "ImportPage.c" } gint camera_accumulator_get_videos (CameraAccumulator* self) { gint result; gint _tmp0_ = 0; -#line 406 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 414 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" g_return_val_if_fail (IS_CAMERA_ACCUMULATOR (self), 0); -#line 406 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 414 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp0_ = self->priv->_videos; -#line 406 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 414 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" result = _tmp0_; -#line 406 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 414 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return result; -#line 5049 "ImportPage.c" +#line 5114 "ImportPage.c" } static void camera_accumulator_set_videos (CameraAccumulator* self, gint value) { gint _tmp0_ = 0; -#line 406 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 414 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" g_return_if_fail (IS_CAMERA_ACCUMULATOR (self)); -#line 406 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 414 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp0_ = value; -#line 406 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 414 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" self->priv->_videos = _tmp0_; -#line 406 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 414 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" g_object_notify ((GObject *) self, "videos"); -#line 5063 "ImportPage.c" +#line 5128 "ImportPage.c" } gint camera_accumulator_get_raw (CameraAccumulator* self) { gint result; gint _tmp0_ = 0; -#line 407 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 415 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" g_return_val_if_fail (IS_CAMERA_ACCUMULATOR (self), 0); -#line 407 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 415 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp0_ = self->priv->_raw; -#line 407 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 415 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" result = _tmp0_; -#line 407 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 415 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return result; -#line 5078 "ImportPage.c" +#line 5143 "ImportPage.c" } static void camera_accumulator_set_raw (CameraAccumulator* self, gint value) { gint _tmp0_ = 0; -#line 407 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 415 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" g_return_if_fail (IS_CAMERA_ACCUMULATOR (self)); -#line 407 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 415 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp0_ = value; -#line 407 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 415 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" self->priv->_raw = _tmp0_; -#line 407 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 415 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" g_object_notify ((GObject *) self, "raw"); -#line 5092 "ImportPage.c" +#line 5157 "ImportPage.c" } static void camera_accumulator_class_init (CameraAccumulatorClass * klass) { -#line 403 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 411 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" camera_accumulator_parent_class = g_type_class_peek_parent (klass); -#line 403 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 411 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" g_type_class_add_private (klass, sizeof (CameraAccumulatorPrivate)); -#line 403 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 411 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" G_OBJECT_CLASS (klass)->get_property = _vala_camera_accumulator_get_property; -#line 403 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 411 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" G_OBJECT_CLASS (klass)->set_property = _vala_camera_accumulator_set_property; -#line 403 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 411 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" G_OBJECT_CLASS (klass)->finalize = camera_accumulator_finalize; -#line 403 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 411 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" g_object_class_install_property (G_OBJECT_CLASS (klass), CAMERA_ACCUMULATOR_TOTAL, g_param_spec_int ("total", "total", "total", G_MININT, G_MAXINT, 0, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE)); -#line 403 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 411 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" g_object_class_install_property (G_OBJECT_CLASS (klass), CAMERA_ACCUMULATOR_PHOTOS, g_param_spec_int ("photos", "photos", "photos", G_MININT, G_MAXINT, 0, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE)); -#line 403 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 411 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" g_object_class_install_property (G_OBJECT_CLASS (klass), CAMERA_ACCUMULATOR_VIDEOS, g_param_spec_int ("videos", "videos", "videos", G_MININT, G_MAXINT, 0, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE)); -#line 403 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 411 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" g_object_class_install_property (G_OBJECT_CLASS (klass), CAMERA_ACCUMULATOR_RAW, g_param_spec_int ("raw", "raw", "raw", G_MININT, G_MAXINT, 0, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE)); -#line 5115 "ImportPage.c" +#line 5180 "ImportPage.c" } static void camera_accumulator_core_tracker_accumulator_interface_init (CoreTrackerAccumulatorIface * iface) { -#line 403 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 411 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" camera_accumulator_core_tracker_accumulator_parent_iface = g_type_interface_peek_parent (iface); -#line 403 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 411 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" iface->include = (gboolean (*)(CoreTrackerAccumulator*, DataObject*)) camera_accumulator_real_include; -#line 403 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 411 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" iface->uninclude = (gboolean (*)(CoreTrackerAccumulator*, DataObject*)) camera_accumulator_real_uninclude; -#line 403 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 411 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" iface->altered = (gboolean (*)(CoreTrackerAccumulator*, DataObject*, Alteration*)) camera_accumulator_real_altered; -#line 5128 "ImportPage.c" +#line 5193 "ImportPage.c" } static void camera_accumulator_instance_init (CameraAccumulator * self) { -#line 403 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 411 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" self->priv = CAMERA_ACCUMULATOR_GET_PRIVATE (self); -#line 404 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 412 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" self->priv->_total = 0; -#line 405 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 413 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" self->priv->_photos = 0; -#line 406 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 414 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" self->priv->_videos = 0; -#line 407 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 415 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" self->priv->_raw = 0; -#line 5143 "ImportPage.c" +#line 5208 "ImportPage.c" } static void camera_accumulator_finalize (GObject* obj) { CameraAccumulator * self; -#line 403 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 411 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_CAMERA_ACCUMULATOR, CameraAccumulator); -#line 403 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 411 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" G_OBJECT_CLASS (camera_accumulator_parent_class)->finalize (obj); -#line 5153 "ImportPage.c" +#line 5218 "ImportPage.c" } @@ -5171,39 +5236,39 @@ GType camera_accumulator_get_type (void) { static void _vala_camera_accumulator_get_property (GObject * object, guint property_id, GValue * value, GParamSpec * pspec) { CameraAccumulator * self; self = G_TYPE_CHECK_INSTANCE_CAST (object, TYPE_CAMERA_ACCUMULATOR, CameraAccumulator); -#line 403 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 411 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" switch (property_id) { -#line 403 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 411 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" case CAMERA_ACCUMULATOR_TOTAL: -#line 403 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 411 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" g_value_set_int (value, camera_accumulator_get_total (self)); -#line 403 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 411 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" break; -#line 403 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 411 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" case CAMERA_ACCUMULATOR_PHOTOS: -#line 403 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 411 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" g_value_set_int (value, camera_accumulator_get_photos (self)); -#line 403 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 411 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" break; -#line 403 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 411 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" case CAMERA_ACCUMULATOR_VIDEOS: -#line 403 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 411 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" g_value_set_int (value, camera_accumulator_get_videos (self)); -#line 403 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 411 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" break; -#line 403 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 411 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" case CAMERA_ACCUMULATOR_RAW: -#line 403 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 411 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" g_value_set_int (value, camera_accumulator_get_raw (self)); -#line 403 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 411 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" break; -#line 5200 "ImportPage.c" +#line 5265 "ImportPage.c" default: -#line 403 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 411 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); -#line 403 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 411 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" break; -#line 5206 "ImportPage.c" +#line 5271 "ImportPage.c" } } @@ -5211,47 +5276,47 @@ static void _vala_camera_accumulator_get_property (GObject * object, guint prope static void _vala_camera_accumulator_set_property (GObject * object, guint property_id, const GValue * value, GParamSpec * pspec) { CameraAccumulator * self; self = G_TYPE_CHECK_INSTANCE_CAST (object, TYPE_CAMERA_ACCUMULATOR, CameraAccumulator); -#line 403 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 411 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" switch (property_id) { -#line 403 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 411 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" case CAMERA_ACCUMULATOR_TOTAL: -#line 403 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 411 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" camera_accumulator_set_total (self, g_value_get_int (value)); -#line 403 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 411 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" break; -#line 403 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 411 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" case CAMERA_ACCUMULATOR_PHOTOS: -#line 403 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 411 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" camera_accumulator_set_photos (self, g_value_get_int (value)); -#line 403 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 411 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" break; -#line 403 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 411 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" case CAMERA_ACCUMULATOR_VIDEOS: -#line 403 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 411 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" camera_accumulator_set_videos (self, g_value_get_int (value)); -#line 403 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 411 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" break; -#line 403 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 411 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" case CAMERA_ACCUMULATOR_RAW: -#line 403 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 411 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" camera_accumulator_set_raw (self, g_value_get_int (value)); -#line 403 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 411 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" break; -#line 5240 "ImportPage.c" +#line 5305 "ImportPage.c" default: -#line 403 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 411 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); -#line 403 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 411 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" break; -#line 5246 "ImportPage.c" +#line 5311 "ImportPage.c" } } static void _import_page_on_media_added_removed_data_collection_contents_altered (DataCollection* _sender, GeeIterable* added, GeeIterable* removed, gpointer self) { -#line 766 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 774 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" import_page_on_media_added_removed ((ImportPage*) self); -#line 5254 "ImportPage.c" +#line 5319 "ImportPage.c" } @@ -5268,69 +5333,69 @@ GType import_page_refresh_result_get_type (void) { static void _import_page_on_import_selected_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) { -#line 868 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 883 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" import_page_on_import_selected ((ImportPage*) self); -#line 5273 "ImportPage.c" +#line 5338 "ImportPage.c" } static void _import_page_on_import_all_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) { -#line 868 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 883 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" import_page_on_import_all ((ImportPage*) self); -#line 5280 "ImportPage.c" +#line 5345 "ImportPage.c" } static void _page_on_action_toggle_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) { -#line 868 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 883 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" page_on_action_toggle ((Page*) self, action, parameter); -#line 5287 "ImportPage.c" +#line 5352 "ImportPage.c" } static void _import_page_on_display_titles_gsimple_action_change_state_callback (GSimpleAction* action, GVariant* value, gpointer self) { -#line 868 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 883 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" import_page_on_display_titles ((ImportPage*) self, action, value); -#line 5294 "ImportPage.c" +#line 5359 "ImportPage.c" } static gint64 _import_page_preview_comparator_comparator (void* a, void* b, gpointer self) { gint64 result; result = import_page_preview_comparator (a, b); -#line 747 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 755 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return result; -#line 5303 "ImportPage.c" +#line 5368 "ImportPage.c" } static gboolean _import_page_preview_comparator_predicate_comparator_predicate (DataObject* object, Alteration* alteration, gpointer self) { gboolean result; result = import_page_preview_comparator_predicate (object, alteration); -#line 747 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 755 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return result; -#line 5312 "ImportPage.c" +#line 5377 "ImportPage.c" } static void _import_page_on_view_changed_view_collection_items_state_changed (ViewCollection* _sender, GeeIterable* changed, gpointer self) { -#line 750 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 758 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" import_page_on_view_changed ((ImportPage*) self); -#line 5319 "ImportPage.c" +#line 5384 "ImportPage.c" } static void _import_page_on_view_changed_data_collection_contents_altered (DataCollection* _sender, GeeIterable* added, GeeIterable* removed, gpointer self) { -#line 751 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 759 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" import_page_on_view_changed ((ImportPage*) self); -#line 5326 "ImportPage.c" +#line 5391 "ImportPage.c" } static void _import_page_on_view_changed_view_collection_items_visibility_changed (ViewCollection* _sender, GeeCollection* changed, gpointer self) { -#line 752 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 760 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" import_page_on_view_changed ((ImportPage*) self); -#line 5333 "ImportPage.c" +#line 5398 "ImportPage.c" } @@ -5377,80 +5442,80 @@ ImportPage* import_page_construct (GType object_type, Camera* camera, const gcha GValue _tmp51_ = {0}; LibraryPhotoSourceCollection* _tmp52_ = NULL; VideoSourceCollection* _tmp53_ = NULL; -#line 709 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 717 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" g_return_val_if_fail (camera != NULL, NULL); -#line 709 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 717 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" g_return_val_if_fail (uri != NULL, NULL); -#line 710 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 718 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp0_ = _ ("Camera"); -#line 710 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 718 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" self = (ImportPage*) checkerboard_page_construct (object_type, _tmp0_); -#line 711 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 719 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp1_ = camera; -#line 711 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 719 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp2_ = _GPHOTO_REF_CAMERA0 (_tmp1_); -#line 711 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 719 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _gp_camera_unref0 (self->priv->camera); -#line 711 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 719 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" self->priv->camera = _tmp2_; -#line 712 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 720 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp3_ = uri; -#line 712 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 720 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp4_ = g_strdup (_tmp3_); -#line 712 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 720 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_free0 (self->priv->uri); -#line 712 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 720 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" self->priv->uri = _tmp4_; -#line 713 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 721 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp5_ = uri; -#line 713 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 721 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp6_ = g_strdup_printf ("ImportSources for %s", _tmp5_); -#line 713 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 721 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp7_ = _tmp6_; -#line 713 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 721 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp8_ = import_source_collection_new (_tmp7_); -#line 713 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 721 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _data_collection_unref0 (self->priv->import_sources); -#line 713 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 721 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" self->priv->import_sources = G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_SOURCE_COLLECTION, SourceCollection); -#line 713 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 721 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_free0 (_tmp7_); -#line 714 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 722 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp9_ = icon; -#line 714 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 722 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp10_ = g_strdup (_tmp9_); -#line 714 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 722 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_free0 (self->priv->icon); -#line 714 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 722 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" self->priv->icon = _tmp10_; -#line 716 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 724 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp11_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); -#line 716 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 724 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp12_ = _tmp11_; -#line 716 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 724 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp13_ = camera_view_tracker_new (_tmp12_); -#line 716 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 724 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _core_tracker_unref0 (self->priv->tracker); -#line 716 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 724 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" self->priv->tracker = _tmp13_; -#line 716 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 724 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _data_collection_unref0 (_tmp12_); -#line 719 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 727 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp14_ = display_name; -#line 719 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 727 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" if (NULL != _tmp14_) { -#line 5442 "ImportPage.c" +#line 5507 "ImportPage.c" const gchar* _tmp15_ = NULL; gchar* _tmp16_ = NULL; -#line 720 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 728 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp15_ = display_name; -#line 720 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 728 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp16_ = g_strdup (_tmp15_); -#line 720 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 728 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_free0 (self->priv->camera_name); -#line 720 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 728 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" self->priv->camera_name = _tmp16_; -#line 5453 "ImportPage.c" +#line 5518 "ImportPage.c" } else { CameraAbilities abilities = {0}; int res = 0; @@ -5458,189 +5523,189 @@ ImportPage* import_page_construct (GType object_type, Camera* camera, const gcha CameraAbilities _tmp18_ = {0}; int _tmp19_ = 0; int _tmp20_ = 0; -#line 723 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 731 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp17_ = camera; -#line 723 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 731 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp19_ = gp_camera_get_abilities (_tmp17_, &_tmp18_); -#line 723 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 731 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" (abilities); -#line 723 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 731 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" abilities = _tmp18_; -#line 723 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 731 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" res = _tmp19_; -#line 724 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 732 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp20_ = res; -#line 724 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 732 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" if (_tmp20_ != GP_OK) { -#line 5475 "ImportPage.c" +#line 5540 "ImportPage.c" int _tmp21_ = 0; gchar* _tmp22_ = NULL; gchar* _tmp23_ = NULL; const gchar* _tmp24_ = NULL; gchar* _tmp25_ = NULL; -#line 725 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 733 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp21_ = res; -#line 725 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 733 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp22_ = gp_result_to_full_string (_tmp21_); -#line 725 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 733 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp23_ = _tmp22_; -#line 725 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - g_debug ("ImportPage.vala:725: Unable to get camera abilities: %s", _tmp23_); -#line 725 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 733 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" + g_debug ("ImportPage.vala:733: Unable to get camera abilities: %s", _tmp23_); +#line 733 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_free0 (_tmp23_); -#line 726 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 734 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp24_ = _ ("Camera"); -#line 726 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 734 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp25_ = g_strdup (_tmp24_); -#line 726 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 734 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_free0 (self->priv->camera_name); -#line 726 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 734 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" self->priv->camera_name = _tmp25_; -#line 5499 "ImportPage.c" +#line 5564 "ImportPage.c" } -#line 719 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 727 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" (abilities); -#line 5503 "ImportPage.c" +#line 5568 "ImportPage.c" } -#line 729 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 737 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp26_ = self->priv->camera_label; -#line 729 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 737 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp27_ = self->priv->camera_name; -#line 729 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 737 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" gtk_label_set_text (_tmp26_, _tmp27_); -#line 730 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 738 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp28_ = self->priv->camera_name; -#line 730 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 738 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" page_set_page_name (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), _tmp28_); -#line 733 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 741 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp29_ = g_volume_monitor_get (); -#line 733 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 741 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_object_unref0 (self->priv->volume_monitor); -#line 733 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 741 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" self->priv->volume_monitor = _tmp29_; -#line 736 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 744 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp30_ = import_page_null_context; -#line 736 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 744 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" if (_tmp30_ == NULL) { -#line 5525 "ImportPage.c" +#line 5590 "ImportPage.c" GPContextWrapper* _tmp31_ = NULL; -#line 737 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 745 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp31_ = gp_context_wrapper_new (); -#line 737 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 745 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _gp_context_wrapper_unref0 (import_page_null_context); -#line 737 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 745 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" import_page_null_context = _tmp31_; -#line 5533 "ImportPage.c" +#line 5598 "ImportPage.c" } -#line 740 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 748 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp32_ = import_page_spin_idle_context; -#line 740 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 748 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" if (_tmp32_ == NULL) { -#line 5539 "ImportPage.c" +#line 5604 "ImportPage.c" GPSpinIdleWrapper* _tmp33_ = NULL; -#line 741 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 749 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp33_ = gp_spin_idle_wrapper_new (); -#line 741 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 749 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _gp_context_wrapper_unref0 (import_page_spin_idle_context); -#line 741 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 749 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" import_page_spin_idle_context = _tmp33_; -#line 5547 "ImportPage.c" +#line 5612 "ImportPage.c" } -#line 744 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 752 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp34_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); -#line 744 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 752 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp35_ = _tmp34_; -#line 744 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 752 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp36_ = self->priv->import_sources; -#line 744 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 752 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp37_ = import_page_import_view_manager_new (self); -#line 744 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 752 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp38_ = _tmp37_; -#line 744 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 752 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp39_ = view_collection_monitor_source_collection (_tmp35_, _tmp36_, G_TYPE_CHECK_INSTANCE_CAST (_tmp38_, TYPE_VIEW_MANAGER, ViewManager), NULL, NULL, NULL, NULL); -#line 744 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 752 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp40_ = _tmp39_; -#line 744 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 752 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _view_collection_monitor_unref0 (_tmp40_); -#line 744 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 752 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _view_manager_unref0 (_tmp38_); -#line 744 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 752 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _data_collection_unref0 (_tmp35_); -#line 747 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 755 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp41_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); -#line 747 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 755 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp42_ = _tmp41_; -#line 747 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 755 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" data_collection_set_comparator (G_TYPE_CHECK_INSTANCE_CAST (_tmp42_, TYPE_DATA_COLLECTION, DataCollection), _import_page_preview_comparator_comparator, NULL, _import_page_preview_comparator_predicate_comparator_predicate, NULL); -#line 747 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 755 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _data_collection_unref0 (_tmp42_); -#line 750 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 758 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp43_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); -#line 750 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 758 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp44_ = _tmp43_; -#line 750 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 758 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" g_signal_connect_object (_tmp44_, "items-state-changed", (GCallback) _import_page_on_view_changed_view_collection_items_state_changed, self, 0); -#line 750 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 758 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _data_collection_unref0 (_tmp44_); -#line 751 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 759 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp45_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); -#line 751 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 759 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp46_ = _tmp45_; -#line 751 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 759 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp46_, TYPE_DATA_COLLECTION, DataCollection), "contents-altered", (GCallback) _import_page_on_view_changed_data_collection_contents_altered, self, 0); -#line 751 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 759 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _data_collection_unref0 (_tmp46_); -#line 752 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 760 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp47_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); -#line 752 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 760 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp48_ = _tmp47_; -#line 752 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 760 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" g_signal_connect_object (_tmp48_, "items-visibility-changed", (GCallback) _import_page_on_view_changed_view_collection_items_visibility_changed, self, 0); -#line 752 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 760 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _data_collection_unref0 (_tmp48_); -#line 755 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 763 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp49_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); -#line 755 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 763 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp50_ = _tmp49_; -#line 755 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 763 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" g_value_init (&_tmp51_, G_TYPE_BOOLEAN); -#line 755 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 763 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" g_value_set_boolean (&_tmp51_, TRUE); -#line 755 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 763 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" data_collection_set_property (G_TYPE_CHECK_INSTANCE_CAST (_tmp50_, TYPE_DATA_COLLECTION, DataCollection), CHECKERBOARD_ITEM_PROP_SHOW_SUBTITLES, &_tmp51_, NULL, NULL); -#line 755 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 763 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" G_IS_VALUE (&_tmp51_) ? (g_value_unset (&_tmp51_), NULL) : NULL; -#line 755 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 763 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _data_collection_unref0 (_tmp50_); -#line 758 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 766 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp52_ = library_photo_global; -#line 758 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 766 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp52_, TYPE_DATA_COLLECTION, DataCollection), "contents-altered", (GCallback) _import_page_on_media_added_removed_data_collection_contents_altered, self, 0); -#line 759 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 767 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp53_ = video_global; -#line 759 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 767 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp53_, TYPE_DATA_COLLECTION, DataCollection), "contents-altered", (GCallback) _import_page_on_media_added_removed_data_collection_contents_altered, self, 0); -#line 761 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 769 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" checkerboard_page_init_item_context_menu (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage), "ImportContextMenu"); -#line 762 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 770 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" checkerboard_page_init_page_context_menu (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage), "ImportContextMenu"); -#line 709 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 717 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return self; -#line 5629 "ImportPage.c" +#line 5694 "ImportPage.c" } ImportPage* import_page_new (Camera* camera, const gchar* uri, const gchar* display_name, const gchar* icon) { -#line 709 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 717 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return import_page_construct (TYPE_IMPORT_PAGE, camera, uri, display_name, icon); -#line 5636 "ImportPage.c" +#line 5701 "ImportPage.c" } static void _import_page_on_hide_imported_gtk_button_clicked (GtkButton* _sender, gpointer self) { -#line 777 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 785 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" import_page_on_hide_imported ((ImportPage*) self); -#line 5643 "ImportPage.c" +#line 5708 "ImportPage.c" } @@ -5648,15 +5713,15 @@ static GtkToolbar* import_page_real_get_toolbar (Page* base) { ImportPage * self; GtkToolbar* result = NULL; GtkToolbar* _tmp0_ = NULL; - GtkToolbar* _tmp50_ = NULL; - GtkToolbar* _tmp51_ = NULL; -#line 770 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" + GtkToolbar* _tmp59_ = NULL; + GtkToolbar* _tmp60_ = NULL; +#line 778 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_IMPORT_PAGE, ImportPage); -#line 771 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 779 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp0_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)->toolbar; -#line 771 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 779 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" if (_tmp0_ == NULL) { -#line 5659 "ImportPage.c" +#line 5724 "ImportPage.c" GtkToolbar* _tmp1_ = NULL; GtkToolbar* _tmp2_ = NULL; const gchar* _tmp3_ = NULL; @@ -5694,244 +5759,285 @@ static GtkToolbar* import_page_real_get_toolbar (Page* base) { GtkToggleToolButton* find_button = NULL; GtkToggleToolButton* _tmp32_ = NULL; GtkToggleToolButton* _tmp33_ = NULL; - GtkToolbar* _tmp34_ = NULL; - GtkToggleToolButton* _tmp35_ = NULL; - GtkToolbar* _tmp36_ = NULL; - GtkSeparatorToolItem* _tmp37_ = NULL; + GtkToggleToolButton* _tmp34_ = NULL; + GtkToolbar* _tmp35_ = NULL; + GtkToggleToolButton* _tmp36_ = NULL; + GtkToolbar* _tmp37_ = NULL; GtkSeparatorToolItem* _tmp38_ = NULL; + GtkSeparatorToolItem* _tmp39_ = NULL; GtkToolButton* import_selected_button = NULL; - GtkToolButton* _tmp39_ = NULL; GtkToolButton* _tmp40_ = NULL; GtkToolButton* _tmp41_ = NULL; - GtkToolbar* _tmp42_ = NULL; - GtkToolButton* _tmp43_ = NULL; - GtkToolButton* import_all_button = NULL; + GtkToolButton* _tmp42_ = NULL; + const gchar* _tmp43_ = NULL; GtkToolButton* _tmp44_ = NULL; GtkToolButton* _tmp45_ = NULL; GtkToolButton* _tmp46_ = NULL; GtkToolbar* _tmp47_ = NULL; GtkToolButton* _tmp48_ = NULL; - GtkProgressBar* _tmp49_ = NULL; -#line 772 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" + GtkToolButton* import_all_button = NULL; + GtkToolButton* _tmp49_ = NULL; + GtkToolButton* _tmp50_ = NULL; + GtkToolButton* _tmp51_ = NULL; + const gchar* _tmp52_ = NULL; + GtkToolButton* _tmp53_ = NULL; + GtkToolButton* _tmp54_ = NULL; + GtkToolButton* _tmp55_ = NULL; + GtkToolbar* _tmp56_ = NULL; + GtkToolButton* _tmp57_ = NULL; + GtkProgressBar* _tmp58_ = NULL; +#line 780 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp1_ = PAGE_CLASS (import_page_parent_class)->get_toolbar (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage), TYPE_PAGE, Page)); -#line 772 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 780 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp2_ = _tmp1_; -#line 772 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 780 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_object_unref0 (_tmp2_); -#line 775 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 783 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp3_ = _ ("Hide photos already imported"); -#line 775 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 783 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp4_ = (GtkCheckButton*) gtk_check_button_new_with_label (_tmp3_); -#line 775 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 783 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" g_object_ref_sink (_tmp4_); -#line 775 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 783 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_object_unref0 (self->priv->hide_imported); -#line 775 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 783 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" self->priv->hide_imported = _tmp4_; -#line 776 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 784 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp5_ = self->priv->hide_imported; -#line 776 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 784 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp6_ = _ ("Only display photos that have not been imported"); -#line 776 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 784 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" gtk_widget_set_tooltip_text (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, gtk_widget_get_type (), GtkWidget), _tmp6_); -#line 777 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 785 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp7_ = self->priv->hide_imported; -#line 777 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 785 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, gtk_button_get_type (), GtkButton), "clicked", (GCallback) _import_page_on_hide_imported_gtk_button_clicked, self, 0); -#line 778 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 786 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp8_ = self->priv->hide_imported; -#line 778 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 786 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, gtk_widget_get_type (), GtkWidget), FALSE); -#line 779 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 787 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp9_ = self->priv->hide_imported; -#line 779 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 787 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp10_ = config_facade_get_instance (); -#line 779 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 787 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp11_ = _tmp10_; -#line 779 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 787 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp12_ = configuration_facade_get_hide_photos_already_imported (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade)); -#line 779 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 787 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" gtk_toggle_button_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, gtk_toggle_button_get_type (), GtkToggleButton), _tmp12_); -#line 779 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 787 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_object_unref0 (_tmp11_); -#line 780 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 788 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp13_ = gtk_tool_item_new (); -#line 780 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 788 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" g_object_ref_sink (_tmp13_); -#line 780 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 788 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" hide_item = _tmp13_; -#line 781 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 789 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp14_ = hide_item; -#line 781 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 789 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" gtk_tool_item_set_is_important (_tmp14_, TRUE); -#line 782 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 790 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp15_ = hide_item; -#line 782 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 790 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp16_ = self->priv->hide_imported; -#line 782 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 790 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, gtk_widget_get_type (), GtkWidget)); -#line 784 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 792 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp17_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)->toolbar; -#line 784 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 792 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp18_ = hide_item; -#line 784 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 792 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" gtk_toolbar_insert (_tmp17_, _tmp18_, -1); -#line 787 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 795 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp19_ = (GtkSeparatorToolItem*) gtk_separator_tool_item_new (); -#line 787 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 795 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" g_object_ref_sink (_tmp19_); -#line 787 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 795 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" separator = _tmp19_; -#line 788 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 796 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp20_ = separator; -#line 788 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 796 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" gtk_separator_tool_item_set_draw (_tmp20_, FALSE); -#line 790 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 798 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp21_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)->toolbar; -#line 790 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 798 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp22_ = separator; -#line 790 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 798 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" gtk_toolbar_insert (_tmp21_, G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, gtk_tool_item_get_type (), GtkToolItem), -1); -#line 793 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 801 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp23_ = self->priv->progress_bar; -#line 793 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 801 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" gtk_orientable_set_orientation (G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, GTK_TYPE_ORIENTABLE, GtkOrientable), GTK_ORIENTATION_HORIZONTAL); -#line 794 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 802 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp24_ = self->priv->progress_bar; -#line 794 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 802 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" gtk_widget_set_visible (G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, gtk_widget_get_type (), GtkWidget), FALSE); -#line 795 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 803 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp25_ = gtk_tool_item_new (); -#line 795 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 803 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" g_object_ref_sink (_tmp25_); -#line 795 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 803 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" progress_item = _tmp25_; -#line 796 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 804 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp26_ = progress_item; -#line 796 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 804 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" gtk_tool_item_set_expand (_tmp26_, TRUE); -#line 797 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 805 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp27_ = progress_item; -#line 797 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 805 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp28_ = self->priv->progress_bar; -#line 797 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 805 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp27_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp28_, gtk_widget_get_type (), GtkWidget)); -#line 798 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 806 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp29_ = self->priv->progress_bar; -#line 798 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 806 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" gtk_progress_bar_set_show_text (_tmp29_, TRUE); -#line 800 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 808 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp30_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)->toolbar; -#line 800 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 808 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp31_ = progress_item; -#line 800 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 808 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" gtk_toolbar_insert (_tmp30_, _tmp31_, -1); -#line 803 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 811 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp32_ = (GtkToggleToolButton*) gtk_toggle_tool_button_new (); -#line 803 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 811 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" g_object_ref_sink (_tmp32_); -#line 803 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 811 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" find_button = _tmp32_; -#line 804 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp33_ = find_button; -#line 804 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - gtk_actionable_set_action_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp33_, GTK_TYPE_ACTIONABLE, GtkActionable), "win.CommonDisplaySearchbar"); -#line 806 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp34_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)->toolbar; -#line 806 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp35_ = find_button; -#line 806 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - gtk_toolbar_insert (_tmp34_, G_TYPE_CHECK_INSTANCE_CAST (_tmp35_, gtk_tool_item_get_type (), GtkToolItem), -1); -#line 809 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp36_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)->toolbar; -#line 809 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp37_ = (GtkSeparatorToolItem*) gtk_separator_tool_item_new (); -#line 809 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - g_object_ref_sink (_tmp37_); -#line 809 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp38_ = _tmp37_; -#line 809 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - gtk_toolbar_insert (_tmp36_, G_TYPE_CHECK_INSTANCE_CAST (_tmp38_, gtk_tool_item_get_type (), GtkToolItem), -1); -#line 809 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _g_object_unref0 (_tmp38_); #line 812 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp39_ = (GtkToolButton*) gtk_tool_button_new (NULL, NULL); -#line 812 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - g_object_ref_sink (_tmp39_); + _tmp33_ = find_button; #line 812 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - import_selected_button = _tmp39_; + gtk_tool_button_set_icon_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp33_, gtk_tool_button_get_type (), GtkToolButton), "edit-find"); #line 813 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp40_ = import_selected_button; + _tmp34_ = find_button; #line 813 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - gtk_tool_button_set_icon_name (_tmp40_, RESOURCES_IMPORT); -#line 814 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp41_ = import_selected_button; -#line 814 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - gtk_actionable_set_action_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp41_, GTK_TYPE_ACTIONABLE, GtkActionable), "win.ImportSelected"); -#line 816 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp42_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)->toolbar; -#line 816 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp43_ = import_selected_button; -#line 816 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - gtk_toolbar_insert (_tmp42_, G_TYPE_CHECK_INSTANCE_CAST (_tmp43_, gtk_tool_item_get_type (), GtkToolItem), -1); -#line 819 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp44_ = (GtkToolButton*) gtk_tool_button_new (NULL, NULL); -#line 819 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - g_object_ref_sink (_tmp44_); -#line 819 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - import_all_button = _tmp44_; -#line 820 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp45_ = import_all_button; -#line 820 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - gtk_tool_button_set_icon_name (_tmp45_, RESOURCES_IMPORT_ALL); + gtk_actionable_set_action_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp34_, GTK_TYPE_ACTIONABLE, GtkActionable), "win.CommonDisplaySearchbar"); +#line 815 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" + _tmp35_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)->toolbar; +#line 815 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" + _tmp36_ = find_button; +#line 815 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" + gtk_toolbar_insert (_tmp35_, G_TYPE_CHECK_INSTANCE_CAST (_tmp36_, gtk_tool_item_get_type (), GtkToolItem), -1); +#line 818 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" + _tmp37_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)->toolbar; +#line 818 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" + _tmp38_ = (GtkSeparatorToolItem*) gtk_separator_tool_item_new (); +#line 818 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" + g_object_ref_sink (_tmp38_); +#line 818 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" + _tmp39_ = _tmp38_; +#line 818 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" + gtk_toolbar_insert (_tmp37_, G_TYPE_CHECK_INSTANCE_CAST (_tmp39_, gtk_tool_item_get_type (), GtkToolItem), -1); +#line 818 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" + _g_object_unref0 (_tmp39_); +#line 821 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" + _tmp40_ = (GtkToolButton*) gtk_tool_button_new (NULL, NULL); #line 821 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp46_ = import_all_button; + g_object_ref_sink (_tmp40_); #line 821 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - gtk_actionable_set_action_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp46_, GTK_TYPE_ACTIONABLE, GtkActionable), "win.ImportAll"); + import_selected_button = _tmp40_; +#line 822 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" + _tmp41_ = import_selected_button; +#line 822 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" + gtk_tool_button_set_icon_name (_tmp41_, "import"); #line 823 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp47_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)->toolbar; + _tmp42_ = import_selected_button; #line 823 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp48_ = import_all_button; + _tmp43_ = _ ("Import _Selected"); #line 823 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" + gtk_tool_button_set_label (_tmp42_, _tmp43_); +#line 824 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" + _tmp44_ = import_selected_button; +#line 824 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" + gtk_tool_item_set_is_important (G_TYPE_CHECK_INSTANCE_CAST (_tmp44_, gtk_tool_item_get_type (), GtkToolItem), TRUE); +#line 825 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" + _tmp45_ = import_selected_button; +#line 825 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" + gtk_tool_button_set_use_underline (_tmp45_, TRUE); +#line 826 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" + _tmp46_ = import_selected_button; +#line 826 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" + gtk_actionable_set_action_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp46_, GTK_TYPE_ACTIONABLE, GtkActionable), "win.ImportSelected"); +#line 828 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" + _tmp47_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)->toolbar; +#line 828 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" + _tmp48_ = import_selected_button; +#line 828 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" gtk_toolbar_insert (_tmp47_, G_TYPE_CHECK_INSTANCE_CAST (_tmp48_, gtk_tool_item_get_type (), GtkToolItem), -1); -#line 827 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp49_ = self->priv->progress_bar; -#line 827 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - gtk_widget_set_no_show_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp49_, gtk_widget_get_type (), GtkWidget), TRUE); -#line 829 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - import_page_update_toolbar_state (self); #line 831 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" + _tmp49_ = (GtkToolButton*) gtk_tool_button_new (NULL, NULL); +#line 831 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" + g_object_ref_sink (_tmp49_); +#line 831 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" + import_all_button = _tmp49_; +#line 832 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" + _tmp50_ = import_all_button; +#line 832 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" + gtk_tool_button_set_icon_name (_tmp50_, "import-all"); +#line 833 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" + _tmp51_ = import_all_button; +#line 833 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" + _tmp52_ = _ ("Import _All"); +#line 833 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" + gtk_tool_button_set_label (_tmp51_, _tmp52_); +#line 834 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" + _tmp53_ = import_all_button; +#line 834 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" + gtk_tool_item_set_is_important (G_TYPE_CHECK_INSTANCE_CAST (_tmp53_, gtk_tool_item_get_type (), GtkToolItem), TRUE); +#line 835 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" + _tmp54_ = import_all_button; +#line 835 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" + gtk_tool_button_set_use_underline (_tmp54_, TRUE); +#line 836 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" + _tmp55_ = import_all_button; +#line 836 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" + gtk_actionable_set_action_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp55_, GTK_TYPE_ACTIONABLE, GtkActionable), "win.ImportAll"); +#line 838 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" + _tmp56_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)->toolbar; +#line 838 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" + _tmp57_ = import_all_button; +#line 838 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" + gtk_toolbar_insert (_tmp56_, G_TYPE_CHECK_INSTANCE_CAST (_tmp57_, gtk_tool_item_get_type (), GtkToolItem), -1); +#line 842 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" + _tmp58_ = self->priv->progress_bar; +#line 842 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" + gtk_widget_set_no_show_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp58_, gtk_widget_get_type (), GtkWidget), TRUE); +#line 844 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" + import_page_update_toolbar_state (self); +#line 846 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget)); -#line 771 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 779 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_object_unref0 (import_all_button); -#line 771 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 779 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_object_unref0 (import_selected_button); -#line 771 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 779 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_object_unref0 (find_button); -#line 771 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 779 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_object_unref0 (progress_item); -#line 771 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 779 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_object_unref0 (separator); -#line 771 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 779 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_object_unref0 (hide_item); -#line 5917 "ImportPage.c" - } -#line 834 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp50_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)->toolbar; -#line 834 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp51_ = _g_object_ref0 (_tmp50_); -#line 834 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - result = _tmp51_; -#line 834 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 6023 "ImportPage.c" + } +#line 849 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" + _tmp59_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)->toolbar; +#line 849 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" + _tmp60_ = _g_object_ref0 (_tmp59_); +#line 849 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" + result = _tmp60_; +#line 849 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return result; -#line 5927 "ImportPage.c" +#line 6033 "ImportPage.c" } static gpointer _core_tracker_ref0 (gpointer self) { -#line 838 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 853 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return self ? core_tracker_ref (self) : NULL; -#line 5934 "ImportPage.c" +#line 6040 "ImportPage.c" } @@ -5940,17 +6046,17 @@ static CoreViewTracker* import_page_real_get_view_tracker (CheckerboardPage* bas CoreViewTracker* result = NULL; CameraViewTracker* _tmp0_ = NULL; CoreViewTracker* _tmp1_ = NULL; -#line 837 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 852 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_IMPORT_PAGE, ImportPage); -#line 838 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 853 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp0_ = self->priv->tracker; -#line 838 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 853 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp1_ = _core_tracker_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, CORE_TYPE_VIEW_TRACKER, CoreViewTracker)); -#line 838 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 853 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" result = _tmp1_; -#line 838 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 853 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return result; -#line 5953 "ImportPage.c" +#line 6059 "ImportPage.c" } @@ -5959,17 +6065,17 @@ static gchar* import_page_real_get_view_empty_message (CheckerboardPage* base) { gchar* result = NULL; const gchar* _tmp0_ = NULL; gchar* _tmp1_ = NULL; -#line 841 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 856 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_IMPORT_PAGE, ImportPage); -#line 842 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 857 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp0_ = _ ("The camera seems to be empty. No photos/videos found to import"); -#line 842 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 857 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp1_ = g_strdup (_tmp0_); -#line 842 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 857 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" result = _tmp1_; -#line 842 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 857 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return result; -#line 5972 "ImportPage.c" +#line 6078 "ImportPage.c" } @@ -5978,17 +6084,17 @@ static gchar* import_page_real_get_filter_no_match_message (CheckerboardPage* ba gchar* result = NULL; const gchar* _tmp0_ = NULL; gchar* _tmp1_ = NULL; -#line 845 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 860 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_IMPORT_PAGE, ImportPage); -#line 846 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 861 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp0_ = _ ("No new photos/videos found on camera"); -#line 846 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 861 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp1_ = g_strdup (_tmp0_); -#line 846 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 861 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" result = _tmp1_; -#line 846 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 861 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return result; -#line 5991 "ImportPage.c" +#line 6097 "ImportPage.c" } @@ -6003,33 +6109,33 @@ static gint64 import_page_preview_comparator (void* a, void* b) { ImportSource* _tmp6_ = NULL; time_t _tmp7_ = 0; gint64 _tmp8_ = 0LL; -#line 850 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 865 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp0_ = a; -#line 850 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 865 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp1_ = import_preview_get_import_source (G_TYPE_CHECK_INSTANCE_CAST ((ImportPreview*) _tmp0_, TYPE_IMPORT_PREVIEW, ImportPreview)); -#line 850 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 865 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp2_ = _tmp1_; -#line 850 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 865 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp3_ = import_source_get_exposure_time (_tmp2_); -#line 850 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 865 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp4_ = b; -#line 850 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 865 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp5_ = import_preview_get_import_source (G_TYPE_CHECK_INSTANCE_CAST ((ImportPreview*) _tmp4_, TYPE_IMPORT_PREVIEW, ImportPreview)); -#line 850 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 865 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp6_ = _tmp5_; -#line 850 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 865 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp7_ = import_source_get_exposure_time (_tmp6_); -#line 850 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 865 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp8_ = (gint64) (_tmp3_ - _tmp7_); -#line 850 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 865 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_object_unref0 (_tmp6_); -#line 850 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 865 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_object_unref0 (_tmp2_); -#line 850 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 865 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" result = _tmp8_; -#line 850 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 865 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return result; -#line 6032 "ImportPage.c" +#line 6138 "ImportPage.c" } @@ -6037,19 +6143,19 @@ static gboolean import_page_preview_comparator_predicate (DataObject* object, Al gboolean result = FALSE; Alteration* _tmp0_ = NULL; gboolean _tmp1_ = FALSE; -#line 854 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 869 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" g_return_val_if_fail (IS_DATA_OBJECT (object), FALSE); -#line 854 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 869 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" g_return_val_if_fail (IS_ALTERATION (alteration), FALSE); -#line 855 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 870 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp0_ = alteration; -#line 855 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 870 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp1_ = alteration_has_detail (_tmp0_, "metadata", "exposure-time"); -#line 855 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 870 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" result = _tmp1_; -#line 855 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 870 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return result; -#line 6052 "ImportPage.c" +#line 6158 "ImportPage.c" } @@ -6059,21 +6165,21 @@ static gint64 import_page_import_job_comparator (ImportPage* self, void* a, void time_t _tmp1_ = 0; void* _tmp2_ = NULL; time_t _tmp3_ = 0; -#line 858 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 873 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" g_return_val_if_fail (IS_IMPORT_PAGE (self), 0LL); -#line 859 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 874 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp0_ = a; -#line 859 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 874 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp1_ = import_page_camera_import_job_get_exposure_time (G_TYPE_CHECK_INSTANCE_CAST ((ImportPageCameraImportJob*) _tmp0_, IMPORT_PAGE_TYPE_CAMERA_IMPORT_JOB, ImportPageCameraImportJob)); -#line 859 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 874 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp2_ = b; -#line 859 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 874 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp3_ = import_page_camera_import_job_get_exposure_time (G_TYPE_CHECK_INSTANCE_CAST ((ImportPageCameraImportJob*) _tmp2_, IMPORT_PAGE_TYPE_CAMERA_IMPORT_JOB, ImportPageCameraImportJob)); -#line 859 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 874 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" result = (gint64) (_tmp1_ - _tmp3_); -#line 859 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 874 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return result; -#line 6076 "ImportPage.c" +#line 6182 "ImportPage.c" } @@ -6081,72 +6187,119 @@ static void import_page_real_init_collect_ui_filenames (Page* base, GeeList* ui_ ImportPage * self; GeeList* _tmp0_ = NULL; GeeList* _tmp1_ = NULL; -#line 862 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 877 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_IMPORT_PAGE, ImportPage); -#line 862 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 877 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" g_return_if_fail (GEE_IS_LIST (ui_filenames)); -#line 863 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 878 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp0_ = ui_filenames; -#line 863 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 878 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" PAGE_CLASS (import_page_parent_class)->init_collect_ui_filenames (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage), TYPE_PAGE, Page), _tmp0_); -#line 865 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 880 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp1_ = ui_filenames; -#line 865 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 880 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_COLLECTION, GeeCollection), "import.ui"); -#line 6096 "ImportPage.c" +#line 6202 "ImportPage.c" } static GVariant* _variant_new15 (gboolean value) { -#line 880 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 895 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return g_variant_ref_sink (g_variant_new_boolean (value)); -#line 6103 "ImportPage.c" +#line 6209 "ImportPage.c" } -static void import_page_real_add_actions (Page* base) { +static void import_page_real_add_actions (Page* base, GActionMap* map) { ImportPage * self; - AppWindow* _tmp0_ = NULL; - AppWindow* _tmp1_ = NULL; + GActionMap* _tmp0_ = NULL; + GActionMap* _tmp1_ = NULL; GAction* _tmp2_ = NULL; GAction* _tmp3_ = NULL; ConfigFacade* _tmp4_ = NULL; ConfigFacade* _tmp5_ = NULL; gboolean _tmp6_ = FALSE; GVariant* _tmp7_ = NULL; -#line 875 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 890 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_IMPORT_PAGE, ImportPage); -#line 876 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - PAGE_CLASS (import_page_parent_class)->add_actions (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage), TYPE_PAGE, Page)); -#line 878 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp0_ = app_window_get_instance (); -#line 878 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp1_ = _tmp0_; -#line 878 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - g_action_map_add_action_entries (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, g_action_map_get_type (), GActionMap), IMPORT_PAGE_entries, G_N_ELEMENTS (IMPORT_PAGE_entries), self); -#line 878 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _g_object_unref0 (_tmp1_); -#line 880 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 890 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" + g_return_if_fail (G_IS_ACTION_MAP (map)); +#line 891 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" + _tmp0_ = map; +#line 891 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" + PAGE_CLASS (import_page_parent_class)->add_actions (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage), TYPE_PAGE, Page), _tmp0_); +#line 893 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" + _tmp1_ = map; +#line 893 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" + g_action_map_add_action_entries (_tmp1_, IMPORT_PAGE_entries, G_N_ELEMENTS (IMPORT_PAGE_entries), self); +#line 895 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp2_ = page_get_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "ViewTitle"); -#line 880 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 895 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp3_ = _tmp2_; -#line 880 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 895 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp4_ = config_facade_get_instance (); -#line 880 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 895 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp5_ = _tmp4_; -#line 880 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 895 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp6_ = configuration_facade_get_display_photo_titles (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade)); -#line 880 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 895 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp7_ = _variant_new15 (_tmp6_); -#line 880 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 895 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" g_action_change_state (_tmp3_, _tmp7_); -#line 880 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 895 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_variant_unref0 (_tmp7_); -#line 880 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 895 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_object_unref0 (_tmp5_); -#line 880 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 895 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_object_unref0 (_tmp3_); -#line 6149 "ImportPage.c" +#line 6255 "ImportPage.c" +} + + +static void import_page_real_remove_actions (Page* base, GActionMap* map) { + ImportPage * self; + GActionMap* _tmp0_ = NULL; +#line 898 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" + self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_IMPORT_PAGE, ImportPage); +#line 898 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" + g_return_if_fail (G_IS_ACTION_MAP (map)); +#line 899 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" + _tmp0_ = map; +#line 899 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" + PAGE_CLASS (import_page_parent_class)->remove_actions (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage), TYPE_PAGE, Page), _tmp0_); +#line 6270 "ImportPage.c" + { + GActionEntry* entry_collection = NULL; + gint entry_collection_length1 = 0; + gint _entry_collection_size_ = 0; + gint entry_it = 0; +#line 900 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" + entry_collection = IMPORT_PAGE_entries; +#line 900 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" + entry_collection_length1 = G_N_ELEMENTS (IMPORT_PAGE_entries); +#line 900 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" + for (entry_it = 0; entry_it < G_N_ELEMENTS (IMPORT_PAGE_entries); entry_it = entry_it + 1) { +#line 6282 "ImportPage.c" + GActionEntry entry = {0}; +#line 900 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" + entry = entry_collection[entry_it]; +#line 6286 "ImportPage.c" + { + GActionMap* _tmp1_ = NULL; + GActionEntry _tmp2_ = {0}; + const gchar* _tmp3_ = NULL; +#line 901 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" + _tmp1_ = map; +#line 901 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" + _tmp2_ = entry; +#line 901 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" + _tmp3_ = _tmp2_.name; +#line 901 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" + g_action_map_remove_action (_tmp1_, _tmp3_); +#line 6299 "ImportPage.c" + } + } + } } @@ -6154,17 +6307,17 @@ Camera* import_page_get_camera (ImportPage* self) { Camera* result = NULL; Camera* _tmp0_ = NULL; Camera* _tmp1_ = NULL; -#line 883 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 905 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" g_return_val_if_fail (IS_IMPORT_PAGE (self), NULL); -#line 884 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 906 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp0_ = self->priv->camera; -#line 884 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 906 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp1_ = _GPHOTO_REF_CAMERA0 (_tmp0_); -#line 884 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 906 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" result = _tmp1_; -#line 884 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 906 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return result; -#line 6167 "ImportPage.c" +#line 6320 "ImportPage.c" } @@ -6172,32 +6325,32 @@ gchar* import_page_get_uri (ImportPage* self) { gchar* result = NULL; const gchar* _tmp0_ = NULL; gchar* _tmp1_ = NULL; -#line 887 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 909 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" g_return_val_if_fail (IS_IMPORT_PAGE (self), NULL); -#line 888 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 910 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp0_ = self->priv->uri; -#line 888 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 910 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp1_ = g_strdup (_tmp0_); -#line 888 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 910 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" result = _tmp1_; -#line 888 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 910 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return result; -#line 6185 "ImportPage.c" +#line 6338 "ImportPage.c" } gboolean import_page_is_busy (ImportPage* self) { gboolean result = FALSE; gboolean _tmp0_ = FALSE; -#line 891 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 913 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" g_return_val_if_fail (IS_IMPORT_PAGE (self), FALSE); -#line 892 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 914 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp0_ = self->priv->busy; -#line 892 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 914 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" result = _tmp0_; -#line 892 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 914 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return result; -#line 6200 "ImportPage.c" +#line 6353 "ImportPage.c" } @@ -6205,21 +6358,21 @@ static void import_page_real_init_actions (Page* base, gint selected_count, gint ImportPage * self; gint _tmp0_ = 0; gint _tmp1_ = 0; -#line 895 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 917 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_IMPORT_PAGE, ImportPage); -#line 896 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 918 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" import_page_on_view_changed (self); -#line 898 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 920 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" page_set_action_important (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "ImportSelected", TRUE); -#line 899 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 921 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" page_set_action_important (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "ImportAll", TRUE); -#line 901 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 923 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp0_ = selected_count; -#line 901 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 923 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp1_ = count; -#line 901 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 923 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" PAGE_CLASS (import_page_parent_class)->init_actions (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage), TYPE_PAGE, Page), _tmp0_, _tmp1_); -#line 6222 "ImportPage.c" +#line 6375 "ImportPage.c" } @@ -6227,29 +6380,29 @@ gboolean import_page_is_refreshed (ImportPage* self) { gboolean result = FALSE; gboolean _tmp0_ = FALSE; gboolean _tmp1_ = FALSE; -#line 904 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 926 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" g_return_val_if_fail (IS_IMPORT_PAGE (self), FALSE); -#line 905 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 927 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp1_ = self->priv->refreshed; -#line 905 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 927 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" if (_tmp1_) { -#line 6236 "ImportPage.c" +#line 6389 "ImportPage.c" gboolean _tmp2_ = FALSE; -#line 905 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 927 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp2_ = self->priv->busy; -#line 905 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 927 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp0_ = !_tmp2_; -#line 6242 "ImportPage.c" +#line 6395 "ImportPage.c" } else { -#line 905 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 927 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp0_ = FALSE; -#line 6246 "ImportPage.c" +#line 6399 "ImportPage.c" } -#line 905 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 927 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" result = _tmp0_; -#line 905 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 927 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return result; -#line 6252 "ImportPage.c" +#line 6405 "ImportPage.c" } @@ -6257,130 +6410,130 @@ gchar* import_page_get_refresh_message (ImportPage* self) { gchar* result = NULL; gchar* msg = NULL; const gchar* _tmp0_ = NULL; -#line 908 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 930 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" g_return_val_if_fail (IS_IMPORT_PAGE (self), NULL); -#line 909 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 931 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" msg = NULL; -#line 910 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 932 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp0_ = self->priv->refresh_error; -#line 910 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 932 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" if (_tmp0_ != NULL) { -#line 6268 "ImportPage.c" +#line 6421 "ImportPage.c" const gchar* _tmp1_ = NULL; gchar* _tmp2_ = NULL; -#line 911 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 933 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp1_ = self->priv->refresh_error; -#line 911 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 933 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp2_ = g_strdup (_tmp1_); -#line 911 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 933 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_free0 (msg); -#line 911 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 933 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" msg = _tmp2_; -#line 6279 "ImportPage.c" +#line 6432 "ImportPage.c" } else { int _tmp3_ = 0; -#line 912 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 934 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp3_ = self->priv->refresh_result; -#line 912 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 934 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" if (_tmp3_ == GP_OK) { -#line 6286 "ImportPage.c" +#line 6439 "ImportPage.c" } else { int _tmp4_ = 0; gchar* _tmp5_ = NULL; -#line 915 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 937 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp4_ = self->priv->refresh_result; -#line 915 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 937 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp5_ = gp_result_to_full_string (_tmp4_); -#line 915 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 937 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_free0 (msg); -#line 915 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 937 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" msg = _tmp5_; -#line 6298 "ImportPage.c" +#line 6451 "ImportPage.c" } } -#line 918 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 940 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" result = msg; -#line 918 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 940 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return result; -#line 6305 "ImportPage.c" +#line 6458 "ImportPage.c" } static void import_page_update_status (ImportPage* self, gboolean busy, gboolean refreshed) { gboolean _tmp0_ = FALSE; gboolean _tmp1_ = FALSE; -#line 921 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 943 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" g_return_if_fail (IS_IMPORT_PAGE (self)); -#line 922 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 944 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp0_ = busy; -#line 922 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 944 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" self->priv->busy = _tmp0_; -#line 923 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 945 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp1_ = refreshed; -#line 923 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 945 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" self->priv->refreshed = _tmp1_; -#line 925 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 947 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" import_page_on_view_changed (self); -#line 6324 "ImportPage.c" +#line 6477 "ImportPage.c" } static void import_page_update_toolbar_state (ImportPage* self) { GtkCheckButton* _tmp0_ = NULL; -#line 928 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 950 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" g_return_if_fail (IS_IMPORT_PAGE (self)); -#line 929 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 951 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp0_ = self->priv->hide_imported; -#line 929 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 951 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" if (_tmp0_ != NULL) { -#line 6336 "ImportPage.c" +#line 6489 "ImportPage.c" gboolean _tmp1_ = FALSE; gboolean _tmp2_ = FALSE; gboolean _tmp3_ = FALSE; GtkCheckButton* _tmp8_ = NULL; -#line 930 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 952 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp3_ = self->priv->busy; -#line 930 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 952 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" if (!_tmp3_) { -#line 6345 "ImportPage.c" +#line 6498 "ImportPage.c" gboolean _tmp4_ = FALSE; -#line 930 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 952 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp4_ = self->priv->refreshed; -#line 930 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 952 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp2_ = _tmp4_; -#line 6351 "ImportPage.c" +#line 6504 "ImportPage.c" } else { -#line 930 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 952 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp2_ = FALSE; -#line 6355 "ImportPage.c" +#line 6508 "ImportPage.c" } -#line 930 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 952 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" if (_tmp2_) { -#line 6359 "ImportPage.c" +#line 6512 "ImportPage.c" ViewCollection* _tmp5_ = NULL; ViewCollection* _tmp6_ = NULL; gint _tmp7_ = 0; -#line 930 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 952 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp5_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); -#line 930 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 952 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp6_ = _tmp5_; -#line 930 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 952 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp7_ = view_collection_get_unfiltered_count (_tmp6_); -#line 930 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 952 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp1_ = _tmp7_ > 0; -#line 930 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 952 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _data_collection_unref0 (_tmp6_); -#line 6373 "ImportPage.c" +#line 6526 "ImportPage.c" } else { -#line 930 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 952 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp1_ = FALSE; -#line 6377 "ImportPage.c" +#line 6530 "ImportPage.c" } -#line 930 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 952 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp8_ = self->priv->hide_imported; -#line 930 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 952 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, gtk_widget_get_type (), GtkWidget), _tmp1_); -#line 6383 "ImportPage.c" +#line 6536 "ImportPage.c" } } @@ -6394,129 +6547,129 @@ static void import_page_on_view_changed (ImportPage* self) { gboolean _tmp9_ = FALSE; gboolean _tmp14_ = FALSE; gboolean _tmp15_ = FALSE; -#line 933 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 955 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" g_return_if_fail (IS_IMPORT_PAGE (self)); -#line 934 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 956 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp2_ = self->priv->busy; -#line 934 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 956 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" if (!_tmp2_) { -#line 6403 "ImportPage.c" +#line 6556 "ImportPage.c" gboolean _tmp3_ = FALSE; -#line 934 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 956 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp3_ = self->priv->refreshed; -#line 934 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 956 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp1_ = _tmp3_; -#line 6409 "ImportPage.c" +#line 6562 "ImportPage.c" } else { -#line 934 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 956 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp1_ = FALSE; -#line 6413 "ImportPage.c" +#line 6566 "ImportPage.c" } -#line 934 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 956 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" if (_tmp1_) { -#line 6417 "ImportPage.c" +#line 6570 "ImportPage.c" ViewCollection* _tmp4_ = NULL; ViewCollection* _tmp5_ = NULL; gint _tmp6_ = 0; -#line 934 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 956 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp4_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); -#line 934 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 956 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp5_ = _tmp4_; -#line 934 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 956 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp6_ = view_collection_get_selected_count (_tmp5_); -#line 934 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 956 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp0_ = _tmp6_ > 0; -#line 934 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 956 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _data_collection_unref0 (_tmp5_); -#line 6431 "ImportPage.c" +#line 6584 "ImportPage.c" } else { -#line 934 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 956 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp0_ = FALSE; -#line 6435 "ImportPage.c" +#line 6588 "ImportPage.c" } -#line 934 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 956 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "ImportSelected", _tmp0_); -#line 935 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 957 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp9_ = self->priv->busy; -#line 935 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 957 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" if (!_tmp9_) { -#line 6443 "ImportPage.c" +#line 6596 "ImportPage.c" gboolean _tmp10_ = FALSE; -#line 935 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 957 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp10_ = self->priv->refreshed; -#line 935 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 957 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp8_ = _tmp10_; -#line 6449 "ImportPage.c" +#line 6602 "ImportPage.c" } else { -#line 935 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 957 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp8_ = FALSE; -#line 6453 "ImportPage.c" +#line 6606 "ImportPage.c" } -#line 935 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 957 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" if (_tmp8_) { -#line 6457 "ImportPage.c" +#line 6610 "ImportPage.c" ViewCollection* _tmp11_ = NULL; ViewCollection* _tmp12_ = NULL; gint _tmp13_ = 0; -#line 935 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 957 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp11_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); -#line 935 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 957 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp12_ = _tmp11_; -#line 935 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 957 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp13_ = data_collection_get_count (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, TYPE_DATA_COLLECTION, DataCollection)); -#line 935 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 957 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp7_ = _tmp13_ > 0; -#line 935 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 957 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _data_collection_unref0 (_tmp12_); -#line 6471 "ImportPage.c" +#line 6624 "ImportPage.c" } else { -#line 935 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 957 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp7_ = FALSE; -#line 6475 "ImportPage.c" +#line 6628 "ImportPage.c" } -#line 935 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 957 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "ImportAll", _tmp7_); -#line 936 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 958 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp15_ = self->priv->busy; -#line 936 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 958 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" if (!_tmp15_) { -#line 6483 "ImportPage.c" +#line 6636 "ImportPage.c" ViewCollection* _tmp16_ = NULL; ViewCollection* _tmp17_ = NULL; gint _tmp18_ = 0; -#line 936 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 958 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp16_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); -#line 936 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 958 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp17_ = _tmp16_; -#line 936 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 958 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp18_ = data_collection_get_count (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, TYPE_DATA_COLLECTION, DataCollection)); -#line 936 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 958 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp14_ = _tmp18_ > 0; -#line 936 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 958 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _data_collection_unref0 (_tmp17_); -#line 6497 "ImportPage.c" +#line 6650 "ImportPage.c" } else { -#line 936 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 958 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp14_ = FALSE; -#line 6501 "ImportPage.c" +#line 6654 "ImportPage.c" } -#line 936 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 958 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "CommonSelectAll", _tmp14_); -#line 938 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 960 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" import_page_update_toolbar_state (self); -#line 6507 "ImportPage.c" +#line 6660 "ImportPage.c" } static void import_page_on_media_added_removed (ImportPage* self) { ImportPageImportPageSearchViewFilter* _tmp0_ = NULL; -#line 941 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 963 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" g_return_if_fail (IS_IMPORT_PAGE (self)); -#line 942 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 964 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp0_ = self->priv->search_filter; -#line 942 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 964 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" g_signal_emit_by_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_VIEW_FILTER, ViewFilter), "refresh"); -#line 6519 "ImportPage.c" +#line 6672 "ImportPage.c" } @@ -6528,33 +6681,33 @@ static void import_page_on_display_titles (ImportPage* self, GSimpleAction* acti ConfigFacade* _tmp3_ = NULL; GSimpleAction* _tmp4_ = NULL; GVariant* _tmp5_ = NULL; -#line 945 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 967 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" g_return_if_fail (IS_IMPORT_PAGE (self)); -#line 945 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 967 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" g_return_if_fail (G_IS_SIMPLE_ACTION (action)); -#line 946 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 968 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp0_ = value; -#line 946 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 968 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp1_ = g_variant_get_boolean (_tmp0_); -#line 946 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 968 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" display = _tmp1_; -#line 948 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 970 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" checkerboard_page_set_display_titles (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage), display); -#line 950 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 972 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp2_ = config_facade_get_instance (); -#line 950 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 972 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp3_ = _tmp2_; -#line 950 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 972 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" configuration_facade_set_display_photo_titles (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), display); -#line 950 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 972 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_object_unref0 (_tmp3_); -#line 951 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 973 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp4_ = action; -#line 951 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 973 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp5_ = value; -#line 951 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 973 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" g_simple_action_set_state (_tmp4_, _tmp5_); -#line 6557 "ImportPage.c" +#line 6710 "ImportPage.c" } @@ -6563,36 +6716,36 @@ static void import_page_real_switched_to (Page* base) { ConfigFacade* _tmp0_ = NULL; ConfigFacade* _tmp1_ = NULL; gboolean _tmp2_ = FALSE; -#line 954 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 976 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_IMPORT_PAGE, ImportPage); -#line 955 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 977 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp0_ = config_facade_get_instance (); -#line 955 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 977 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp1_ = _tmp0_; -#line 955 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 977 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp2_ = configuration_facade_get_display_photo_titles (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade)); -#line 955 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 977 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" checkerboard_page_set_display_titles (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage), _tmp2_); -#line 955 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 977 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_object_unref0 (_tmp1_); -#line 957 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 979 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" PAGE_CLASS (import_page_parent_class)->switched_to (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage), TYPE_PAGE, Page)); -#line 6580 "ImportPage.c" +#line 6733 "ImportPage.c" } static void import_page_real_ready (Page* base) { ImportPage * self; ImportPageHideImportedViewFilter* _tmp0_ = NULL; -#line 960 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 982 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_IMPORT_PAGE, ImportPage); -#line 961 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 983 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" import_page_try_refreshing_camera (self, FALSE); -#line 962 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 984 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp0_ = self->priv->hide_imported_filter; -#line 962 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 984 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" g_signal_emit_by_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_VIEW_FILTER, ViewFilter), "refresh"); -#line 6595 "ImportPage.c" +#line 6748 "ImportPage.c" } @@ -6603,50 +6756,50 @@ static void import_page_try_refreshing_camera (ImportPage* self, gboolean fail_o ImportPageRefreshResult _tmp3_ = 0; ImportPageRefreshResult _tmp4_ = 0; GError * _inner_error_ = NULL; -#line 965 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 987 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" g_return_if_fail (IS_IMPORT_PAGE (self)); -#line 967 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 989 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp1_ = self->priv->refreshed; -#line 967 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 989 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" if (_tmp1_) { -#line 967 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 989 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp0_ = TRUE; -#line 6614 "ImportPage.c" +#line 6767 "ImportPage.c" } else { gboolean _tmp2_ = FALSE; -#line 967 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 989 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp2_ = self->priv->busy; -#line 967 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 989 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp0_ = _tmp2_; -#line 6621 "ImportPage.c" +#line 6774 "ImportPage.c" } -#line 967 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 989 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" if (_tmp0_) { -#line 968 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 990 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return; -#line 6627 "ImportPage.c" +#line 6780 "ImportPage.c" } -#line 970 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 992 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp3_ = import_page_refresh_camera (self); -#line 970 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 992 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" res = _tmp3_; -#line 971 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 993 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp4_ = res; -#line 971 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 993 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" switch (_tmp4_) { -#line 971 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 993 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" case IMPORT_PAGE_REFRESH_RESULT_OK: -#line 971 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 993 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" case IMPORT_PAGE_REFRESH_RESULT_BUSY: -#line 6641 "ImportPage.c" +#line 6794 "ImportPage.c" { -#line 976 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 998 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" break; -#line 6645 "ImportPage.c" +#line 6798 "ImportPage.c" } -#line 971 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 993 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" case IMPORT_PAGE_REFRESH_RESULT_LOCKED: -#line 6649 "ImportPage.c" +#line 6802 "ImportPage.c" { gboolean _tmp5_ = FALSE; const gchar* _tmp6_ = NULL; @@ -6655,89 +6808,89 @@ static void import_page_try_refreshing_camera (ImportPage* self, gboolean fail_o GFile* _tmp8_ = NULL; GMount* mount = NULL; GMount* _tmp13_ = NULL; -#line 979 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1001 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp5_ = fail_on_locked; -#line 979 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1001 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" if (_tmp5_) { -#line 980 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1002 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" app_window_error_message (IMPORT_PAGE_UNMOUNT_FAILED_MSG, NULL); -#line 982 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1004 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" break; -#line 6666 "ImportPage.c" +#line 6819 "ImportPage.c" } -#line 986 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1008 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp6_ = self->priv->uri; -#line 986 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - g_debug ("ImportPage.vala:986: Checking if %s is mounted…", _tmp6_); -#line 988 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1008 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" + g_debug ("ImportPage.vala:1008: Checking if %s is mounted…", _tmp6_); +#line 1010 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp7_ = self->priv->uri; -#line 988 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1010 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp8_ = g_file_new_for_uri (_tmp7_); -#line 988 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1010 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" uri = _tmp8_; -#line 990 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1012 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" mount = NULL; -#line 6680 "ImportPage.c" +#line 6833 "ImportPage.c" { GMount* _tmp9_ = NULL; GFile* _tmp10_ = NULL; GMount* _tmp11_ = NULL; GMount* _tmp12_ = NULL; -#line 992 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1014 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp10_ = uri; -#line 992 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1014 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp11_ = g_file_find_enclosing_mount (_tmp10_, NULL, &_inner_error_); -#line 992 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1014 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp9_ = _tmp11_; -#line 992 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1014 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 6694 "ImportPage.c" - goto __catch62_g_error; +#line 6847 "ImportPage.c" + goto __catch64_g_error; } -#line 992 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1014 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp12_ = _tmp9_; -#line 992 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1014 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp9_ = NULL; -#line 992 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1014 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_object_unref0 (mount); -#line 992 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1014 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" mount = _tmp12_; -#line 991 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1013 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_object_unref0 (_tmp9_); -#line 6707 "ImportPage.c" +#line 6860 "ImportPage.c" } - goto __finally62; - __catch62_g_error: + goto __finally64; + __catch64_g_error: { GError* err = NULL; -#line 991 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1013 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" err = _inner_error_; -#line 991 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1013 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _inner_error_ = NULL; -#line 991 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1013 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_error_free0 (err); -#line 6719 "ImportPage.c" +#line 6872 "ImportPage.c" } - __finally62: -#line 991 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" + __finally64: +#line 1013 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 991 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1013 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_object_unref0 (mount); -#line 991 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1013 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_object_unref0 (uri); -#line 991 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1013 "/home/jens/Source/shotwell/src/camera/ImportPage.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 991 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1013 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" g_clear_error (&_inner_error_); -#line 991 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1013 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return; -#line 6734 "ImportPage.c" +#line 6887 "ImportPage.c" } -#line 997 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1019 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp13_ = mount; -#line 997 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1019 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" if (_tmp13_ != NULL) { -#line 6740 "ImportPage.c" +#line 6893 "ImportPage.c" gchar* mounted_message = NULL; const gchar* _tmp14_ = NULL; gchar* _tmp15_ = NULL; @@ -6755,73 +6908,73 @@ static void import_page_try_refreshing_camera (ImportPage* self, gboolean fail_o gint _tmp25_ = 0; GtkMessageDialog* _tmp26_ = NULL; gint _tmp27_ = 0; -#line 999 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1021 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp14_ = _ ("Shotwell needs to unmount the camera from the filesystem in order to a" \ "ccess it. Continue?"); -#line 999 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1021 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp15_ = g_strdup (_tmp14_); -#line 999 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1021 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" mounted_message = _tmp15_; -#line 1001 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1023 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp16_ = app_window_get_instance (); -#line 1001 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1023 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp17_ = _tmp16_; -#line 1001 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1023 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp18_ = mounted_message; -#line 1001 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1023 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp19_ = (GtkMessageDialog*) gtk_message_dialog_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, gtk_window_get_type (), GtkWindow), GTK_DIALOG_MODAL, GTK_MESSAGE_QUESTION, GTK_BUTTONS_CANCEL, "%s", _tmp18_); -#line 1001 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1023 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" g_object_ref_sink (_tmp19_); -#line 1001 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1023 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp20_ = _tmp19_; -#line 1001 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1023 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_object_unref0 (_tmp17_); -#line 1001 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1023 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" dialog = _tmp20_; -#line 1004 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1026 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp21_ = dialog; -#line 1004 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1026 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" gtk_window_set_title (G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, gtk_window_get_type (), GtkWindow), RESOURCES_APP_TITLE); -#line 1005 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1027 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp22_ = dialog; -#line 1005 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1027 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp23_ = _ ("_Unmount"); -#line 1005 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1027 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" gtk_dialog_add_button (G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, gtk_dialog_get_type (), GtkDialog), _tmp23_, (gint) GTK_RESPONSE_YES); -#line 1006 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1028 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp24_ = dialog; -#line 1006 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1028 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp25_ = gtk_dialog_run (G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, gtk_dialog_get_type (), GtkDialog)); -#line 1006 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1028 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" dialog_res = _tmp25_; -#line 1007 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1029 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp26_ = dialog; -#line 1007 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1029 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" gtk_widget_destroy (G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, gtk_widget_get_type (), GtkWidget)); -#line 1009 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1031 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp27_ = dialog_res; -#line 1009 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1031 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" if (_tmp27_ != ((gint) GTK_RESPONSE_YES)) { -#line 6804 "ImportPage.c" +#line 6957 "ImportPage.c" const gchar* _tmp28_ = NULL; -#line 1010 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1032 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp28_ = _ ("Please unmount the camera."); -#line 1010 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1032 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" checkerboard_page_set_page_message (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage), _tmp28_); -#line 6810 "ImportPage.c" +#line 6963 "ImportPage.c" } else { GMount* _tmp29_ = NULL; -#line 1012 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1034 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp29_ = mount; -#line 1012 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1034 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" import_page_unmount_camera (self, _tmp29_); -#line 6817 "ImportPage.c" +#line 6970 "ImportPage.c" } -#line 997 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1019 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_object_unref0 (dialog); -#line 997 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1019 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_free0 (mounted_message); -#line 6823 "ImportPage.c" +#line 6976 "ImportPage.c" } else { gchar* locked_message = NULL; const gchar* _tmp30_ = NULL; @@ -6836,115 +6989,115 @@ static void import_page_try_refreshing_camera (ImportPage* self, gboolean fail_o GtkMessageDialog* _tmp38_ = NULL; GtkMessageDialog* _tmp39_ = NULL; const gchar* _tmp40_ = NULL; -#line 1015 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1037 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp30_ = _ ("The camera is locked by another application. Shotwell can only access " \ "the camera when it’s unlocked. Please close any other application usin" \ "g the camera and try again."); -#line 1015 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1037 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp31_ = g_strdup (_tmp30_); -#line 1015 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1037 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" locked_message = _tmp31_; -#line 1018 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1040 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp32_ = app_window_get_instance (); -#line 1018 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1040 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp33_ = _tmp32_; -#line 1018 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1040 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp34_ = locked_message; -#line 1018 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1040 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp35_ = (GtkMessageDialog*) gtk_message_dialog_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp33_, gtk_window_get_type (), GtkWindow), GTK_DIALOG_MODAL, GTK_MESSAGE_WARNING, GTK_BUTTONS_OK, "%s", _tmp34_); -#line 1018 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1040 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" g_object_ref_sink (_tmp35_); -#line 1018 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1040 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp36_ = _tmp35_; -#line 1018 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1040 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_object_unref0 (_tmp33_); -#line 1018 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1040 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" dialog = _tmp36_; -#line 1021 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1043 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp37_ = dialog; -#line 1021 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1043 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" gtk_window_set_title (G_TYPE_CHECK_INSTANCE_CAST (_tmp37_, gtk_window_get_type (), GtkWindow), RESOURCES_APP_TITLE); -#line 1022 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1044 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp38_ = dialog; -#line 1022 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1044 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" gtk_dialog_run (G_TYPE_CHECK_INSTANCE_CAST (_tmp38_, gtk_dialog_get_type (), GtkDialog)); -#line 1023 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1045 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp39_ = dialog; -#line 1023 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1045 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" gtk_widget_destroy (G_TYPE_CHECK_INSTANCE_CAST (_tmp39_, gtk_widget_get_type (), GtkWidget)); -#line 1025 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1047 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp40_ = _ ("Please close any other application using the camera."); -#line 1025 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1047 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" checkerboard_page_set_page_message (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage), _tmp40_); -#line 997 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1019 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_object_unref0 (dialog); -#line 997 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1019 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_free0 (locked_message); -#line 6880 "ImportPage.c" +#line 7033 "ImportPage.c" } -#line 1027 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1049 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_object_unref0 (mount); -#line 1027 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1049 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_object_unref0 (uri); -#line 1027 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1049 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" break; -#line 6888 "ImportPage.c" +#line 7041 "ImportPage.c" } -#line 971 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 993 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" case IMPORT_PAGE_REFRESH_RESULT_LIBRARY_ERROR: -#line 6892 "ImportPage.c" +#line 7045 "ImportPage.c" { const gchar* _tmp41_ = NULL; gchar* _tmp42_ = NULL; gchar* _tmp43_ = NULL; gchar* _tmp44_ = NULL; gchar* _tmp45_ = NULL; -#line 1030 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1052 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp41_ = _ ("Unable to fetch previews from the camera:\n%s"); -#line 1030 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1052 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp42_ = import_page_get_refresh_message (self); -#line 1030 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1052 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp43_ = _tmp42_; -#line 1030 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1052 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp44_ = g_strdup_printf (_tmp41_, _tmp43_); -#line 1030 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1052 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp45_ = _tmp44_; -#line 1030 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1052 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" app_window_error_message (_tmp45_, NULL); -#line 1030 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1052 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_free0 (_tmp45_); -#line 1030 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1052 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_free0 (_tmp43_); -#line 1032 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1054 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" break; -#line 6917 "ImportPage.c" +#line 7070 "ImportPage.c" } default: { ImportPageRefreshResult _tmp46_ = 0; -#line 1035 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1057 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp46_ = res; -#line 1035 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - g_error ("ImportPage.vala:1035: Unknown result type %d", (gint) _tmp46_); -#line 6926 "ImportPage.c" +#line 1057 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" + g_error ("ImportPage.vala:1057: Unknown result type %d", (gint) _tmp46_); +#line 7079 "ImportPage.c" } } } static void _import_page_on_unmounted_g_mount_unmounted (GMount* _sender, gpointer self) { -#line 1052 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1074 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" import_page_on_unmounted ((ImportPage*) self, _sender); -#line 6935 "ImportPage.c" +#line 7088 "ImportPage.c" } static void _import_page_on_unmount_finished_gasync_ready_callback (GObject* source_object, GAsyncResult* res, gpointer self) { -#line 1055 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1077 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" import_page_on_unmount_finished ((ImportPage*) self, source_object, res); -#line 1055 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1077 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" g_object_unref (self); -#line 6944 "ImportPage.c" +#line 7097 "ImportPage.c" } @@ -6962,67 +7115,67 @@ gboolean import_page_unmount_camera (ImportPage* self, GMount* mount) { AppWindow* _tmp9_ = NULL; GtkMountOperation* _tmp10_ = NULL; GtkMountOperation* _tmp11_ = NULL; -#line 1039 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1061 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" g_return_val_if_fail (IS_IMPORT_PAGE (self), FALSE); -#line 1039 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1061 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" g_return_val_if_fail (G_IS_MOUNT (mount), FALSE); -#line 1040 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1062 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp0_ = self->priv->busy; -#line 1040 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1062 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" if (_tmp0_) { -#line 1041 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1063 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" result = FALSE; -#line 1041 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1063 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return result; -#line 6974 "ImportPage.c" +#line 7127 "ImportPage.c" } -#line 1043 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1065 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" import_page_update_status (self, TRUE, FALSE); -#line 1044 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1066 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp1_ = self->priv->progress_bar; -#line 1044 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1066 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" gtk_widget_set_visible (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_widget_get_type (), GtkWidget), TRUE); -#line 1045 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1067 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp2_ = self->priv->progress_bar; -#line 1045 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1067 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" gtk_progress_bar_set_fraction (_tmp2_, 0.0); -#line 1046 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1068 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp3_ = self->priv->progress_bar; -#line 1046 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1068 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" gtk_progress_bar_set_ellipsize (_tmp3_, PANGO_ELLIPSIZE_NONE); -#line 1047 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1069 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp4_ = self->priv->progress_bar; -#line 1047 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1069 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp5_ = _ ("Unmounting…"); -#line 1047 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1069 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" gtk_progress_bar_set_text (_tmp4_, _tmp5_); -#line 1052 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1074 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp6_ = mount; -#line 1052 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1074 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" g_signal_connect_object (_tmp6_, "unmounted", (GCallback) _import_page_on_unmounted_g_mount_unmounted, self, 0); -#line 1054 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - g_debug ("ImportPage.vala:1054: Unmounting camera…"); -#line 1055 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1076 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" + g_debug ("ImportPage.vala:1076: Unmounting camera…"); +#line 1077 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp7_ = mount; -#line 1055 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1077 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp8_ = app_window_get_instance (); -#line 1055 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1077 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp9_ = _tmp8_; -#line 1055 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1077 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp10_ = (GtkMountOperation*) gtk_mount_operation_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, gtk_window_get_type (), GtkWindow)); -#line 1055 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1077 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp11_ = _tmp10_; -#line 1055 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1077 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" g_mount_unmount_with_operation (_tmp7_, G_MOUNT_UNMOUNT_NONE, G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, g_mount_operation_get_type (), GMountOperation), NULL, _import_page_on_unmount_finished_gasync_ready_callback, g_object_ref (self)); -#line 1055 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1077 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_object_unref0 (_tmp11_); -#line 1055 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1077 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_object_unref0 (_tmp9_); -#line 1058 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1080 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" result = TRUE; -#line 1058 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1080 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return result; -#line 7022 "ImportPage.c" +#line 7175 "ImportPage.c" } @@ -7031,35 +7184,35 @@ static void import_page_on_unmount_finished (ImportPage* self, GObject* source, GObject* _tmp0_ = NULL; GMount* _tmp1_ = NULL; GError * _inner_error_ = NULL; -#line 1061 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1083 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" g_return_if_fail (IS_IMPORT_PAGE (self)); -#line 1061 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1083 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" g_return_if_fail ((source == NULL) || G_IS_OBJECT (source)); -#line 1061 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1083 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" g_return_if_fail (G_IS_ASYNC_RESULT (aresult)); -#line 1062 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - g_debug ("ImportPage.vala:1062: Async unmount finished"); -#line 1064 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1084 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" + g_debug ("ImportPage.vala:1084: Async unmount finished"); +#line 1086 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp0_ = source; -#line 1064 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1086 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp1_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, g_mount_get_type (), GMount)); -#line 1064 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1086 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" mount = _tmp1_; -#line 7045 "ImportPage.c" +#line 7198 "ImportPage.c" { GAsyncResult* _tmp2_ = NULL; -#line 1066 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1088 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp2_ = aresult; -#line 1066 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1088 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" g_mount_unmount_with_operation_finish (mount, _tmp2_, &_inner_error_); -#line 1066 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1088 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 7054 "ImportPage.c" - goto __catch63_g_error; +#line 7207 "ImportPage.c" + goto __catch65_g_error; } } - goto __finally63; - __catch63_g_error: + goto __finally65; + __catch65_g_error: { GError* err = NULL; guint _tmp3_ = 0U; @@ -7067,52 +7220,52 @@ static void import_page_on_unmount_finished (ImportPage* self, GObject* source, GtkProgressBar* _tmp5_ = NULL; GtkProgressBar* _tmp6_ = NULL; GtkProgressBar* _tmp7_ = NULL; -#line 1065 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1087 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" err = _inner_error_; -#line 1065 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1087 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _inner_error_ = NULL; -#line 1068 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1090 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" app_window_error_message (IMPORT_PAGE_UNMOUNT_FAILED_MSG, NULL); -#line 1071 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1093 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" g_signal_parse_name ("unmounted", g_mount_get_type (), &_tmp3_, NULL, FALSE); -#line 1071 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1093 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" g_signal_handlers_disconnect_matched (mount, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _import_page_on_unmounted_g_mount_unmounted, self); -#line 1073 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1095 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp4_ = self->priv->refreshed; -#line 1073 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1095 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" import_page_update_status (self, FALSE, _tmp4_); -#line 1074 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1096 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp5_ = self->priv->progress_bar; -#line 1074 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1096 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" gtk_progress_bar_set_ellipsize (_tmp5_, PANGO_ELLIPSIZE_NONE); -#line 1075 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1097 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp6_ = self->priv->progress_bar; -#line 1075 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1097 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" gtk_progress_bar_set_text (_tmp6_, ""); -#line 1076 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1098 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp7_ = self->priv->progress_bar; -#line 1076 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1098 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" gtk_widget_set_visible (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, gtk_widget_get_type (), GtkWidget), FALSE); -#line 1065 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1087 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_error_free0 (err); -#line 7095 "ImportPage.c" +#line 7248 "ImportPage.c" } - __finally63: -#line 1065 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" + __finally65: +#line 1087 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1065 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1087 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_object_unref0 (mount); -#line 1065 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1087 "/home/jens/Source/shotwell/src/camera/ImportPage.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 1065 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1087 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" g_clear_error (&_inner_error_); -#line 1065 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1087 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return; -#line 7108 "ImportPage.c" +#line 7261 "ImportPage.c" } -#line 1061 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1083 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_object_unref0 (mount); -#line 7112 "ImportPage.c" +#line 7265 "ImportPage.c" } @@ -7121,31 +7274,31 @@ static void import_page_on_unmounted (ImportPage* self, GMount* mount) { GtkProgressBar* _tmp1_ = NULL; GtkProgressBar* _tmp2_ = NULL; GtkProgressBar* _tmp3_ = NULL; -#line 1080 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1102 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" g_return_if_fail (IS_IMPORT_PAGE (self)); -#line 1080 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1102 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" g_return_if_fail (G_IS_MOUNT (mount)); -#line 1081 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - g_debug ("ImportPage.vala:1081: on_unmounted"); -#line 1083 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1103 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" + g_debug ("ImportPage.vala:1103: on_unmounted"); +#line 1105 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp0_ = self->priv->refreshed; -#line 1083 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1105 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" import_page_update_status (self, FALSE, _tmp0_); -#line 1084 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1106 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp1_ = self->priv->progress_bar; -#line 1084 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1106 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" gtk_progress_bar_set_ellipsize (_tmp1_, PANGO_ELLIPSIZE_NONE); -#line 1085 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1107 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp2_ = self->priv->progress_bar; -#line 1085 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1107 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" gtk_progress_bar_set_text (_tmp2_, ""); -#line 1086 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1108 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp3_ = self->priv->progress_bar; -#line 1086 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1108 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" gtk_widget_set_visible (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, gtk_widget_get_type (), GtkWidget), FALSE); -#line 1088 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1110 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" import_page_try_refreshing_camera (self, TRUE); -#line 7145 "ImportPage.c" +#line 7298 "ImportPage.c" } @@ -7154,23 +7307,23 @@ static void import_page_clear_all_import_sources (ImportPage* self) { SourceCollection* _tmp0_ = NULL; Marker* _tmp1_ = NULL; SourceCollection* _tmp2_ = NULL; -#line 1091 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1113 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" g_return_if_fail (IS_IMPORT_PAGE (self)); -#line 1092 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1114 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp0_ = self->priv->import_sources; -#line 1092 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1114 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp1_ = data_collection_start_marking (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_DATA_COLLECTION, DataCollection)); -#line 1092 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1114 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" marker = _tmp1_; -#line 1093 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1115 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" marker_mark_all (marker); -#line 1094 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1116 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp2_ = self->priv->import_sources; -#line 1094 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1116 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" source_collection_destroy_marked (_tmp2_, marker, FALSE, NULL, NULL, NULL); -#line 1091 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1113 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_object_unref0 (marker); -#line 7170 "ImportPage.c" +#line 7323 "ImportPage.c" } @@ -7204,93 +7357,93 @@ static gboolean import_page_check_directory_exists (ImportPage* self, gint fsid, gint list_len = 0; CameraList* _tmp15_ = NULL; gint _tmp16_ = 0; -#line 1104 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1126 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" g_return_val_if_fail (IS_IMPORT_PAGE (self), FALSE); -#line 1104 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1126 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" g_return_val_if_fail (dir != NULL, FALSE); -#line 1104 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1126 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" g_return_val_if_fail (search_target != NULL, FALSE); -#line 1105 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1127 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp0_ = self->priv->camera; -#line 1105 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1127 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp1_ = self->priv->camera_name; -#line 1105 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1127 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp2_ = fsid; -#line 1105 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1127 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp3_ = dir; -#line 1105 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1127 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp4_ = import_page_get_fulldir (_tmp0_, _tmp1_, _tmp2_, _tmp3_); -#line 1105 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1127 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" fulldir = _tmp4_; -#line 1109 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1131 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp6_ = gp_list_new (&_tmp5_); -#line 1109 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1131 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _gp_list_unref0 (folders); -#line 1109 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1131 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" folders = _tmp5_; -#line 1109 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1131 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _result_ = _tmp6_; -#line 1110 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1132 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp7_ = _result_; -#line 1110 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1132 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" if (_tmp7_ != GP_OK) { -#line 1112 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1134 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" result = FALSE; -#line 1112 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1134 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _gp_list_unref0 (folders); -#line 1112 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1134 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_free0 (fulldir); -#line 1112 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1134 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return result; -#line 7242 "ImportPage.c" +#line 7395 "ImportPage.c" } -#line 1115 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1137 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp8_ = self->priv->camera; -#line 1115 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1137 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp9_ = fulldir; -#line 1115 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1137 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp10_ = folders; -#line 1115 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1137 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp11_ = import_page_spin_idle_context; -#line 1115 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1137 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp12_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, GP_TYPE_CONTEXT_WRAPPER, GPContextWrapper)->context; -#line 1115 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1137 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp13_ = gp_camera_folder_list_folders (_tmp8_, _tmp9_, _tmp10_, _tmp12_); -#line 1115 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1137 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _result_ = _tmp13_; -#line 1116 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1138 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp14_ = _result_; -#line 1116 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1138 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" if (_tmp14_ != GP_OK) { -#line 1118 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1140 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" result = FALSE; -#line 1118 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1140 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _gp_list_unref0 (folders); -#line 1118 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1140 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_free0 (fulldir); -#line 1118 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1140 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return result; -#line 7270 "ImportPage.c" +#line 7423 "ImportPage.c" } -#line 1121 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1143 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp15_ = folders; -#line 1121 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1143 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp16_ = gp_list_count (_tmp15_); -#line 1121 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1143 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" list_len = _tmp16_; -#line 7278 "ImportPage.c" +#line 7431 "ImportPage.c" { gint list_index = 0; -#line 1123 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1145 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" list_index = 0; -#line 7283 "ImportPage.c" +#line 7436 "ImportPage.c" { gboolean _tmp17_ = FALSE; -#line 1123 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1145 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp17_ = TRUE; -#line 1123 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1145 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" while (TRUE) { -#line 7290 "ImportPage.c" +#line 7443 "ImportPage.c" gint _tmp19_ = 0; gint _tmp20_ = 0; gchar* tmp = NULL; @@ -7300,73 +7453,73 @@ static gboolean import_page_check_directory_exists (ImportPage* self, gint fsid, gchar* _tmp24_ = NULL; const gchar* _tmp25_ = NULL; const gchar* _tmp26_ = NULL; -#line 1123 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1145 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" if (!_tmp17_) { -#line 7302 "ImportPage.c" +#line 7455 "ImportPage.c" gint _tmp18_ = 0; -#line 1123 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1145 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp18_ = list_index; -#line 1123 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1145 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" list_index = _tmp18_ + 1; -#line 7308 "ImportPage.c" +#line 7461 "ImportPage.c" } -#line 1123 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1145 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp17_ = FALSE; -#line 1123 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1145 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp19_ = list_index; -#line 1123 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1145 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp20_ = list_len; -#line 1123 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1145 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" if (!(_tmp19_ < _tmp20_)) { -#line 1123 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1145 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" break; -#line 7320 "ImportPage.c" +#line 7473 "ImportPage.c" } -#line 1126 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1148 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp21_ = folders; -#line 1126 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1148 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp22_ = list_index; -#line 1126 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1148 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" gp_list_get_name (_tmp21_, _tmp22_, &_tmp23_); -#line 1126 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1148 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_free0 (tmp); -#line 1126 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1148 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp24_ = g_strdup (_tmp23_); -#line 1126 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1148 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" tmp = _tmp24_; -#line 1127 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1149 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp25_ = tmp; -#line 1127 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1149 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp26_ = search_target; -#line 1127 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1149 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" if (g_strcmp0 (_tmp25_, _tmp26_) == 0) { -#line 1128 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1150 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" result = TRUE; -#line 1128 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1150 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_free0 (tmp); -#line 1128 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1150 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _gp_list_unref0 (folders); -#line 1128 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1150 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_free0 (fulldir); -#line 1128 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1150 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return result; -#line 7350 "ImportPage.c" +#line 7503 "ImportPage.c" } -#line 1123 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1145 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_free0 (tmp); -#line 7354 "ImportPage.c" +#line 7507 "ImportPage.c" } } } -#line 1131 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1153 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" result = FALSE; -#line 1131 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1153 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _gp_list_unref0 (folders); -#line 1131 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1153 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_free0 (fulldir); -#line 1131 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1153 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return result; -#line 7366 "ImportPage.c" +#line 7519 "ImportPage.c" } @@ -7411,143 +7564,143 @@ static ImportPageRefreshResult import_page_refresh_camera (ImportPage* self) { int _tmp85_ = 0; int _tmp89_ = 0; int _tmp94_ = 0; -#line 1134 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1156 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" g_return_val_if_fail (IS_IMPORT_PAGE (self), 0); -#line 1135 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1157 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp0_ = self->priv->busy; -#line 1135 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1157 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" if (_tmp0_) { -#line 1136 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1158 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" result = IMPORT_PAGE_REFRESH_RESULT_BUSY; -#line 1136 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1158 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return result; -#line 7421 "ImportPage.c" +#line 7574 "ImportPage.c" } -#line 1138 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1160 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp1_ = _ ("Starting import, please wait…"); -#line 1138 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1160 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" checkerboard_page_set_page_message (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage), _tmp1_); -#line 1140 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1162 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp2_ = self->priv->busy; -#line 1140 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1162 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" import_page_update_status (self, _tmp2_, FALSE); -#line 1142 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1164 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_free0 (self->priv->refresh_error); -#line 1142 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1164 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" self->priv->refresh_error = NULL; -#line 1143 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1165 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp3_ = self->priv->camera; -#line 1143 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1165 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp4_ = import_page_spin_idle_context; -#line 1143 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1165 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp5_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, GP_TYPE_CONTEXT_WRAPPER, GPContextWrapper)->context; -#line 1143 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1165 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp6_ = gp_camera_init (_tmp3_, _tmp5_); -#line 1143 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1165 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" self->priv->refresh_result = _tmp6_; -#line 1144 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1166 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp7_ = self->priv->refresh_result; -#line 1144 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1166 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" if (_tmp7_ != GP_OK) { -#line 7449 "ImportPage.c" +#line 7602 "ImportPage.c" int _tmp8_ = 0; gchar* _tmp9_ = NULL; gchar* _tmp10_ = NULL; ImportPageRefreshResult _tmp11_ = 0; int _tmp12_ = 0; -#line 1145 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1167 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp8_ = self->priv->refresh_result; -#line 1145 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1167 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp9_ = gp_result_to_full_string (_tmp8_); -#line 1145 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1167 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp10_ = _tmp9_; -#line 1145 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - g_warning ("ImportPage.vala:1145: Unable to initialize camera: %s", _tmp10_); -#line 1145 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1167 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" + g_warning ("ImportPage.vala:1167: Unable to initialize camera: %s", _tmp10_); +#line 1167 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_free0 (_tmp10_); -#line 1147 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1169 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp12_ = self->priv->refresh_result; -#line 1147 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1169 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" if (_tmp12_ == GP_ERROR_IO_LOCK) { -#line 1147 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1169 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp11_ = IMPORT_PAGE_REFRESH_RESULT_LOCKED; -#line 7471 "ImportPage.c" +#line 7624 "ImportPage.c" } else { -#line 1147 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1169 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp11_ = IMPORT_PAGE_REFRESH_RESULT_LIBRARY_ERROR; -#line 7475 "ImportPage.c" +#line 7628 "ImportPage.c" } -#line 1147 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1169 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" result = _tmp11_; -#line 1147 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1169 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return result; -#line 7481 "ImportPage.c" +#line 7634 "ImportPage.c" } -#line 1150 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1172 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp13_ = self->priv->refreshed; -#line 1150 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1172 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" import_page_update_status (self, TRUE, _tmp13_); -#line 1152 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1174 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" import_page_on_view_changed (self); -#line 1154 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1176 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp14_ = self->priv->progress_bar; -#line 1154 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1176 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" gtk_progress_bar_set_ellipsize (_tmp14_, PANGO_ELLIPSIZE_NONE); -#line 1155 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1177 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp15_ = self->priv->progress_bar; -#line 1155 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1177 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp16_ = _ ("Fetching photo information"); -#line 1155 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1177 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" gtk_progress_bar_set_text (_tmp15_, _tmp16_); -#line 1156 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1178 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp17_ = self->priv->progress_bar; -#line 1156 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1178 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" gtk_progress_bar_set_fraction (_tmp17_, 0.0); -#line 1157 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1179 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp18_ = self->priv->progress_bar; -#line 1157 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1179 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" gtk_progress_bar_set_pulse_step (_tmp18_, 0.01); -#line 1158 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1180 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp19_ = self->priv->progress_bar; -#line 1158 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1180 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" gtk_widget_set_visible (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, gtk_widget_get_type (), GtkWidget), TRUE); -#line 1160 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1182 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp20_ = gee_array_list_new (TYPE_IMPORT_SOURCE, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL); -#line 1160 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1182 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" import_list = _tmp20_; -#line 1162 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1184 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" sifs = NULL; -#line 1163 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1185 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" count = 0; -#line 1164 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1186 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp21_ = self->priv->camera; -#line 1164 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1186 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp22_ = import_page_spin_idle_context; -#line 1164 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1186 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp23_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, GP_TYPE_CONTEXT_WRAPPER, GPContextWrapper)->context; -#line 1164 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1186 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp25_ = gp_camera_get_storageinfo (_tmp21_, &sifs, &_tmp24_, _tmp23_); -#line 1164 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1186 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" count = _tmp24_; -#line 1164 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1186 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" self->priv->refresh_result = _tmp25_; -#line 1165 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1187 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp26_ = self->priv->refresh_result; -#line 1165 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1187 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" if (_tmp26_ == GP_OK) { -#line 7535 "ImportPage.c" +#line 7688 "ImportPage.c" { gint fsid = 0; -#line 1166 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1188 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" fsid = 0; -#line 7540 "ImportPage.c" +#line 7693 "ImportPage.c" { gboolean _tmp27_ = FALSE; -#line 1166 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1188 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp27_ = TRUE; -#line 1166 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1188 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" while (TRUE) { -#line 7547 "ImportPage.c" +#line 7700 "ImportPage.c" gint _tmp29_ = 0; gint _tmp30_ = 0; gboolean got_well_known_dir = FALSE; @@ -7572,381 +7725,381 @@ static ImportPageRefreshResult import_page_refresh_camera (ImportPage* self) { gint _tmp67_ = 0; gboolean _tmp68_ = FALSE; gboolean _tmp71_ = FALSE; -#line 1166 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1188 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" if (!_tmp27_) { -#line 7574 "ImportPage.c" +#line 7727 "ImportPage.c" gint _tmp28_ = 0; -#line 1166 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1188 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp28_ = fsid; -#line 1166 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1188 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" fsid = _tmp28_ + 1; -#line 7580 "ImportPage.c" +#line 7733 "ImportPage.c" } -#line 1166 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1188 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp27_ = FALSE; -#line 1166 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1188 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp29_ = fsid; -#line 1166 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1188 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp30_ = count; -#line 1166 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1188 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" if (!(_tmp29_ < _tmp30_)) { -#line 1166 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1188 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" break; -#line 7592 "ImportPage.c" +#line 7745 "ImportPage.c" } -#line 1170 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1192 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" got_well_known_dir = FALSE; -#line 1173 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1195 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp31_ = fsid; -#line 1173 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1195 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp32_ = import_page_check_directory_exists (self, _tmp31_, "/", "DCIM"); -#line 1173 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1195 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" if (_tmp32_) { -#line 7602 "ImportPage.c" +#line 7755 "ImportPage.c" gint _tmp33_ = 0; GeeArrayList* _tmp34_ = NULL; -#line 1174 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1196 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp33_ = fsid; -#line 1174 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1196 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp34_ = import_list; -#line 1174 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1196 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" import_page_enumerate_files (self, _tmp33_, "/DCIM", _tmp34_); -#line 1175 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1197 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" got_well_known_dir = TRUE; -#line 7613 "ImportPage.c" +#line 7766 "ImportPage.c" } -#line 1177 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1199 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp35_ = fsid; -#line 1177 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1199 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp36_ = import_page_check_directory_exists (self, _tmp35_, "/", "dcim"); -#line 1177 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1199 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" if (_tmp36_) { -#line 7621 "ImportPage.c" +#line 7774 "ImportPage.c" gint _tmp37_ = 0; GeeArrayList* _tmp38_ = NULL; -#line 1178 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1200 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp37_ = fsid; -#line 1178 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1200 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp38_ = import_list; -#line 1178 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1200 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" import_page_enumerate_files (self, _tmp37_, "/dcim", _tmp38_); -#line 1179 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1201 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" got_well_known_dir = TRUE; -#line 7632 "ImportPage.c" +#line 7785 "ImportPage.c" } -#line 1184 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1206 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp39_ = fsid; -#line 1184 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1206 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp40_ = import_page_check_directory_exists (self, _tmp39_, "/PRIVATE/", "AVCHD"); -#line 1184 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1206 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" if (_tmp40_) { -#line 7640 "ImportPage.c" +#line 7793 "ImportPage.c" gint _tmp41_ = 0; GeeArrayList* _tmp42_ = NULL; -#line 1185 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1207 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp41_ = fsid; -#line 1185 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1207 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp42_ = import_list; -#line 1185 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1207 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" import_page_enumerate_files (self, _tmp41_, "/PRIVATE/AVCHD", _tmp42_); -#line 1186 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1208 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" got_well_known_dir = TRUE; -#line 7651 "ImportPage.c" +#line 7804 "ImportPage.c" } -#line 1188 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1210 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp43_ = fsid; -#line 1188 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1210 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp44_ = import_page_check_directory_exists (self, _tmp43_, "/private/", "avchd"); -#line 1188 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1210 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" if (_tmp44_) { -#line 7659 "ImportPage.c" +#line 7812 "ImportPage.c" gint _tmp45_ = 0; GeeArrayList* _tmp46_ = NULL; -#line 1189 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1211 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp45_ = fsid; -#line 1189 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1211 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp46_ = import_list; -#line 1189 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1211 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" import_page_enumerate_files (self, _tmp45_, "/private/avchd", _tmp46_); -#line 1190 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1212 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" got_well_known_dir = TRUE; -#line 7670 "ImportPage.c" +#line 7823 "ImportPage.c" } -#line 1192 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1214 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp47_ = fsid; -#line 1192 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1214 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp48_ = import_page_check_directory_exists (self, _tmp47_, "/", "AVCHD"); -#line 1192 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1214 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" if (_tmp48_) { -#line 7678 "ImportPage.c" +#line 7831 "ImportPage.c" gint _tmp49_ = 0; GeeArrayList* _tmp50_ = NULL; -#line 1193 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1215 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp49_ = fsid; -#line 1193 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1215 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp50_ = import_list; -#line 1193 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1215 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" import_page_enumerate_files (self, _tmp49_, "/AVCHD", _tmp50_); -#line 1194 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1216 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" got_well_known_dir = TRUE; -#line 7689 "ImportPage.c" +#line 7842 "ImportPage.c" } -#line 1196 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1218 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp51_ = fsid; -#line 1196 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1218 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp52_ = import_page_check_directory_exists (self, _tmp51_, "/", "avchd"); -#line 1196 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1218 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" if (_tmp52_) { -#line 7697 "ImportPage.c" +#line 7850 "ImportPage.c" gint _tmp53_ = 0; GeeArrayList* _tmp54_ = NULL; -#line 1197 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1219 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp53_ = fsid; -#line 1197 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1219 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp54_ = import_list; -#line 1197 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1219 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" import_page_enumerate_files (self, _tmp53_, "/avchd", _tmp54_); -#line 1198 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1220 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" got_well_known_dir = TRUE; -#line 7708 "ImportPage.c" +#line 7861 "ImportPage.c" } -#line 1203 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1225 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp55_ = fsid; -#line 1203 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1225 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp56_ = import_page_check_directory_exists (self, _tmp55_, "/PRIVATE/", "SONY"); -#line 1203 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1225 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" if (_tmp56_) { -#line 7716 "ImportPage.c" +#line 7869 "ImportPage.c" gint _tmp57_ = 0; GeeArrayList* _tmp58_ = NULL; -#line 1204 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1226 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp57_ = fsid; -#line 1204 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1226 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp58_ = import_list; -#line 1204 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1226 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" import_page_enumerate_files (self, _tmp57_, "/PRIVATE/SONY", _tmp58_); -#line 1205 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1227 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" got_well_known_dir = TRUE; -#line 7727 "ImportPage.c" +#line 7880 "ImportPage.c" } -#line 1207 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1229 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp59_ = fsid; -#line 1207 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1229 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp60_ = import_page_check_directory_exists (self, _tmp59_, "/private/", "sony"); -#line 1207 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1229 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" if (_tmp60_) { -#line 7735 "ImportPage.c" +#line 7888 "ImportPage.c" gint _tmp61_ = 0; GeeArrayList* _tmp62_ = NULL; -#line 1208 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1230 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp61_ = fsid; -#line 1208 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1230 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp62_ = import_list; -#line 1208 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1230 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" import_page_enumerate_files (self, _tmp61_, "/private/sony", _tmp62_); -#line 1209 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1231 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" got_well_known_dir = TRUE; -#line 7746 "ImportPage.c" +#line 7899 "ImportPage.c" } -#line 1213 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1235 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp63_ = fsid; -#line 1213 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1235 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp64_ = import_page_check_directory_exists (self, _tmp63_, "/", "MP_ROOT"); -#line 1213 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1235 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" if (_tmp64_) { -#line 7754 "ImportPage.c" +#line 7907 "ImportPage.c" gint _tmp65_ = 0; GeeArrayList* _tmp66_ = NULL; -#line 1214 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1236 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp65_ = fsid; -#line 1214 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1236 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp66_ = import_list; -#line 1214 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1236 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" import_page_enumerate_files (self, _tmp65_, "/MP_ROOT", _tmp66_); -#line 1215 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1237 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" got_well_known_dir = TRUE; -#line 7765 "ImportPage.c" +#line 7918 "ImportPage.c" } -#line 1217 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1239 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp67_ = fsid; -#line 1217 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1239 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp68_ = import_page_check_directory_exists (self, _tmp67_, "/", "mp_root"); -#line 1217 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1239 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" if (_tmp68_) { -#line 7773 "ImportPage.c" +#line 7926 "ImportPage.c" gint _tmp69_ = 0; GeeArrayList* _tmp70_ = NULL; -#line 1218 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1240 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp69_ = fsid; -#line 1218 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1240 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp70_ = import_list; -#line 1218 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1240 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" import_page_enumerate_files (self, _tmp69_, "/mp_root", _tmp70_); -#line 1219 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1241 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" got_well_known_dir = TRUE; -#line 7784 "ImportPage.c" +#line 7937 "ImportPage.c" } -#line 1224 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1246 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp71_ = got_well_known_dir; -#line 1224 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1246 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" if (!_tmp71_) { -#line 7790 "ImportPage.c" +#line 7943 "ImportPage.c" gint _tmp72_ = 0; GeeArrayList* _tmp73_ = NULL; gboolean _tmp74_ = FALSE; -#line 1225 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1247 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp72_ = fsid; -#line 1225 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1247 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp73_ = import_list; -#line 1225 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1247 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp74_ = import_page_enumerate_files (self, _tmp72_, "/", _tmp73_); -#line 1225 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1247 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" if (!_tmp74_) { -#line 1226 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1248 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" break; -#line 7804 "ImportPage.c" +#line 7957 "ImportPage.c" } } } } } } -#line 1231 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1253 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" import_page_clear_all_import_sources (self); -#line 1234 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1256 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp75_ = import_list; -#line 1234 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1256 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" import_page_auto_match_raw_jpeg (self, _tmp75_); -#line 1241 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1263 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp76_ = import_list; -#line 1241 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1263 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" import_page_load_previews_and_metadata (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp76_, GEE_TYPE_LIST, GeeList)); -#line 1248 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1270 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp77_ = self->priv->progress_bar; -#line 1248 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1270 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" gtk_widget_set_visible (G_TYPE_CHECK_INSTANCE_CAST (_tmp77_, gtk_widget_get_type (), GtkWidget), FALSE); -#line 1249 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1271 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp78_ = self->priv->progress_bar; -#line 1249 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1271 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" gtk_progress_bar_set_ellipsize (_tmp78_, PANGO_ELLIPSIZE_NONE); -#line 1250 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1272 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp79_ = self->priv->progress_bar; -#line 1250 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1272 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" gtk_progress_bar_set_text (_tmp79_, ""); -#line 1251 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1273 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp80_ = self->priv->progress_bar; -#line 1251 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1273 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" gtk_progress_bar_set_fraction (_tmp80_, 0.0); -#line 1253 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1275 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp81_ = self->priv->camera; -#line 1253 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1275 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp82_ = import_page_spin_idle_context; -#line 1253 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1275 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp83_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp82_, GP_TYPE_CONTEXT_WRAPPER, GPContextWrapper)->context; -#line 1253 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1275 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp84_ = gp_camera_exit (_tmp81_, _tmp83_); -#line 1253 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1275 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" res = _tmp84_; -#line 1254 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1276 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp85_ = res; -#line 1254 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1276 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" if (_tmp85_ != GP_OK) { -#line 7851 "ImportPage.c" +#line 8004 "ImportPage.c" int _tmp86_ = 0; gchar* _tmp87_ = NULL; gchar* _tmp88_ = NULL; -#line 1256 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1278 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp86_ = res; -#line 1256 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1278 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp87_ = gp_result_to_full_string (_tmp86_); -#line 1256 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1278 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp88_ = _tmp87_; -#line 1256 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - g_warning ("ImportPage.vala:1256: Unable to unlock camera: %s", _tmp88_); -#line 1256 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1278 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" + g_warning ("ImportPage.vala:1278: Unable to unlock camera: %s", _tmp88_); +#line 1278 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_free0 (_tmp88_); -#line 7865 "ImportPage.c" +#line 8018 "ImportPage.c" } -#line 1259 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1281 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp89_ = self->priv->refresh_result; -#line 1259 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1281 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" if (_tmp89_ == GP_OK) { -#line 7871 "ImportPage.c" +#line 8024 "ImportPage.c" SourceCollection* _tmp90_ = NULL; gint _tmp91_ = 0; -#line 1260 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1282 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp90_ = self->priv->import_sources; -#line 1260 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1282 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp91_ = data_collection_get_count (G_TYPE_CHECK_INSTANCE_CAST (_tmp90_, TYPE_DATA_COLLECTION, DataCollection)); -#line 1260 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1282 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" if (_tmp91_ == 0) { -#line 7880 "ImportPage.c" +#line 8033 "ImportPage.c" gchar* _tmp92_ = NULL; gchar* _tmp93_ = NULL; -#line 1261 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1283 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp92_ = checkerboard_page_get_view_empty_message (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage)); -#line 1261 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1283 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp93_ = _tmp92_; -#line 1261 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1283 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" checkerboard_page_set_page_message (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage), _tmp93_); -#line 1261 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1283 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_free0 (_tmp93_); -#line 7891 "ImportPage.c" +#line 8044 "ImportPage.c" } -#line 1263 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1285 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" import_page_update_status (self, FALSE, TRUE); -#line 7895 "ImportPage.c" +#line 8048 "ImportPage.c" } else { -#line 1265 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1287 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" import_page_update_status (self, FALSE, FALSE); -#line 1268 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1290 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" import_page_clear_all_import_sources (self); -#line 7901 "ImportPage.c" +#line 8054 "ImportPage.c" } -#line 1271 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1293 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" import_page_on_view_changed (self); -#line 1273 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1295 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp94_ = self->priv->refresh_result; -#line 1273 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1295 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" switch (_tmp94_) { -#line 1273 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1295 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" case GP_OK: -#line 7911 "ImportPage.c" +#line 8064 "ImportPage.c" { -#line 1275 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1297 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" result = IMPORT_PAGE_REFRESH_RESULT_OK; -#line 1275 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1297 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_object_unref0 (import_list); -#line 1275 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1297 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return result; -#line 7919 "ImportPage.c" +#line 8072 "ImportPage.c" } -#line 1273 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1295 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" case GP_ERROR_IO_LOCK: -#line 7923 "ImportPage.c" +#line 8076 "ImportPage.c" { -#line 1278 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1300 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" result = IMPORT_PAGE_REFRESH_RESULT_LOCKED; -#line 1278 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1300 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_object_unref0 (import_list); -#line 1278 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1300 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return result; -#line 7931 "ImportPage.c" +#line 8084 "ImportPage.c" } default: { -#line 1281 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1303 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" result = IMPORT_PAGE_REFRESH_RESULT_LIBRARY_ERROR; -#line 1281 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1303 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_object_unref0 (import_list); -#line 1281 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1303 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return result; -#line 7941 "ImportPage.c" +#line 8094 "ImportPage.c" } } -#line 1134 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1156 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_object_unref0 (import_list); -#line 7946 "ImportPage.c" +#line 8099 "ImportPage.c" } @@ -7954,17 +8107,17 @@ static gchar string_get (const gchar* self, glong index) { gchar result = '\0'; glong _tmp0_ = 0L; gchar _tmp1_ = '\0'; -#line 1086 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1086 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" g_return_val_if_fail (self != NULL, '\0'); -#line 1087 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1087 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp0_ = index; -#line 1087 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1087 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp1_ = ((gchar*) self)[_tmp0_]; -#line 1087 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1087 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" result = _tmp1_; -#line 1087 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1087 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" return result; -#line 7964 "ImportPage.c" +#line 8117 "ImportPage.c" } @@ -7985,105 +8138,105 @@ static gchar* string_slice (const gchar* self, glong start, glong end) { glong _tmp19_ = 0L; glong _tmp20_ = 0L; gchar* _tmp21_ = NULL; -#line 1328 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1328 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" g_return_val_if_fail (self != NULL, NULL); -#line 1329 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1329 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp0_ = strlen (self); -#line 1329 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1329 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp1_ = _tmp0_; -#line 1329 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1329 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" string_length = (glong) _tmp1_; -#line 1330 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1330 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp2_ = start; -#line 1330 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1330 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" if (_tmp2_ < ((glong) 0)) { -#line 7997 "ImportPage.c" +#line 8150 "ImportPage.c" glong _tmp3_ = 0L; glong _tmp4_ = 0L; -#line 1331 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1331 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp3_ = string_length; -#line 1331 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1331 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp4_ = start; -#line 1331 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1331 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" start = _tmp3_ + _tmp4_; -#line 8006 "ImportPage.c" +#line 8159 "ImportPage.c" } -#line 1333 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1333 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp5_ = end; -#line 1333 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1333 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" if (_tmp5_ < ((glong) 0)) { -#line 8012 "ImportPage.c" +#line 8165 "ImportPage.c" glong _tmp6_ = 0L; glong _tmp7_ = 0L; -#line 1334 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1334 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp6_ = string_length; -#line 1334 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1334 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp7_ = end; -#line 1334 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1334 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" end = _tmp6_ + _tmp7_; -#line 8021 "ImportPage.c" +#line 8174 "ImportPage.c" } -#line 1336 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp9_ = start; -#line 1336 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" if (_tmp9_ >= ((glong) 0)) { -#line 8027 "ImportPage.c" +#line 8180 "ImportPage.c" glong _tmp10_ = 0L; glong _tmp11_ = 0L; -#line 1336 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp10_ = start; -#line 1336 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp11_ = string_length; -#line 1336 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp8_ = _tmp10_ <= _tmp11_; -#line 8036 "ImportPage.c" +#line 8189 "ImportPage.c" } else { -#line 1336 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp8_ = FALSE; -#line 8040 "ImportPage.c" +#line 8193 "ImportPage.c" } -#line 1336 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" g_return_val_if_fail (_tmp8_, NULL); -#line 1337 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1337 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp13_ = end; -#line 1337 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1337 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" if (_tmp13_ >= ((glong) 0)) { -#line 8048 "ImportPage.c" +#line 8201 "ImportPage.c" glong _tmp14_ = 0L; glong _tmp15_ = 0L; -#line 1337 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1337 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp14_ = end; -#line 1337 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1337 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp15_ = string_length; -#line 1337 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1337 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp12_ = _tmp14_ <= _tmp15_; -#line 8057 "ImportPage.c" +#line 8210 "ImportPage.c" } else { -#line 1337 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1337 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp12_ = FALSE; -#line 8061 "ImportPage.c" +#line 8214 "ImportPage.c" } -#line 1337 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1337 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" g_return_val_if_fail (_tmp12_, NULL); -#line 1338 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1338 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp16_ = start; -#line 1338 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1338 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp17_ = end; -#line 1338 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1338 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" g_return_val_if_fail (_tmp16_ <= _tmp17_, NULL); -#line 1339 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1339 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp18_ = start; -#line 1339 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1339 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp19_ = end; -#line 1339 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1339 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp20_ = start; -#line 1339 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1339 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp21_ = g_strndup (((gchar*) self) + _tmp18_, (gsize) (_tmp19_ - _tmp20_)); -#line 1339 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1339 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" result = _tmp21_; -#line 1339 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1339 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" return result; -#line 8083 "ImportPage.c" +#line 8236 "ImportPage.c" } @@ -8094,71 +8247,71 @@ static gchar* import_page_chomp_ch (const gchar* str, gchar ch) { gint _tmp1_ = 0; gint _tmp2_ = 0; gchar* _tmp12_ = NULL; -#line 1285 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1307 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" g_return_val_if_fail (str != NULL, NULL); -#line 1286 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1308 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp0_ = str; -#line 1286 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1308 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp1_ = strlen (_tmp0_); -#line 1286 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1308 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp2_ = _tmp1_; -#line 1286 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1308 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" offset = (glong) _tmp2_; -#line 1287 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1309 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" while (TRUE) { -#line 8106 "ImportPage.c" +#line 8259 "ImportPage.c" glong _tmp3_ = 0L; glong _tmp4_ = 0L; const gchar* _tmp5_ = NULL; glong _tmp6_ = 0L; gchar _tmp7_ = '\0'; gchar _tmp8_ = '\0'; -#line 1287 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1309 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp3_ = offset; -#line 1287 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1309 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" offset = _tmp3_ - 1; -#line 1287 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1309 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp4_ = offset; -#line 1287 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1309 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" if (!(_tmp4_ >= ((glong) 0))) { -#line 1287 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1309 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" break; -#line 8123 "ImportPage.c" +#line 8276 "ImportPage.c" } -#line 1288 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1310 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp5_ = str; -#line 1288 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1310 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp6_ = offset; -#line 1288 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1310 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp7_ = string_get (_tmp5_, _tmp6_); -#line 1288 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1310 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp8_ = ch; -#line 1288 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1310 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" if (_tmp7_ != _tmp8_) { -#line 8135 "ImportPage.c" +#line 8288 "ImportPage.c" const gchar* _tmp9_ = NULL; glong _tmp10_ = 0L; gchar* _tmp11_ = NULL; -#line 1289 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1311 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp9_ = str; -#line 1289 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1311 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp10_ = offset; -#line 1289 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1311 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp11_ = string_slice (_tmp9_, (glong) 0, _tmp10_); -#line 1289 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1311 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" result = _tmp11_; -#line 1289 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1311 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return result; -#line 8149 "ImportPage.c" +#line 8302 "ImportPage.c" } } -#line 1292 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1314 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp12_ = g_strdup (""); -#line 1292 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1314 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" result = _tmp12_; -#line 1292 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1314 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return result; -#line 8158 "ImportPage.c" +#line 8311 "ImportPage.c" } @@ -8167,127 +8320,127 @@ gchar* import_page_append_path (const gchar* basepath, const gchar* addition) { gboolean _tmp0_ = FALSE; const gchar* _tmp1_ = NULL; gboolean _tmp2_ = FALSE; -#line 1295 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1317 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" g_return_val_if_fail (basepath != NULL, NULL); -#line 1295 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1317 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" g_return_val_if_fail (addition != NULL, NULL); -#line 1296 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1318 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp1_ = basepath; -#line 1296 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1318 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp2_ = g_str_has_suffix (_tmp1_, "/"); -#line 1296 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1318 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" if (!_tmp2_) { -#line 8177 "ImportPage.c" +#line 8330 "ImportPage.c" const gchar* _tmp3_ = NULL; gboolean _tmp4_ = FALSE; -#line 1296 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1318 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp3_ = addition; -#line 1296 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1318 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp4_ = g_str_has_prefix (_tmp3_, "/"); -#line 1296 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1318 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp0_ = !_tmp4_; -#line 8186 "ImportPage.c" +#line 8339 "ImportPage.c" } else { -#line 1296 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1318 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp0_ = FALSE; -#line 8190 "ImportPage.c" +#line 8343 "ImportPage.c" } -#line 1296 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1318 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" if (_tmp0_) { -#line 8194 "ImportPage.c" +#line 8347 "ImportPage.c" const gchar* _tmp5_ = NULL; gchar* _tmp6_ = NULL; gchar* _tmp7_ = NULL; const gchar* _tmp8_ = NULL; gchar* _tmp9_ = NULL; gchar* _tmp10_ = NULL; -#line 1297 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1319 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp5_ = basepath; -#line 1297 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1319 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp6_ = g_strconcat (_tmp5_, "/", NULL); -#line 1297 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1319 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp7_ = _tmp6_; -#line 1297 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1319 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp8_ = addition; -#line 1297 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1319 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp9_ = g_strconcat (_tmp7_, _tmp8_, NULL); -#line 1297 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1319 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp10_ = _tmp9_; -#line 1297 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1319 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_free0 (_tmp7_); -#line 1297 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1319 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" result = _tmp10_; -#line 1297 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1319 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return result; -#line 8219 "ImportPage.c" +#line 8372 "ImportPage.c" } else { gboolean _tmp11_ = FALSE; const gchar* _tmp12_ = NULL; gboolean _tmp13_ = FALSE; -#line 1298 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1320 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp12_ = basepath; -#line 1298 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1320 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp13_ = g_str_has_suffix (_tmp12_, "/"); -#line 1298 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1320 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" if (_tmp13_) { -#line 8230 "ImportPage.c" +#line 8383 "ImportPage.c" const gchar* _tmp14_ = NULL; gboolean _tmp15_ = FALSE; -#line 1298 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1320 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp14_ = addition; -#line 1298 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1320 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp15_ = g_str_has_prefix (_tmp14_, "/"); -#line 1298 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1320 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp11_ = _tmp15_; -#line 8239 "ImportPage.c" +#line 8392 "ImportPage.c" } else { -#line 1298 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1320 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp11_ = FALSE; -#line 8243 "ImportPage.c" +#line 8396 "ImportPage.c" } -#line 1298 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1320 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" if (_tmp11_) { -#line 8247 "ImportPage.c" +#line 8400 "ImportPage.c" const gchar* _tmp16_ = NULL; gchar* _tmp17_ = NULL; gchar* _tmp18_ = NULL; const gchar* _tmp19_ = NULL; gchar* _tmp20_ = NULL; gchar* _tmp21_ = NULL; -#line 1299 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1321 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp16_ = basepath; -#line 1299 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1321 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp17_ = import_page_chomp_ch (_tmp16_, '/'); -#line 1299 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1321 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp18_ = _tmp17_; -#line 1299 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1321 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp19_ = addition; -#line 1299 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1321 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp20_ = g_strconcat (_tmp18_, _tmp19_, NULL); -#line 1299 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1321 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp21_ = _tmp20_; -#line 1299 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1321 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_free0 (_tmp18_); -#line 1299 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1321 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" result = _tmp21_; -#line 1299 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1321 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return result; -#line 8272 "ImportPage.c" +#line 8425 "ImportPage.c" } else { const gchar* _tmp22_ = NULL; const gchar* _tmp23_ = NULL; gchar* _tmp24_ = NULL; -#line 1301 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1323 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp22_ = basepath; -#line 1301 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1323 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp23_ = addition; -#line 1301 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1323 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp24_ = g_strconcat (_tmp22_, _tmp23_, NULL); -#line 1301 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1323 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" result = _tmp24_; -#line 1301 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1323 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return result; -#line 8287 "ImportPage.c" +#line 8440 "ImportPage.c" } } } @@ -8313,80 +8466,80 @@ gchar* import_page_get_fs_basedir (Camera* camera, gint fsid) { CameraStorageInformation* _tmp11_ = NULL; CameraStorageInfoFields _tmp12_ = 0; gchar* _tmp15_ = NULL; -#line 1306 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1328 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" g_return_val_if_fail (camera != NULL, NULL); -#line 1307 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1329 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" sifs = NULL; -#line 1308 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1330 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" count = 0; -#line 1309 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1331 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp0_ = camera; -#line 1309 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1331 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp1_ = import_page_null_context; -#line 1309 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1331 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp2_ = _tmp1_->context; -#line 1309 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1331 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp4_ = gp_camera_get_storageinfo (_tmp0_, &sifs, &_tmp3_, _tmp2_); -#line 1309 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1331 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" count = _tmp3_; -#line 1309 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1331 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" res = _tmp4_; -#line 1310 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1332 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp5_ = res; -#line 1310 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1332 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" if (_tmp5_ != GP_OK) { -#line 1311 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1333 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" result = NULL; -#line 1311 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1333 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return result; -#line 8339 "ImportPage.c" +#line 8492 "ImportPage.c" } -#line 1313 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1335 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp6_ = fsid; -#line 1313 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1335 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp7_ = count; -#line 1313 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1335 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" if (_tmp6_ >= _tmp7_) { -#line 1314 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1336 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" result = NULL; -#line 1314 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1336 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return result; -#line 8351 "ImportPage.c" +#line 8504 "ImportPage.c" } -#line 1316 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1338 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp8_ = sifs; -#line 1316 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1338 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp9_ = fsid; -#line 1316 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1338 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" ifs = _tmp8_ + _tmp9_; -#line 1318 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1340 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp11_ = ifs; -#line 1318 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1340 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp12_ = (*_tmp11_).fields; -#line 1318 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1340 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" if ((_tmp12_ & GP_STORAGEINFO_BASE) != 0) { -#line 8365 "ImportPage.c" +#line 8518 "ImportPage.c" CameraStorageInformation* _tmp13_ = NULL; const gchar* _tmp14_ = NULL; -#line 1318 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1340 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp13_ = ifs; -#line 1318 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1340 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp14_ = (*_tmp13_).basedir; -#line 1318 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1340 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp10_ = _tmp14_; -#line 8374 "ImportPage.c" +#line 8527 "ImportPage.c" } else { -#line 1318 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1340 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp10_ = "/"; -#line 8378 "ImportPage.c" +#line 8531 "ImportPage.c" } -#line 1318 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1340 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp15_ = g_strdup (_tmp10_); -#line 1318 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1340 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" result = _tmp15_; -#line 1318 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1340 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return result; -#line 8386 "ImportPage.c" +#line 8539 "ImportPage.c" } @@ -8403,74 +8556,74 @@ gchar* import_page_get_fulldir (Camera* camera, const gchar* camera_name, gint f const gchar* _tmp11_ = NULL; const gchar* _tmp12_ = NULL; gchar* _tmp13_ = NULL; -#line 1321 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1343 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" g_return_val_if_fail (camera != NULL, NULL); -#line 1321 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1343 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" g_return_val_if_fail (camera_name != NULL, NULL); -#line 1321 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1343 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" g_return_val_if_fail (folder != NULL, NULL); -#line 1322 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1344 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp0_ = folder; -#line 1322 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1344 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp1_ = strlen (_tmp0_); -#line 1322 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1344 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp2_ = _tmp1_; -#line 1322 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1344 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" if (_tmp2_ > GP_MAX_BASEDIR_LENGTH) { -#line 1323 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1345 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" result = NULL; -#line 1323 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1345 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return result; -#line 8421 "ImportPage.c" +#line 8574 "ImportPage.c" } -#line 1325 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1347 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp3_ = camera; -#line 1325 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1347 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp4_ = fsid; -#line 1325 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1347 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp5_ = import_page_get_fs_basedir (_tmp3_, _tmp4_); -#line 1325 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1347 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" basedir = _tmp5_; -#line 1326 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1348 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp6_ = basedir; -#line 1326 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1348 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" if (_tmp6_ == NULL) { -#line 8435 "ImportPage.c" +#line 8588 "ImportPage.c" const gchar* _tmp7_ = NULL; gint _tmp8_ = 0; const gchar* _tmp9_ = NULL; gchar* _tmp10_ = NULL; -#line 1327 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1349 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp7_ = camera_name; -#line 1327 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1349 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp8_ = fsid; -#line 1327 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - g_debug ("ImportPage.vala:1327: Unable to find base directory for %s fsid %d", _tmp7_, _tmp8_); -#line 1329 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1349 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" + g_debug ("ImportPage.vala:1349: Unable to find base directory for %s fsid %d", _tmp7_, _tmp8_); +#line 1351 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp9_ = folder; -#line 1329 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1351 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp10_ = g_strdup (_tmp9_); -#line 1329 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1351 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" result = _tmp10_; -#line 1329 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1351 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_free0 (basedir); -#line 1329 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1351 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return result; -#line 8456 "ImportPage.c" +#line 8609 "ImportPage.c" } -#line 1332 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1354 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp11_ = basedir; -#line 1332 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1354 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp12_ = folder; -#line 1332 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1354 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp13_ = import_page_append_path (_tmp11_, _tmp12_); -#line 1332 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1354 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" result = _tmp13_; -#line 1332 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1354 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_free0 (basedir); -#line 1332 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1354 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return result; -#line 8470 "ImportPage.c" +#line 8623 "ImportPage.c" } @@ -8506,137 +8659,137 @@ static gboolean import_page_enumerate_files (ImportPage* self, gint fsid, const int _tmp120_ = 0; int _tmp121_ = 0; GError * _inner_error_ = NULL; -#line 1335 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1357 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" g_return_val_if_fail (IS_IMPORT_PAGE (self), FALSE); -#line 1335 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1357 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" g_return_val_if_fail (dir != NULL, FALSE); -#line 1335 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1357 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" g_return_val_if_fail (GEE_IS_ARRAY_LIST (import_list), FALSE); -#line 1336 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1358 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp0_ = self->priv->camera; -#line 1336 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1358 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp1_ = self->priv->camera_name; -#line 1336 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1358 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp2_ = fsid; -#line 1336 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1358 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp3_ = dir; -#line 1336 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1358 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp4_ = import_page_get_fulldir (_tmp0_, _tmp1_, _tmp2_, _tmp3_); -#line 1336 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1358 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" fulldir = _tmp4_; -#line 1337 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1359 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp5_ = fulldir; -#line 1337 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1359 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" if (_tmp5_ == NULL) { -#line 8528 "ImportPage.c" +#line 8681 "ImportPage.c" const gchar* _tmp6_ = NULL; -#line 1338 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1360 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp6_ = dir; -#line 1338 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - g_warning ("ImportPage.vala:1338: Skipping enumerating %s: invalid folder name", _tmp6_); -#line 1340 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1360 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" + g_warning ("ImportPage.vala:1360: Skipping enumerating %s: invalid folder name", _tmp6_); +#line 1362 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" result = TRUE; -#line 1340 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1362 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_free0 (fulldir); -#line 1340 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1362 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return result; -#line 8540 "ImportPage.c" +#line 8693 "ImportPage.c" } -#line 1344 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1366 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp8_ = gp_list_new (&_tmp7_); -#line 1344 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1366 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _gp_list_unref0 (files); -#line 1344 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1366 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" files = _tmp7_; -#line 1344 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1366 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" self->priv->refresh_result = _tmp8_; -#line 1345 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1367 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp9_ = self->priv->refresh_result; -#line 1345 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1367 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" if (_tmp9_ != GP_OK) { -#line 8554 "ImportPage.c" +#line 8707 "ImportPage.c" int _tmp10_ = 0; gchar* _tmp11_ = NULL; gchar* _tmp12_ = NULL; -#line 1346 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1368 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp10_ = self->priv->refresh_result; -#line 1346 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1368 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp11_ = gp_result_to_full_string (_tmp10_); -#line 1346 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1368 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp12_ = _tmp11_; -#line 1346 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - g_warning ("ImportPage.vala:1346: Unable to create file list: %s", _tmp12_); -#line 1346 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1368 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" + g_warning ("ImportPage.vala:1368: Unable to create file list: %s", _tmp12_); +#line 1368 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_free0 (_tmp12_); -#line 1348 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1370 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" result = FALSE; -#line 1348 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1370 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _gp_list_unref0 (files); -#line 1348 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1370 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_free0 (fulldir); -#line 1348 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1370 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return result; -#line 8576 "ImportPage.c" +#line 8729 "ImportPage.c" } -#line 1351 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1373 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp13_ = self->priv->camera; -#line 1351 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1373 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp14_ = fulldir; -#line 1351 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1373 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp15_ = files; -#line 1351 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1373 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp16_ = import_page_spin_idle_context; -#line 1351 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1373 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp17_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, GP_TYPE_CONTEXT_WRAPPER, GPContextWrapper)->context; -#line 1351 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1373 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp18_ = gp_camera_folder_list_files (_tmp13_, _tmp14_, _tmp15_, _tmp17_); -#line 1351 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1373 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" self->priv->refresh_result = _tmp18_; -#line 1352 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1374 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp19_ = self->priv->refresh_result; -#line 1352 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1374 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" if (_tmp19_ != GP_OK) { -#line 8596 "ImportPage.c" +#line 8749 "ImportPage.c" const gchar* _tmp20_ = NULL; int _tmp21_ = 0; gchar* _tmp22_ = NULL; gchar* _tmp23_ = NULL; -#line 1353 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1375 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp20_ = fulldir; -#line 1353 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1375 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp21_ = self->priv->refresh_result; -#line 1353 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1375 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp22_ = gp_result_to_full_string (_tmp21_); -#line 1353 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1375 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp23_ = _tmp22_; -#line 1353 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - g_warning ("ImportPage.vala:1353: Unable to list files in %s: %s", _tmp20_, _tmp23_); -#line 1353 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1375 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" + g_warning ("ImportPage.vala:1375: Unable to list files in %s: %s", _tmp20_, _tmp23_); +#line 1375 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_free0 (_tmp23_); -#line 1356 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1378 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" self->priv->refresh_result = GP_OK; -#line 1358 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1380 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" result = TRUE; -#line 1358 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1380 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _gp_list_unref0 (files); -#line 1358 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1380 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_free0 (fulldir); -#line 1358 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1380 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return result; -#line 8623 "ImportPage.c" +#line 8776 "ImportPage.c" } { gint ctr = 0; -#line 1361 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1383 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" ctr = 0; -#line 8629 "ImportPage.c" +#line 8782 "ImportPage.c" { gboolean _tmp24_ = FALSE; -#line 1361 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1383 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp24_ = TRUE; -#line 1361 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1383 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" while (TRUE) { -#line 8636 "ImportPage.c" +#line 8789 "ImportPage.c" gint _tmp26_ = 0; CameraList* _tmp27_ = NULL; gint _tmp28_ = 0; @@ -8647,79 +8800,79 @@ static gboolean import_page_enumerate_files (ImportPage* self, gint fsid, const int _tmp32_ = 0; gchar* _tmp33_ = NULL; int _tmp34_ = 0; -#line 1361 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1383 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" if (!_tmp24_) { -#line 8649 "ImportPage.c" +#line 8802 "ImportPage.c" gint _tmp25_ = 0; -#line 1361 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1383 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp25_ = ctr; -#line 1361 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1383 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" ctr = _tmp25_ + 1; -#line 8655 "ImportPage.c" +#line 8808 "ImportPage.c" } -#line 1361 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1383 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp24_ = FALSE; -#line 1361 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1383 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp26_ = ctr; -#line 1361 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1383 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp27_ = files; -#line 1361 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1383 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp28_ = gp_list_count (_tmp27_); -#line 1361 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1383 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" if (!(_tmp26_ < _tmp28_)) { -#line 1361 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1383 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" break; -#line 8669 "ImportPage.c" +#line 8822 "ImportPage.c" } -#line 1363 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1385 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp29_ = files; -#line 1363 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1385 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp30_ = ctr; -#line 1363 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1385 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp32_ = gp_list_get_name (_tmp29_, _tmp30_, &_tmp31_); -#line 1363 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1385 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_free0 (filename); -#line 1363 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1385 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp33_ = g_strdup (_tmp31_); -#line 1363 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1385 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" filename = _tmp33_; -#line 1363 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1385 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" self->priv->refresh_result = _tmp32_; -#line 1364 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1386 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp34_ = self->priv->refresh_result; -#line 1364 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1386 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" if (_tmp34_ != GP_OK) { -#line 8689 "ImportPage.c" +#line 8842 "ImportPage.c" gint _tmp35_ = 0; const gchar* _tmp36_ = NULL; int _tmp37_ = 0; gchar* _tmp38_ = NULL; gchar* _tmp39_ = NULL; -#line 1365 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1387 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp35_ = ctr; -#line 1365 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1387 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp36_ = fulldir; -#line 1365 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1387 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp37_ = self->priv->refresh_result; -#line 1365 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1387 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp38_ = gp_result_to_full_string (_tmp37_); -#line 1365 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1387 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp39_ = _tmp38_; -#line 1365 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - g_warning ("ImportPage.vala:1365: Unable to get the name of file %d in %s: %s", _tmp35_, _tmp36_, _tmp39_); -#line 1365 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1387 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" + g_warning ("ImportPage.vala:1387: Unable to get the name of file %d in %s: %s", _tmp35_, _tmp36_, _tmp39_); +#line 1387 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_free0 (_tmp39_); -#line 1368 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1390 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" result = FALSE; -#line 1368 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1390 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_free0 (filename); -#line 1368 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1390 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _gp_list_unref0 (files); -#line 1368 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1390 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_free0 (fulldir); -#line 1368 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1390 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return result; -#line 8719 "ImportPage.c" +#line 8872 "ImportPage.c" } { CameraFileInfo info = {0}; @@ -8737,91 +8890,91 @@ static gboolean import_page_enumerate_files (ImportPage* self, gint fsid, const const gchar* _tmp58_ = NULL; gboolean _tmp59_ = FALSE; GtkProgressBar* _tmp102_ = NULL; -#line 1373 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1395 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp41_ = import_page_spin_idle_context; -#line 1373 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1395 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp42_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp41_, GP_TYPE_CONTEXT_WRAPPER, GPContextWrapper)->context; -#line 1373 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1395 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp43_ = self->priv->camera; -#line 1373 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1395 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp44_ = fulldir; -#line 1373 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1395 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp45_ = filename; -#line 1373 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1395 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp47_ = gp_get_info (_tmp42_, _tmp43_, _tmp44_, _tmp45_, &_tmp46_, &_inner_error_); -#line 1373 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1395 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" (info); -#line 1373 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1395 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" info = _tmp46_; -#line 1373 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1395 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp40_ = _tmp47_; -#line 1373 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1395 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1373 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1395 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" (info); -#line 8759 "ImportPage.c" - goto __catch64_g_error; +#line 8912 "ImportPage.c" + goto __catch66_g_error; } -#line 1373 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1395 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" if (!_tmp40_) { -#line 8764 "ImportPage.c" +#line 8917 "ImportPage.c" const gchar* _tmp48_ = NULL; const gchar* _tmp49_ = NULL; -#line 1374 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1396 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp48_ = fulldir; -#line 1374 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1396 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp49_ = filename; -#line 1374 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - g_warning ("ImportPage.vala:1374: Skipping import of %s/%s: name too long", _tmp48_, _tmp49_); -#line 1376 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1396 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" + g_warning ("ImportPage.vala:1396: Skipping import of %s/%s: name too long", _tmp48_, _tmp49_); +#line 1398 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" (info); -#line 1376 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1398 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_free0 (filename); -#line 1376 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1398 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" continue; -#line 8779 "ImportPage.c" +#line 8932 "ImportPage.c" } -#line 1379 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1401 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp50_ = info; -#line 1379 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1401 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp51_ = _tmp50_.file; -#line 1379 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1401 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp52_ = _tmp51_.fields; -#line 1379 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1401 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" if ((_tmp52_ & GP_FILE_INFO_TYPE) == 0) { -#line 8789 "ImportPage.c" +#line 8942 "ImportPage.c" const gchar* _tmp53_ = NULL; const gchar* _tmp54_ = NULL; CameraFileInfo _tmp55_ = {0}; CameraFileInfoFile _tmp56_ = {0}; CameraFileInfoFields _tmp57_ = 0; -#line 1380 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1402 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp53_ = fulldir; -#line 1380 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1402 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp54_ = filename; -#line 1380 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1402 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp55_ = info; -#line 1380 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1402 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp56_ = _tmp55_.file; -#line 1380 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1402 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp57_ = _tmp56_.fields; -#line 1380 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - g_message ("ImportPage.vala:1380: Skipping %s/%s: No file (file=%02Xh)", _tmp53_, _tmp54_, (guint) _tmp57_); -#line 1383 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1402 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" + g_message ("ImportPage.vala:1402: Skipping %s/%s: No file (file=%02Xh)", _tmp53_, _tmp54_, (guint) _tmp57_); +#line 1405 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" (info); -#line 1383 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1405 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_free0 (filename); -#line 1383 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1405 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" continue; -#line 8813 "ImportPage.c" +#line 8966 "ImportPage.c" } -#line 1386 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1408 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp58_ = filename; -#line 1386 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1408 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp59_ = video_reader_is_supported_video_filename (_tmp58_); -#line 1386 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1408 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" if (_tmp59_) { -#line 8821 "ImportPage.c" +#line 8974 "ImportPage.c" VideoImportSource* video_source = NULL; const gchar* _tmp60_ = NULL; Camera* _tmp61_ = NULL; @@ -8837,41 +8990,41 @@ static gboolean import_page_enumerate_files (ImportPage* self, gint fsid, const VideoImportSource* _tmp71_ = NULL; GeeArrayList* _tmp72_ = NULL; VideoImportSource* _tmp73_ = NULL; -#line 1387 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1409 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp60_ = self->priv->camera_name; -#line 1387 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1409 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp61_ = self->priv->camera; -#line 1387 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1409 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp62_ = fsid; -#line 1387 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1409 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp63_ = dir; -#line 1387 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1409 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp64_ = filename; -#line 1387 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1409 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp65_ = info; -#line 1387 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1409 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp66_ = _tmp65_.file; -#line 1387 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1409 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp67_ = _tmp66_.size; -#line 1387 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1409 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp68_ = info; -#line 1387 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1409 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp69_ = _tmp68_.file; -#line 1387 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1409 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp70_ = _tmp69_.mtime; -#line 1387 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1409 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp71_ = video_import_source_new (_tmp60_, _tmp61_, _tmp62_, _tmp63_, _tmp64_, _tmp67_, _tmp70_); -#line 1387 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1409 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" video_source = _tmp71_; -#line 1389 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1411 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp72_ = import_list; -#line 1389 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1411 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp73_ = video_source; -#line 1389 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1411 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp72_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp73_, TYPE_IMPORT_SOURCE, ImportSource)); -#line 1386 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1408 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_object_unref0 (video_source); -#line 8871 "ImportPage.c" +#line 9024 "ImportPage.c" } else { PhotoFileFormat file_format = 0; CameraFileInfo _tmp74_ = {0}; @@ -8894,110 +9047,110 @@ static gboolean import_page_enumerate_files (ImportPage* self, gint fsid, const PhotoFileFormat _tmp99_ = 0; PhotoImportSource* _tmp100_ = NULL; PhotoImportSource* _tmp101_ = NULL; -#line 1392 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1414 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp74_ = info; -#line 1392 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1414 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp75_ = _tmp74_.file; -#line 1392 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1414 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp76_ = _tmp75_.type; -#line 1392 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1414 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp77_ = photo_file_format_from_gphoto_type (_tmp76_); -#line 1392 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1414 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" file_format = _tmp77_; -#line 1393 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1415 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp78_ = file_format; -#line 1393 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1415 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" if (_tmp78_ == PHOTO_FILE_FORMAT_UNKNOWN) { -#line 8908 "ImportPage.c" +#line 9061 "ImportPage.c" const gchar* _tmp79_ = NULL; PhotoFileFormat _tmp80_ = 0; PhotoFileFormat _tmp81_ = 0; -#line 1394 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1416 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp79_ = filename; -#line 1394 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1416 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp80_ = photo_file_format_get_by_basename_extension (_tmp79_); -#line 1394 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1416 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" file_format = _tmp80_; -#line 1395 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1417 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp81_ = file_format; -#line 1395 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1417 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" if (_tmp81_ == PHOTO_FILE_FORMAT_UNKNOWN) { -#line 8922 "ImportPage.c" +#line 9075 "ImportPage.c" const gchar* _tmp82_ = NULL; const gchar* _tmp83_ = NULL; CameraFileInfo _tmp84_ = {0}; CameraFileInfoFile _tmp85_ = {0}; const gchar* _tmp86_ = NULL; -#line 1396 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1418 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp82_ = fulldir; -#line 1396 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1418 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp83_ = filename; -#line 1396 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1418 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp84_ = info; -#line 1396 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1418 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp85_ = _tmp84_.file; -#line 1396 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1418 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp86_ = _tmp85_.type; -#line 1396 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - g_message ("ImportPage.vala:1396: Skipping %s/%s: Not a supported file extension (" \ +#line 1418 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" + g_message ("ImportPage.vala:1418: Skipping %s/%s: Not a supported file extension (" \ "%s)", _tmp82_, _tmp83_, _tmp86_); -#line 1399 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1421 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" (info); -#line 1399 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1421 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_free0 (filename); -#line 1399 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1421 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" continue; -#line 8946 "ImportPage.c" +#line 9099 "ImportPage.c" } } -#line 1402 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1424 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp87_ = import_list; -#line 1402 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1424 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp88_ = self->priv->camera_name; -#line 1402 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1424 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp89_ = self->priv->camera; -#line 1402 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1424 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp90_ = fsid; -#line 1402 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1424 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp91_ = dir; -#line 1402 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1424 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp92_ = filename; -#line 1402 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1424 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp93_ = info; -#line 1402 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1424 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp94_ = _tmp93_.file; -#line 1402 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1424 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp95_ = _tmp94_.size; -#line 1402 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1424 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp96_ = info; -#line 1402 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1424 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp97_ = _tmp96_.file; -#line 1402 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1424 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp98_ = _tmp97_.mtime; -#line 1402 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1424 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp99_ = file_format; -#line 1402 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1424 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp100_ = photo_import_source_new (_tmp88_, _tmp89_, _tmp90_, _tmp91_, _tmp92_, _tmp95_, _tmp98_, _tmp99_); -#line 1402 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1424 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp101_ = _tmp100_; -#line 1402 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1424 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp87_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp101_, TYPE_IMPORT_SOURCE, ImportSource)); -#line 1402 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1424 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_object_unref0 (_tmp101_); -#line 8983 "ImportPage.c" +#line 9136 "ImportPage.c" } -#line 1406 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1428 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp102_ = self->priv->progress_bar; -#line 1406 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1428 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" gtk_progress_bar_pulse (_tmp102_); -#line 1409 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1431 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" spin_event_loop (); -#line 1371 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1393 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" (info); -#line 8993 "ImportPage.c" +#line 9146 "ImportPage.c" } - goto __finally64; - __catch64_g_error: + goto __finally66; + __catch66_g_error: { GError* err = NULL; const gchar* _tmp103_ = NULL; @@ -9006,164 +9159,164 @@ static gboolean import_page_enumerate_files (ImportPage* self, gint fsid, const GError* _tmp106_ = NULL; const gchar* _tmp107_ = NULL; gchar* _tmp108_ = NULL; -#line 1371 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1393 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" err = _inner_error_; -#line 1371 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1393 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _inner_error_ = NULL; -#line 1411 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1433 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp103_ = fulldir; -#line 1411 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1433 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp104_ = err; -#line 1411 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1433 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp105_ = _tmp104_->message; -#line 1411 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - g_warning ("ImportPage.vala:1411: Error while enumerating files in %s: %s", _tmp103_, _tmp105_); -#line 1413 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1433 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" + g_warning ("ImportPage.vala:1433: Error while enumerating files in %s: %s", _tmp103_, _tmp105_); +#line 1435 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp106_ = err; -#line 1413 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1435 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp107_ = _tmp106_->message; -#line 1413 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1435 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp108_ = g_strdup (_tmp107_); -#line 1413 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1435 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_free0 (self->priv->refresh_error); -#line 1413 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1435 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" self->priv->refresh_error = _tmp108_; -#line 1415 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1437 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" result = FALSE; -#line 1415 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1437 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_error_free0 (err); -#line 1415 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1437 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_free0 (filename); -#line 1415 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1437 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _gp_list_unref0 (files); -#line 1415 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1437 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_free0 (fulldir); -#line 1415 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1437 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return result; -#line 9039 "ImportPage.c" +#line 9192 "ImportPage.c" } - __finally64: -#line 1371 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" + __finally66: +#line 1393 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1371 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1393 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_free0 (filename); -#line 1371 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1393 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _gp_list_unref0 (files); -#line 1371 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1393 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_free0 (fulldir); -#line 1371 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1393 "/home/jens/Source/shotwell/src/camera/ImportPage.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 1371 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1393 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" g_clear_error (&_inner_error_); -#line 1371 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1393 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return FALSE; -#line 9056 "ImportPage.c" +#line 9209 "ImportPage.c" } -#line 1361 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1383 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_free0 (filename); -#line 9060 "ImportPage.c" +#line 9213 "ImportPage.c" } } } -#line 1420 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1442 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp110_ = gp_list_new (&_tmp109_); -#line 1420 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1442 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _gp_list_unref0 (folders); -#line 1420 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1442 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" folders = _tmp109_; -#line 1420 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1442 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" self->priv->refresh_result = _tmp110_; -#line 1421 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1443 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp111_ = self->priv->refresh_result; -#line 1421 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1443 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" if (_tmp111_ != GP_OK) { -#line 9076 "ImportPage.c" +#line 9229 "ImportPage.c" int _tmp112_ = 0; gchar* _tmp113_ = NULL; gchar* _tmp114_ = NULL; -#line 1422 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1444 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp112_ = self->priv->refresh_result; -#line 1422 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1444 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp113_ = gp_result_to_full_string (_tmp112_); -#line 1422 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1444 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp114_ = _tmp113_; -#line 1422 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - g_warning ("ImportPage.vala:1422: Unable to create folder list: %s", _tmp114_); -#line 1422 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1444 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" + g_warning ("ImportPage.vala:1444: Unable to create folder list: %s", _tmp114_); +#line 1444 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_free0 (_tmp114_); -#line 1424 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1446 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" result = FALSE; -#line 1424 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1446 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _gp_list_unref0 (folders); -#line 1424 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1446 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _gp_list_unref0 (files); -#line 1424 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1446 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_free0 (fulldir); -#line 1424 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1446 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return result; -#line 9100 "ImportPage.c" +#line 9253 "ImportPage.c" } -#line 1427 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1449 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp115_ = self->priv->camera; -#line 1427 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1449 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp116_ = fulldir; -#line 1427 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1449 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp117_ = folders; -#line 1427 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1449 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp118_ = import_page_spin_idle_context; -#line 1427 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1449 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp119_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp118_, GP_TYPE_CONTEXT_WRAPPER, GPContextWrapper)->context; -#line 1427 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1449 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp120_ = gp_camera_folder_list_folders (_tmp115_, _tmp116_, _tmp117_, _tmp119_); -#line 1427 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1449 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" self->priv->refresh_result = _tmp120_; -#line 1428 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1450 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp121_ = self->priv->refresh_result; -#line 1428 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1450 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" if (_tmp121_ != GP_OK) { -#line 9120 "ImportPage.c" +#line 9273 "ImportPage.c" const gchar* _tmp122_ = NULL; int _tmp123_ = 0; gchar* _tmp124_ = NULL; gchar* _tmp125_ = NULL; -#line 1429 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1451 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp122_ = fulldir; -#line 1429 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1451 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp123_ = self->priv->refresh_result; -#line 1429 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1451 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp124_ = gp_result_to_full_string (_tmp123_); -#line 1429 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1451 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp125_ = _tmp124_; -#line 1429 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - g_warning ("ImportPage.vala:1429: Unable to list folders in %s: %s", _tmp122_, _tmp125_); -#line 1429 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1451 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" + g_warning ("ImportPage.vala:1451: Unable to list folders in %s: %s", _tmp122_, _tmp125_); +#line 1451 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_free0 (_tmp125_); -#line 1432 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1454 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" self->priv->refresh_result = GP_OK; -#line 1434 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1456 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" result = TRUE; -#line 1434 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1456 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _gp_list_unref0 (folders); -#line 1434 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1456 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _gp_list_unref0 (files); -#line 1434 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1456 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_free0 (fulldir); -#line 1434 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1456 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return result; -#line 9149 "ImportPage.c" +#line 9302 "ImportPage.c" } { gint ctr = 0; -#line 1437 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1459 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" ctr = 0; -#line 9155 "ImportPage.c" +#line 9308 "ImportPage.c" { gboolean _tmp126_ = FALSE; -#line 1437 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1459 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp126_ = TRUE; -#line 1437 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1459 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" while (TRUE) { -#line 9162 "ImportPage.c" +#line 9315 "ImportPage.c" gint _tmp128_ = 0; CameraList* _tmp129_ = NULL; gint _tmp130_ = 0; @@ -9182,151 +9335,151 @@ static gboolean import_page_enumerate_files (ImportPage* self, gint fsid, const GeeArrayList* _tmp146_ = NULL; gboolean _tmp147_ = FALSE; gboolean _tmp148_ = FALSE; -#line 1437 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1459 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" if (!_tmp126_) { -#line 9183 "ImportPage.c" +#line 9336 "ImportPage.c" gint _tmp127_ = 0; -#line 1437 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1459 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp127_ = ctr; -#line 1437 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1459 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" ctr = _tmp127_ + 1; -#line 9189 "ImportPage.c" +#line 9342 "ImportPage.c" } -#line 1437 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1459 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp126_ = FALSE; -#line 1437 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1459 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp128_ = ctr; -#line 1437 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1459 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp129_ = folders; -#line 1437 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1459 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp130_ = gp_list_count (_tmp129_); -#line 1437 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1459 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" if (!(_tmp128_ < _tmp130_)) { -#line 1437 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1459 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" break; -#line 9203 "ImportPage.c" +#line 9356 "ImportPage.c" } -#line 1439 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1461 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp131_ = folders; -#line 1439 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1461 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp132_ = ctr; -#line 1439 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1461 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp134_ = gp_list_get_name (_tmp131_, _tmp132_, &_tmp133_); -#line 1439 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1461 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_free0 (subdir); -#line 1439 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1461 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp135_ = g_strdup (_tmp133_); -#line 1439 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1461 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" subdir = _tmp135_; -#line 1439 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1461 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" self->priv->refresh_result = _tmp134_; -#line 1440 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1462 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp136_ = self->priv->refresh_result; -#line 1440 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1462 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" if (_tmp136_ != GP_OK) { -#line 9223 "ImportPage.c" +#line 9376 "ImportPage.c" gint _tmp137_ = 0; int _tmp138_ = 0; gchar* _tmp139_ = NULL; gchar* _tmp140_ = NULL; -#line 1441 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1463 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp137_ = ctr; -#line 1441 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1463 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp138_ = self->priv->refresh_result; -#line 1441 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1463 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp139_ = gp_result_to_full_string (_tmp138_); -#line 1441 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1463 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp140_ = _tmp139_; -#line 1441 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - g_warning ("ImportPage.vala:1441: Unable to get name of folder %d: %s", _tmp137_, _tmp140_); -#line 1441 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1463 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" + g_warning ("ImportPage.vala:1463: Unable to get name of folder %d: %s", _tmp137_, _tmp140_); +#line 1463 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_free0 (_tmp140_); -#line 1443 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1465 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" result = FALSE; -#line 1443 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1465 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_free0 (subdir); -#line 1443 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1465 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _gp_list_unref0 (folders); -#line 1443 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1465 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _gp_list_unref0 (files); -#line 1443 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1465 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_free0 (fulldir); -#line 1443 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1465 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return result; -#line 9252 "ImportPage.c" +#line 9405 "ImportPage.c" } -#line 1446 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1468 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp141_ = fsid; -#line 1446 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1468 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp142_ = dir; -#line 1446 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1468 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp143_ = subdir; -#line 1446 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1468 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp144_ = import_page_append_path (_tmp142_, _tmp143_); -#line 1446 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1468 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp145_ = _tmp144_; -#line 1446 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1468 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp146_ = import_list; -#line 1446 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1468 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp147_ = import_page_enumerate_files (self, _tmp141_, _tmp145_, _tmp146_); -#line 1446 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1468 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp148_ = !_tmp147_; -#line 1446 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1468 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_free0 (_tmp145_); -#line 1446 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1468 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" if (_tmp148_) { -#line 1447 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1469 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" result = FALSE; -#line 1447 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1469 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_free0 (subdir); -#line 1447 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1469 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _gp_list_unref0 (folders); -#line 1447 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1469 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _gp_list_unref0 (files); -#line 1447 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1469 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_free0 (fulldir); -#line 1447 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1469 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return result; -#line 9286 "ImportPage.c" +#line 9439 "ImportPage.c" } -#line 1437 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1459 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_free0 (subdir); -#line 9290 "ImportPage.c" +#line 9443 "ImportPage.c" } } } -#line 1450 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1472 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" result = TRUE; -#line 1450 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1472 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _gp_list_unref0 (folders); -#line 1450 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1472 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _gp_list_unref0 (files); -#line 1450 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1472 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_free0 (fulldir); -#line 1450 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1472 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return result; -#line 9304 "ImportPage.c" +#line 9457 "ImportPage.c" } static void import_page_auto_match_raw_jpeg (ImportPage* self, GeeArrayList* import_list) { -#line 1454 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1476 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" g_return_if_fail (IS_IMPORT_PAGE (self)); -#line 1454 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1476 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" g_return_if_fail (GEE_IS_ARRAY_LIST (import_list)); -#line 9313 "ImportPage.c" +#line 9466 "ImportPage.c" { gint i = 0; -#line 1455 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1477 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" i = 0; -#line 9318 "ImportPage.c" +#line 9471 "ImportPage.c" { gboolean _tmp0_ = FALSE; -#line 1455 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1477 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp0_ = TRUE; -#line 1455 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1477 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" while (TRUE) { -#line 9325 "ImportPage.c" +#line 9478 "ImportPage.c" gint _tmp2_ = 0; GeeArrayList* _tmp3_ = NULL; gint _tmp4_ = 0; @@ -9350,162 +9503,162 @@ static void import_page_auto_match_raw_jpeg (ImportPage* self, GeeArrayList* imp PhotoImportSource* _tmp29_ = NULL; gboolean _tmp30_ = FALSE; PhotoImportSource* _tmp31_ = NULL; -#line 1455 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1477 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" if (!_tmp0_) { -#line 9351 "ImportPage.c" +#line 9504 "ImportPage.c" gint _tmp1_ = 0; -#line 1455 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1477 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp1_ = i; -#line 1455 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1477 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" i = _tmp1_ + 1; -#line 9357 "ImportPage.c" +#line 9510 "ImportPage.c" } -#line 1455 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1477 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp0_ = FALSE; -#line 1455 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1477 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp2_ = i; -#line 1455 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1477 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp3_ = import_list; -#line 1455 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1477 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp4_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_COLLECTION, GeeCollection)); -#line 1455 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1477 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp5_ = _tmp4_; -#line 1455 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1477 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" if (!(_tmp2_ < _tmp5_)) { -#line 1455 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1477 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" break; -#line 9373 "ImportPage.c" +#line 9526 "ImportPage.c" } -#line 1456 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1478 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp6_ = import_list; -#line 1456 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1478 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp7_ = i; -#line 1456 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1478 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp8_ = gee_abstract_list_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), _tmp7_); -#line 1456 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1478 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp9_ = (ImportSource*) _tmp8_; -#line 1456 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1478 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp10_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp9_, TYPE_PHOTO_IMPORT_SOURCE) ? ((PhotoImportSource*) _tmp9_) : NULL; -#line 1456 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1478 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" if (_tmp10_ == NULL) { -#line 1456 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1478 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_object_unref0 (_tmp9_); -#line 9389 "ImportPage.c" +#line 9542 "ImportPage.c" } -#line 1456 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1478 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" current = _tmp10_; -#line 1457 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1479 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp12_ = i; -#line 1457 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1479 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp13_ = import_list; -#line 1457 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1479 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp14_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, GEE_TYPE_COLLECTION, GeeCollection)); -#line 1457 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1479 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp15_ = _tmp14_; -#line 1457 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1479 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" if ((_tmp12_ + 1) < _tmp15_) { -#line 9403 "ImportPage.c" +#line 9556 "ImportPage.c" GeeArrayList* _tmp16_ = NULL; gint _tmp17_ = 0; gpointer _tmp18_ = NULL; ImportSource* _tmp19_ = NULL; PhotoImportSource* _tmp20_ = NULL; -#line 1458 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1480 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp16_ = import_list; -#line 1458 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1480 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp17_ = i; -#line 1458 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1480 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp18_ = gee_abstract_list_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), _tmp17_ + 1); -#line 1458 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1480 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp19_ = (ImportSource*) _tmp18_; -#line 1458 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1480 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp20_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp19_, TYPE_PHOTO_IMPORT_SOURCE) ? ((PhotoImportSource*) _tmp19_) : NULL; -#line 1458 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1480 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" if (_tmp20_ == NULL) { -#line 1458 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1480 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_object_unref0 (_tmp19_); -#line 9423 "ImportPage.c" +#line 9576 "ImportPage.c" } -#line 1458 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1480 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_object_unref0 (_tmp11_); -#line 1458 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1480 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp11_ = _tmp20_; -#line 9429 "ImportPage.c" +#line 9582 "ImportPage.c" } else { -#line 1458 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1480 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_object_unref0 (_tmp11_); -#line 1458 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1480 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp11_ = NULL; -#line 9435 "ImportPage.c" +#line 9588 "ImportPage.c" } -#line 1457 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1479 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp21_ = _g_object_ref0 (_tmp11_); -#line 1457 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1479 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" next = _tmp21_; -#line 1459 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1481 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp23_ = i; -#line 1459 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1481 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" if (_tmp23_ > 0) { -#line 9445 "ImportPage.c" +#line 9598 "ImportPage.c" GeeArrayList* _tmp24_ = NULL; gint _tmp25_ = 0; gpointer _tmp26_ = NULL; ImportSource* _tmp27_ = NULL; PhotoImportSource* _tmp28_ = NULL; -#line 1460 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1482 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp24_ = import_list; -#line 1460 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1482 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp25_ = i; -#line 1460 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1482 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp26_ = gee_abstract_list_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), _tmp25_ - 1); -#line 1460 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1482 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp27_ = (ImportSource*) _tmp26_; -#line 1460 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1482 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp28_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp27_, TYPE_PHOTO_IMPORT_SOURCE) ? ((PhotoImportSource*) _tmp27_) : NULL; -#line 1460 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1482 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" if (_tmp28_ == NULL) { -#line 1460 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1482 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_object_unref0 (_tmp27_); -#line 9465 "ImportPage.c" +#line 9618 "ImportPage.c" } -#line 1460 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1482 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_object_unref0 (_tmp22_); -#line 1460 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1482 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp22_ = _tmp28_; -#line 9471 "ImportPage.c" +#line 9624 "ImportPage.c" } else { -#line 1460 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1482 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_object_unref0 (_tmp22_); -#line 1460 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1482 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp22_ = NULL; -#line 9477 "ImportPage.c" +#line 9630 "ImportPage.c" } -#line 1459 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1481 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp29_ = _g_object_ref0 (_tmp22_); -#line 1459 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1481 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" prev = _tmp29_; -#line 1461 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1483 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp31_ = current; -#line 1461 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1483 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" if (_tmp31_ != NULL) { -#line 9487 "ImportPage.c" +#line 9640 "ImportPage.c" PhotoImportSource* _tmp32_ = NULL; PhotoFileFormat _tmp33_ = 0; -#line 1461 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1483 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp32_ = current; -#line 1461 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1483 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp33_ = photo_import_source_get_file_format (_tmp32_); -#line 1461 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1483 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp30_ = _tmp33_ == PHOTO_FILE_FORMAT_RAW; -#line 9496 "ImportPage.c" +#line 9649 "ImportPage.c" } else { -#line 1461 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1483 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp30_ = FALSE; -#line 9500 "ImportPage.c" +#line 9653 "ImportPage.c" } -#line 1461 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1483 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" if (_tmp30_) { -#line 9504 "ImportPage.c" +#line 9657 "ImportPage.c" gchar* current_name = NULL; gchar* ext = NULL; PhotoImportSource* _tmp34_ = NULL; @@ -9519,48 +9672,48 @@ static void import_page_auto_match_raw_jpeg (ImportPage* self, GeeArrayList* imp gboolean _tmp52_ = FALSE; PhotoImportSource* _tmp53_ = NULL; PhotoImportSource* _tmp65_ = NULL; -#line 1464 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1486 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp34_ = current; -#line 1464 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1486 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp35_ = import_source_get_filename (G_TYPE_CHECK_INSTANCE_CAST (_tmp34_, TYPE_IMPORT_SOURCE, ImportSource)); -#line 1464 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1486 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp36_ = _tmp35_; -#line 1464 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1486 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" disassemble_filename (_tmp36_, &_tmp37_, &_tmp38_); -#line 1464 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1486 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_free0 (current_name); -#line 1464 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1486 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" current_name = _tmp37_; -#line 1464 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1486 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_free0 (ext); -#line 1464 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1486 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" ext = _tmp38_; -#line 1464 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1486 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_free0 (_tmp36_); -#line 1467 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1489 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" associated = NULL; -#line 1468 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1490 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp40_ = next; -#line 1468 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1490 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" if (_tmp40_ != NULL) { -#line 9542 "ImportPage.c" +#line 9695 "ImportPage.c" PhotoImportSource* _tmp41_ = NULL; PhotoFileFormat _tmp42_ = 0; -#line 1468 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1490 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp41_ = next; -#line 1468 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1490 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp42_ = photo_import_source_get_file_format (_tmp41_); -#line 1468 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1490 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp39_ = _tmp42_ == PHOTO_FILE_FORMAT_JFIF; -#line 9551 "ImportPage.c" +#line 9704 "ImportPage.c" } else { -#line 1468 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1490 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp39_ = FALSE; -#line 9555 "ImportPage.c" +#line 9708 "ImportPage.c" } -#line 1468 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1490 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" if (_tmp39_) { -#line 9559 "ImportPage.c" +#line 9712 "ImportPage.c" gchar* next_name = NULL; PhotoImportSource* _tmp43_ = NULL; gchar* _tmp44_ = NULL; @@ -9569,69 +9722,69 @@ static void import_page_auto_match_raw_jpeg (ImportPage* self, GeeArrayList* imp gchar* _tmp47_ = NULL; const gchar* _tmp48_ = NULL; const gchar* _tmp49_ = NULL; -#line 1470 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1492 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp43_ = next; -#line 1470 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1492 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp44_ = import_source_get_filename (G_TYPE_CHECK_INSTANCE_CAST (_tmp43_, TYPE_IMPORT_SOURCE, ImportSource)); -#line 1470 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1492 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp45_ = _tmp44_; -#line 1470 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1492 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" disassemble_filename (_tmp45_, &_tmp46_, &_tmp47_); -#line 1470 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1492 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_free0 (next_name); -#line 1470 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1492 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" next_name = _tmp46_; -#line 1470 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1492 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_free0 (ext); -#line 1470 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1492 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" ext = _tmp47_; -#line 1470 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1492 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_free0 (_tmp45_); -#line 1471 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1493 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp48_ = next_name; -#line 1471 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1493 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp49_ = current_name; -#line 1471 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1493 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" if (g_strcmp0 (_tmp48_, _tmp49_) == 0) { -#line 9592 "ImportPage.c" +#line 9745 "ImportPage.c" PhotoImportSource* _tmp50_ = NULL; PhotoImportSource* _tmp51_ = NULL; -#line 1472 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1494 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp50_ = next; -#line 1472 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1494 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp51_ = _g_object_ref0 (_tmp50_); -#line 1472 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1494 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_object_unref0 (associated); -#line 1472 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1494 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" associated = _tmp51_; -#line 9603 "ImportPage.c" +#line 9756 "ImportPage.c" } -#line 1468 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1490 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_free0 (next_name); -#line 9607 "ImportPage.c" +#line 9760 "ImportPage.c" } -#line 1474 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1496 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp53_ = prev; -#line 1474 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1496 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" if (_tmp53_ != NULL) { -#line 9613 "ImportPage.c" +#line 9766 "ImportPage.c" PhotoImportSource* _tmp54_ = NULL; PhotoFileFormat _tmp55_ = 0; -#line 1474 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1496 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp54_ = prev; -#line 1474 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1496 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp55_ = photo_import_source_get_file_format (_tmp54_); -#line 1474 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1496 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp52_ = _tmp55_ == PHOTO_FILE_FORMAT_JFIF; -#line 9622 "ImportPage.c" +#line 9775 "ImportPage.c" } else { -#line 1474 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1496 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp52_ = FALSE; -#line 9626 "ImportPage.c" +#line 9779 "ImportPage.c" } -#line 1474 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1496 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" if (_tmp52_) { -#line 9630 "ImportPage.c" +#line 9783 "ImportPage.c" gchar* prev_name = NULL; PhotoImportSource* _tmp56_ = NULL; gchar* _tmp57_ = NULL; @@ -9640,52 +9793,52 @@ static void import_page_auto_match_raw_jpeg (ImportPage* self, GeeArrayList* imp gchar* _tmp60_ = NULL; const gchar* _tmp61_ = NULL; const gchar* _tmp62_ = NULL; -#line 1476 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1498 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp56_ = prev; -#line 1476 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1498 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp57_ = import_source_get_filename (G_TYPE_CHECK_INSTANCE_CAST (_tmp56_, TYPE_IMPORT_SOURCE, ImportSource)); -#line 1476 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1498 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp58_ = _tmp57_; -#line 1476 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1498 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" disassemble_filename (_tmp58_, &_tmp59_, &_tmp60_); -#line 1476 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1498 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_free0 (prev_name); -#line 1476 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1498 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" prev_name = _tmp59_; -#line 1476 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1498 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_free0 (ext); -#line 1476 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1498 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" ext = _tmp60_; -#line 1476 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1498 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_free0 (_tmp58_); -#line 1477 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1499 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp61_ = prev_name; -#line 1477 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1499 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp62_ = current_name; -#line 1477 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1499 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" if (g_strcmp0 (_tmp61_, _tmp62_) == 0) { -#line 9663 "ImportPage.c" +#line 9816 "ImportPage.c" PhotoImportSource* _tmp63_ = NULL; PhotoImportSource* _tmp64_ = NULL; -#line 1478 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1500 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp63_ = prev; -#line 1478 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1500 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp64_ = _g_object_ref0 (_tmp63_); -#line 1478 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1500 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_object_unref0 (associated); -#line 1478 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1500 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" associated = _tmp64_; -#line 9674 "ImportPage.c" +#line 9827 "ImportPage.c" } -#line 1474 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1496 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_free0 (prev_name); -#line 9678 "ImportPage.c" +#line 9831 "ImportPage.c" } -#line 1482 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1504 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp65_ = associated; -#line 1482 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1504 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" if (_tmp65_ != NULL) { -#line 9684 "ImportPage.c" +#line 9837 "ImportPage.c" PhotoImportSource* _tmp66_ = NULL; gchar* _tmp67_ = NULL; gchar* _tmp68_ = NULL; @@ -9697,68 +9850,68 @@ static void import_page_auto_match_raw_jpeg (ImportPage* self, GeeArrayList* imp GeeArrayList* _tmp74_ = NULL; PhotoImportSource* _tmp75_ = NULL; gboolean _tmp76_ = FALSE; -#line 1483 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1505 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp66_ = current; -#line 1483 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1505 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp67_ = import_source_get_filename (G_TYPE_CHECK_INSTANCE_CAST (_tmp66_, TYPE_IMPORT_SOURCE, ImportSource)); -#line 1483 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1505 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp68_ = _tmp67_; -#line 1483 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1505 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp69_ = associated; -#line 1483 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1505 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp70_ = import_source_get_filename (G_TYPE_CHECK_INSTANCE_CAST (_tmp69_, TYPE_IMPORT_SOURCE, ImportSource)); -#line 1483 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1505 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp71_ = _tmp70_; -#line 1483 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - g_debug ("ImportPage.vala:1483: Found RAW+JPEG pair: %s and %s", _tmp68_, _tmp71_); -#line 1483 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1505 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" + g_debug ("ImportPage.vala:1505: Found RAW+JPEG pair: %s and %s", _tmp68_, _tmp71_); +#line 1505 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_free0 (_tmp71_); -#line 1483 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1505 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_free0 (_tmp68_); -#line 1484 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1506 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp72_ = current; -#line 1484 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1506 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp73_ = associated; -#line 1484 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1506 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" photo_import_source_set_associated (_tmp72_, _tmp73_); -#line 1485 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1507 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp74_ = import_list; -#line 1485 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1507 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp75_ = associated; -#line 1485 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1507 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp76_ = gee_abstract_collection_remove (G_TYPE_CHECK_INSTANCE_CAST (_tmp74_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp75_, TYPE_IMPORT_SOURCE, ImportSource)); -#line 1485 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1507 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" if (!_tmp76_) { -#line 9728 "ImportPage.c" +#line 9881 "ImportPage.c" PhotoImportSource* _tmp77_ = NULL; -#line 1486 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - g_debug ("ImportPage.vala:1486: Unable to associate files"); -#line 1487 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1508 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" + g_debug ("ImportPage.vala:1508: Unable to associate files"); +#line 1509 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp77_ = current; -#line 1487 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1509 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" photo_import_source_set_associated (_tmp77_, NULL); -#line 9736 "ImportPage.c" +#line 9889 "ImportPage.c" } } -#line 1461 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1483 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_object_unref0 (associated); -#line 1461 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1483 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_free0 (ext); -#line 1461 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1483 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_free0 (current_name); -#line 9745 "ImportPage.c" +#line 9898 "ImportPage.c" } -#line 1455 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1477 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_object_unref0 (prev); -#line 1455 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1477 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_object_unref0 (_tmp22_); -#line 1455 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1477 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_object_unref0 (next); -#line 1455 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1477 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_object_unref0 (_tmp11_); -#line 1455 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1477 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_object_unref0 (current); -#line 9757 "ImportPage.c" +#line 9910 "ImportPage.c" } } } @@ -9768,13 +9921,13 @@ static void import_page_auto_match_raw_jpeg (ImportPage* self, GeeArrayList* imp static void import_page_load_previews_and_metadata (ImportPage* self, GeeList* import_list) { gint loaded_photos = 0; GError * _inner_error_ = NULL; -#line 1494 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1516 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" g_return_if_fail (IS_IMPORT_PAGE (self)); -#line 1494 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1516 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" g_return_if_fail (GEE_IS_LIST (import_list)); -#line 1495 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1517 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" loaded_photos = 0; -#line 9773 "ImportPage.c" +#line 9926 "ImportPage.c" { GeeList* _import_source_list = NULL; GeeList* _tmp0_ = NULL; @@ -9784,25 +9937,25 @@ static void import_page_load_previews_and_metadata (ImportPage* self, GeeList* i gint _tmp3_ = 0; gint _tmp4_ = 0; gint _import_source_index = 0; -#line 1496 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1518 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp0_ = import_list; -#line 1496 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1518 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp1_ = _g_object_ref0 (_tmp0_); -#line 1496 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1518 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _import_source_list = _tmp1_; -#line 1496 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1518 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp2_ = _import_source_list; -#line 1496 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1518 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp3_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_COLLECTION, GeeCollection)); -#line 1496 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1518 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp4_ = _tmp3_; -#line 1496 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1518 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _import_source_size = _tmp4_; -#line 1496 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1518 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _import_source_index = -1; -#line 1496 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1518 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" while (TRUE) { -#line 9801 "ImportPage.c" +#line 9954 "ImportPage.c" gint _tmp5_ = 0; gint _tmp6_ = 0; gint _tmp7_ = 0; @@ -9853,143 +10006,143 @@ static void import_page_load_previews_and_metadata (ImportPage* self, GeeList* i GeeList* _tmp130_ = NULL; gint _tmp131_ = 0; gint _tmp132_ = 0; -#line 1496 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1518 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp5_ = _import_source_index; -#line 1496 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1518 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _import_source_index = _tmp5_ + 1; -#line 1496 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1518 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp6_ = _import_source_index; -#line 1496 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1518 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp7_ = _import_source_size; -#line 1496 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1518 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" if (!(_tmp6_ < _tmp7_)) { -#line 1496 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1518 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" break; -#line 9864 "ImportPage.c" +#line 10017 "ImportPage.c" } -#line 1496 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1518 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp8_ = _import_source_list; -#line 1496 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1518 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp9_ = _import_source_index; -#line 1496 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1518 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp10_ = gee_list_get (_tmp8_, _tmp9_); -#line 1496 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1518 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" import_source = (ImportSource*) _tmp10_; -#line 1497 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1519 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp11_ = import_source; -#line 1497 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1519 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp12_ = import_source_get_filename (_tmp11_); -#line 1497 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1519 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" filename = _tmp12_; -#line 1498 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1520 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp13_ = import_source; -#line 1498 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1520 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp14_ = import_source_get_fulldir (_tmp13_); -#line 1498 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1520 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" fulldir = _tmp14_; -#line 1499 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1521 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp15_ = fulldir; -#line 1499 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1521 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" if (_tmp15_ == NULL) { -#line 9890 "ImportPage.c" +#line 10043 "ImportPage.c" ImportSource* _tmp16_ = NULL; gchar* _tmp17_ = NULL; gchar* _tmp18_ = NULL; -#line 1500 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1522 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp16_ = import_source; -#line 1500 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1522 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp17_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, TYPE_DATA_OBJECT, DataObject)); -#line 1500 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1522 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp18_ = _tmp17_; -#line 1500 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - g_warning ("ImportPage.vala:1500: Skipping loading preview of %s: invalid folder n" \ +#line 1522 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" + g_warning ("ImportPage.vala:1522: Skipping loading preview of %s: invalid folder n" \ "ame", _tmp18_); -#line 1500 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1522 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_free0 (_tmp18_); -#line 1502 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1524 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_free0 (fulldir); -#line 1502 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1524 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_free0 (filename); -#line 1502 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1524 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_object_unref0 (import_source); -#line 1502 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1524 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" continue; -#line 9912 "ImportPage.c" +#line 10065 "ImportPage.c" } -#line 1506 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1528 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" associated = NULL; -#line 1507 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1529 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp20_ = import_source; -#line 1507 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1529 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp20_, TYPE_PHOTO_IMPORT_SOURCE)) { -#line 9920 "ImportPage.c" +#line 10073 "ImportPage.c" ImportSource* _tmp21_ = NULL; PhotoImportSource* _tmp22_ = NULL; PhotoImportSource* _tmp23_ = NULL; -#line 1508 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1530 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp21_ = import_source; -#line 1508 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1530 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp22_ = photo_import_source_get_associated (G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, TYPE_PHOTO_IMPORT_SOURCE, PhotoImportSource)); -#line 1508 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1530 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp23_ = _tmp22_; -#line 1508 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1530 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp19_ = _tmp23_ != NULL; -#line 1508 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1530 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_object_unref0 (_tmp23_); -#line 9934 "ImportPage.c" +#line 10087 "ImportPage.c" } else { -#line 1507 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1529 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp19_ = FALSE; -#line 9938 "ImportPage.c" +#line 10091 "ImportPage.c" } -#line 1507 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1529 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" if (_tmp19_) { -#line 9942 "ImportPage.c" +#line 10095 "ImportPage.c" ImportSource* _tmp24_ = NULL; PhotoImportSource* _tmp25_ = NULL; -#line 1509 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1531 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp24_ = import_source; -#line 1509 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1531 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp25_ = photo_import_source_get_associated (G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, TYPE_PHOTO_IMPORT_SOURCE, PhotoImportSource)); -#line 1509 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1531 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_object_unref0 (associated); -#line 1509 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1531 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" associated = _tmp25_; -#line 9953 "ImportPage.c" +#line 10106 "ImportPage.c" } -#line 1512 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1534 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp26_ = self->priv->progress_bar; -#line 1512 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1534 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" gtk_progress_bar_set_ellipsize (_tmp26_, PANGO_ELLIPSIZE_MIDDLE); -#line 1513 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1535 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp27_ = self->priv->progress_bar; -#line 1513 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1535 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp28_ = _ ("Fetching preview for %s"); -#line 1513 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1535 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp29_ = import_source; -#line 1513 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1535 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp30_ = data_object_get_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp29_, TYPE_DATA_OBJECT, DataObject)); -#line 1513 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1535 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp31_ = _tmp30_; -#line 1513 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1535 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp32_ = g_strdup_printf (_tmp28_, _tmp31_); -#line 1513 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1535 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp33_ = _tmp32_; -#line 1513 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1535 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" gtk_progress_bar_set_text (_tmp27_, _tmp33_); -#line 1513 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1535 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_free0 (_tmp33_); -#line 1513 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1535 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_free0 (_tmp31_); -#line 1520 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1542 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" metadata = NULL; -#line 1521 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1543 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp34_ = filename; -#line 1521 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1543 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp35_ = video_reader_is_supported_video_filename (_tmp34_); -#line 1521 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1543 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" if (!_tmp35_) { -#line 9987 "ImportPage.c" +#line 10140 "ImportPage.c" { PhotoMetadata* _tmp36_ = NULL; GPSpinIdleWrapper* _tmp37_ = NULL; @@ -9999,94 +10152,94 @@ static void import_page_load_previews_and_metadata (ImportPage* self, GeeList* i const gchar* _tmp41_ = NULL; PhotoMetadata* _tmp42_ = NULL; PhotoMetadata* _tmp43_ = NULL; -#line 1523 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1545 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp37_ = import_page_spin_idle_context; -#line 1523 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1545 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp38_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp37_, GP_TYPE_CONTEXT_WRAPPER, GPContextWrapper)->context; -#line 1523 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1545 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp39_ = self->priv->camera; -#line 1523 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1545 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp40_ = fulldir; -#line 1523 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1545 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp41_ = filename; -#line 1523 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1545 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp42_ = gp_load_metadata (_tmp38_, _tmp39_, _tmp40_, _tmp41_, &_inner_error_); -#line 1523 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1545 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp36_ = _tmp42_; -#line 1523 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1545 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 10013 "ImportPage.c" - goto __catch65_g_error; +#line 10166 "ImportPage.c" + goto __catch67_g_error; } -#line 1523 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1545 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp43_ = _tmp36_; -#line 1523 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1545 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp36_ = NULL; -#line 1523 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1545 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _media_metadata_unref0 (metadata); -#line 1523 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1545 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" metadata = _tmp43_; -#line 1522 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1544 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _media_metadata_unref0 (_tmp36_); -#line 10026 "ImportPage.c" +#line 10179 "ImportPage.c" } - goto __finally65; - __catch65_g_error: + goto __finally67; + __catch67_g_error: { GError* err = NULL; const gchar* _tmp44_ = NULL; const gchar* _tmp45_ = NULL; GError* _tmp46_ = NULL; const gchar* _tmp47_ = NULL; -#line 1522 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1544 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" err = _inner_error_; -#line 1522 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1544 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _inner_error_ = NULL; -#line 1526 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1548 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp44_ = fulldir; -#line 1526 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1548 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp45_ = filename; -#line 1526 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1548 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp46_ = err; -#line 1526 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1548 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp47_ = _tmp46_->message; -#line 1526 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - g_warning ("ImportPage.vala:1526: Unable to fetch metadata for %s/%s: %s", _tmp44_, _tmp45_, _tmp47_); -#line 1522 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1548 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" + g_warning ("ImportPage.vala:1548: Unable to fetch metadata for %s/%s: %s", _tmp44_, _tmp45_, _tmp47_); +#line 1544 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_error_free0 (err); -#line 10052 "ImportPage.c" +#line 10205 "ImportPage.c" } - __finally65: -#line 1522 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" + __finally67: +#line 1544 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1522 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1544 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _media_metadata_unref0 (metadata); -#line 1522 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1544 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_object_unref0 (associated); -#line 1522 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1544 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_free0 (fulldir); -#line 1522 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1544 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_free0 (filename); -#line 1522 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1544 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_object_unref0 (import_source); -#line 1522 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1544 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_object_unref0 (_import_source_list); -#line 1522 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1544 "/home/jens/Source/shotwell/src/camera/ImportPage.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 1522 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1544 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" g_clear_error (&_inner_error_); -#line 1522 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1544 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return; -#line 10075 "ImportPage.c" +#line 10228 "ImportPage.c" } } -#line 1532 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1554 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" exif_only_md5 = NULL; -#line 1533 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1555 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp48_ = metadata; -#line 1533 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1555 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" if (_tmp48_ != NULL) { -#line 10084 "ImportPage.c" +#line 10237 "ImportPage.c" guint8* flattened_sans_thumbnail = NULL; PhotoMetadata* _tmp49_ = NULL; gint _tmp50_ = 0; @@ -10096,76 +10249,76 @@ static void import_page_load_previews_and_metadata (ImportPage* self, GeeList* i gboolean _tmp52_ = FALSE; guint8* _tmp53_ = NULL; gint _tmp53__length1 = 0; -#line 1534 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1556 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp49_ = metadata; -#line 1534 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1556 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp51_ = photo_metadata_flatten_exif (_tmp49_, FALSE, &_tmp50_); -#line 1534 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1556 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" flattened_sans_thumbnail = _tmp51_; -#line 1534 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1556 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" flattened_sans_thumbnail_length1 = _tmp50_; -#line 1534 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1556 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _flattened_sans_thumbnail_size_ = flattened_sans_thumbnail_length1; -#line 1535 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1557 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp53_ = flattened_sans_thumbnail; -#line 1535 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1557 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp53__length1 = flattened_sans_thumbnail_length1; -#line 1535 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1557 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" if (_tmp53_ != NULL) { -#line 10110 "ImportPage.c" +#line 10263 "ImportPage.c" guint8* _tmp54_ = NULL; gint _tmp54__length1 = 0; -#line 1535 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1557 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp54_ = flattened_sans_thumbnail; -#line 1535 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1557 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp54__length1 = flattened_sans_thumbnail_length1; -#line 1535 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1557 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp52_ = _tmp54__length1 > 0; -#line 10119 "ImportPage.c" +#line 10272 "ImportPage.c" } else { -#line 1535 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1557 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp52_ = FALSE; -#line 10123 "ImportPage.c" +#line 10276 "ImportPage.c" } -#line 1535 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1557 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" if (_tmp52_) { -#line 10127 "ImportPage.c" +#line 10280 "ImportPage.c" guint8* _tmp55_ = NULL; gint _tmp55__length1 = 0; guint8* _tmp56_ = NULL; gint _tmp56__length1 = 0; gchar* _tmp57_ = NULL; -#line 1536 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1558 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp55_ = flattened_sans_thumbnail; -#line 1536 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1558 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp55__length1 = flattened_sans_thumbnail_length1; -#line 1536 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1558 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp56_ = flattened_sans_thumbnail; -#line 1536 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1558 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp56__length1 = flattened_sans_thumbnail_length1; -#line 1536 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1558 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp57_ = md5_binary (_tmp55_, (gsize) _tmp56__length1); -#line 1536 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1558 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_free0 (exif_only_md5); -#line 1536 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1558 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" exif_only_md5 = _tmp57_; -#line 10147 "ImportPage.c" +#line 10300 "ImportPage.c" } -#line 1533 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1555 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" flattened_sans_thumbnail = (g_free (flattened_sans_thumbnail), NULL); -#line 10151 "ImportPage.c" +#line 10304 "ImportPage.c" } -#line 1545 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1567 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" preview_raw = NULL; -#line 1545 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1567 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" preview_raw_length1 = 0; -#line 1545 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1567 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _preview_raw_size_ = preview_raw_length1; -#line 1546 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1568 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" preview_raw_length = (gsize) 0; -#line 1547 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1569 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" preview = NULL; -#line 10163 "ImportPage.c" +#line 10316 "ImportPage.c" { gchar* preview_fulldir = NULL; const gchar* _tmp58_ = NULL; @@ -10185,260 +10338,260 @@ static void import_page_load_previews_and_metadata (ImportPage* self, GeeList* i gsize _tmp75_ = 0UL; GdkPixbuf* _tmp76_ = NULL; GdkPixbuf* _tmp77_ = NULL; -#line 1549 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1571 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp58_ = fulldir; -#line 1549 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1571 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp59_ = g_strdup (_tmp58_); -#line 1549 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1571 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" preview_fulldir = _tmp59_; -#line 1550 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1572 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp60_ = filename; -#line 1550 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1572 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp61_ = g_strdup (_tmp60_); -#line 1550 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1572 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" preview_filename = _tmp61_; -#line 1551 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1573 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp62_ = associated; -#line 1551 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1573 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" if (_tmp62_ != NULL) { -#line 10199 "ImportPage.c" +#line 10352 "ImportPage.c" PhotoImportSource* _tmp63_ = NULL; gchar* _tmp64_ = NULL; PhotoImportSource* _tmp65_ = NULL; gchar* _tmp66_ = NULL; -#line 1552 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1574 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp63_ = associated; -#line 1552 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1574 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp64_ = import_source_get_fulldir (G_TYPE_CHECK_INSTANCE_CAST (_tmp63_, TYPE_IMPORT_SOURCE, ImportSource)); -#line 1552 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1574 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_free0 (preview_fulldir); -#line 1552 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1574 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" preview_fulldir = _tmp64_; -#line 1553 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1575 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp65_ = associated; -#line 1553 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1575 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp66_ = import_source_get_filename (G_TYPE_CHECK_INSTANCE_CAST (_tmp65_, TYPE_IMPORT_SOURCE, ImportSource)); -#line 1553 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1575 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_free0 (preview_filename); -#line 1553 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1575 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" preview_filename = _tmp66_; -#line 10220 "ImportPage.c" +#line 10373 "ImportPage.c" } -#line 1555 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1577 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp68_ = import_page_spin_idle_context; -#line 1555 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1577 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp69_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp68_, GP_TYPE_CONTEXT_WRAPPER, GPContextWrapper)->context; -#line 1555 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1577 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp70_ = self->priv->camera; -#line 1555 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1577 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp71_ = preview_fulldir; -#line 1555 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1577 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp72_ = preview_filename; -#line 1555 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1577 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp76_ = gp_load_preview (_tmp69_, _tmp70_, _tmp71_, _tmp72_, &_tmp73_, &_tmp74_, &_tmp75_, &_inner_error_); -#line 1555 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1577 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" preview_raw = (g_free (preview_raw), NULL); -#line 1555 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1577 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" preview_raw = _tmp73_; -#line 1555 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1577 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" preview_raw_length1 = _tmp74_; -#line 1555 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1577 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _preview_raw_size_ = preview_raw_length1; -#line 1555 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1577 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" preview_raw_length = _tmp75_; -#line 1555 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1577 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp67_ = _tmp76_; -#line 1555 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1577 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1555 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1577 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_free0 (preview_filename); -#line 1555 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1577 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_free0 (preview_fulldir); -#line 10252 "ImportPage.c" - goto __catch66_g_error; +#line 10405 "ImportPage.c" + goto __catch68_g_error; } -#line 1555 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1577 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp77_ = _tmp67_; -#line 1555 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1577 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp67_ = NULL; -#line 1555 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1577 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_object_unref0 (preview); -#line 1555 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1577 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" preview = _tmp77_; -#line 1548 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1570 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_object_unref0 (_tmp67_); -#line 1548 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1570 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_free0 (preview_filename); -#line 1548 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1570 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_free0 (preview_fulldir); -#line 10269 "ImportPage.c" +#line 10422 "ImportPage.c" } - goto __finally66; - __catch66_g_error: + goto __finally68; + __catch68_g_error: { GError* err = NULL; const gchar* _tmp78_ = NULL; gboolean _tmp79_ = FALSE; -#line 1548 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1570 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" err = _inner_error_; -#line 1548 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1570 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _inner_error_ = NULL; -#line 1563 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1585 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp78_ = filename; -#line 1563 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1585 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp79_ = video_reader_is_supported_video_filename (_tmp78_); -#line 1563 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1585 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" if (!_tmp79_) { -#line 10287 "ImportPage.c" +#line 10440 "ImportPage.c" const gchar* _tmp80_ = NULL; const gchar* _tmp81_ = NULL; GError* _tmp82_ = NULL; const gchar* _tmp83_ = NULL; -#line 1564 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1586 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp80_ = fulldir; -#line 1564 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1586 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp81_ = filename; -#line 1564 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1586 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp82_ = err; -#line 1564 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1586 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp83_ = _tmp82_->message; -#line 1564 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - g_warning ("ImportPage.vala:1564: Unable to fetch preview for %s/%s: %s", _tmp80_, _tmp81_, _tmp83_); -#line 10302 "ImportPage.c" +#line 1586 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" + g_warning ("ImportPage.vala:1586: Unable to fetch preview for %s/%s: %s", _tmp80_, _tmp81_, _tmp83_); +#line 10455 "ImportPage.c" } -#line 1548 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1570 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_error_free0 (err); -#line 10306 "ImportPage.c" +#line 10459 "ImportPage.c" } - __finally66: -#line 1548 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" + __finally68: +#line 1570 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1548 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1570 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_object_unref0 (preview); -#line 1548 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1570 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" preview_raw = (g_free (preview_raw), NULL); -#line 1548 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1570 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_free0 (exif_only_md5); -#line 1548 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1570 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _media_metadata_unref0 (metadata); -#line 1548 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1570 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_object_unref0 (associated); -#line 1548 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1570 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_free0 (fulldir); -#line 1548 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1570 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_free0 (filename); -#line 1548 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1570 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_object_unref0 (import_source); -#line 1548 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1570 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_object_unref0 (_import_source_list); -#line 1548 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1570 "/home/jens/Source/shotwell/src/camera/ImportPage.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 1548 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1570 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" g_clear_error (&_inner_error_); -#line 1548 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1570 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return; -#line 10335 "ImportPage.c" +#line 10488 "ImportPage.c" } -#line 1569 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1591 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" preview_md5 = NULL; -#line 1570 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1592 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp86_ = preview; -#line 1570 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1592 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" if (_tmp86_ != NULL) { -#line 10343 "ImportPage.c" +#line 10496 "ImportPage.c" guint8* _tmp87_ = NULL; gint _tmp87__length1 = 0; -#line 1570 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1592 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp87_ = preview_raw; -#line 1570 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1592 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp87__length1 = preview_raw_length1; -#line 1570 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1592 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp85_ = _tmp87_ != NULL; -#line 10352 "ImportPage.c" +#line 10505 "ImportPage.c" } else { -#line 1570 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1592 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp85_ = FALSE; -#line 10356 "ImportPage.c" +#line 10509 "ImportPage.c" } -#line 1570 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1592 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" if (_tmp85_) { -#line 10360 "ImportPage.c" +#line 10513 "ImportPage.c" gsize _tmp88_ = 0UL; -#line 1570 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1592 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp88_ = preview_raw_length; -#line 1570 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1592 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp84_ = _tmp88_ > ((gsize) 0); -#line 10366 "ImportPage.c" +#line 10519 "ImportPage.c" } else { -#line 1570 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1592 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp84_ = FALSE; -#line 10370 "ImportPage.c" +#line 10523 "ImportPage.c" } -#line 1570 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1592 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" if (_tmp84_) { -#line 10374 "ImportPage.c" +#line 10527 "ImportPage.c" guint8* _tmp89_ = NULL; gint _tmp89__length1 = 0; gsize _tmp90_ = 0UL; gchar* _tmp91_ = NULL; -#line 1571 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1593 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp89_ = preview_raw; -#line 1571 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1593 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp89__length1 = preview_raw_length1; -#line 1571 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1593 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp90_ = preview_raw_length; -#line 1571 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1593 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp91_ = md5_binary (_tmp89_, _tmp90_); -#line 1571 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1593 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_free0 (preview_md5); -#line 1571 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1593 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" preview_md5 = _tmp91_; -#line 10391 "ImportPage.c" +#line 10544 "ImportPage.c" } -#line 1577 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1599 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp92_ = import_source; -#line 1577 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1599 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp92_, TYPE_VIDEO_IMPORT_SOURCE)) { -#line 10397 "ImportPage.c" +#line 10550 "ImportPage.c" ImportSource* _tmp93_ = NULL; GdkPixbuf* _tmp94_ = NULL; -#line 1578 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1600 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp93_ = import_source; -#line 1578 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1600 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp94_ = preview; -#line 1578 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1600 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" video_import_source_update (G_TYPE_CHECK_INSTANCE_TYPE (_tmp93_, TYPE_VIDEO_IMPORT_SOURCE) ? ((VideoImportSource*) _tmp93_) : NULL, _tmp94_); -#line 10406 "ImportPage.c" +#line 10559 "ImportPage.c" } -#line 1580 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1602 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp95_ = import_source; -#line 1580 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1602 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp95_, TYPE_PHOTO_IMPORT_SOURCE)) { -#line 10412 "ImportPage.c" +#line 10565 "ImportPage.c" ImportSource* _tmp96_ = NULL; GdkPixbuf* _tmp97_ = NULL; const gchar* _tmp98_ = NULL; PhotoMetadata* _tmp99_ = NULL; const gchar* _tmp100_ = NULL; -#line 1581 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1603 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp96_ = import_source; -#line 1581 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1603 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp97_ = preview; -#line 1581 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1603 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp98_ = preview_md5; -#line 1581 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1603 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp99_ = metadata; -#line 1581 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1603 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp100_ = exif_only_md5; -#line 1581 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1603 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" photo_import_source_update (G_TYPE_CHECK_INSTANCE_TYPE (_tmp96_, TYPE_PHOTO_IMPORT_SOURCE) ? ((PhotoImportSource*) _tmp96_) : NULL, _tmp97_, _tmp98_, _tmp99_, _tmp100_); -#line 10430 "ImportPage.c" +#line 10583 "ImportPage.c" } -#line 1584 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1606 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp101_ = associated; -#line 1584 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1606 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" if (_tmp101_ != NULL) { -#line 10436 "ImportPage.c" +#line 10589 "ImportPage.c" { PhotoMetadata* associated_metadata = NULL; GPSpinIdleWrapper* _tmp102_ = NULL; @@ -10456,55 +10609,55 @@ static void import_page_load_previews_and_metadata (ImportPage* self, GeeList* i GdkPixbuf* _tmp114_ = NULL; const gchar* _tmp115_ = NULL; PhotoMetadata* _tmp116_ = NULL; -#line 1586 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1608 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp102_ = import_page_spin_idle_context; -#line 1586 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1608 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp103_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp102_, GP_TYPE_CONTEXT_WRAPPER, GPContextWrapper)->context; -#line 1586 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1608 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp104_ = self->priv->camera; -#line 1586 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1608 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp105_ = associated; -#line 1586 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1608 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp106_ = import_source_get_fulldir (G_TYPE_CHECK_INSTANCE_CAST (_tmp105_, TYPE_IMPORT_SOURCE, ImportSource)); -#line 1586 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1608 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp107_ = _tmp106_; -#line 1586 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1608 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp108_ = associated; -#line 1586 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1608 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp109_ = import_source_get_filename (G_TYPE_CHECK_INSTANCE_CAST (_tmp108_, TYPE_IMPORT_SOURCE, ImportSource)); -#line 1586 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1608 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp110_ = _tmp109_; -#line 1586 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1608 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp111_ = gp_load_metadata (_tmp103_, _tmp104_, _tmp107_, _tmp110_, &_inner_error_); -#line 1586 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1608 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp112_ = _tmp111_; -#line 1586 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1608 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_free0 (_tmp110_); -#line 1586 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1608 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_free0 (_tmp107_); -#line 1586 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1608 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" associated_metadata = _tmp112_; -#line 1586 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1608 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 10484 "ImportPage.c" - goto __catch67_g_error; +#line 10637 "ImportPage.c" + goto __catch69_g_error; } -#line 1588 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1610 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp113_ = associated; -#line 1588 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1610 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp114_ = preview; -#line 1588 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1610 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp115_ = preview_md5; -#line 1588 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1610 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp116_ = associated_metadata; -#line 1588 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1610 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" photo_import_source_update (_tmp113_, _tmp114_, _tmp115_, _tmp116_, NULL); -#line 1585 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1607 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _media_metadata_unref0 (associated_metadata); -#line 10499 "ImportPage.c" +#line 10652 "ImportPage.c" } - goto __finally67; - __catch67_g_error: + goto __finally69; + __catch69_g_error: { GError* err = NULL; PhotoImportSource* _tmp117_ = NULL; @@ -10515,115 +10668,115 @@ static void import_page_load_previews_and_metadata (ImportPage* self, GeeList* i gchar* _tmp122_ = NULL; GError* _tmp123_ = NULL; const gchar* _tmp124_ = NULL; -#line 1585 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1607 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" err = _inner_error_; -#line 1585 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1607 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _inner_error_ = NULL; -#line 1590 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1612 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp117_ = associated; -#line 1590 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1612 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp118_ = import_source_get_fulldir (G_TYPE_CHECK_INSTANCE_CAST (_tmp117_, TYPE_IMPORT_SOURCE, ImportSource)); -#line 1590 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1612 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp119_ = _tmp118_; -#line 1590 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1612 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp120_ = associated; -#line 1590 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1612 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp121_ = import_source_get_filename (G_TYPE_CHECK_INSTANCE_CAST (_tmp120_, TYPE_IMPORT_SOURCE, ImportSource)); -#line 1590 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1612 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp122_ = _tmp121_; -#line 1590 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1612 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp123_ = err; -#line 1590 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1612 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp124_ = _tmp123_->message; -#line 1590 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - g_warning ("ImportPage.vala:1590: Unable to fetch metadata for %s/%s: %s", _tmp119_, _tmp122_, _tmp124_); -#line 1590 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1612 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" + g_warning ("ImportPage.vala:1612: Unable to fetch metadata for %s/%s: %s", _tmp119_, _tmp122_, _tmp124_); +#line 1612 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_free0 (_tmp122_); -#line 1590 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1612 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_free0 (_tmp119_); -#line 1585 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1607 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_error_free0 (err); -#line 10541 "ImportPage.c" +#line 10694 "ImportPage.c" } - __finally67: -#line 1585 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" + __finally69: +#line 1607 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1585 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1607 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_free0 (preview_md5); -#line 1585 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1607 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_object_unref0 (preview); -#line 1585 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1607 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" preview_raw = (g_free (preview_raw), NULL); -#line 1585 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1607 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_free0 (exif_only_md5); -#line 1585 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1607 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _media_metadata_unref0 (metadata); -#line 1585 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1607 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_object_unref0 (associated); -#line 1585 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1607 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_free0 (fulldir); -#line 1585 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1607 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_free0 (filename); -#line 1585 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1607 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_object_unref0 (import_source); -#line 1585 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1607 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_object_unref0 (_import_source_list); -#line 1585 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1607 "/home/jens/Source/shotwell/src/camera/ImportPage.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 1585 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1607 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" g_clear_error (&_inner_error_); -#line 1585 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1607 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return; -#line 10572 "ImportPage.c" +#line 10725 "ImportPage.c" } } -#line 1596 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1618 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp125_ = self->priv->import_sources; -#line 1596 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1618 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp126_ = import_source; -#line 1596 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1618 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" data_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp125_, TYPE_DATA_COLLECTION, DataCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp126_, TYPE_DATA_OBJECT, DataObject)); -#line 1598 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1620 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp127_ = self->priv->progress_bar; -#line 1598 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1620 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp128_ = loaded_photos; -#line 1598 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1620 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" loaded_photos = _tmp128_ + 1; -#line 1598 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1620 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp129_ = loaded_photos; -#line 1598 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1620 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp130_ = import_list; -#line 1598 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1620 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp131_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp130_, GEE_TYPE_COLLECTION, GeeCollection)); -#line 1598 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1620 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp132_ = _tmp131_; -#line 1598 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1620 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" gtk_progress_bar_set_fraction (_tmp127_, ((gdouble) _tmp129_) / ((gdouble) _tmp132_)); -#line 1605 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1627 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" spin_event_loop (); -#line 1496 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1518 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_free0 (preview_md5); -#line 1496 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1518 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_object_unref0 (preview); -#line 1496 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1518 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" preview_raw = (g_free (preview_raw), NULL); -#line 1496 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1518 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_free0 (exif_only_md5); -#line 1496 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1518 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _media_metadata_unref0 (metadata); -#line 1496 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1518 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_object_unref0 (associated); -#line 1496 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1518 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_free0 (fulldir); -#line 1496 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1518 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_free0 (filename); -#line 1496 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1518 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_object_unref0 (import_source); -#line 10617 "ImportPage.c" +#line 10770 "ImportPage.c" } -#line 1496 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1518 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_object_unref0 (_import_source_list); -#line 10621 "ImportPage.c" +#line 10774 "ImportPage.c" } } @@ -10635,58 +10788,58 @@ static void import_page_on_hide_imported (ImportPage* self) { ConfigFacade* _tmp9_ = NULL; GtkCheckButton* _tmp10_ = NULL; gboolean _tmp11_ = FALSE; -#line 1609 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1631 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" g_return_if_fail (IS_IMPORT_PAGE (self)); -#line 1610 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1632 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp0_ = self->priv->hide_imported; -#line 1610 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1632 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp1_ = gtk_toggle_button_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_toggle_button_get_type (), GtkToggleButton)); -#line 1610 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1632 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" if (_tmp1_) { -#line 10641 "ImportPage.c" +#line 10794 "ImportPage.c" ViewCollection* _tmp2_ = NULL; ViewCollection* _tmp3_ = NULL; ImportPageHideImportedViewFilter* _tmp4_ = NULL; -#line 1611 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1633 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp2_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); -#line 1611 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1633 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp3_ = _tmp2_; -#line 1611 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1633 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp4_ = self->priv->hide_imported_filter; -#line 1611 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1633 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" view_collection_install_view_filter (_tmp3_, G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_VIEW_FILTER, ViewFilter)); -#line 1611 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1633 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _data_collection_unref0 (_tmp3_); -#line 10655 "ImportPage.c" +#line 10808 "ImportPage.c" } else { ViewCollection* _tmp5_ = NULL; ViewCollection* _tmp6_ = NULL; ImportPageHideImportedViewFilter* _tmp7_ = NULL; -#line 1613 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1635 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp5_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); -#line 1613 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1635 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp6_ = _tmp5_; -#line 1613 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1635 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp7_ = self->priv->hide_imported_filter; -#line 1613 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1635 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" view_collection_remove_view_filter (_tmp6_, G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_VIEW_FILTER, ViewFilter)); -#line 1613 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1635 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _data_collection_unref0 (_tmp6_); -#line 10670 "ImportPage.c" +#line 10823 "ImportPage.c" } -#line 1615 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1637 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp8_ = config_facade_get_instance (); -#line 1615 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1637 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp9_ = _tmp8_; -#line 1615 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1637 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp10_ = self->priv->hide_imported; -#line 1615 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1637 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp11_ = gtk_toggle_button_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, gtk_toggle_button_get_type (), GtkToggleButton)); -#line 1615 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1637 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" configuration_facade_set_hide_photos_already_imported (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), _tmp11_); -#line 1615 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1637 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_object_unref0 (_tmp9_); -#line 10684 "ImportPage.c" +#line 10837 "ImportPage.c" } @@ -10695,23 +10848,23 @@ static void import_page_on_import_selected (ImportPage* self) { ViewCollection* _tmp1_ = NULL; GeeList* _tmp2_ = NULL; GeeList* _tmp3_ = NULL; -#line 1618 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1640 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" g_return_if_fail (IS_IMPORT_PAGE (self)); -#line 1619 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1641 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp0_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); -#line 1619 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1641 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp1_ = _tmp0_; -#line 1619 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1641 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp2_ = view_collection_get_selected (_tmp1_); -#line 1619 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1641 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp3_ = _tmp2_; -#line 1619 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1641 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" import_page_import (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_ITERABLE, GeeIterable)); -#line 1619 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1641 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_object_unref0 (_tmp3_); -#line 1619 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1641 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _data_collection_unref0 (_tmp1_); -#line 10709 "ImportPage.c" +#line 10862 "ImportPage.c" } @@ -10720,53 +10873,53 @@ static void import_page_on_import_all (ImportPage* self) { ViewCollection* _tmp1_ = NULL; GeeCollection* _tmp2_ = NULL; GeeCollection* _tmp3_ = NULL; -#line 1622 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1644 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" g_return_if_fail (IS_IMPORT_PAGE (self)); -#line 1623 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1645 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp0_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); -#line 1623 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1645 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp1_ = _tmp0_; -#line 1623 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1645 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp2_ = data_collection_get_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_DATA_COLLECTION, DataCollection)); -#line 1623 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1645 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp3_ = _tmp2_; -#line 1623 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1645 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" import_page_import (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_ITERABLE, GeeIterable)); -#line 1623 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1645 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_object_unref0 (_tmp3_); -#line 1623 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1645 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _data_collection_unref0 (_tmp1_); -#line 10734 "ImportPage.c" +#line 10887 "ImportPage.c" } static gint64 _import_page_import_job_comparator_comparator (void* a, void* b, gpointer self) { gint64 result; result = import_page_import_job_comparator ((ImportPage*) self, a, b); -#line 1639 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1661 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return result; -#line 10743 "ImportPage.c" +#line 10896 "ImportPage.c" } static void _import_page_import_reporter_batch_import_import_reporter (ImportManifest* manifest, BatchImportRoll* import_roll, gpointer self) { -#line 1675 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1697 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" import_page_import_reporter ((ImportPage*) self, manifest); -#line 10750 "ImportPage.c" +#line 10903 "ImportPage.c" } static void _import_page_on_import_job_failed_batch_import_import_job_failed (BatchImport* _sender, BatchImportResult* _result_, gpointer self) { -#line 1677 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1699 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" import_page_on_import_job_failed ((ImportPage*) self, _result_); -#line 10757 "ImportPage.c" +#line 10910 "ImportPage.c" } static void _import_page_close_import_batch_import_import_complete (BatchImport* _sender, ImportManifest* manifest, BatchImportRoll* import_roll, gpointer self) { -#line 1678 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1700 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" import_page_close_import ((ImportPage*) self); -#line 10764 "ImportPage.c" +#line 10917 "ImportPage.c" } @@ -10790,85 +10943,85 @@ static void import_page_import (ImportPage* self, GeeIterable* items) { SortedList* _tmp59_ = NULL; gint _tmp60_ = 0; gint _tmp61_ = 0; -#line 1626 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1648 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" g_return_if_fail (IS_IMPORT_PAGE (self)); -#line 1626 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1648 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" g_return_if_fail (GEE_IS_ITERABLE (items)); -#line 1627 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1649 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp0_ = self->priv->camera; -#line 1627 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1649 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp1_ = import_page_spin_idle_context; -#line 1627 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1649 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp2_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GP_TYPE_CONTEXT_WRAPPER, GPContextWrapper)->context; -#line 1627 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1649 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp3_ = gp_camera_init (_tmp0_, _tmp2_); -#line 1627 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1649 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" res = _tmp3_; -#line 1628 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1650 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp4_ = res; -#line 1628 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1650 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" if (_tmp4_ != GP_OK) { -#line 10806 "ImportPage.c" +#line 10959 "ImportPage.c" const gchar* _tmp5_ = NULL; int _tmp6_ = 0; gchar* _tmp7_ = NULL; gchar* _tmp8_ = NULL; gchar* _tmp9_ = NULL; gchar* _tmp10_ = NULL; -#line 1629 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1651 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp5_ = _ ("Unable to lock camera: %s"); -#line 1629 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1651 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp6_ = res; -#line 1629 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1651 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp7_ = gp_result_to_full_string (_tmp6_); -#line 1629 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1651 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp8_ = _tmp7_; -#line 1629 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1651 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp9_ = g_strdup_printf (_tmp5_, _tmp8_); -#line 1629 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1651 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp10_ = _tmp9_; -#line 1629 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1651 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" app_window_error_message (_tmp10_, NULL); -#line 1629 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1651 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_free0 (_tmp10_); -#line 1629 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1651 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_free0 (_tmp8_); -#line 1631 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1653 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return; -#line 10833 "ImportPage.c" +#line 10986 "ImportPage.c" } -#line 1634 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1656 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp11_ = self->priv->refreshed; -#line 1634 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1656 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" import_page_update_status (self, TRUE, _tmp11_); -#line 1636 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1658 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" import_page_on_view_changed (self); -#line 1637 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1659 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp12_ = self->priv->progress_bar; -#line 1637 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1659 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" gtk_widget_set_visible (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, gtk_widget_get_type (), GtkWidget), FALSE); -#line 1639 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1661 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp13_ = sorted_list_new (IMPORT_PAGE_TYPE_CAMERA_IMPORT_JOB, (GBoxedCopyFunc) batch_import_job_ref, batch_import_job_unref, _import_page_import_job_comparator_comparator, self); -#line 1639 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1661 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" jobs = _tmp13_; -#line 1640 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1662 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp14_ = gee_array_list_new (IMPORT_PAGE_TYPE_CAMERA_IMPORT_JOB, (GBoxedCopyFunc) batch_import_job_ref, batch_import_job_unref, NULL, NULL, NULL); -#line 1640 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1662 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" already_imported = _tmp14_; -#line 10853 "ImportPage.c" +#line 11006 "ImportPage.c" { GeeIterator* _object_it = NULL; GeeIterable* _tmp15_ = NULL; GeeIterator* _tmp16_ = NULL; -#line 1642 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1664 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp15_ = items; -#line 1642 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1664 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp16_ = gee_iterable_iterator (_tmp15_); -#line 1642 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1664 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _object_it = _tmp16_; -#line 1642 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1664 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" while (TRUE) { -#line 10866 "ImportPage.c" +#line 11019 "ImportPage.c" GeeIterator* _tmp17_ = NULL; gboolean _tmp18_ = FALSE; DataObject* object = NULL; @@ -10890,41 +11043,41 @@ static void import_page_import (ImportPage* self, GeeIterable* items) { ImportSource* _tmp42_ = NULL; SortedList* _tmp53_ = NULL; ImportPageCameraImportJob* _tmp54_ = NULL; -#line 1642 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1664 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp17_ = _object_it; -#line 1642 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1664 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp18_ = gee_iterator_next (_tmp17_); -#line 1642 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1664 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" if (!_tmp18_) { -#line 1642 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1664 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" break; -#line 10896 "ImportPage.c" +#line 11049 "ImportPage.c" } -#line 1642 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1664 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp19_ = _object_it; -#line 1642 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1664 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp20_ = gee_iterator_get (_tmp19_); -#line 1642 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1664 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" object = (DataObject*) _tmp20_; -#line 1643 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1665 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp21_ = object; -#line 1643 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1665 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp22_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, TYPE_IMPORT_PREVIEW, ImportPreview)); -#line 1643 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1665 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" preview = _tmp22_; -#line 1644 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1666 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp23_ = preview; -#line 1644 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1666 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp24_ = data_view_get_source (G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, TYPE_DATA_VIEW, DataView)); -#line 1644 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1666 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" import_file = G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, TYPE_IMPORT_SOURCE, ImportSource); -#line 1646 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1668 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp25_ = preview; -#line 1646 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1668 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp26_ = import_preview_is_already_imported (_tmp25_); -#line 1646 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1668 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" if (_tmp26_) { -#line 10922 "ImportPage.c" +#line 11075 "ImportPage.c" ImportSource* _tmp27_ = NULL; gchar* _tmp28_ = NULL; gchar* _tmp29_ = NULL; @@ -10936,84 +11089,84 @@ static void import_page_import (ImportPage* self, GeeIterable* items) { DuplicatedFile* _tmp35_ = NULL; ImportPageCameraImportJob* _tmp36_ = NULL; ImportPageCameraImportJob* _tmp37_ = NULL; -#line 1647 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1669 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp27_ = import_file; -#line 1647 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1669 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp28_ = import_source_get_filename (_tmp27_); -#line 1647 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1669 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp29_ = _tmp28_; -#line 1647 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - g_message ("ImportPage.vala:1647: Skipping import of %s: checksum detected in libr" \ +#line 1669 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" + g_message ("ImportPage.vala:1669: Skipping import of %s: checksum detected in libr" \ "ary", _tmp29_); -#line 1647 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1669 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_free0 (_tmp29_); -#line 1650 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1672 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp30_ = already_imported; -#line 1650 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1672 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp31_ = import_page_null_context; -#line 1650 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1672 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp32_ = import_file; -#line 1650 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1672 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp33_ = preview; -#line 1650 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1672 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp34_ = import_preview_get_duplicated_file (_tmp33_); -#line 1650 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1672 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp35_ = _tmp34_; -#line 1650 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1672 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp36_ = import_page_camera_import_job_new (_tmp31_, _tmp32_, _tmp35_); -#line 1650 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1672 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp37_ = _tmp36_; -#line 1650 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1672 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp30_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp37_); -#line 1650 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1672 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _batch_import_job_unref0 (_tmp37_); -#line 1650 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1672 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_object_unref0 (_tmp35_); -#line 1653 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1675 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_object_unref0 (import_file); -#line 1653 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1675 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_object_unref0 (preview); -#line 1653 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1675 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_object_unref0 (object); -#line 1653 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1675 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" continue; -#line 10974 "ImportPage.c" +#line 11127 "ImportPage.c" } -#line 1656 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1678 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp38_ = import_page_null_context; -#line 1656 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1678 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp39_ = import_file; -#line 1656 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1678 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp40_ = import_page_camera_import_job_new (_tmp38_, _tmp39_, NULL); -#line 1656 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1678 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" import_job = _tmp40_; -#line 1659 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1681 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp42_ = import_file; -#line 1659 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1681 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp42_, TYPE_PHOTO_IMPORT_SOURCE)) { -#line 10988 "ImportPage.c" +#line 11141 "ImportPage.c" ImportSource* _tmp43_ = NULL; PhotoImportSource* _tmp44_ = NULL; PhotoImportSource* _tmp45_ = NULL; -#line 1660 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1682 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp43_ = import_file; -#line 1660 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1682 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp44_ = photo_import_source_get_associated (G_TYPE_CHECK_INSTANCE_CAST (_tmp43_, TYPE_PHOTO_IMPORT_SOURCE, PhotoImportSource)); -#line 1660 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1682 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp45_ = _tmp44_; -#line 1660 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1682 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp41_ = _tmp45_ != NULL; -#line 1660 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1682 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_object_unref0 (_tmp45_); -#line 11002 "ImportPage.c" +#line 11155 "ImportPage.c" } else { -#line 1659 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1681 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp41_ = FALSE; -#line 11006 "ImportPage.c" +#line 11159 "ImportPage.c" } -#line 1659 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1681 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" if (_tmp41_) { -#line 11010 "ImportPage.c" +#line 11163 "ImportPage.c" ImportPageCameraImportJob* _tmp46_ = NULL; GPContextWrapper* _tmp47_ = NULL; ImportSource* _tmp48_ = NULL; @@ -11021,67 +11174,67 @@ static void import_page_import (ImportPage* self, GeeIterable* items) { PhotoImportSource* _tmp50_ = NULL; ImportPageCameraImportJob* _tmp51_ = NULL; ImportPageCameraImportJob* _tmp52_ = NULL; -#line 1661 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1683 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp46_ = import_job; -#line 1661 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1683 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp47_ = import_page_null_context; -#line 1661 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1683 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp48_ = import_file; -#line 1661 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1683 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp49_ = photo_import_source_get_associated (G_TYPE_CHECK_INSTANCE_CAST (_tmp48_, TYPE_PHOTO_IMPORT_SOURCE, PhotoImportSource)); -#line 1661 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1683 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp50_ = _tmp49_; -#line 1661 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1683 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp51_ = import_page_camera_import_job_new (_tmp47_, G_TYPE_CHECK_INSTANCE_CAST (_tmp50_, TYPE_IMPORT_SOURCE, ImportSource), NULL); -#line 1661 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1683 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp52_ = _tmp51_; -#line 1661 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1683 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" batch_import_job_set_associated (G_TYPE_CHECK_INSTANCE_CAST (_tmp46_, TYPE_BATCH_IMPORT_JOB, BatchImportJob), G_TYPE_CHECK_INSTANCE_CAST (_tmp52_, TYPE_BATCH_IMPORT_JOB, BatchImportJob)); -#line 1661 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1683 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _batch_import_job_unref0 (_tmp52_); -#line 1661 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1683 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_object_unref0 (_tmp50_); -#line 11038 "ImportPage.c" +#line 11191 "ImportPage.c" } -#line 1665 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1687 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp53_ = jobs; -#line 1665 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1687 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp54_ = import_job; -#line 1665 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1687 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp53_, GEE_TYPE_COLLECTION, GeeCollection), _tmp54_); -#line 1642 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1664 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _batch_import_job_unref0 (import_job); -#line 1642 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1664 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_object_unref0 (import_file); -#line 1642 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1664 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_object_unref0 (preview); -#line 1642 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1664 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_object_unref0 (object); -#line 11054 "ImportPage.c" +#line 11207 "ImportPage.c" } -#line 1642 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1664 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_object_unref0 (_object_it); -#line 11058 "ImportPage.c" +#line 11211 "ImportPage.c" } -#line 1668 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1690 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp55_ = jobs; -#line 1668 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1690 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp56_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp55_, GEE_TYPE_COLLECTION, GeeCollection)); -#line 1668 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1690 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp57_ = _tmp56_; -#line 1668 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1690 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp58_ = self->priv->camera_name; -#line 1668 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - g_debug ("ImportPage.vala:1668: Importing %d files from %s", _tmp57_, _tmp58_); -#line 1670 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1690 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" + g_debug ("ImportPage.vala:1690: Importing %d files from %s", _tmp57_, _tmp58_); +#line 1692 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp59_ = jobs; -#line 1670 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1692 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp60_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp59_, GEE_TYPE_COLLECTION, GeeCollection)); -#line 1670 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1692 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp61_ = _tmp60_; -#line 1670 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1692 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" if (_tmp61_ > 0) { -#line 11078 "ImportPage.c" +#line 11231 "ImportPage.c" ImportPage* _tmp62_ = NULL; ImportPage* _tmp63_ = NULL; BatchImport* batch_import = NULL; @@ -11096,92 +11249,92 @@ static void import_page_import (ImportPage* self, GeeIterable* items) { BatchImport* _tmp72_ = NULL; LibraryWindow* _tmp73_ = NULL; LibraryWindow* _tmp74_ = NULL; -#line 1672 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1694 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp62_ = self->priv->local_ref; -#line 1672 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1694 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _vala_assert (_tmp62_ == NULL, "local_ref == null"); -#line 1673 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1695 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp63_ = _g_object_ref0 (self); -#line 1673 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1695 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_object_unref0 (self->priv->local_ref); -#line 1673 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1695 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" self->priv->local_ref = _tmp63_; -#line 1675 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1697 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp64_ = jobs; -#line 1675 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1697 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp65_ = self->priv->camera_name; -#line 1675 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1697 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp66_ = already_imported; -#line 1675 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1697 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp67_ = batch_import_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp64_, GEE_TYPE_ITERABLE, GeeIterable), _tmp65_, _import_page_import_reporter_batch_import_import_reporter, self, NULL, _tmp66_, NULL, NULL, NULL); -#line 1675 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1697 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" batch_import = _tmp67_; -#line 1677 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1699 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp68_ = batch_import; -#line 1677 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1699 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" g_signal_connect_object (_tmp68_, "import-job-failed", (GCallback) _import_page_on_import_job_failed_batch_import_import_job_failed, self, 0); -#line 1678 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1700 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp69_ = batch_import; -#line 1678 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1700 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" g_signal_connect_object (_tmp69_, "import-complete", (GCallback) _import_page_close_import_batch_import_import_complete, self, 0); -#line 1680 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1702 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp70_ = library_window_get_app (); -#line 1680 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1702 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp71_ = _tmp70_; -#line 1680 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1702 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp72_ = batch_import; -#line 1680 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1702 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" library_window_enqueue_batch_import (_tmp71_, _tmp72_, TRUE); -#line 1680 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1702 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_object_unref0 (_tmp71_); -#line 1681 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1703 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp73_ = library_window_get_app (); -#line 1681 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1703 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp74_ = _tmp73_; -#line 1681 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1703 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" library_window_switch_to_import_queue_page (_tmp74_); -#line 1681 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1703 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_object_unref0 (_tmp74_); -#line 1670 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1692 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_object_unref0 (batch_import); -#line 11141 "ImportPage.c" +#line 11294 "ImportPage.c" } else { GeeArrayList* _tmp75_ = NULL; gint _tmp76_ = 0; gint _tmp77_ = 0; -#line 1685 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1707 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp75_ = already_imported; -#line 1685 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1707 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp76_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp75_, GEE_TYPE_COLLECTION, GeeCollection)); -#line 1685 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1707 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp77_ = _tmp76_; -#line 1685 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1707 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" if (_tmp77_ > 0) { -#line 11154 "ImportPage.c" +#line 11307 "ImportPage.c" GeeArrayList* _tmp78_ = NULL; ImportManifest* _tmp79_ = NULL; ImportManifest* _tmp80_ = NULL; -#line 1686 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1708 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp78_ = already_imported; -#line 1686 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1708 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp79_ = import_manifest_new (NULL, G_TYPE_CHECK_INSTANCE_CAST (_tmp78_, GEE_TYPE_LIST, GeeList)); -#line 1686 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1708 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp80_ = _tmp79_; -#line 1686 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1708 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" import_page_import_reporter (self, _tmp80_); -#line 1686 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1708 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _import_manifest_unref0 (_tmp80_); -#line 11168 "ImportPage.c" +#line 11321 "ImportPage.c" } -#line 1688 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1710 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" import_page_close_import (self); -#line 11172 "ImportPage.c" +#line 11325 "ImportPage.c" } -#line 1626 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1648 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_object_unref0 (already_imported); -#line 1626 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1648 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_object_unref0 (jobs); -#line 11178 "ImportPage.c" +#line 11331 "ImportPage.c" } @@ -11190,53 +11343,53 @@ static void import_page_on_import_job_failed (ImportPage* self, BatchImportResul BatchImportResult* _tmp1_ = NULL; GFile* _tmp2_ = NULL; GError * _inner_error_ = NULL; -#line 1692 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1714 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" g_return_if_fail (IS_IMPORT_PAGE (self)); -#line 1692 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1714 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" g_return_if_fail (IS_BATCH_IMPORT_RESULT (_result_)); -#line 1693 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1715 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp1_ = _result_; -#line 1693 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1715 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp2_ = _tmp1_->file; -#line 1693 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1715 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" if (_tmp2_ == NULL) { -#line 1693 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1715 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp0_ = TRUE; -#line 11199 "ImportPage.c" +#line 11352 "ImportPage.c" } else { BatchImportResult* _tmp3_ = NULL; ImportResult _tmp4_ = 0; -#line 1693 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1715 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp3_ = _result_; -#line 1693 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1715 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp4_ = _tmp3_->result; -#line 1693 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1715 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp0_ = _tmp4_ == IMPORT_RESULT_SUCCESS; -#line 11209 "ImportPage.c" +#line 11362 "ImportPage.c" } -#line 1693 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1715 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" if (_tmp0_) { -#line 1694 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1716 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return; -#line 11215 "ImportPage.c" +#line 11368 "ImportPage.c" } { BatchImportResult* _tmp5_ = NULL; GFile* _tmp6_ = NULL; -#line 1698 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1720 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp5_ = _result_; -#line 1698 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1720 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp6_ = _tmp5_->file; -#line 1698 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1720 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" g_file_delete (_tmp6_, NULL, &_inner_error_); -#line 1698 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1720 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 11228 "ImportPage.c" - goto __catch68_g_error; +#line 11381 "ImportPage.c" + goto __catch70_g_error; } } - goto __finally68; - __catch68_g_error: + goto __finally70; + __catch70_g_error: { GError* err = NULL; BatchImportResult* _tmp7_ = NULL; @@ -11245,57 +11398,57 @@ static void import_page_on_import_job_failed (ImportPage* self, BatchImportResul gchar* _tmp10_ = NULL; GError* _tmp11_ = NULL; const gchar* _tmp12_ = NULL; -#line 1697 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1719 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" err = _inner_error_; -#line 1697 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1719 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _inner_error_ = NULL; -#line 1700 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1722 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp7_ = _result_; -#line 1700 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1722 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp8_ = _tmp7_->file; -#line 1700 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1722 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp9_ = g_file_get_path (_tmp8_); -#line 1700 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1722 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp10_ = _tmp9_; -#line 1700 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1722 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp11_ = err; -#line 1700 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1722 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp12_ = _tmp11_->message; -#line 1700 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - g_message ("ImportPage.vala:1700: Unable to delete downloaded file %s: %s", _tmp10_, _tmp12_); -#line 1700 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1722 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" + g_message ("ImportPage.vala:1722: Unable to delete downloaded file %s: %s", _tmp10_, _tmp12_); +#line 1722 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_free0 (_tmp10_); -#line 1697 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1719 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_error_free0 (err); -#line 11264 "ImportPage.c" +#line 11417 "ImportPage.c" } - __finally68: -#line 1697 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" + __finally70: +#line 1719 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1697 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1719 "/home/jens/Source/shotwell/src/camera/ImportPage.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 1697 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1719 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" g_clear_error (&_inner_error_); -#line 1697 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1719 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return; -#line 11275 "ImportPage.c" +#line 11428 "ImportPage.c" } } static gpointer _batch_import_job_ref0 (gpointer self) { -#line 1744 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1766 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return self ? batch_import_job_ref (self) : NULL; -#line 11283 "ImportPage.c" +#line 11436 "ImportPage.c" } static gboolean _progress_dialog_monitor_progress_monitor (guint64 current, guint64 total, gboolean do_event_loop, gpointer self) { gboolean result; result = progress_dialog_monitor ((ProgressDialog*) self, current, total, do_event_loop); -#line 1751 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1773 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return result; -#line 11292 "ImportPage.c" +#line 11445 "ImportPage.c" } @@ -11325,31 +11478,31 @@ static void import_page_import_reporter (ImportPage* self, ImportManifest* manif gint _tmp91_ = 0; gint _tmp92_ = 0; ProgressDialog* _tmp98_ = NULL; -#line 1704 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1726 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" g_return_if_fail (IS_IMPORT_PAGE (self)); -#line 1704 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1726 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" g_return_if_fail (IS_IMPORT_MANIFEST (manifest)); -#line 1710 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1732 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp0_ = self->priv->local_ref; -#line 1710 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1732 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp1_ = _g_object_ref0 (_tmp0_); -#line 1710 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1732 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" local_ref = _tmp1_; -#line 1711 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1733 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_object_unref0 (self->priv->local_ref); -#line 1711 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1733 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" self->priv->local_ref = NULL; -#line 1713 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1735 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp2_ = manifest; -#line 1713 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1735 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp3_ = _tmp2_->success; -#line 1713 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1735 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp4_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_COLLECTION, GeeCollection)); -#line 1713 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1735 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp5_ = _tmp4_; -#line 1713 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1735 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" if (_tmp5_ > 0) { -#line 11346 "ImportPage.c" +#line 11499 "ImportPage.c" gchar* photos_string = NULL; ImportManifest* _tmp6_ = NULL; GeeList* _tmp7_ = NULL; @@ -11409,176 +11562,176 @@ static void import_page_import_reporter (ImportPage* self, ImportManifest* manif ImportManifest* _tmp56_ = NULL; ImportUIQuestionParams* _tmp57_ = NULL; gboolean _tmp58_ = FALSE; -#line 1714 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1736 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp6_ = manifest; -#line 1714 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1736 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp7_ = _tmp6_->success; -#line 1714 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1736 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp8_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GEE_TYPE_COLLECTION, GeeCollection)); -#line 1714 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1736 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp9_ = _tmp8_; -#line 1714 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1736 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp10_ = ngettext ("Delete this photo from camera?", "Delete these %d photos from camera?", (gulong) _tmp9_); -#line 1714 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1736 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp11_ = manifest; -#line 1714 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1736 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp12_ = _tmp11_->success; -#line 1714 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1736 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp13_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, GEE_TYPE_COLLECTION, GeeCollection)); -#line 1714 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1736 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp14_ = _tmp13_; -#line 1714 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1736 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp15_ = g_strdup_printf (_tmp10_, _tmp14_); -#line 1714 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1736 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" photos_string = _tmp15_; -#line 1717 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1739 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp16_ = manifest; -#line 1717 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1739 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp17_ = _tmp16_->success; -#line 1717 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1739 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp18_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, GEE_TYPE_COLLECTION, GeeCollection)); -#line 1717 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1739 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp19_ = _tmp18_; -#line 1717 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1739 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp20_ = ngettext ("Delete this video from camera?", "Delete these %d videos from camera?", (gulong) _tmp19_); -#line 1717 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1739 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp21_ = manifest; -#line 1717 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1739 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp22_ = _tmp21_->success; -#line 1717 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1739 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp23_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, GEE_TYPE_COLLECTION, GeeCollection)); -#line 1717 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1739 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp24_ = _tmp23_; -#line 1717 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1739 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp25_ = g_strdup_printf (_tmp20_, _tmp24_); -#line 1717 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1739 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" videos_string = _tmp25_; -#line 1720 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1742 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp26_ = manifest; -#line 1720 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1742 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp27_ = _tmp26_->success; -#line 1720 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1742 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp28_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp27_, GEE_TYPE_COLLECTION, GeeCollection)); -#line 1720 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1742 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp29_ = _tmp28_; -#line 1720 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1742 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp30_ = ngettext ("Delete this photo/video from camera?", "Delete these %d photos/videos from camera?", (gulong) _tmp29_); -#line 1720 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1742 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp31_ = manifest; -#line 1720 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1742 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp32_ = _tmp31_->success; -#line 1720 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1742 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp33_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp32_, GEE_TYPE_COLLECTION, GeeCollection)); -#line 1720 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1742 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp34_ = _tmp33_; -#line 1720 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1742 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp35_ = g_strdup_printf (_tmp30_, _tmp34_); -#line 1720 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1742 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" both_string = _tmp35_; -#line 1723 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1745 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp36_ = manifest; -#line 1723 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1745 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp37_ = _tmp36_->success; -#line 1723 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1745 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp38_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp37_, GEE_TYPE_COLLECTION, GeeCollection)); -#line 1723 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1745 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp39_ = _tmp38_; -#line 1723 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1745 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp40_ = ngettext ("Delete these files from camera?", "Delete these %d files from camera?", (gulong) _tmp39_); -#line 1723 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1745 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp41_ = manifest; -#line 1723 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1745 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp42_ = _tmp41_->success; -#line 1723 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1745 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp43_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp42_, GEE_TYPE_COLLECTION, GeeCollection)); -#line 1723 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1745 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp44_ = _tmp43_; -#line 1723 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1745 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp45_ = g_strdup_printf (_tmp40_, _tmp44_); -#line 1723 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1745 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" neither_string = _tmp45_; -#line 1727 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1749 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp46_ = manifest; -#line 1727 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1749 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp47_ = _tmp46_->success; -#line 1727 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1749 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp48_ = photos_string; -#line 1727 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1749 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp49_ = videos_string; -#line 1727 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1749 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp50_ = both_string; -#line 1727 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1749 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp51_ = neither_string; -#line 1727 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1749 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp52_ = import_ui_get_media_specific_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp47_, GEE_TYPE_COLLECTION, GeeCollection), _tmp48_, _tmp49_, _tmp50_, _tmp51_); -#line 1727 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1749 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" question_string = _tmp52_; -#line 1730 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1752 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp53_ = question_string; -#line 1730 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1752 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp54_ = _ ("_Keep"); -#line 1730 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1752 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp55_ = import_ui_question_params_new (_tmp53_, RESOURCES_DELETE_LABEL, _tmp54_); -#line 1730 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1752 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" question = _tmp55_; -#line 1733 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1755 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp56_ = manifest; -#line 1733 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1755 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp57_ = question; -#line 1733 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1755 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp58_ = import_ui_report_manifest (_tmp56_, FALSE, _tmp57_); -#line 1733 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1755 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" if (!_tmp58_) { -#line 1734 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1756 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _import_ui_question_params_unref0 (question); -#line 1734 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1756 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_free0 (question_string); -#line 1734 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1756 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_free0 (neither_string); -#line 1734 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1756 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_free0 (both_string); -#line 1734 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1756 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_free0 (videos_string); -#line 1734 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1756 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_free0 (photos_string); -#line 1734 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1756 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_object_unref0 (local_ref); -#line 1734 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1756 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return; -#line 11542 "ImportPage.c" +#line 11695 "ImportPage.c" } -#line 1713 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1735 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _import_ui_question_params_unref0 (question); -#line 1713 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1735 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_free0 (question_string); -#line 1713 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1735 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_free0 (neither_string); -#line 1713 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1735 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_free0 (both_string); -#line 1713 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1735 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_free0 (videos_string); -#line 1713 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1735 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_free0 (photos_string); -#line 11556 "ImportPage.c" +#line 11709 "ImportPage.c" } else { ImportManifest* _tmp59_ = NULL; -#line 1736 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1758 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp59_ = manifest; -#line 1736 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1758 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" import_ui_report_manifest (_tmp59_, FALSE, NULL); -#line 1737 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1759 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_object_unref0 (local_ref); -#line 1737 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1759 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return; -#line 11567 "ImportPage.c" +#line 11720 "ImportPage.c" } -#line 1742 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1764 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp60_ = self->priv->import_sources; -#line 1742 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1764 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp61_ = data_collection_start_marking (G_TYPE_CHECK_INSTANCE_CAST (_tmp60_, TYPE_DATA_COLLECTION, DataCollection)); -#line 1742 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1764 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" marker = _tmp61_; -#line 11575 "ImportPage.c" +#line 11728 "ImportPage.c" { GeeList* _batch_result_list = NULL; ImportManifest* _tmp62_ = NULL; @@ -11589,27 +11742,27 @@ static void import_page_import_reporter (ImportPage* self, ImportManifest* manif gint _tmp66_ = 0; gint _tmp67_ = 0; gint _batch_result_index = 0; -#line 1743 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1765 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp62_ = manifest; -#line 1743 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1765 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp63_ = _tmp62_->success; -#line 1743 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1765 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp64_ = _g_object_ref0 (_tmp63_); -#line 1743 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1765 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _batch_result_list = _tmp64_; -#line 1743 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1765 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp65_ = _batch_result_list; -#line 1743 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1765 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp66_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp65_, GEE_TYPE_COLLECTION, GeeCollection)); -#line 1743 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1765 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp67_ = _tmp66_; -#line 1743 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1765 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _batch_result_size = _tmp67_; -#line 1743 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1765 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _batch_result_index = -1; -#line 1743 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1765 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" while (TRUE) { -#line 11606 "ImportPage.c" +#line 11759 "ImportPage.c" gint _tmp68_ = 0; gint _tmp69_ = 0; gint _tmp70_ = 0; @@ -11625,134 +11778,134 @@ static void import_page_import_reporter (ImportPage* self, ImportManifest* manif ImportPageCameraImportJob* _tmp78_ = NULL; ImportSource* _tmp79_ = NULL; ImportSource* _tmp80_ = NULL; -#line 1743 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1765 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp68_ = _batch_result_index; -#line 1743 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1765 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _batch_result_index = _tmp68_ + 1; -#line 1743 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1765 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp69_ = _batch_result_index; -#line 1743 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1765 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp70_ = _batch_result_size; -#line 1743 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1765 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" if (!(_tmp69_ < _tmp70_)) { -#line 1743 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1765 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" break; -#line 11634 "ImportPage.c" +#line 11787 "ImportPage.c" } -#line 1743 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1765 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp71_ = _batch_result_list; -#line 1743 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1765 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp72_ = _batch_result_index; -#line 1743 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1765 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp73_ = gee_list_get (_tmp71_, _tmp72_); -#line 1743 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1765 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" batch_result = (BatchImportResult*) _tmp73_; -#line 1744 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1766 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp74_ = batch_result; -#line 1744 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1766 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp75_ = _tmp74_->job; -#line 1744 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1766 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp76_ = _batch_import_job_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp75_, IMPORT_PAGE_TYPE_CAMERA_IMPORT_JOB) ? ((ImportPageCameraImportJob*) _tmp75_) : NULL); -#line 1744 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1766 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" job = _tmp76_; -#line 1746 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1768 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp77_ = marker; -#line 1746 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1768 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp78_ = job; -#line 1746 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1768 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp79_ = import_page_camera_import_job_get_source (_tmp78_); -#line 1746 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1768 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp80_ = _tmp79_; -#line 1746 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1768 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" marker_mark (_tmp77_, G_TYPE_CHECK_INSTANCE_CAST (_tmp80_, TYPE_DATA_OBJECT, DataObject)); -#line 1746 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1768 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_object_unref0 (_tmp80_); -#line 1743 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1765 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _batch_import_job_unref0 (job); -#line 1743 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1765 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _batch_import_result_unref0 (batch_result); -#line 11668 "ImportPage.c" +#line 11821 "ImportPage.c" } -#line 1743 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1765 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_object_unref0 (_batch_result_list); -#line 11672 "ImportPage.c" +#line 11825 "ImportPage.c" } -#line 1749 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1771 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp81_ = app_window_get_instance (); -#line 1749 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1771 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp82_ = _tmp81_; -#line 1749 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1771 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp83_ = _ ("Removing photos/videos from camera"); -#line 1749 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1771 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp84_ = g_cancellable_new (); -#line 1749 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1771 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp85_ = _tmp84_; -#line 1749 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1771 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp86_ = progress_dialog_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp82_, gtk_window_get_type (), GtkWindow), _tmp83_, _tmp85_); -#line 1749 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1771 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" g_object_ref_sink (_tmp86_); -#line 1749 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1771 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp87_ = _tmp86_; -#line 1749 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1771 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_object_unref0 (_tmp85_); -#line 1749 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1771 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_object_unref0 (_tmp82_); -#line 1749 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1771 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" progress = _tmp87_; -#line 1751 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1773 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp88_ = self->priv->import_sources; -#line 1751 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1773 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp89_ = marker; -#line 1751 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1773 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp90_ = progress; -#line 1751 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1773 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp91_ = source_collection_destroy_marked (_tmp88_, _tmp89_, TRUE, _progress_dialog_monitor_progress_monitor, _tmp90_, NULL); -#line 1751 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1773 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" error_count = _tmp91_; -#line 1752 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1774 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp92_ = error_count; -#line 1752 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1774 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" if (_tmp92_ > 0) { -#line 11710 "ImportPage.c" +#line 11863 "ImportPage.c" gchar* error_string = NULL; gint _tmp93_ = 0; const gchar* _tmp94_ = NULL; gint _tmp95_ = 0; gchar* _tmp96_ = NULL; const gchar* _tmp97_ = NULL; -#line 1753 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1775 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp93_ = error_count; -#line 1753 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1775 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp94_ = ngettext ("Unable to delete %d photo/video from the camera due to errors.", "Unable to delete %d photos/videos from the camera due to errors.", (gulong) _tmp93_); -#line 1753 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1775 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp95_ = error_count; -#line 1753 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1775 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp96_ = g_strdup_printf (_tmp94_, _tmp95_); -#line 1753 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1775 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" error_string = _tmp96_; -#line 1757 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1779 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp97_ = error_string; -#line 1757 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1779 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" app_window_error_message (_tmp97_, NULL); -#line 1752 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1774 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_free0 (error_string); -#line 11733 "ImportPage.c" +#line 11886 "ImportPage.c" } -#line 1760 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1782 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp98_ = progress; -#line 1760 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1782 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" progress_dialog_close (_tmp98_); -#line 1763 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1785 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_object_unref0 (local_ref); -#line 1763 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1785 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" local_ref = NULL; -#line 1704 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1726 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_object_unref0 (progress); -#line 1704 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1726 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_object_unref0 (marker); -#line 1704 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1726 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_object_unref0 (local_ref); -#line 11749 "ImportPage.c" +#line 11902 "ImportPage.c" } @@ -11764,45 +11917,45 @@ static void import_page_close_import (ImportPage* self) { int _tmp3_ = 0; int _tmp4_ = 0; gboolean _tmp8_ = FALSE; -#line 1766 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1788 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" g_return_if_fail (IS_IMPORT_PAGE (self)); -#line 1767 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1789 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp0_ = self->priv->camera; -#line 1767 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1789 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp1_ = import_page_spin_idle_context; -#line 1767 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1789 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp2_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GP_TYPE_CONTEXT_WRAPPER, GPContextWrapper)->context; -#line 1767 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1789 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp3_ = gp_camera_exit (_tmp0_, _tmp2_); -#line 1767 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1789 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" res = _tmp3_; -#line 1768 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1790 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp4_ = res; -#line 1768 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1790 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" if (_tmp4_ != GP_OK) { -#line 11777 "ImportPage.c" +#line 11930 "ImportPage.c" int _tmp5_ = 0; gchar* _tmp6_ = NULL; gchar* _tmp7_ = NULL; -#line 1770 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1792 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp5_ = res; -#line 1770 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1792 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp6_ = gp_result_to_full_string (_tmp5_); -#line 1770 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1792 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp7_ = _tmp6_; -#line 1770 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - g_message ("ImportPage.vala:1770: Unable to unlock camera: %s", _tmp7_); -#line 1770 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1792 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" + g_message ("ImportPage.vala:1792: Unable to unlock camera: %s", _tmp7_); +#line 1792 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_free0 (_tmp7_); -#line 11791 "ImportPage.c" +#line 11944 "ImportPage.c" } -#line 1773 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1795 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp8_ = self->priv->refreshed; -#line 1773 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1795 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" import_page_update_status (self, FALSE, _tmp8_); -#line 1775 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1797 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" import_page_on_view_changed (self); -#line 11799 "ImportPage.c" +#line 11952 "ImportPage.c" } @@ -11810,24 +11963,24 @@ static void import_page_real_set_display_titles (CheckerboardPage* base, gboolea ImportPage * self; gboolean _tmp0_ = FALSE; gboolean _tmp1_ = FALSE; -#line 1778 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1800 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_IMPORT_PAGE, ImportPage); -#line 1779 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1801 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp0_ = display; -#line 1779 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1801 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" CHECKERBOARD_PAGE_CLASS (import_page_parent_class)->set_display_titles (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage), _tmp0_); -#line 1781 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1803 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp1_ = display; -#line 1781 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1803 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" page_set_action_active (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "ViewTitle", _tmp1_); -#line 11817 "ImportPage.c" +#line 11970 "ImportPage.c" } static gpointer _view_filter_ref0 (gpointer self) { -#line 1786 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1808 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return self ? view_filter_ref (self) : NULL; -#line 11824 "ImportPage.c" +#line 11977 "ImportPage.c" } @@ -11836,17 +11989,17 @@ static SearchViewFilter* import_page_real_get_search_view_filter (CheckerboardPa SearchViewFilter* result = NULL; ImportPageImportPageSearchViewFilter* _tmp0_ = NULL; SearchViewFilter* _tmp1_ = NULL; -#line 1785 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1807 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_IMPORT_PAGE, ImportPage); -#line 1786 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1808 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp0_ = self->priv->search_filter; -#line 1786 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1808 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp1_ = _view_filter_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_SEARCH_VIEW_FILTER, SearchViewFilter)); -#line 1786 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1808 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" result = _tmp1_; -#line 1786 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 1808 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return result; -#line 11843 "ImportPage.c" +#line 11996 "ImportPage.c" } @@ -11854,28 +12007,28 @@ static ImportPageImportViewManager* import_page_import_view_manager_construct (G ImportPageImportViewManager* self = NULL; ImportPage* _tmp0_ = NULL; ImportPage* _tmp1_ = NULL; -#line 463 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 471 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" g_return_val_if_fail (IS_IMPORT_PAGE (owner), NULL); -#line 463 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 471 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" self = (ImportPageImportViewManager*) view_manager_construct (object_type); -#line 464 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 472 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp0_ = owner; -#line 464 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 472 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp1_ = _g_object_ref0 (_tmp0_); -#line 464 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 472 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_object_unref0 (self->priv->owner); -#line 464 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 472 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" self->priv->owner = _tmp1_; -#line 463 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 471 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return self; -#line 11865 "ImportPage.c" +#line 12018 "ImportPage.c" } static ImportPageImportViewManager* import_page_import_view_manager_new (ImportPage* owner) { -#line 463 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 471 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return import_page_import_view_manager_construct (IMPORT_PAGE_TYPE_IMPORT_VIEW_MANAGER, owner); -#line 11872 "ImportPage.c" +#line 12025 "ImportPage.c" } @@ -11884,51 +12037,51 @@ static DataView* import_page_import_view_manager_real_create_view (ViewManager* DataView* result = NULL; DataSource* _tmp0_ = NULL; ImportPreview* _tmp1_ = NULL; -#line 467 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 475 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, IMPORT_PAGE_TYPE_IMPORT_VIEW_MANAGER, ImportPageImportViewManager); -#line 467 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 475 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" g_return_val_if_fail (IS_DATA_SOURCE (source), NULL); -#line 468 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 476 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp0_ = source; -#line 468 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 476 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp1_ = import_preview_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_IMPORT_SOURCE, ImportSource)); -#line 468 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 476 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" result = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_DATA_VIEW, DataView); -#line 468 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 476 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return result; -#line 11893 "ImportPage.c" +#line 12046 "ImportPage.c" } static void import_page_import_view_manager_class_init (ImportPageImportViewManagerClass * klass) { -#line 460 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 468 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" import_page_import_view_manager_parent_class = g_type_class_peek_parent (klass); -#line 460 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 468 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" ((ViewManagerClass *) klass)->finalize = import_page_import_view_manager_finalize; -#line 460 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 468 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" g_type_class_add_private (klass, sizeof (ImportPageImportViewManagerPrivate)); -#line 460 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 468 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" ((ViewManagerClass *) klass)->create_view = import_page_import_view_manager_real_create_view; -#line 11906 "ImportPage.c" +#line 12059 "ImportPage.c" } static void import_page_import_view_manager_instance_init (ImportPageImportViewManager * self) { -#line 460 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 468 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" self->priv = IMPORT_PAGE_IMPORT_VIEW_MANAGER_GET_PRIVATE (self); -#line 11913 "ImportPage.c" +#line 12066 "ImportPage.c" } static void import_page_import_view_manager_finalize (ViewManager* obj) { ImportPageImportViewManager * self; -#line 460 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 468 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, IMPORT_PAGE_TYPE_IMPORT_VIEW_MANAGER, ImportPageImportViewManager); -#line 461 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 469 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_object_unref0 (self->priv->owner); -#line 460 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 468 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" VIEW_MANAGER_CLASS (import_page_import_view_manager_parent_class)->finalize (obj); -#line 11925 "ImportPage.c" +#line 12078 "ImportPage.c" } @@ -11945,9 +12098,9 @@ static GType import_page_import_view_manager_get_type (void) { static gpointer _gp_context_wrapper_ref0 (gpointer self) { -#line 487 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 495 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return self ? gp_context_wrapper_ref (self) : NULL; -#line 11944 "ImportPage.c" +#line 12097 "ImportPage.c" } @@ -11973,134 +12126,134 @@ static ImportPageCameraImportJob* import_page_camera_import_job_construct (GType PhotoMetadata* _tmp19_ = NULL; ImportSource* _tmp20_ = NULL; time_t _tmp21_ = 0; -#line 485 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 493 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" g_return_val_if_fail (GP_IS_CONTEXT_WRAPPER (context), NULL); -#line 485 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 493 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" g_return_val_if_fail (IS_IMPORT_SOURCE (import_file), NULL); -#line 485 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 493 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" g_return_val_if_fail ((duplicated_file == NULL) || IS_DUPLICATED_FILE (duplicated_file), NULL); -#line 485 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 493 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" self = (ImportPageCameraImportJob*) batch_import_job_construct (object_type); -#line 487 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 495 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp0_ = context; -#line 487 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 495 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp1_ = _gp_context_wrapper_ref0 (_tmp0_); -#line 487 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 495 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _gp_context_wrapper_unref0 (self->priv->context); -#line 487 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 495 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" self->priv->context = _tmp1_; -#line 488 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 496 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp2_ = import_file; -#line 488 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 496 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp3_ = _g_object_ref0 (_tmp2_); -#line 488 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 496 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_object_unref0 (self->priv->import_file); -#line 488 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 496 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" self->priv->import_file = _tmp3_; -#line 489 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 497 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp4_ = duplicated_file; -#line 489 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 497 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp5_ = _g_object_ref0 (_tmp4_); -#line 489 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 497 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_object_unref0 (self->priv->duplicated_file); -#line 489 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 497 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" self->priv->duplicated_file = _tmp5_; -#line 492 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 500 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp6_ = import_file; -#line 492 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 500 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp7_ = import_source_get_camera (_tmp6_); -#line 492 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 500 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _gp_camera_unref0 (self->priv->camera); -#line 492 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 500 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" self->priv->camera = _tmp7_; -#line 493 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 501 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp8_ = import_file; -#line 493 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 501 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp9_ = import_source_get_fulldir (_tmp8_); -#line 493 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 501 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_free0 (self->priv->fulldir); -#line 493 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 501 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" self->priv->fulldir = _tmp9_; -#line 495 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 503 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp10_ = self->priv->fulldir; -#line 495 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 503 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _vala_assert (_tmp10_ != NULL, "fulldir != null"); -#line 496 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 504 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp11_ = import_file; -#line 496 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 504 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp12_ = import_source_get_filename (_tmp11_); -#line 496 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 504 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_free0 (self->priv->filename); -#line 496 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 504 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" self->priv->filename = _tmp12_; -#line 497 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 505 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp13_ = import_file; -#line 497 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 505 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp14_ = import_source_get_filesize (_tmp13_); -#line 497 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 505 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" self->priv->filesize = (guint64) _tmp14_; -#line 498 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 506 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp16_ = import_file; -#line 498 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 506 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp16_, TYPE_PHOTO_IMPORT_SOURCE)) { -#line 12040 "ImportPage.c" +#line 12193 "ImportPage.c" ImportSource* _tmp17_ = NULL; PhotoMetadata* _tmp18_ = NULL; -#line 499 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 507 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp17_ = import_file; -#line 499 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 507 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp18_ = photo_import_source_get_metadata (G_TYPE_CHECK_INSTANCE_TYPE (_tmp17_, TYPE_PHOTO_IMPORT_SOURCE) ? ((PhotoImportSource*) _tmp17_) : NULL); -#line 499 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 507 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _media_metadata_unref0 (_tmp15_); -#line 499 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 507 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp15_ = _tmp18_; -#line 12051 "ImportPage.c" +#line 12204 "ImportPage.c" } else { -#line 499 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 507 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _media_metadata_unref0 (_tmp15_); -#line 499 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 507 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp15_ = NULL; -#line 12057 "ImportPage.c" +#line 12210 "ImportPage.c" } -#line 498 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 506 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp19_ = _media_metadata_ref0 (_tmp15_); -#line 498 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 506 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _media_metadata_unref0 (self->priv->metadata); -#line 498 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 506 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" self->priv->metadata = _tmp19_; -#line 500 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 508 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp20_ = import_file; -#line 500 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 508 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp21_ = import_source_get_exposure_time (_tmp20_); -#line 500 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 508 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" self->priv->exposure_time = _tmp21_; -#line 485 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 493 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _media_metadata_unref0 (_tmp15_); -#line 485 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 493 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return self; -#line 12075 "ImportPage.c" +#line 12228 "ImportPage.c" } static ImportPageCameraImportJob* import_page_camera_import_job_new (GPContextWrapper* context, ImportSource* import_file, DuplicatedFile* duplicated_file) { -#line 485 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 493 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return import_page_camera_import_job_construct (IMPORT_PAGE_TYPE_CAMERA_IMPORT_JOB, context, import_file, duplicated_file); -#line 12082 "ImportPage.c" +#line 12235 "ImportPage.c" } static time_t import_page_camera_import_job_get_exposure_time (ImportPageCameraImportJob* self) { time_t result = 0; time_t _tmp0_ = 0; -#line 503 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 511 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" g_return_val_if_fail (IMPORT_PAGE_IS_CAMERA_IMPORT_JOB (self), 0); -#line 504 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 512 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp0_ = self->priv->exposure_time; -#line 504 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 512 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" result = _tmp0_; -#line 504 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 512 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return result; -#line 12097 "ImportPage.c" +#line 12250 "ImportPage.c" } @@ -12109,17 +12262,17 @@ static DuplicatedFile* import_page_camera_import_job_real_get_duplicated_file (B DuplicatedFile* result = NULL; DuplicatedFile* _tmp0_ = NULL; DuplicatedFile* _tmp1_ = NULL; -#line 507 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 515 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, IMPORT_PAGE_TYPE_CAMERA_IMPORT_JOB, ImportPageCameraImportJob); -#line 508 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 516 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp0_ = self->priv->duplicated_file; -#line 508 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 516 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp1_ = _g_object_ref0 (_tmp0_); -#line 508 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 516 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" result = _tmp1_; -#line 508 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 516 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return result; -#line 12116 "ImportPage.c" +#line 12269 "ImportPage.c" } @@ -12128,29 +12281,29 @@ static time_t import_page_camera_import_job_real_get_exposure_time_override (Bat time_t result = 0; time_t _tmp0_ = 0; ImportSource* _tmp1_ = NULL; -#line 511 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 519 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, IMPORT_PAGE_TYPE_CAMERA_IMPORT_JOB, ImportPageCameraImportJob); -#line 512 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 520 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp1_ = self->priv->import_file; -#line 512 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 520 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp1_, TYPE_VIDEO_IMPORT_SOURCE)) { -#line 12131 "ImportPage.c" +#line 12284 "ImportPage.c" time_t _tmp2_ = 0; -#line 512 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 520 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp2_ = import_page_camera_import_job_get_exposure_time (self); -#line 512 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 520 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp0_ = _tmp2_; -#line 12137 "ImportPage.c" +#line 12290 "ImportPage.c" } else { -#line 512 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 520 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp0_ = (time_t) 0; -#line 12141 "ImportPage.c" +#line 12294 "ImportPage.c" } -#line 512 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 520 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" result = _tmp0_; -#line 512 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 520 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return result; -#line 12147 "ImportPage.c" +#line 12300 "ImportPage.c" } @@ -12159,17 +12312,17 @@ static gchar* import_page_camera_import_job_real_get_dest_identifier (BatchImpor gchar* result = NULL; const gchar* _tmp0_ = NULL; gchar* _tmp1_ = NULL; -#line 515 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 523 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, IMPORT_PAGE_TYPE_CAMERA_IMPORT_JOB, ImportPageCameraImportJob); -#line 516 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 524 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp0_ = self->priv->filename; -#line 516 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 524 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp1_ = g_strdup (_tmp0_); -#line 516 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 524 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" result = _tmp1_; -#line 516 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 524 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return result; -#line 12166 "ImportPage.c" +#line 12319 "ImportPage.c" } @@ -12178,17 +12331,17 @@ static gchar* import_page_camera_import_job_real_get_source_identifier (BatchImp gchar* result = NULL; ImportSource* _tmp0_ = NULL; gchar* _tmp1_ = NULL; -#line 519 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 527 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, IMPORT_PAGE_TYPE_CAMERA_IMPORT_JOB, ImportPageCameraImportJob); -#line 520 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 528 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp0_ = self->priv->import_file; -#line 520 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 528 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp1_ = import_source_get_filename (_tmp0_); -#line 520 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 528 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" result = _tmp1_; -#line 520 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 528 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return result; -#line 12185 "ImportPage.c" +#line 12338 "ImportPage.c" } @@ -12197,17 +12350,17 @@ static gchar* import_page_camera_import_job_real_get_basename (BatchImportJob* b gchar* result = NULL; const gchar* _tmp0_ = NULL; gchar* _tmp1_ = NULL; -#line 523 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 531 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, IMPORT_PAGE_TYPE_CAMERA_IMPORT_JOB, ImportPageCameraImportJob); -#line 524 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 532 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp0_ = self->priv->filename; -#line 524 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 532 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp1_ = g_strdup (_tmp0_); -#line 524 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 532 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" result = _tmp1_; -#line 524 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 532 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return result; -#line 12204 "ImportPage.c" +#line 12357 "ImportPage.c" } @@ -12216,17 +12369,17 @@ static gchar* import_page_camera_import_job_real_get_path (BatchImportJob* base) gchar* result = NULL; const gchar* _tmp0_ = NULL; gchar* _tmp1_ = NULL; -#line 527 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 535 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, IMPORT_PAGE_TYPE_CAMERA_IMPORT_JOB, ImportPageCameraImportJob); -#line 528 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 536 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp0_ = self->priv->fulldir; -#line 528 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 536 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp1_ = g_strdup (_tmp0_); -#line 528 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 536 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" result = _tmp1_; -#line 528 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 536 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return result; -#line 12223 "ImportPage.c" +#line 12376 "ImportPage.c" } @@ -12234,19 +12387,19 @@ static void import_page_camera_import_job_real_set_associated (BatchImportJob* b ImportPageCameraImportJob * self; BatchImportJob* _tmp0_ = NULL; ImportPageCameraImportJob* _tmp1_ = NULL; -#line 531 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 539 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, IMPORT_PAGE_TYPE_CAMERA_IMPORT_JOB, ImportPageCameraImportJob); -#line 531 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 539 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" g_return_if_fail (IS_BATCH_IMPORT_JOB (associated)); -#line 532 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 540 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp0_ = associated; -#line 532 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 540 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp1_ = _batch_import_job_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp0_, IMPORT_PAGE_TYPE_CAMERA_IMPORT_JOB) ? ((ImportPageCameraImportJob*) _tmp0_) : NULL); -#line 532 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 540 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _batch_import_job_unref0 (self->priv->associated); -#line 532 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 540 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" self->priv->associated = _tmp1_; -#line 12243 "ImportPage.c" +#line 12396 "ImportPage.c" } @@ -12254,30 +12407,30 @@ static ImportSource* import_page_camera_import_job_get_source (ImportPageCameraI ImportSource* result = NULL; ImportSource* _tmp0_ = NULL; ImportSource* _tmp1_ = NULL; -#line 535 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 543 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" g_return_val_if_fail (IMPORT_PAGE_IS_CAMERA_IMPORT_JOB (self), NULL); -#line 536 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 544 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp0_ = self->priv->import_file; -#line 536 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 544 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp1_ = _g_object_ref0 (_tmp0_); -#line 536 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 544 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" result = _tmp1_; -#line 536 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 544 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return result; -#line 12261 "ImportPage.c" +#line 12414 "ImportPage.c" } static gboolean import_page_camera_import_job_real_is_directory (BatchImportJob* base) { ImportPageCameraImportJob * self; gboolean result = FALSE; -#line 539 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 547 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, IMPORT_PAGE_TYPE_CAMERA_IMPORT_JOB, ImportPageCameraImportJob); -#line 540 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 548 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" result = FALSE; -#line 540 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 548 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return result; -#line 12274 "ImportPage.c" +#line 12427 "ImportPage.c" } @@ -12287,37 +12440,37 @@ static gboolean import_page_camera_import_job_real_determine_file_size (BatchImp GFile* _vala_file = NULL; gboolean result = FALSE; guint64 _tmp0_ = 0ULL; -#line 543 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 551 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, IMPORT_PAGE_TYPE_CAMERA_IMPORT_JOB, ImportPageCameraImportJob); -#line 544 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 552 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_object_unref0 (_vala_file); -#line 544 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 552 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _vala_file = NULL; -#line 545 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 553 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp0_ = self->priv->filesize; -#line 545 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 553 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _vala_filesize = _tmp0_; -#line 547 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 555 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" result = TRUE; -#line 547 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 555 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" if (filesize) { -#line 547 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 555 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" *filesize = _vala_filesize; -#line 12300 "ImportPage.c" +#line 12453 "ImportPage.c" } -#line 547 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 555 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" if (file) { -#line 547 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 555 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" *file = _vala_file; -#line 12306 "ImportPage.c" +#line 12459 "ImportPage.c" } else { -#line 547 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 555 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_object_unref0 (_vala_file); -#line 12310 "ImportPage.c" +#line 12463 "ImportPage.c" } -#line 547 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 555 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return result; -#line 12314 "ImportPage.c" +#line 12467 "ImportPage.c" } @@ -12333,17 +12486,17 @@ static gboolean import_page_camera_import_job_real_prepare (BatchImportJob* base GFile* _tmp55_ = NULL; GFile* _tmp56_ = NULL; GError * _inner_error_ = NULL; -#line 550 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 558 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, IMPORT_PAGE_TYPE_CAMERA_IMPORT_JOB, ImportPageCameraImportJob); -#line 551 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 559 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_object_unref0 (_vala_file_to_import); -#line 551 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 559 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _vala_file_to_import = NULL; -#line 552 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 560 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _vala_copy_to_library = FALSE; -#line 554 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 562 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" dest_file = NULL; -#line 12340 "ImportPage.c" +#line 12493 "ImportPage.c" { gboolean collision = FALSE; GFile* _tmp0_ = NULL; @@ -12353,37 +12506,37 @@ static gboolean import_page_camera_import_job_real_prepare (BatchImportJob* base gboolean _tmp4_ = FALSE; GFile* _tmp5_ = NULL; GFile* _tmp6_ = NULL; -#line 557 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 565 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp1_ = self->priv->filename; -#line 557 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 565 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp2_ = self->priv->metadata; -#line 557 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 565 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp3_ = self->priv->exposure_time; -#line 557 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 565 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp5_ = library_files_generate_unique_file (_tmp1_, G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_MEDIA_METADATA, MediaMetadata), _tmp3_, &_tmp4_, &_inner_error_); -#line 557 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 565 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" collision = _tmp4_; -#line 557 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 565 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp0_ = _tmp5_; -#line 557 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 565 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 12364 "ImportPage.c" - goto __catch69_g_error; +#line 12517 "ImportPage.c" + goto __catch71_g_error; } -#line 557 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 565 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp6_ = _tmp0_; -#line 557 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 565 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp0_ = NULL; -#line 557 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 565 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_object_unref0 (dest_file); -#line 557 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 565 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" dest_file = _tmp6_; -#line 555 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 563 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_object_unref0 (_tmp0_); -#line 12377 "ImportPage.c" +#line 12530 "ImportPage.c" } - goto __finally69; - __catch69_g_error: + goto __finally71; + __catch71_g_error: { GError* err = NULL; ImportSource* _tmp7_ = NULL; @@ -12391,86 +12544,86 @@ static gboolean import_page_camera_import_job_real_prepare (BatchImportJob* base gchar* _tmp9_ = NULL; GError* _tmp10_ = NULL; const gchar* _tmp11_ = NULL; -#line 555 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 563 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" err = _inner_error_; -#line 555 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 563 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _inner_error_ = NULL; -#line 560 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 568 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp7_ = self->priv->import_file; -#line 560 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 568 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp8_ = import_source_get_filename (_tmp7_); -#line 560 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 568 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp9_ = _tmp8_; -#line 560 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 568 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp10_ = err; -#line 560 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 568 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp11_ = _tmp10_->message; -#line 560 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - g_warning ("ImportPage.vala:560: Unable to generate local file for %s: %s", _tmp9_, _tmp11_); -#line 560 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 568 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" + g_warning ("ImportPage.vala:568: Unable to generate local file for %s: %s", _tmp9_, _tmp11_); +#line 568 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_free0 (_tmp9_); -#line 555 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 563 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_error_free0 (err); -#line 12408 "ImportPage.c" +#line 12561 "ImportPage.c" } - __finally69: -#line 555 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" + __finally71: +#line 563 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 555 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 563 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" g_propagate_error (error, _inner_error_); -#line 555 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 563 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_object_unref0 (dest_file); -#line 555 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 563 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return FALSE; -#line 12419 "ImportPage.c" +#line 12572 "ImportPage.c" } -#line 564 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 572 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp12_ = dest_file; -#line 564 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 572 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" if (_tmp12_ == NULL) { -#line 12425 "ImportPage.c" +#line 12578 "ImportPage.c" ImportSource* _tmp13_ = NULL; gchar* _tmp14_ = NULL; gchar* _tmp15_ = NULL; -#line 565 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 573 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp13_ = self->priv->import_file; -#line 565 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 573 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp14_ = import_source_get_filename (_tmp13_); -#line 565 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 573 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp15_ = _tmp14_; -#line 565 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - g_message ("ImportPage.vala:565: Unable to generate local file for %s", _tmp15_); -#line 565 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 573 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" + g_message ("ImportPage.vala:573: Unable to generate local file for %s", _tmp15_); +#line 573 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_free0 (_tmp15_); -#line 567 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 575 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" result = FALSE; -#line 567 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 575 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_object_unref0 (dest_file); -#line 567 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 575 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" if (file_to_import) { -#line 567 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 575 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" *file_to_import = _vala_file_to_import; -#line 12447 "ImportPage.c" +#line 12600 "ImportPage.c" } else { -#line 567 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 575 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_object_unref0 (_vala_file_to_import); -#line 12451 "ImportPage.c" +#line 12604 "ImportPage.c" } -#line 567 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 575 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" if (copy_to_library) { -#line 567 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 575 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" *copy_to_library = _vala_copy_to_library; -#line 12457 "ImportPage.c" +#line 12610 "ImportPage.c" } -#line 567 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 575 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return result; -#line 12461 "ImportPage.c" +#line 12614 "ImportPage.c" } -#line 572 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 580 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp16_ = dest_file; -#line 572 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 580 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" library_monitor_blacklist_file (_tmp16_, "CameraImportJob.prepare"); -#line 12467 "ImportPage.c" +#line 12620 "ImportPage.c" { GPContextWrapper* _tmp17_ = NULL; GPContext* _tmp18_ = NULL; @@ -12478,50 +12631,50 @@ static gboolean import_page_camera_import_job_real_prepare (BatchImportJob* base const gchar* _tmp20_ = NULL; const gchar* _tmp21_ = NULL; GFile* _tmp22_ = NULL; -#line 574 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 582 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp17_ = self->priv->context; -#line 574 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 582 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp18_ = _tmp17_->context; -#line 574 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 582 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp19_ = self->priv->camera; -#line 574 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 582 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp20_ = self->priv->fulldir; -#line 574 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 582 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp21_ = self->priv->filename; -#line 574 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 582 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp22_ = dest_file; -#line 574 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 582 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" gp_save_image (_tmp18_, _tmp19_, _tmp20_, _tmp21_, _tmp22_, &_inner_error_); -#line 574 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 582 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 12491 "ImportPage.c" - goto __finally70; +#line 12644 "ImportPage.c" + goto __finally72; } } - __finally70: + __finally72: { GFile* _tmp23_ = NULL; -#line 576 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 584 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp23_ = dest_file; -#line 576 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 584 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" library_monitor_unblacklist_file (_tmp23_); -#line 12502 "ImportPage.c" +#line 12655 "ImportPage.c" } -#line 573 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 581 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 573 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 581 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" g_propagate_error (error, _inner_error_); -#line 573 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 581 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_object_unref0 (dest_file); -#line 573 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 581 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return FALSE; -#line 12512 "ImportPage.c" +#line 12665 "ImportPage.c" } -#line 580 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 588 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp24_ = self->priv->associated; -#line 580 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 588 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" if (_tmp24_ != NULL) { -#line 12518 "ImportPage.c" +#line 12671 "ImportPage.c" BackingPhotoRow* _tmp39_ = NULL; GFile* assoc_dest = NULL; BackingPhotoRow* _tmp42_ = NULL; @@ -12539,133 +12692,133 @@ static gboolean import_page_camera_import_job_real_prepare (BatchImportJob* base BackingPhotoRow* _tmp32_ = NULL; BackingPhotoRow* _tmp33_ = NULL; BackingPhotoRow* _tmp34_ = NULL; -#line 583 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 591 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp26_ = dest_file; -#line 583 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 591 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp27_ = g_file_get_path (_tmp26_); -#line 583 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 591 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp28_ = _tmp27_; -#line 583 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 591 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp29_ = self->priv->associated; -#line 583 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 591 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp30_ = batch_import_job_get_basename (G_TYPE_CHECK_INSTANCE_CAST (_tmp29_, TYPE_BATCH_IMPORT_JOB, BatchImportJob)); -#line 583 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 591 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp31_ = _tmp30_; -#line 583 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 591 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp32_ = raw_developer_create_backing_row_for_development (RAW_DEVELOPER_CAMERA, _tmp28_, _tmp31_, &_inner_error_); -#line 583 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 591 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp33_ = _tmp32_; -#line 583 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 591 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_free0 (_tmp31_); -#line 583 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 591 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_free0 (_tmp28_); -#line 583 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 591 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp25_ = _tmp33_; -#line 583 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 591 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 12560 "ImportPage.c" - goto __catch71_g_error; +#line 12713 "ImportPage.c" + goto __catch73_g_error; } -#line 582 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 590 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp34_ = _tmp25_; -#line 582 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 590 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp25_ = NULL; -#line 582 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 590 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _backing_photo_row_unref0 (self->priv->associated_file); -#line 582 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 590 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" self->priv->associated_file = _tmp34_; -#line 581 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 589 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _backing_photo_row_unref0 (_tmp25_); -#line 12573 "ImportPage.c" +#line 12726 "ImportPage.c" } - goto __finally71; - __catch71_g_error: + goto __finally73; + __catch73_g_error: { GError* err = NULL; ImportPageCameraImportJob* _tmp35_ = NULL; const gchar* _tmp36_ = NULL; GError* _tmp37_ = NULL; const gchar* _tmp38_ = NULL; -#line 581 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 589 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" err = _inner_error_; -#line 581 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 589 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _inner_error_ = NULL; -#line 586 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 594 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp35_ = self->priv->associated; -#line 586 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 594 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp36_ = _tmp35_->priv->filename; -#line 586 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 594 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp37_ = err; -#line 586 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 594 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp38_ = _tmp37_->message; -#line 586 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - g_warning ("ImportPage.vala:586: Unable to generate backing associated file for %s" \ +#line 594 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" + g_warning ("ImportPage.vala:594: Unable to generate backing associated file for %s" \ ": %s", _tmp36_, _tmp38_); -#line 581 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 589 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_error_free0 (err); -#line 12599 "ImportPage.c" +#line 12752 "ImportPage.c" } - __finally71: -#line 581 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" + __finally73: +#line 589 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 581 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 589 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" g_propagate_error (error, _inner_error_); -#line 581 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 589 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_object_unref0 (dest_file); -#line 581 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 589 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return FALSE; -#line 12610 "ImportPage.c" +#line 12763 "ImportPage.c" } -#line 590 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 598 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp39_ = self->priv->associated_file; -#line 590 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 598 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" if (_tmp39_ == NULL) { -#line 12616 "ImportPage.c" +#line 12769 "ImportPage.c" ImportPageCameraImportJob* _tmp40_ = NULL; const gchar* _tmp41_ = NULL; -#line 591 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 599 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp40_ = self->priv->associated; -#line 591 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 599 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp41_ = _tmp40_->priv->filename; -#line 591 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - g_message ("ImportPage.vala:591: Unable to generate backing associated file for %s", _tmp41_); -#line 592 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 599 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" + g_message ("ImportPage.vala:599: Unable to generate backing associated file for %s", _tmp41_); +#line 600 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" result = FALSE; -#line 592 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 600 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_object_unref0 (dest_file); -#line 592 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 600 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" if (file_to_import) { -#line 592 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 600 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" *file_to_import = _vala_file_to_import; -#line 12633 "ImportPage.c" +#line 12786 "ImportPage.c" } else { -#line 592 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 600 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_object_unref0 (_vala_file_to_import); -#line 12637 "ImportPage.c" +#line 12790 "ImportPage.c" } -#line 592 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 600 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" if (copy_to_library) { -#line 592 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 600 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" *copy_to_library = _vala_copy_to_library; -#line 12643 "ImportPage.c" +#line 12796 "ImportPage.c" } -#line 592 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 600 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return result; -#line 12647 "ImportPage.c" +#line 12800 "ImportPage.c" } -#line 595 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 603 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp42_ = self->priv->associated_file; -#line 595 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 603 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp43_ = _tmp42_->filepath; -#line 595 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 603 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp44_ = g_file_new_for_path (_tmp43_); -#line 595 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 603 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" assoc_dest = _tmp44_; -#line 596 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 604 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp45_ = assoc_dest; -#line 596 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 604 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" library_monitor_blacklist_file (_tmp45_, "CameraImportJob.prepare"); -#line 12661 "ImportPage.c" +#line 12814 "ImportPage.c" { GPContextWrapper* _tmp46_ = NULL; GPContext* _tmp47_ = NULL; @@ -12675,88 +12828,88 @@ static gboolean import_page_camera_import_job_real_prepare (BatchImportJob* base ImportPageCameraImportJob* _tmp51_ = NULL; const gchar* _tmp52_ = NULL; GFile* _tmp53_ = NULL; -#line 598 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 606 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp46_ = self->priv->context; -#line 598 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 606 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp47_ = _tmp46_->context; -#line 598 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 606 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp48_ = self->priv->camera; -#line 598 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 606 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp49_ = self->priv->associated; -#line 598 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 606 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp50_ = _tmp49_->priv->fulldir; -#line 598 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 606 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp51_ = self->priv->associated; -#line 598 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 606 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp52_ = _tmp51_->priv->filename; -#line 598 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 606 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp53_ = assoc_dest; -#line 598 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 606 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" gp_save_image (_tmp47_, _tmp48_, _tmp50_, _tmp52_, _tmp53_, &_inner_error_); -#line 598 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 606 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 12691 "ImportPage.c" - goto __finally72; +#line 12844 "ImportPage.c" + goto __finally74; } } - __finally72: + __finally74: { GFile* _tmp54_ = NULL; -#line 601 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 609 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp54_ = assoc_dest; -#line 601 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 609 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" library_monitor_unblacklist_file (_tmp54_); -#line 12702 "ImportPage.c" +#line 12855 "ImportPage.c" } -#line 597 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 605 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 597 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 605 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" g_propagate_error (error, _inner_error_); -#line 597 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 605 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_object_unref0 (assoc_dest); -#line 597 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 605 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_object_unref0 (dest_file); -#line 597 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 605 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return FALSE; -#line 12714 "ImportPage.c" +#line 12867 "ImportPage.c" } -#line 580 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 588 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_object_unref0 (assoc_dest); -#line 12718 "ImportPage.c" +#line 12871 "ImportPage.c" } -#line 605 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 613 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp55_ = dest_file; -#line 605 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 613 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp56_ = _g_object_ref0 (_tmp55_); -#line 605 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 613 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_object_unref0 (_vala_file_to_import); -#line 605 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 613 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _vala_file_to_import = _tmp56_; -#line 606 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 614 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _vala_copy_to_library = FALSE; -#line 608 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 616 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" result = TRUE; -#line 608 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 616 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_object_unref0 (dest_file); -#line 608 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 616 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" if (file_to_import) { -#line 608 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 616 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" *file_to_import = _vala_file_to_import; -#line 12738 "ImportPage.c" +#line 12891 "ImportPage.c" } else { -#line 608 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 616 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_object_unref0 (_vala_file_to_import); -#line 12742 "ImportPage.c" +#line 12895 "ImportPage.c" } -#line 608 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 616 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" if (copy_to_library) { -#line 608 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 616 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" *copy_to_library = _vala_copy_to_library; -#line 12748 "ImportPage.c" +#line 12901 "ImportPage.c" } -#line 608 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 616 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return result; -#line 12752 "ImportPage.c" +#line 12905 "ImportPage.c" } @@ -12766,153 +12919,153 @@ static gboolean import_page_camera_import_job_real_complete (BatchImportJob* bas gboolean ret = FALSE; MediaSource* _tmp0_ = NULL; GError * _inner_error_ = NULL; -#line 611 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 619 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, IMPORT_PAGE_TYPE_CAMERA_IMPORT_JOB, ImportPageCameraImportJob); -#line 611 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 619 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" g_return_val_if_fail (IS_MEDIA_SOURCE (source), FALSE); -#line 611 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 619 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" g_return_val_if_fail (IS_BATCH_IMPORT_ROLL (import_roll), FALSE); -#line 612 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 620 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" ret = FALSE; -#line 613 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 621 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp0_ = source; -#line 613 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 621 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp0_, TYPE_PHOTO)) { -#line 12774 "ImportPage.c" +#line 12927 "ImportPage.c" Photo* photo = NULL; MediaSource* _tmp1_ = NULL; Photo* _tmp2_ = NULL; BackingPhotoRow* _tmp3_ = NULL; -#line 614 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 622 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp1_ = source; -#line 614 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 622 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp2_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp1_, TYPE_PHOTO) ? ((Photo*) _tmp1_) : NULL); -#line 614 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 622 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" photo = _tmp2_; -#line 617 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 625 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp3_ = self->priv->associated_file; -#line 617 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 625 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" if (_tmp3_ != NULL) { -#line 12789 "ImportPage.c" +#line 12942 "ImportPage.c" Photo* _tmp4_ = NULL; BackingPhotoRow* _tmp5_ = NULL; Photo* _tmp6_ = NULL; ConfigFacade* _tmp7_ = NULL; ConfigFacade* _tmp8_ = NULL; RawDeveloper _tmp9_ = 0; -#line 618 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 626 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp4_ = photo; -#line 618 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 626 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp5_ = self->priv->associated_file; -#line 618 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 626 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" photo_add_backing_photo_for_development (_tmp4_, RAW_DEVELOPER_CAMERA, _tmp5_, &_inner_error_); -#line 618 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 626 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 618 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 626 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" g_propagate_error (error, _inner_error_); -#line 618 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 626 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_object_unref0 (photo); -#line 618 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 626 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return FALSE; -#line 12810 "ImportPage.c" +#line 12963 "ImportPage.c" } -#line 619 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 627 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" ret = TRUE; -#line 620 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 628 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp6_ = photo; -#line 620 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 628 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp7_ = config_facade_get_instance (); -#line 620 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 628 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp8_ = _tmp7_; -#line 620 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 628 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp9_ = configuration_facade_get_default_raw_developer (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade)); -#line 620 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 628 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" photo_set_raw_developer (_tmp6_, _tmp9_); -#line 620 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 628 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_object_unref0 (_tmp8_); -#line 12826 "ImportPage.c" +#line 12979 "ImportPage.c" } -#line 613 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 621 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_object_unref0 (photo); -#line 12830 "ImportPage.c" +#line 12983 "ImportPage.c" } -#line 623 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 631 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" result = ret; -#line 623 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 631 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return result; -#line 12836 "ImportPage.c" +#line 12989 "ImportPage.c" } static void import_page_camera_import_job_class_init (ImportPageCameraImportJobClass * klass) { -#line 472 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 480 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" import_page_camera_import_job_parent_class = g_type_class_peek_parent (klass); -#line 472 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 480 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" ((BatchImportJobClass *) klass)->finalize = import_page_camera_import_job_finalize; -#line 472 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 480 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" g_type_class_add_private (klass, sizeof (ImportPageCameraImportJobPrivate)); -#line 472 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 480 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" ((BatchImportJobClass *) klass)->get_duplicated_file = import_page_camera_import_job_real_get_duplicated_file; -#line 472 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 480 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" ((BatchImportJobClass *) klass)->get_exposure_time_override = import_page_camera_import_job_real_get_exposure_time_override; -#line 472 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 480 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" ((BatchImportJobClass *) klass)->get_dest_identifier = import_page_camera_import_job_real_get_dest_identifier; -#line 472 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 480 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" ((BatchImportJobClass *) klass)->get_source_identifier = import_page_camera_import_job_real_get_source_identifier; -#line 472 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 480 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" ((BatchImportJobClass *) klass)->get_basename = import_page_camera_import_job_real_get_basename; -#line 472 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 480 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" ((BatchImportJobClass *) klass)->get_path = import_page_camera_import_job_real_get_path; -#line 472 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 480 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" ((BatchImportJobClass *) klass)->set_associated = import_page_camera_import_job_real_set_associated; -#line 472 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 480 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" ((BatchImportJobClass *) klass)->is_directory = import_page_camera_import_job_real_is_directory; -#line 472 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 480 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" ((BatchImportJobClass *) klass)->determine_file_size = import_page_camera_import_job_real_determine_file_size; -#line 472 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 480 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" ((BatchImportJobClass *) klass)->prepare = import_page_camera_import_job_real_prepare; -#line 472 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 480 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" ((BatchImportJobClass *) klass)->complete = import_page_camera_import_job_real_complete; -#line 12869 "ImportPage.c" +#line 13022 "ImportPage.c" } static void import_page_camera_import_job_instance_init (ImportPageCameraImportJob * self) { -#line 472 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 480 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" self->priv = IMPORT_PAGE_CAMERA_IMPORT_JOB_GET_PRIVATE (self); -#line 481 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 489 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" self->priv->associated = NULL; -#line 482 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 490 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" self->priv->associated_file = NULL; -#line 12880 "ImportPage.c" +#line 13033 "ImportPage.c" } static void import_page_camera_import_job_finalize (BatchImportJob* obj) { ImportPageCameraImportJob * self; -#line 472 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 480 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, IMPORT_PAGE_TYPE_CAMERA_IMPORT_JOB, ImportPageCameraImportJob); -#line 473 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 481 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _gp_context_wrapper_unref0 (self->priv->context); -#line 474 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 482 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_object_unref0 (self->priv->import_file); -#line 475 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 483 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _gp_camera_unref0 (self->priv->camera); -#line 476 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 484 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_free0 (self->priv->fulldir); -#line 477 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 485 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_free0 (self->priv->filename); -#line 479 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 487 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _media_metadata_unref0 (self->priv->metadata); -#line 481 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 489 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _batch_import_job_unref0 (self->priv->associated); -#line 482 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 490 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _backing_photo_row_unref0 (self->priv->associated_file); -#line 483 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 491 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_object_unref0 (self->priv->duplicated_file); -#line 472 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 480 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" BATCH_IMPORT_JOB_CLASS (import_page_camera_import_job_parent_class)->finalize (obj); -#line 12908 "ImportPage.c" +#line 13061 "ImportPage.c" } @@ -12931,13 +13084,13 @@ static GType import_page_camera_import_job_get_type (void) { static guint import_page_import_page_search_view_filter_real_get_criteria (SearchViewFilter* base) { ImportPageImportPageSearchViewFilter * self; guint result = 0U; -#line 628 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 636 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, IMPORT_PAGE_TYPE_IMPORT_PAGE_SEARCH_VIEW_FILTER, ImportPageImportPageSearchViewFilter); -#line 629 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 637 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" result = (guint) (SEARCH_FILTER_CRITERIA_TEXT | SEARCH_FILTER_CRITERIA_MEDIA); -#line 629 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 637 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return result; -#line 12933 "ImportPage.c" +#line 13086 "ImportPage.c" } @@ -12945,19 +13098,19 @@ static gboolean string_contains (const gchar* self, const gchar* needle) { gboolean result = FALSE; const gchar* _tmp0_ = NULL; gchar* _tmp1_ = NULL; -#line 1376 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1376 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" g_return_val_if_fail (self != NULL, FALSE); -#line 1376 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1376 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" g_return_val_if_fail (needle != NULL, FALSE); -#line 1377 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1377 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp0_ = needle; -#line 1377 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1377 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp1_ = strstr ((gchar*) self, (gchar*) _tmp0_); -#line 1377 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1377 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" result = _tmp1_ != NULL; -#line 1377 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1377 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" return result; -#line 12953 "ImportPage.c" +#line 13106 "ImportPage.c" } @@ -12970,186 +13123,186 @@ static gboolean import_page_import_page_search_view_filter_real_predicate (ViewF gboolean _tmp2_ = FALSE; guint _tmp3_ = 0U; guint _tmp26_ = 0U; -#line 632 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 640 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, IMPORT_PAGE_TYPE_IMPORT_PAGE_SEARCH_VIEW_FILTER, ImportPageImportPageSearchViewFilter); -#line 632 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 640 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" g_return_val_if_fail (IS_DATA_VIEW (view), FALSE); -#line 633 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 641 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp0_ = view; -#line 633 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 641 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp1_ = import_preview_get_import_source (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_IMPORT_PREVIEW, ImportPreview)); -#line 633 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 641 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" source = _tmp1_; -#line 636 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 644 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp3_ = search_view_filter_get_criteria (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SEARCH_VIEW_FILTER, SearchViewFilter)); -#line 636 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 644 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" if ((gboolean) (SEARCH_FILTER_CRITERIA_MEDIA & _tmp3_)) { -#line 12980 "ImportPage.c" +#line 13133 "ImportPage.c" gboolean _tmp4_ = FALSE; -#line 636 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 644 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp4_ = search_view_filter_filter_by_media_type (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SEARCH_VIEW_FILTER, SearchViewFilter)); -#line 636 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 644 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp2_ = _tmp4_; -#line 12986 "ImportPage.c" +#line 13139 "ImportPage.c" } else { -#line 636 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 644 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp2_ = FALSE; -#line 12990 "ImportPage.c" +#line 13143 "ImportPage.c" } -#line 636 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 644 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" if (_tmp2_) { -#line 12994 "ImportPage.c" +#line 13147 "ImportPage.c" ImportSource* _tmp5_ = NULL; -#line 637 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 645 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp5_ = source; -#line 637 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 645 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp5_, TYPE_VIDEO_IMPORT_SOURCE)) { -#line 13000 "ImportPage.c" +#line 13153 "ImportPage.c" gboolean _tmp6_ = FALSE; gboolean _tmp7_ = FALSE; -#line 638 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 646 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp6_ = search_view_filter_get_show_media_video (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SEARCH_VIEW_FILTER, SearchViewFilter)); -#line 638 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 646 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp7_ = _tmp6_; -#line 638 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 646 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" if (!_tmp7_) { -#line 639 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 647 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" result = FALSE; -#line 639 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 647 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_object_unref0 (source); -#line 639 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 647 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return result; -#line 13015 "ImportPage.c" +#line 13168 "ImportPage.c" } } else { ImportSource* _tmp8_ = NULL; -#line 640 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 648 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp8_ = source; -#line 640 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 648 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp8_, TYPE_PHOTO_IMPORT_SOURCE)) { -#line 13023 "ImportPage.c" +#line 13176 "ImportPage.c" PhotoImportSource* photo = NULL; ImportSource* _tmp9_ = NULL; PhotoImportSource* _tmp10_ = NULL; PhotoImportSource* _tmp11_ = NULL; PhotoFileFormat _tmp12_ = 0; -#line 641 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 649 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp9_ = source; -#line 641 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 649 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp10_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp9_, TYPE_PHOTO_IMPORT_SOURCE) ? ((PhotoImportSource*) _tmp9_) : NULL); -#line 641 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 649 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" photo = _tmp10_; -#line 642 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 650 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp11_ = photo; -#line 642 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 650 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp12_ = photo_import_source_get_file_format (_tmp11_); -#line 642 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 650 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" if (_tmp12_ == PHOTO_FILE_FORMAT_RAW) { -#line 13041 "ImportPage.c" +#line 13194 "ImportPage.c" PhotoImportSource* _tmp13_ = NULL; PhotoImportSource* _tmp14_ = NULL; PhotoImportSource* _tmp15_ = NULL; gboolean _tmp16_ = FALSE; -#line 643 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 651 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp13_ = photo; -#line 643 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 651 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp14_ = photo_import_source_get_associated (_tmp13_); -#line 643 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 651 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp15_ = _tmp14_; -#line 643 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 651 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp16_ = _tmp15_ != NULL; -#line 643 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 651 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_object_unref0 (_tmp15_); -#line 643 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 651 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" if (_tmp16_) { -#line 13058 "ImportPage.c" +#line 13211 "ImportPage.c" gboolean _tmp17_ = FALSE; gboolean _tmp18_ = FALSE; gboolean _tmp19_ = FALSE; -#line 644 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 652 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp18_ = search_view_filter_get_show_media_photos (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SEARCH_VIEW_FILTER, SearchViewFilter)); -#line 644 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 652 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp19_ = _tmp18_; -#line 644 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 652 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" if (!_tmp19_) { -#line 13068 "ImportPage.c" +#line 13221 "ImportPage.c" gboolean _tmp20_ = FALSE; gboolean _tmp21_ = FALSE; -#line 644 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 652 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp20_ = search_view_filter_get_show_media_raw (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SEARCH_VIEW_FILTER, SearchViewFilter)); -#line 644 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 652 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp21_ = _tmp20_; -#line 644 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 652 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp17_ = !_tmp21_; -#line 13077 "ImportPage.c" +#line 13230 "ImportPage.c" } else { -#line 644 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 652 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp17_ = FALSE; -#line 13081 "ImportPage.c" +#line 13234 "ImportPage.c" } -#line 644 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 652 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" if (_tmp17_) { -#line 645 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 653 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" result = FALSE; -#line 645 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 653 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_object_unref0 (photo); -#line 645 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 653 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_object_unref0 (source); -#line 645 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 653 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return result; -#line 13093 "ImportPage.c" +#line 13246 "ImportPage.c" } } else { gboolean _tmp22_ = FALSE; gboolean _tmp23_ = FALSE; -#line 646 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 654 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp22_ = search_view_filter_get_show_media_raw (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SEARCH_VIEW_FILTER, SearchViewFilter)); -#line 646 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 654 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp23_ = _tmp22_; -#line 646 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 654 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" if (!_tmp23_) { -#line 647 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 655 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" result = FALSE; -#line 647 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 655 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_object_unref0 (photo); -#line 647 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 655 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_object_unref0 (source); -#line 647 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 655 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return result; -#line 13112 "ImportPage.c" +#line 13265 "ImportPage.c" } } } else { gboolean _tmp24_ = FALSE; gboolean _tmp25_ = FALSE; -#line 649 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 657 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp24_ = search_view_filter_get_show_media_photos (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SEARCH_VIEW_FILTER, SearchViewFilter)); -#line 649 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 657 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp25_ = _tmp24_; -#line 649 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 657 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" if (!_tmp25_) { -#line 650 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 658 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" result = FALSE; -#line 650 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 658 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_object_unref0 (photo); -#line 650 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 658 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_object_unref0 (source); -#line 650 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 658 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return result; -#line 13132 "ImportPage.c" +#line 13285 "ImportPage.c" } } -#line 640 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 648 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_object_unref0 (photo); -#line 13137 "ImportPage.c" +#line 13290 "ImportPage.c" } } } -#line 654 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 662 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp26_ = search_view_filter_get_criteria (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SEARCH_VIEW_FILTER, SearchViewFilter)); -#line 654 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 662 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" if ((gboolean) (SEARCH_FILTER_CRITERIA_TEXT & _tmp26_)) { -#line 13145 "ImportPage.c" +#line 13298 "ImportPage.c" const gchar* keywords = NULL; ImportSource* _tmp27_ = NULL; const gchar* _tmp28_ = NULL; @@ -13157,104 +13310,104 @@ static gboolean import_page_import_page_search_view_filter_real_predicate (ViewF gboolean _tmp30_ = FALSE; gint _tmp31_ = 0; gchar** _tmp32_ = NULL; -#line 655 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 663 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp27_ = source; -#line 655 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 663 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp28_ = indexable_get_indexable_keywords (G_TYPE_CHECK_INSTANCE_CAST (_tmp27_, TYPE_INDEXABLE, Indexable)); -#line 655 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 663 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" keywords = _tmp28_; -#line 656 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 664 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp29_ = keywords; -#line 656 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 664 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp30_ = is_string_empty (_tmp29_); -#line 656 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 664 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" if (_tmp30_) { -#line 657 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 665 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" result = FALSE; -#line 657 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 665 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_object_unref0 (source); -#line 657 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 665 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return result; -#line 13171 "ImportPage.c" +#line 13324 "ImportPage.c" } -#line 660 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 668 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp32_ = search_view_filter_get_search_filter_words (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SEARCH_VIEW_FILTER, SearchViewFilter), &_tmp31_); -#line 13175 "ImportPage.c" +#line 13328 "ImportPage.c" { gchar** word_collection = NULL; gint word_collection_length1 = 0; gint _word_collection_size_ = 0; gint word_it = 0; -#line 660 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 668 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" word_collection = _tmp32_; -#line 660 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 668 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" word_collection_length1 = _tmp31_; -#line 660 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 668 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" for (word_it = 0; word_it < _tmp31_; word_it = word_it + 1) { -#line 13187 "ImportPage.c" +#line 13340 "ImportPage.c" const gchar* word = NULL; -#line 660 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 668 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" word = word_collection[word_it]; -#line 13191 "ImportPage.c" +#line 13344 "ImportPage.c" { const gchar* _tmp33_ = NULL; const gchar* _tmp34_ = NULL; gboolean _tmp35_ = FALSE; -#line 661 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 669 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp33_ = keywords; -#line 661 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 669 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp34_ = word; -#line 661 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 669 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp35_ = string_contains (_tmp33_, _tmp34_); -#line 661 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 669 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" if (!_tmp35_) { -#line 662 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 670 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" result = FALSE; -#line 662 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 670 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_object_unref0 (source); -#line 662 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 670 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return result; -#line 13210 "ImportPage.c" +#line 13363 "ImportPage.c" } } } } } -#line 666 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 674 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" result = TRUE; -#line 666 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 674 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_object_unref0 (source); -#line 666 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 674 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return result; -#line 13222 "ImportPage.c" +#line 13375 "ImportPage.c" } static ImportPageImportPageSearchViewFilter* import_page_import_page_search_view_filter_construct (GType object_type) { ImportPageImportPageSearchViewFilter* self = NULL; -#line 627 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 635 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" self = (ImportPageImportPageSearchViewFilter*) search_view_filter_construct (object_type); -#line 627 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 635 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return self; -#line 13232 "ImportPage.c" +#line 13385 "ImportPage.c" } static ImportPageImportPageSearchViewFilter* import_page_import_page_search_view_filter_new (void) { -#line 627 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 635 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return import_page_import_page_search_view_filter_construct (IMPORT_PAGE_TYPE_IMPORT_PAGE_SEARCH_VIEW_FILTER); -#line 13239 "ImportPage.c" +#line 13392 "ImportPage.c" } static void import_page_import_page_search_view_filter_class_init (ImportPageImportPageSearchViewFilterClass * klass) { -#line 627 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 635 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" import_page_import_page_search_view_filter_parent_class = g_type_class_peek_parent (klass); -#line 627 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 635 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" ((SearchViewFilterClass *) klass)->get_criteria = import_page_import_page_search_view_filter_real_get_criteria; -#line 627 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 635 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" ((ViewFilterClass *) klass)->predicate = import_page_import_page_search_view_filter_real_predicate; -#line 13250 "ImportPage.c" +#line 13403 "ImportPage.c" } @@ -13279,45 +13432,45 @@ static gboolean import_page_hide_imported_view_filter_real_predicate (ViewFilter gboolean result = FALSE; DataView* _tmp0_ = NULL; gboolean _tmp1_ = FALSE; -#line 672 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 680 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, IMPORT_PAGE_TYPE_HIDE_IMPORTED_VIEW_FILTER, ImportPageHideImportedViewFilter); -#line 672 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 680 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" g_return_val_if_fail (IS_DATA_VIEW (view), FALSE); -#line 673 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 681 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp0_ = view; -#line 673 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 681 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp1_ = import_preview_is_already_imported (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_IMPORT_PREVIEW, ImportPreview)); -#line 673 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 681 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" result = !_tmp1_; -#line 673 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 681 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return result; -#line 13287 "ImportPage.c" +#line 13440 "ImportPage.c" } static ImportPageHideImportedViewFilter* import_page_hide_imported_view_filter_construct (GType object_type) { ImportPageHideImportedViewFilter* self = NULL; -#line 671 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 679 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" self = (ImportPageHideImportedViewFilter*) view_filter_construct (object_type); -#line 671 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 679 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return self; -#line 13297 "ImportPage.c" +#line 13450 "ImportPage.c" } static ImportPageHideImportedViewFilter* import_page_hide_imported_view_filter_new (void) { -#line 671 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 679 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return import_page_hide_imported_view_filter_construct (IMPORT_PAGE_TYPE_HIDE_IMPORTED_VIEW_FILTER); -#line 13304 "ImportPage.c" +#line 13457 "ImportPage.c" } static void import_page_hide_imported_view_filter_class_init (ImportPageHideImportedViewFilterClass * klass) { -#line 671 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 679 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" import_page_hide_imported_view_filter_parent_class = g_type_class_peek_parent (klass); -#line 671 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 679 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" ((ViewFilterClass *) klass)->predicate = import_page_hide_imported_view_filter_real_predicate; -#line 13313 "ImportPage.c" +#line 13466 "ImportPage.c" } @@ -13338,35 +13491,37 @@ static GType import_page_hide_imported_view_filter_get_type (void) { static void import_page_class_init (ImportPageClass * klass) { -#line 457 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 465 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" import_page_parent_class = g_type_class_peek_parent (klass); -#line 457 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 465 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" g_type_class_add_private (klass, sizeof (ImportPagePrivate)); -#line 457 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 465 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" ((PageClass *) klass)->get_toolbar = import_page_real_get_toolbar; -#line 457 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 465 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" ((CheckerboardPageClass *) klass)->get_view_tracker = import_page_real_get_view_tracker; -#line 457 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 465 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" ((CheckerboardPageClass *) klass)->get_view_empty_message = import_page_real_get_view_empty_message; -#line 457 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 465 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" ((CheckerboardPageClass *) klass)->get_filter_no_match_message = import_page_real_get_filter_no_match_message; -#line 457 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 465 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" ((PageClass *) klass)->init_collect_ui_filenames = import_page_real_init_collect_ui_filenames; -#line 457 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 465 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" ((PageClass *) klass)->add_actions = import_page_real_add_actions; -#line 457 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 465 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" + ((PageClass *) klass)->remove_actions = import_page_real_remove_actions; +#line 465 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" ((PageClass *) klass)->init_actions = import_page_real_init_actions; -#line 457 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 465 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" ((PageClass *) klass)->switched_to = import_page_real_switched_to; -#line 457 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 465 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" ((PageClass *) klass)->ready = import_page_real_ready; -#line 457 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 465 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" ((CheckerboardPageClass *) klass)->set_display_titles = import_page_real_set_display_titles; -#line 457 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 465 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" ((CheckerboardPageClass *) klass)->get_search_view_filter = import_page_real_get_search_view_filter; -#line 457 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 465 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" G_OBJECT_CLASS (klass)->finalize = import_page_finalize; -#line 13362 "ImportPage.c" +#line 13517 "ImportPage.c" } @@ -13375,43 +13530,43 @@ static void import_page_instance_init (ImportPage * self) { GtkProgressBar* _tmp1_ = NULL; ImportPageImportPageSearchViewFilter* _tmp2_ = NULL; ImportPageHideImportedViewFilter* _tmp3_ = NULL; -#line 457 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 465 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" self->priv = IMPORT_PAGE_GET_PRIVATE (self); -#line 680 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 688 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" self->priv->import_sources = NULL; -#line 681 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 689 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp0_ = (GtkLabel*) gtk_label_new (NULL); -#line 681 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 689 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" g_object_ref_sink (_tmp0_); -#line 681 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 689 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" self->priv->camera_label = _tmp0_; -#line 683 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 691 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp1_ = (GtkProgressBar*) gtk_progress_bar_new (); -#line 683 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 691 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" g_object_ref_sink (_tmp1_); -#line 683 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 691 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" self->priv->progress_bar = _tmp1_; -#line 686 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 694 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" self->priv->busy = FALSE; -#line 687 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 695 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" self->priv->refreshed = FALSE; -#line 688 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 696 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" self->priv->refresh_result = GP_OK; -#line 689 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 697 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" self->priv->refresh_error = NULL; -#line 691 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 699 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" self->priv->volume_monitor = NULL; -#line 692 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 700 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" self->priv->local_ref = NULL; -#line 694 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 702 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp2_ = import_page_import_page_search_view_filter_new (); -#line 694 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 702 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" self->priv->search_filter = _tmp2_; -#line 695 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 703 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp3_ = import_page_hide_imported_view_filter_new (); -#line 695 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 703 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" self->priv->hide_imported_filter = _tmp3_; -#line 13407 "ImportPage.c" +#line 13562 "ImportPage.c" } @@ -13421,51 +13576,51 @@ static void import_page_finalize (GObject* obj) { guint _tmp1_ = 0U; VideoSourceCollection* _tmp2_ = NULL; guint _tmp3_ = 0U; -#line 457 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 465 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_IMPORT_PAGE, ImportPage); -#line 766 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 774 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp0_ = library_photo_global; -#line 766 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 774 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" g_signal_parse_name ("contents-altered", TYPE_DATA_COLLECTION, &_tmp1_, NULL, FALSE); -#line 766 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 774 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_DATA_COLLECTION, DataCollection), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _import_page_on_media_added_removed_data_collection_contents_altered, self); -#line 767 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 775 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp2_ = video_global; -#line 767 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 775 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" g_signal_parse_name ("contents-altered", TYPE_DATA_COLLECTION, &_tmp3_, NULL, FALSE); -#line 767 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 775 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_DATA_COLLECTION, DataCollection), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _import_page_on_media_added_removed_data_collection_contents_altered, self); -#line 680 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 688 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _data_collection_unref0 (self->priv->import_sources); -#line 681 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 689 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_object_unref0 (self->priv->camera_label); -#line 682 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 690 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_object_unref0 (self->priv->hide_imported); -#line 683 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 691 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_object_unref0 (self->priv->progress_bar); -#line 684 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 692 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _gp_camera_unref0 (self->priv->camera); -#line 685 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 693 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_free0 (self->priv->uri); -#line 689 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 697 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_free0 (self->priv->refresh_error); -#line 690 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 698 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_free0 (self->priv->camera_name); -#line 691 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 699 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_object_unref0 (self->priv->volume_monitor); -#line 692 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 700 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_object_unref0 (self->priv->local_ref); -#line 693 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 701 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_free0 (self->priv->icon); -#line 694 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 702 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _view_filter_unref0 (self->priv->search_filter); -#line 695 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 703 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _view_filter_unref0 (self->priv->hide_imported_filter); -#line 696 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 704 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _core_tracker_unref0 (self->priv->tracker); -#line 457 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" +#line 465 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" G_OBJECT_CLASS (import_page_parent_class)->finalize (obj); -#line 13461 "ImportPage.c" +#line 13616 "ImportPage.c" } diff --git a/src/camera/ImportPage.vala b/src/camera/ImportPage.vala index 92445bb..4e055ec 100644 --- a/src/camera/ImportPage.vala +++ b/src/camera/ImportPage.vala @@ -338,14 +338,22 @@ class ImportPreview : MediaSourceItem { uint64 filesize = get_import_source().get_filesize(); // unlikely to be a problem, but what the hay if (filesize <= int64.MAX) { - if (LibraryPhoto.global.has_basename_filesize_duplicate( - get_import_source().get_filename(), (int64) filesize)) { + PhotoID duplicated_photo_id = LibraryPhoto.global.get_basename_filesize_duplicate( + get_import_source().get_filename(), (int64) filesize); + + if (duplicated_photo_id.is_valid()) { + // Check exposure timestamp + LibraryPhoto duplicated_photo = LibraryPhoto.global.fetch(duplicated_photo_id); + time_t photo_exposure_time = photo_import_source.get_exposure_time(); + time_t duplicated_photo_exposure_time = duplicated_photo.get_exposure_time(); - duplicated_file = DuplicatedFile.create_from_photo_id( - LibraryPhoto.global.get_basename_filesize_duplicate( - get_import_source().get_filename(), (int64) filesize)); - - return true; + if (photo_exposure_time == duplicated_photo_exposure_time) { + duplicated_file = DuplicatedFile.create_from_photo_id( + LibraryPhoto.global.get_basename_filesize_duplicate( + get_import_source().get_filename(), (int64) filesize)); + + return true; + } } } } @@ -801,6 +809,7 @@ public class ImportPage : CheckerboardPage { // Find button Gtk.ToggleToolButton find_button = new Gtk.ToggleToolButton(); + find_button.set_icon_name("edit-find"); find_button.set_action_name ("win.CommonDisplaySearchbar"); toolbar.insert(find_button, -1); @@ -810,14 +819,20 @@ public class ImportPage : CheckerboardPage { // Import selected Gtk.ToolButton import_selected_button = new Gtk.ToolButton(null, null); - import_selected_button.set_icon_name(Resources.IMPORT); + import_selected_button.set_icon_name("import"); + import_selected_button.set_label(_("Import _Selected")); + import_selected_button.is_important = true; + import_selected_button.use_underline = true; import_selected_button.set_action_name ("win.ImportSelected"); toolbar.insert(import_selected_button, -1); // Import all Gtk.ToolButton import_all_button = new Gtk.ToolButton(null, null); - import_all_button.set_icon_name(Resources.IMPORT_ALL); + import_all_button.set_icon_name("import-all"); + import_all_button.set_label(_("Import _All")); + import_all_button.is_important = true; + import_all_button.use_underline = true; import_all_button.set_action_name ("win.ImportAll"); toolbar.insert(import_all_button, -1); @@ -872,14 +887,21 @@ public class ImportPage : CheckerboardPage { { "ViewTitle", on_action_toggle, null, "false", on_display_titles }, }; - protected override void add_actions () { - base.add_actions (); + protected override void add_actions (GLib.ActionMap map) { + base.add_actions (map); - AppWindow.get_instance ().add_action_entries (entries, this); + map.add_action_entries (entries, this); get_action ("ViewTitle").change_state (Config.Facade.get_instance ().get_display_photo_titles ()); } - + + protected override void remove_actions(GLib.ActionMap map) { + base.remove_actions(map); + foreach (var entry in entries) { + map.remove_action(entry.name); + } + } + public GPhoto.Camera get_camera() { return camera; } |