diff options
Diffstat (limited to 'src/Photo.c')
| -rw-r--r-- | src/Photo.c | 7844 |
1 files changed, 3973 insertions, 3871 deletions
diff --git a/src/Photo.c b/src/Photo.c index b890199..dffc7d4 100644 --- a/src/Photo.c +++ b/src/Photo.c @@ -1,4 +1,4 @@ -/* Photo.c generated by valac 0.34.4, the Vala compiler +/* Photo.c generated by valac 0.34.7, the Vala compiler * generated from Photo.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -4037,7 +4037,7 @@ Photo* photo_construct (GType object_type, PhotoRow* row) { gint _tmp53_ = 0; RawDeveloper* _tmp54_ = NULL; #line 438 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp52_ = gee_hash_map_new (TYPE_RAW_DEVELOPER, NULL, NULL, TYPE_BACKING_PHOTO_ROW, (GBoxedCopyFunc) backing_photo_row_ref, backing_photo_row_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); + _tmp52_ = gee_hash_map_new (TYPE_RAW_DEVELOPER, NULL, NULL, TYPE_BACKING_PHOTO_ROW, (GBoxedCopyFunc) backing_photo_row_ref, (GDestroyNotify) backing_photo_row_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); #line 438 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (self->priv->developments); #line 438 "/home/jens/Source/shotwell/src/Photo.vala" @@ -4314,7 +4314,7 @@ Photo* photo_construct (GType object_type, PhotoRow* row) { void photo_init_photo (void) { GeeLinkedList* _tmp0_ = NULL; #line 475 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp0_ = gee_linked_list_new (PHOTO_TYPE_CACHED_PIXBUF, (GBoxedCopyFunc) photo_cached_pixbuf_ref, photo_cached_pixbuf_unref, NULL, NULL, NULL); + _tmp0_ = gee_linked_list_new (PHOTO_TYPE_CACHED_PIXBUF, (GBoxedCopyFunc) photo_cached_pixbuf_ref, (GDestroyNotify) photo_cached_pixbuf_unref, NULL, NULL, NULL); #line 475 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (photo_source_pixbuf_cache); #line 475 "/home/jens/Source/shotwell/src/Photo.vala" @@ -4493,11 +4493,11 @@ static gboolean photo_real_internal_delete_backing (DataSource* base, GError** e gboolean result = FALSE; gboolean ret = FALSE; GFile* file = NULL; - PhotoFileFormat _tmp7_ = 0; - GFile* _tmp11_ = NULL; - gboolean _tmp22_ = FALSE; - gboolean _tmp23_ = FALSE; + PhotoFileFormat _tmp8_ = 0; + GFile* _tmp12_ = NULL; gboolean _tmp24_ = FALSE; + gboolean _tmp25_ = FALSE; + gboolean _tmp26_ = FALSE; GError * _inner_error_ = NULL; #line 515 "/home/jens/Source/shotwell/src/Photo.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PHOTO, Photo); @@ -4550,92 +4550,94 @@ static gboolean photo_real_internal_delete_backing (DataSource* base, GError** e } #line 518 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { +#line 4554 "Photo.c" + gboolean _tmp7_ = FALSE; #line 518 "/home/jens/Source/shotwell/src/Photo.vala" g_propagate_error (error, _inner_error_); #line 518 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (file); #line 518 "/home/jens/Source/shotwell/src/Photo.vala" - return FALSE; -#line 4560 "Photo.c" + return _tmp7_; +#line 4562 "Photo.c" } } #line 523 "/home/jens/Source/shotwell/src/Photo.vala" photo_detach_editable (self, TRUE, FALSE, TRUE); #line 525 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp7_ = photo_get_master_file_format (self); + _tmp8_ = photo_get_master_file_format (self); #line 525 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp7_ == PHOTO_FILE_FORMAT_RAW) { -#line 4569 "Photo.c" - gint _tmp8_ = 0; - RawDeveloper* _tmp9_ = NULL; + if (_tmp8_ == PHOTO_FILE_FORMAT_RAW) { +#line 4571 "Photo.c" + gint _tmp9_ = 0; + RawDeveloper* _tmp10_ = NULL; #line 526 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp9_ = raw_developer_as_array (&_tmp8_); -#line 4574 "Photo.c" + _tmp10_ = raw_developer_as_array (&_tmp9_); +#line 4576 "Photo.c" { RawDeveloper* d_collection = NULL; gint d_collection_length1 = 0; gint _d_collection_size_ = 0; gint d_it = 0; #line 526 "/home/jens/Source/shotwell/src/Photo.vala" - d_collection = _tmp9_; + d_collection = _tmp10_; #line 526 "/home/jens/Source/shotwell/src/Photo.vala" - d_collection_length1 = _tmp8_; + d_collection_length1 = _tmp9_; #line 526 "/home/jens/Source/shotwell/src/Photo.vala" - for (d_it = 0; d_it < _tmp8_; d_it = d_it + 1) { -#line 4586 "Photo.c" + for (d_it = 0; d_it < _tmp9_; d_it = d_it + 1) { +#line 4588 "Photo.c" RawDeveloper d = 0; #line 526 "/home/jens/Source/shotwell/src/Photo.vala" d = d_collection[d_it]; -#line 4590 "Photo.c" +#line 4592 "Photo.c" { - RawDeveloper _tmp10_ = 0; + RawDeveloper _tmp11_ = 0; #line 527 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp10_ = d; + _tmp11_ = d; #line 527 "/home/jens/Source/shotwell/src/Photo.vala" - photo_delete_raw_development (self, _tmp10_); -#line 4597 "Photo.c" + photo_delete_raw_development (self, _tmp11_); +#line 4599 "Photo.c" } } #line 526 "/home/jens/Source/shotwell/src/Photo.vala" d_collection = (g_free (d_collection), NULL); -#line 4602 "Photo.c" +#line 4604 "Photo.c" } } #line 531 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp11_ = file; + _tmp12_ = file; #line 531 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp11_ != NULL) { -#line 4609 "Photo.c" + if (_tmp12_ != NULL) { +#line 4611 "Photo.c" { - gboolean _tmp12_ = FALSE; - GFile* _tmp13_ = NULL; - gboolean _tmp14_ = FALSE; + gboolean _tmp13_ = FALSE; + GFile* _tmp14_ = NULL; + gboolean _tmp15_ = FALSE; #line 533 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp13_ = file; + _tmp14_ = file; #line 533 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp14_ = g_file_trash (_tmp13_, NULL, &_inner_error_); + _tmp15_ = g_file_trash (_tmp14_, NULL, &_inner_error_); #line 533 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp12_ = _tmp14_; + _tmp13_ = _tmp15_; #line 533 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 4622 "Photo.c" +#line 4624 "Photo.c" goto __catch258_g_error; } #line 533 "/home/jens/Source/shotwell/src/Photo.vala" - ret = _tmp12_; -#line 4627 "Photo.c" + ret = _tmp13_; +#line 4629 "Photo.c" } goto __finally258; __catch258_g_error: { GError* err = NULL; - GFile* _tmp15_ = NULL; - gchar* _tmp16_ = NULL; + GFile* _tmp16_ = NULL; gchar* _tmp17_ = NULL; gchar* _tmp18_ = NULL; gchar* _tmp19_ = NULL; - GError* _tmp20_ = NULL; - const gchar* _tmp21_ = NULL; + gchar* _tmp20_ = NULL; + GError* _tmp21_ = NULL; + const gchar* _tmp22_ = NULL; #line 532 "/home/jens/Source/shotwell/src/Photo.vala" err = _inner_error_; #line 532 "/home/jens/Source/shotwell/src/Photo.vala" @@ -4643,76 +4645,80 @@ static gboolean photo_real_internal_delete_backing (DataSource* base, GError** e #line 535 "/home/jens/Source/shotwell/src/Photo.vala" ret = FALSE; #line 536 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp15_ = file; + _tmp16_ = file; #line 536 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp16_ = g_file_get_path (_tmp15_); + _tmp17_ = g_file_get_path (_tmp16_); #line 536 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp17_ = _tmp16_; + _tmp18_ = _tmp17_; #line 536 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp18_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject)); + _tmp19_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject)); #line 536 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp19_ = _tmp18_; + _tmp20_ = _tmp19_; #line 536 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp20_ = err; + _tmp21_ = err; #line 536 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp21_ = _tmp20_->message; + _tmp22_ = _tmp21_->message; #line 536 "/home/jens/Source/shotwell/src/Photo.vala" - g_message ("Photo.vala:536: Unable to move editable %s for %s to trash: %s", _tmp17_, _tmp19_, _tmp21_); + g_message ("Photo.vala:536: Unable to move editable %s for %s to trash: %s", _tmp18_, _tmp20_, _tmp22_); #line 536 "/home/jens/Source/shotwell/src/Photo.vala" - _g_free0 (_tmp19_); + _g_free0 (_tmp20_); #line 536 "/home/jens/Source/shotwell/src/Photo.vala" - _g_free0 (_tmp17_); + _g_free0 (_tmp18_); #line 532 "/home/jens/Source/shotwell/src/Photo.vala" _g_error_free0 (err); -#line 4668 "Photo.c" +#line 4670 "Photo.c" } __finally258: #line 532 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { +#line 4675 "Photo.c" + gboolean _tmp23_ = FALSE; #line 532 "/home/jens/Source/shotwell/src/Photo.vala" g_propagate_error (error, _inner_error_); #line 532 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (file); #line 532 "/home/jens/Source/shotwell/src/Photo.vala" - return FALSE; -#line 4679 "Photo.c" + return _tmp23_; +#line 4683 "Photo.c" } } #line 542 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp24_ = DATA_SOURCE_CLASS (photo_parent_class)->internal_delete_backing (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO_SOURCE, PhotoSource), TYPE_DATA_SOURCE, DataSource), &_inner_error_); + _tmp26_ = DATA_SOURCE_CLASS (photo_parent_class)->internal_delete_backing (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO_SOURCE, PhotoSource), TYPE_DATA_SOURCE, DataSource), &_inner_error_); #line 542 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp23_ = _tmp24_; + _tmp25_ = _tmp26_; #line 542 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { +#line 4692 "Photo.c" + gboolean _tmp27_ = FALSE; #line 542 "/home/jens/Source/shotwell/src/Photo.vala" g_propagate_error (error, _inner_error_); #line 542 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (file); #line 542 "/home/jens/Source/shotwell/src/Photo.vala" - return FALSE; -#line 4694 "Photo.c" + return _tmp27_; +#line 4700 "Photo.c" } #line 542 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp23_) { -#line 4698 "Photo.c" - gboolean _tmp25_ = FALSE; + if (_tmp25_) { +#line 4704 "Photo.c" + gboolean _tmp28_ = FALSE; #line 542 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp25_ = ret; + _tmp28_ = ret; #line 542 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp22_ = _tmp25_; -#line 4704 "Photo.c" + _tmp24_ = _tmp28_; +#line 4710 "Photo.c" } else { #line 542 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp22_ = FALSE; -#line 4708 "Photo.c" + _tmp24_ = FALSE; +#line 4714 "Photo.c" } #line 542 "/home/jens/Source/shotwell/src/Photo.vala" - result = _tmp22_; + result = _tmp24_; #line 542 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (file); #line 542 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 4716 "Photo.c" +#line 4722 "Photo.c" } @@ -4737,11 +4743,11 @@ static BackingPhotoRow* photo_get_backing_row (Photo* self, BackingPhotoID* id) result = NULL; #line 549 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 4741 "Photo.c" +#line 4747 "Photo.c" } #line 551 "/home/jens/Source/shotwell/src/Photo.vala" backing_row = NULL; -#line 4745 "Photo.c" +#line 4751 "Photo.c" { BackingPhotoRow* _tmp2_ = NULL; BackingPhotoTable* _tmp3_ = NULL; @@ -4768,7 +4774,7 @@ static BackingPhotoRow* photo_get_backing_row (Photo* self, BackingPhotoID* id) if (G_UNLIKELY (_inner_error_ != NULL)) { #line 553 "/home/jens/Source/shotwell/src/Photo.vala" if (_inner_error_->domain == DATABASE_ERROR) { -#line 4772 "Photo.c" +#line 4778 "Photo.c" goto __catch259_database_error; } #line 553 "/home/jens/Source/shotwell/src/Photo.vala" @@ -4779,7 +4785,7 @@ static BackingPhotoRow* photo_get_backing_row (Photo* self, BackingPhotoID* id) g_clear_error (&_inner_error_); #line 553 "/home/jens/Source/shotwell/src/Photo.vala" return NULL; -#line 4783 "Photo.c" +#line 4789 "Photo.c" } #line 553 "/home/jens/Source/shotwell/src/Photo.vala" _tmp8_ = _tmp2_; @@ -4791,7 +4797,7 @@ static BackingPhotoRow* photo_get_backing_row (Photo* self, BackingPhotoID* id) backing_row = _tmp8_; #line 552 "/home/jens/Source/shotwell/src/Photo.vala" _backing_photo_row_unref0 (_tmp2_); -#line 4795 "Photo.c" +#line 4801 "Photo.c" } goto __finally259; __catch259_database_error: @@ -4819,7 +4825,7 @@ static BackingPhotoRow* photo_get_backing_row (Photo* self, BackingPhotoID* id) _g_free0 (_tmp10_); #line 552 "/home/jens/Source/shotwell/src/Photo.vala" _g_error_free0 (err); -#line 4823 "Photo.c" +#line 4829 "Photo.c" } __finally259: #line 552 "/home/jens/Source/shotwell/src/Photo.vala" @@ -4832,13 +4838,13 @@ static BackingPhotoRow* photo_get_backing_row (Photo* self, BackingPhotoID* id) g_clear_error (&_inner_error_); #line 552 "/home/jens/Source/shotwell/src/Photo.vala" return NULL; -#line 4836 "Photo.c" +#line 4842 "Photo.c" } #line 558 "/home/jens/Source/shotwell/src/Photo.vala" _tmp13_ = backing_row; #line 558 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp13_ == NULL) { -#line 4842 "Photo.c" +#line 4848 "Photo.c" { BackingPhotoTable* _tmp14_ = NULL; BackingPhotoTable* _tmp15_ = NULL; @@ -4857,7 +4863,7 @@ static BackingPhotoRow* photo_get_backing_row (Photo* self, BackingPhotoID* id) if (G_UNLIKELY (_inner_error_ != NULL)) { #line 560 "/home/jens/Source/shotwell/src/Photo.vala" if (_inner_error_->domain == DATABASE_ERROR) { -#line 4861 "Photo.c" +#line 4867 "Photo.c" goto __catch260_database_error; } #line 560 "/home/jens/Source/shotwell/src/Photo.vala" @@ -4868,7 +4874,7 @@ static BackingPhotoRow* photo_get_backing_row (Photo* self, BackingPhotoID* id) g_clear_error (&_inner_error_); #line 560 "/home/jens/Source/shotwell/src/Photo.vala" return NULL; -#line 4872 "Photo.c" +#line 4878 "Photo.c" } } goto __finally260; @@ -4881,7 +4887,7 @@ static BackingPhotoRow* photo_get_backing_row (Photo* self, BackingPhotoID* id) _inner_error_ = NULL; #line 559 "/home/jens/Source/shotwell/src/Photo.vala" _g_error_free0 (err); -#line 4885 "Photo.c" +#line 4891 "Photo.c" } __finally260: #line 559 "/home/jens/Source/shotwell/src/Photo.vala" @@ -4894,7 +4900,7 @@ static BackingPhotoRow* photo_get_backing_row (Photo* self, BackingPhotoID* id) g_clear_error (&_inner_error_); #line 559 "/home/jens/Source/shotwell/src/Photo.vala" return NULL; -#line 4898 "Photo.c" +#line 4904 "Photo.c" } #line 564 "/home/jens/Source/shotwell/src/Photo.vala" result = NULL; @@ -4902,13 +4908,13 @@ static BackingPhotoRow* photo_get_backing_row (Photo* self, BackingPhotoID* id) _backing_photo_row_unref0 (backing_row); #line 564 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 4906 "Photo.c" +#line 4912 "Photo.c" } #line 567 "/home/jens/Source/shotwell/src/Photo.vala" result = backing_row; #line 567 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 4912 "Photo.c" +#line 4918 "Photo.c" } @@ -4917,14 +4923,15 @@ gboolean photo_is_raw_developer_complete (Photo* self, RawDeveloper d) { GError * _inner_error_ = NULL; #line 572 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_PHOTO (self), FALSE); -#line 4921 "Photo.c" +#line 4927 "Photo.c" { GeeHashMap* _tmp0_ = NULL; + gboolean _tmp13_ = FALSE; #line 573 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = self->priv->developments; #line 573 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_developments); -#line 4928 "Photo.c" +#line 4935 "Photo.c" { gboolean _tmp1_ = FALSE; GeeHashMap* _tmp2_ = NULL; @@ -4938,7 +4945,7 @@ gboolean photo_is_raw_developer_complete (Photo* self, RawDeveloper d) { _tmp4_ = gee_abstract_map_has_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), (gpointer) ((gintptr) _tmp3_)); #line 574 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp4_) { -#line 4942 "Photo.c" +#line 4949 "Photo.c" GeeHashMap* _tmp5_ = NULL; RawDeveloper _tmp6_ = 0; gpointer _tmp7_ = NULL; @@ -4961,26 +4968,26 @@ gboolean photo_is_raw_developer_complete (Photo* self, RawDeveloper d) { _tmp1_ = _tmp10_; #line 575 "/home/jens/Source/shotwell/src/Photo.vala" _backing_photo_row_unref0 (_tmp8_); -#line 4965 "Photo.c" +#line 4972 "Photo.c" } else { #line 574 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = FALSE; -#line 4969 "Photo.c" +#line 4976 "Photo.c" } #line 574 "/home/jens/Source/shotwell/src/Photo.vala" result = _tmp1_; -#line 4973 "Photo.c" +#line 4980 "Photo.c" { GeeHashMap* _tmp11_ = NULL; #line 573 "/home/jens/Source/shotwell/src/Photo.vala" _tmp11_ = self->priv->developments; #line 573 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_developments); -#line 4980 "Photo.c" +#line 4987 "Photo.c" } #line 574 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 4984 "Photo.c" +#line 4991 "Photo.c" } __finally261: { @@ -4989,33 +4996,33 @@ gboolean photo_is_raw_developer_complete (Photo* self, RawDeveloper d) { _tmp12_ = self->priv->developments; #line 573 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_developments); -#line 4993 "Photo.c" +#line 5000 "Photo.c" } #line 573 "/home/jens/Source/shotwell/src/Photo.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 573 "/home/jens/Source/shotwell/src/Photo.vala" g_clear_error (&_inner_error_); #line 573 "/home/jens/Source/shotwell/src/Photo.vala" - return FALSE; -#line 5001 "Photo.c" + return _tmp13_; +#line 5008 "Photo.c" } } gboolean photo_is_raw_developer_available (Photo* self, RawDeveloper d) { gboolean result = FALSE; - RawDeveloper _tmp6_ = 0; + RawDeveloper _tmp7_ = 0; GError * _inner_error_ = NULL; #line 580 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_PHOTO (self), FALSE); -#line 5012 "Photo.c" +#line 5019 "Photo.c" { GeeHashMap* _tmp0_ = NULL; #line 581 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = self->priv->developments; #line 581 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_developments); -#line 5019 "Photo.c" +#line 5026 "Photo.c" { GeeHashMap* _tmp1_ = NULL; RawDeveloper _tmp2_ = 0; @@ -5030,18 +5037,18 @@ gboolean photo_is_raw_developer_available (Photo* self, RawDeveloper d) { if (_tmp3_) { #line 583 "/home/jens/Source/shotwell/src/Photo.vala" result = TRUE; -#line 5034 "Photo.c" +#line 5041 "Photo.c" { GeeHashMap* _tmp4_ = NULL; #line 581 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = self->priv->developments; #line 581 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_developments); -#line 5041 "Photo.c" +#line 5048 "Photo.c" } #line 583 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 5045 "Photo.c" +#line 5052 "Photo.c" } } __finally262: @@ -5051,101 +5058,103 @@ gboolean photo_is_raw_developer_available (Photo* self, RawDeveloper d) { _tmp5_ = self->priv->developments; #line 581 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_developments); -#line 5055 "Photo.c" +#line 5062 "Photo.c" } #line 581 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { +#line 5066 "Photo.c" + gboolean _tmp6_ = FALSE; #line 581 "/home/jens/Source/shotwell/src/Photo.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 581 "/home/jens/Source/shotwell/src/Photo.vala" g_clear_error (&_inner_error_); #line 581 "/home/jens/Source/shotwell/src/Photo.vala" - return FALSE; -#line 5065 "Photo.c" + return _tmp6_; +#line 5074 "Photo.c" } } #line 586 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp6_ = d; + _tmp7_ = d; #line 586 "/home/jens/Source/shotwell/src/Photo.vala" - switch (_tmp6_) { + switch (_tmp7_) { #line 586 "/home/jens/Source/shotwell/src/Photo.vala" case RAW_DEVELOPER_SHOTWELL: -#line 5074 "Photo.c" +#line 5083 "Photo.c" { #line 588 "/home/jens/Source/shotwell/src/Photo.vala" result = TRUE; #line 588 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 5080 "Photo.c" +#line 5089 "Photo.c" } #line 586 "/home/jens/Source/shotwell/src/Photo.vala" case RAW_DEVELOPER_CAMERA: -#line 5084 "Photo.c" +#line 5093 "Photo.c" { #line 591 "/home/jens/Source/shotwell/src/Photo.vala" result = FALSE; #line 591 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 5090 "Photo.c" +#line 5099 "Photo.c" } #line 586 "/home/jens/Source/shotwell/src/Photo.vala" case RAW_DEVELOPER_EMBEDDED: -#line 5094 "Photo.c" +#line 5103 "Photo.c" { { PhotoMetadata* meta = NULL; - PhotoMetadata* _tmp7_ = NULL; - guint num_previews = 0U; PhotoMetadata* _tmp8_ = NULL; - guint _tmp9_ = 0U; + guint num_previews = 0U; + PhotoMetadata* _tmp9_ = NULL; guint _tmp10_ = 0U; + guint _tmp11_ = 0U; #line 595 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp7_ = photo_get_master_metadata (self, &_inner_error_); + _tmp8_ = photo_get_master_metadata (self, &_inner_error_); #line 595 "/home/jens/Source/shotwell/src/Photo.vala" - meta = _tmp7_; + meta = _tmp8_; #line 595 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 5109 "Photo.c" +#line 5118 "Photo.c" goto __catch263_g_error; } #line 596 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp8_ = meta; + _tmp9_ = meta; #line 596 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp9_ = photo_metadata_get_preview_count (_tmp8_); + _tmp10_ = photo_metadata_get_preview_count (_tmp9_); #line 596 "/home/jens/Source/shotwell/src/Photo.vala" - num_previews = _tmp9_; + num_previews = _tmp10_; #line 598 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp10_ = num_previews; + _tmp11_ = num_previews; #line 598 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp10_ > ((guint) 0)) { -#line 5122 "Photo.c" + if (_tmp11_ > ((guint) 0)) { +#line 5131 "Photo.c" PhotoPreview* prev = NULL; - PhotoMetadata* _tmp11_ = NULL; - guint _tmp12_ = 0U; - PhotoPreview* _tmp13_ = NULL; + PhotoMetadata* _tmp12_ = NULL; + guint _tmp13_ = 0U; PhotoPreview* _tmp14_ = NULL; - Dimensions dims = {0}; PhotoPreview* _tmp15_ = NULL; - Dimensions _tmp16_ = {0}; - gint _tmp17_ = 0; - Dimensions _tmp18_ = {0}; - gint _tmp19_ = 0; - Dimensions _tmp20_ = {0}; - gint _tmp21_ = 0; + Dimensions dims = {0}; + PhotoPreview* _tmp16_ = NULL; + Dimensions _tmp17_ = {0}; + gint _tmp18_ = 0; + Dimensions _tmp19_ = {0}; + gint _tmp20_ = 0; + Dimensions _tmp21_ = {0}; + gint _tmp22_ = 0; gint preview_major_axis = 0; - gint _tmp26_ = 0; + gint _tmp27_ = 0; #line 599 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp11_ = meta; + _tmp12_ = meta; #line 599 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp12_ = num_previews; + _tmp13_ = num_previews; #line 599 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp13_ = photo_metadata_get_preview (_tmp11_, _tmp12_ - 1); + _tmp14_ = photo_metadata_get_preview (_tmp12_, _tmp13_ - 1); #line 599 "/home/jens/Source/shotwell/src/Photo.vala" - prev = _tmp13_; + prev = _tmp14_; #line 602 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp14_ = prev; + _tmp15_ = prev; #line 602 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp14_ == NULL) { + if (_tmp15_ == NULL) { #line 603 "/home/jens/Source/shotwell/src/Photo.vala" result = FALSE; #line 603 "/home/jens/Source/shotwell/src/Photo.vala" @@ -5154,51 +5163,51 @@ gboolean photo_is_raw_developer_available (Photo* self, RawDeveloper d) { _media_metadata_unref0 (meta); #line 603 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 5158 "Photo.c" +#line 5167 "Photo.c" } #line 605 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp15_ = prev; + _tmp16_ = prev; #line 605 "/home/jens/Source/shotwell/src/Photo.vala" - photo_preview_get_pixel_dimensions (_tmp15_, &_tmp16_); + photo_preview_get_pixel_dimensions (_tmp16_, &_tmp17_); #line 605 "/home/jens/Source/shotwell/src/Photo.vala" - dims = _tmp16_; + dims = _tmp17_; #line 608 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp18_ = dims; + _tmp19_ = dims; #line 608 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp19_ = _tmp18_.width; + _tmp20_ = _tmp19_.width; #line 608 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp20_ = dims; + _tmp21_ = dims; #line 608 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp21_ = _tmp20_.height; + _tmp22_ = _tmp21_.height; #line 608 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp19_ > _tmp21_) { -#line 5176 "Photo.c" - Dimensions _tmp22_ = {0}; - gint _tmp23_ = 0; + if (_tmp20_ > _tmp22_) { +#line 5185 "Photo.c" + Dimensions _tmp23_ = {0}; + gint _tmp24_ = 0; #line 608 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp22_ = dims; + _tmp23_ = dims; #line 608 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp23_ = _tmp22_.width; + _tmp24_ = _tmp23_.width; #line 608 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp17_ = _tmp23_; -#line 5185 "Photo.c" + _tmp18_ = _tmp24_; +#line 5194 "Photo.c" } else { - Dimensions _tmp24_ = {0}; - gint _tmp25_ = 0; + Dimensions _tmp25_ = {0}; + gint _tmp26_ = 0; #line 608 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp24_ = dims; + _tmp25_ = dims; #line 608 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp25_ = _tmp24_.height; + _tmp26_ = _tmp25_.height; #line 608 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp17_ = _tmp25_; -#line 5195 "Photo.c" + _tmp18_ = _tmp26_; +#line 5204 "Photo.c" } #line 608 "/home/jens/Source/shotwell/src/Photo.vala" - preview_major_axis = _tmp17_; + preview_major_axis = _tmp18_; #line 609 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp26_ = preview_major_axis; + _tmp27_ = preview_major_axis; #line 609 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp26_ < PHOTO_MIN_EMBEDDED_SIZE) { + if (_tmp27_ < PHOTO_MIN_EMBEDDED_SIZE) { #line 610 "/home/jens/Source/shotwell/src/Photo.vala" result = FALSE; #line 610 "/home/jens/Source/shotwell/src/Photo.vala" @@ -5207,7 +5216,7 @@ gboolean photo_is_raw_developer_available (Photo* self, RawDeveloper d) { _media_metadata_unref0 (meta); #line 610 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 5211 "Photo.c" +#line 5220 "Photo.c" } #line 613 "/home/jens/Source/shotwell/src/Photo.vala" result = TRUE; @@ -5217,7 +5226,7 @@ gboolean photo_is_raw_developer_available (Photo* self, RawDeveloper d) { _media_metadata_unref0 (meta); #line 613 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 5221 "Photo.c" +#line 5230 "Photo.c" } #line 617 "/home/jens/Source/shotwell/src/Photo.vala" result = FALSE; @@ -5225,50 +5234,52 @@ gboolean photo_is_raw_developer_available (Photo* self, RawDeveloper d) { _media_metadata_unref0 (meta); #line 617 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 5229 "Photo.c" +#line 5238 "Photo.c" } goto __finally263; __catch263_g_error: { GError* e = NULL; - GError* _tmp27_ = NULL; - const gchar* _tmp28_ = NULL; + GError* _tmp28_ = NULL; + const gchar* _tmp29_ = NULL; #line 594 "/home/jens/Source/shotwell/src/Photo.vala" e = _inner_error_; #line 594 "/home/jens/Source/shotwell/src/Photo.vala" _inner_error_ = NULL; #line 619 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp27_ = e; + _tmp28_ = e; #line 619 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp28_ = _tmp27_->message; + _tmp29_ = _tmp28_->message; #line 619 "/home/jens/Source/shotwell/src/Photo.vala" - g_debug ("Photo.vala:619: Error accessing embedded preview. Message: %s", _tmp28_); + g_debug ("Photo.vala:619: Error accessing embedded preview. Message: %s", _tmp29_); #line 594 "/home/jens/Source/shotwell/src/Photo.vala" _g_error_free0 (e); -#line 5249 "Photo.c" +#line 5258 "Photo.c" } __finally263: #line 594 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { +#line 5263 "Photo.c" + gboolean _tmp30_ = FALSE; #line 594 "/home/jens/Source/shotwell/src/Photo.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 594 "/home/jens/Source/shotwell/src/Photo.vala" g_clear_error (&_inner_error_); #line 594 "/home/jens/Source/shotwell/src/Photo.vala" - return FALSE; -#line 5260 "Photo.c" + return _tmp30_; +#line 5271 "Photo.c" } #line 621 "/home/jens/Source/shotwell/src/Photo.vala" result = FALSE; #line 621 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 5266 "Photo.c" +#line 5277 "Photo.c" } default: { #line 624 "/home/jens/Source/shotwell/src/Photo.vala" g_assert_not_reached (); -#line 5272 "Photo.c" +#line 5283 "Photo.c" } } } @@ -5299,7 +5310,7 @@ void photo_add_backing_photo_for_development (Photo* self, RawDeveloper d, Backi g_propagate_error (error, _inner_error_); #line 632 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 5303 "Photo.c" +#line 5314 "Photo.c" } { GeeHashMap* _tmp3_ = NULL; @@ -5307,7 +5318,7 @@ void photo_add_backing_photo_for_development (Photo* self, RawDeveloper d, Backi _tmp3_ = self->priv->developments; #line 633 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_developments); -#line 5311 "Photo.c" +#line 5322 "Photo.c" { GeeHashMap* _tmp4_ = NULL; RawDeveloper _tmp5_ = 0; @@ -5320,7 +5331,7 @@ void photo_add_backing_photo_for_development (Photo* self, RawDeveloper d, Backi _tmp6_ = bpr; #line 634 "/home/jens/Source/shotwell/src/Photo.vala" gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), (gpointer) ((gintptr) _tmp5_), _tmp6_); -#line 5324 "Photo.c" +#line 5335 "Photo.c" } __finally264: { @@ -5329,7 +5340,7 @@ void photo_add_backing_photo_for_development (Photo* self, RawDeveloper d, Backi _tmp7_ = self->priv->developments; #line 633 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_developments); -#line 5333 "Photo.c" +#line 5344 "Photo.c" } #line 633 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { @@ -5337,7 +5348,7 @@ void photo_add_backing_photo_for_development (Photo* self, RawDeveloper d, Backi g_propagate_error (error, _inner_error_); #line 633 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 5341 "Photo.c" +#line 5352 "Photo.c" } } #line 636 "/home/jens/Source/shotwell/src/Photo.vala" @@ -5348,7 +5359,7 @@ void photo_add_backing_photo_for_development (Photo* self, RawDeveloper d, Backi data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp9_); #line 636 "/home/jens/Source/shotwell/src/Photo.vala" _alteration_unref0 (_tmp9_); -#line 5352 "Photo.c" +#line 5363 "Photo.c" } @@ -5421,7 +5432,7 @@ void photo_import_developed_backing_photo (PhotoRow* row, RawDeveloper d, Backin _g_object_unref0 (file); #line 642 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 5425 "Photo.c" +#line 5436 "Photo.c" } #line 644 "/home/jens/Source/shotwell/src/Photo.vala" _tmp5_ = info; @@ -5451,7 +5462,7 @@ void photo_import_developed_backing_photo (PhotoRow* row, RawDeveloper d, Backin _g_object_unref0 (file); #line 648 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 5455 "Photo.c" +#line 5466 "Photo.c" } #line 650 "/home/jens/Source/shotwell/src/Photo.vala" _tmp10_ = interrogator; @@ -5465,7 +5476,7 @@ void photo_import_developed_backing_photo (PhotoRow* row, RawDeveloper d, Backin if (_tmp13_ == NULL) { #line 651 "/home/jens/Source/shotwell/src/Photo.vala" _tmp12_ = TRUE; -#line 5469 "Photo.c" +#line 5480 "Photo.c" } else { PhotoFileInterrogator* _tmp14_ = NULL; gboolean _tmp15_ = FALSE; @@ -5475,7 +5486,7 @@ void photo_import_developed_backing_photo (PhotoRow* row, RawDeveloper d, Backin _tmp15_ = photo_file_interrogator_get_is_photo_corrupted (_tmp14_); #line 651 "/home/jens/Source/shotwell/src/Photo.vala" _tmp12_ = _tmp15_; -#line 5479 "Photo.c" +#line 5490 "Photo.c" } #line 651 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp12_) { @@ -5489,7 +5500,7 @@ void photo_import_developed_backing_photo (PhotoRow* row, RawDeveloper d, Backin _g_object_unref0 (file); #line 654 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 5493 "Photo.c" +#line 5504 "Photo.c" } #line 657 "/home/jens/Source/shotwell/src/Photo.vala" _tmp16_ = bpr; @@ -5521,7 +5532,7 @@ void photo_import_developed_backing_photo (PhotoRow* row, RawDeveloper d, Backin _tmp27_ = _tmp26_->metadata; #line 660 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp27_ != NULL) { -#line 5525 "Photo.c" +#line 5536 "Photo.c" DetectedPhotoInformation* _tmp28_ = NULL; PhotoMetadata* _tmp29_ = NULL; Orientation _tmp30_ = 0; @@ -5533,11 +5544,11 @@ void photo_import_developed_backing_photo (PhotoRow* row, RawDeveloper d, Backin _tmp30_ = photo_metadata_get_orientation (_tmp29_); #line 660 "/home/jens/Source/shotwell/src/Photo.vala" _tmp25_ = _tmp30_; -#line 5537 "Photo.c" +#line 5548 "Photo.c" } else { #line 661 "/home/jens/Source/shotwell/src/Photo.vala" _tmp25_ = ORIENTATION_TOP_LEFT; -#line 5541 "Photo.c" +#line 5552 "Photo.c" } #line 660 "/home/jens/Source/shotwell/src/Photo.vala" _tmp31_ = bpr; @@ -5567,7 +5578,7 @@ void photo_import_developed_backing_photo (PhotoRow* row, RawDeveloper d, Backin _g_object_unref0 (file); #line 664 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 5571 "Photo.c" +#line 5582 "Photo.c" } #line 665 "/home/jens/Source/shotwell/src/Photo.vala" _tmp35_ = photo_table_get_instance (); @@ -5599,7 +5610,7 @@ void photo_import_developed_backing_photo (PhotoRow* row, RawDeveloper d, Backin _g_object_unref0 (file); #line 665 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 5603 "Photo.c" +#line 5614 "Photo.c" } #line 639 "/home/jens/Source/shotwell/src/Photo.vala" _detected_photo_information_unref0 (detected); @@ -5609,7 +5620,7 @@ void photo_import_developed_backing_photo (PhotoRow* row, RawDeveloper d, Backin _g_object_unref0 (info); #line 639 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (file); -#line 5613 "Photo.c" +#line 5624 "Photo.c" } @@ -5630,7 +5641,7 @@ static void photo_develop_photo (Photo* self, RawDeveloper d) { switch (_tmp0_) { #line 674 "/home/jens/Source/shotwell/src/Photo.vala" case RAW_DEVELOPER_SHOTWELL: -#line 5634 "Photo.c" +#line 5645 "Photo.c" { { BackingPhotoRow* _tmp1_ = NULL; @@ -5670,7 +5681,7 @@ static void photo_develop_photo (Photo* self, RawDeveloper d) { _tmp1_ = _tmp6_; #line 678 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 5674 "Photo.c" +#line 5685 "Photo.c" goto __catch265_g_error; } #line 678 "/home/jens/Source/shotwell/src/Photo.vala" @@ -5683,14 +5694,14 @@ static void photo_develop_photo (Photo* self, RawDeveloper d) { bps = _tmp7_; #line 679 "/home/jens/Source/shotwell/src/Photo.vala" pix = NULL; -#line 5687 "Photo.c" +#line 5698 "Photo.c" { PhotoBackingReaders* _tmp8_ = NULL; #line 680 "/home/jens/Source/shotwell/src/Photo.vala" _tmp8_ = self->priv->readers; #line 680 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_readers); -#line 5694 "Photo.c" +#line 5705 "Photo.c" { GdkPixbuf* _tmp9_ = NULL; Scaling _tmp10_ = {0}; @@ -5704,7 +5715,7 @@ static void photo_develop_photo (Photo* self, RawDeveloper d) { _tmp9_ = _tmp11_; #line 685 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 5708 "Photo.c" +#line 5719 "Photo.c" goto __finally266; } #line 685 "/home/jens/Source/shotwell/src/Photo.vala" @@ -5717,7 +5728,7 @@ static void photo_develop_photo (Photo* self, RawDeveloper d) { pix = _tmp12_; #line 680 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_tmp9_); -#line 5721 "Photo.c" +#line 5732 "Photo.c" } __finally266: { @@ -5726,7 +5737,7 @@ static void photo_develop_photo (Photo* self, RawDeveloper d) { _tmp13_ = self->priv->readers; #line 680 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_readers); -#line 5730 "Photo.c" +#line 5741 "Photo.c" } #line 680 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { @@ -5734,7 +5745,7 @@ static void photo_develop_photo (Photo* self, RawDeveloper d) { _g_object_unref0 (pix); #line 680 "/home/jens/Source/shotwell/src/Photo.vala" _backing_photo_row_unref0 (_tmp1_); -#line 5738 "Photo.c" +#line 5749 "Photo.c" goto __catch265_g_error; } } @@ -5748,14 +5759,14 @@ static void photo_develop_photo (Photo* self, RawDeveloper d) { _g_object_unref0 (pix); #line 690 "/home/jens/Source/shotwell/src/Photo.vala" _backing_photo_row_unref0 (_tmp1_); -#line 5752 "Photo.c" +#line 5763 "Photo.c" { gboolean _tmp15_ = FALSE; #line 714 "/home/jens/Source/shotwell/src/Photo.vala" _tmp15_ = wrote_img_to_disk; #line 714 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp15_) { -#line 5759 "Photo.c" +#line 5770 "Photo.c" { RawDeveloper _tmp16_ = 0; BackingPhotoRow* _tmp17_ = NULL; @@ -5767,12 +5778,12 @@ static void photo_develop_photo (Photo* self, RawDeveloper d) { photo_add_backing_photo_for_development (self, _tmp16_, _tmp17_, &_inner_error_); #line 717 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 5771 "Photo.c" +#line 5782 "Photo.c" goto __catch267_g_error; } #line 719 "/home/jens/Source/shotwell/src/Photo.vala" photo_notify_raw_development_modified (self); -#line 5776 "Photo.c" +#line 5787 "Photo.c" } goto __finally267; __catch267_g_error: @@ -5792,12 +5803,12 @@ static void photo_develop_photo (Photo* self, RawDeveloper d) { g_debug ("Photo.vala:721: Error adding backing photo as development. Message: %s", _tmp19_); #line 715 "/home/jens/Source/shotwell/src/Photo.vala" _g_error_free0 (e); -#line 5796 "Photo.c" +#line 5807 "Photo.c" } __finally267: #line 715 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 5801 "Photo.c" +#line 5812 "Photo.c" goto __catch265_g_error; } } @@ -5806,7 +5817,7 @@ static void photo_develop_photo (Photo* self, RawDeveloper d) { _backing_photo_row_unref0 (bps); #line 690 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 5810 "Photo.c" +#line 5821 "Photo.c" } #line 694 "/home/jens/Source/shotwell/src/Photo.vala" _tmp20_ = bps; @@ -5822,7 +5833,7 @@ static void photo_develop_photo (Photo* self, RawDeveloper d) { _g_object_unref0 (pix); #line 694 "/home/jens/Source/shotwell/src/Photo.vala" _backing_photo_row_unref0 (_tmp1_); -#line 5826 "Photo.c" +#line 5837 "Photo.c" goto __catch265_g_error; } #line 695 "/home/jens/Source/shotwell/src/Photo.vala" @@ -5839,7 +5850,7 @@ static void photo_develop_photo (Photo* self, RawDeveloper d) { _g_object_unref0 (pix); #line 695 "/home/jens/Source/shotwell/src/Photo.vala" _backing_photo_row_unref0 (_tmp1_); -#line 5843 "Photo.c" +#line 5854 "Photo.c" goto __catch265_g_error; } #line 703 "/home/jens/Source/shotwell/src/Photo.vala" @@ -5856,7 +5867,7 @@ static void photo_develop_photo (Photo* self, RawDeveloper d) { _g_object_unref0 (pix); #line 708 "/home/jens/Source/shotwell/src/Photo.vala" _backing_photo_row_unref0 (_tmp1_); -#line 5860 "Photo.c" +#line 5871 "Photo.c" goto __catch265_g_error; } #line 709 "/home/jens/Source/shotwell/src/Photo.vala" @@ -5877,7 +5888,7 @@ static void photo_develop_photo (Photo* self, RawDeveloper d) { _g_object_unref0 (pix); #line 709 "/home/jens/Source/shotwell/src/Photo.vala" _backing_photo_row_unref0 (_tmp1_); -#line 5881 "Photo.c" +#line 5892 "Photo.c" goto __catch265_g_error; } #line 710 "/home/jens/Source/shotwell/src/Photo.vala" @@ -5898,7 +5909,7 @@ static void photo_develop_photo (Photo* self, RawDeveloper d) { _g_object_unref0 (pix); #line 710 "/home/jens/Source/shotwell/src/Photo.vala" _backing_photo_row_unref0 (_tmp1_); -#line 5902 "Photo.c" +#line 5913 "Photo.c" goto __catch265_g_error; } #line 676 "/home/jens/Source/shotwell/src/Photo.vala" @@ -5911,7 +5922,7 @@ static void photo_develop_photo (Photo* self, RawDeveloper d) { _g_object_unref0 (pix); #line 676 "/home/jens/Source/shotwell/src/Photo.vala" _backing_photo_row_unref0 (_tmp1_); -#line 5915 "Photo.c" +#line 5926 "Photo.c" } goto __finally265; __catch265_g_error: @@ -5931,7 +5942,7 @@ static void photo_develop_photo (Photo* self, RawDeveloper d) { g_debug ("Photo.vala:712: Error developing photo: %s", _tmp32_); #line 676 "/home/jens/Source/shotwell/src/Photo.vala" _g_error_free0 (err); -#line 5935 "Photo.c" +#line 5946 "Photo.c" } __finally265: { @@ -5940,7 +5951,7 @@ static void photo_develop_photo (Photo* self, RawDeveloper d) { _tmp33_ = wrote_img_to_disk; #line 714 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp33_) { -#line 5944 "Photo.c" +#line 5955 "Photo.c" { RawDeveloper _tmp34_ = 0; BackingPhotoRow* _tmp35_ = NULL; @@ -5952,12 +5963,12 @@ static void photo_develop_photo (Photo* self, RawDeveloper d) { photo_add_backing_photo_for_development (self, _tmp34_, _tmp35_, &_inner_error_); #line 717 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 5956 "Photo.c" +#line 5967 "Photo.c" goto __catch268_g_error; } #line 719 "/home/jens/Source/shotwell/src/Photo.vala" photo_notify_raw_development_modified (self); -#line 5961 "Photo.c" +#line 5972 "Photo.c" } goto __finally268; __catch268_g_error: @@ -5977,7 +5988,7 @@ static void photo_develop_photo (Photo* self, RawDeveloper d) { g_debug ("Photo.vala:721: Error adding backing photo as development. Message: %s", _tmp37_); #line 715 "/home/jens/Source/shotwell/src/Photo.vala" _g_error_free0 (e); -#line 5981 "Photo.c" +#line 5992 "Photo.c" } __finally268: #line 715 "/home/jens/Source/shotwell/src/Photo.vala" @@ -5990,7 +6001,7 @@ static void photo_develop_photo (Photo* self, RawDeveloper d) { g_clear_error (&_inner_error_); #line 715 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 5994 "Photo.c" +#line 6005 "Photo.c" } } } @@ -6004,23 +6015,23 @@ static void photo_develop_photo (Photo* self, RawDeveloper d) { g_clear_error (&_inner_error_); #line 676 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 6008 "Photo.c" +#line 6019 "Photo.c" } #line 727 "/home/jens/Source/shotwell/src/Photo.vala" break; -#line 6012 "Photo.c" +#line 6023 "Photo.c" } #line 674 "/home/jens/Source/shotwell/src/Photo.vala" case RAW_DEVELOPER_CAMERA: -#line 6016 "Photo.c" +#line 6027 "Photo.c" { #line 731 "/home/jens/Source/shotwell/src/Photo.vala" break; -#line 6020 "Photo.c" +#line 6031 "Photo.c" } #line 674 "/home/jens/Source/shotwell/src/Photo.vala" case RAW_DEVELOPER_EMBEDDED: -#line 6024 "Photo.c" +#line 6035 "Photo.c" { { PhotoMetadata* meta = NULL; @@ -6063,7 +6074,7 @@ static void photo_develop_photo (Photo* self, RawDeveloper d) { meta = _tmp38_; #line 736 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 6067 "Photo.c" +#line 6078 "Photo.c" goto __catch269_g_error; } #line 737 "/home/jens/Source/shotwell/src/Photo.vala" @@ -6078,14 +6089,14 @@ static void photo_develop_photo (Photo* self, RawDeveloper d) { if (_tmp41_ <= ((guint) 0)) { #line 739 "/home/jens/Source/shotwell/src/Photo.vala" _media_metadata_unref0 (meta); -#line 6082 "Photo.c" +#line 6093 "Photo.c" { gboolean _tmp42_ = FALSE; #line 768 "/home/jens/Source/shotwell/src/Photo.vala" _tmp42_ = wrote_img_to_disk; #line 768 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp42_) { -#line 6089 "Photo.c" +#line 6100 "Photo.c" { RawDeveloper _tmp43_ = 0; BackingPhotoRow* _tmp44_ = NULL; @@ -6097,12 +6108,12 @@ static void photo_develop_photo (Photo* self, RawDeveloper d) { photo_add_backing_photo_for_development (self, _tmp43_, _tmp44_, &_inner_error_); #line 771 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 6101 "Photo.c" +#line 6112 "Photo.c" goto __catch270_g_error; } #line 773 "/home/jens/Source/shotwell/src/Photo.vala" photo_notify_raw_development_modified (self); -#line 6106 "Photo.c" +#line 6117 "Photo.c" } goto __finally270; __catch270_g_error: @@ -6122,12 +6133,12 @@ static void photo_develop_photo (Photo* self, RawDeveloper d) { g_debug ("Photo.vala:775: Error adding backing photo as development. Message: %s", _tmp46_); #line 769 "/home/jens/Source/shotwell/src/Photo.vala" _g_error_free0 (e); -#line 6126 "Photo.c" +#line 6137 "Photo.c" } __finally270: #line 769 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 6131 "Photo.c" +#line 6142 "Photo.c" goto __catch269_g_error; } } @@ -6136,7 +6147,7 @@ static void photo_develop_photo (Photo* self, RawDeveloper d) { _backing_photo_row_unref0 (bps); #line 739 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 6140 "Photo.c" +#line 6151 "Photo.c" } #line 740 "/home/jens/Source/shotwell/src/Photo.vala" _tmp47_ = meta; @@ -6156,14 +6167,14 @@ static void photo_develop_photo (Photo* self, RawDeveloper d) { _photo_preview_unref0 (prev); #line 743 "/home/jens/Source/shotwell/src/Photo.vala" _media_metadata_unref0 (meta); -#line 6160 "Photo.c" +#line 6171 "Photo.c" { gboolean _tmp51_ = FALSE; #line 768 "/home/jens/Source/shotwell/src/Photo.vala" _tmp51_ = wrote_img_to_disk; #line 768 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp51_) { -#line 6167 "Photo.c" +#line 6178 "Photo.c" { RawDeveloper _tmp52_ = 0; BackingPhotoRow* _tmp53_ = NULL; @@ -6175,12 +6186,12 @@ static void photo_develop_photo (Photo* self, RawDeveloper d) { photo_add_backing_photo_for_development (self, _tmp52_, _tmp53_, &_inner_error_); #line 771 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 6179 "Photo.c" +#line 6190 "Photo.c" goto __catch271_g_error; } #line 773 "/home/jens/Source/shotwell/src/Photo.vala" photo_notify_raw_development_modified (self); -#line 6184 "Photo.c" +#line 6195 "Photo.c" } goto __finally271; __catch271_g_error: @@ -6200,12 +6211,12 @@ static void photo_develop_photo (Photo* self, RawDeveloper d) { g_debug ("Photo.vala:775: Error adding backing photo as development. Message: %s", _tmp55_); #line 769 "/home/jens/Source/shotwell/src/Photo.vala" _g_error_free0 (e); -#line 6204 "Photo.c" +#line 6215 "Photo.c" } __finally271: #line 769 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 6209 "Photo.c" +#line 6220 "Photo.c" goto __catch269_g_error; } } @@ -6214,7 +6225,7 @@ static void photo_develop_photo (Photo* self, RawDeveloper d) { _backing_photo_row_unref0 (bps); #line 743 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 6218 "Photo.c" +#line 6229 "Photo.c" } #line 746 "/home/jens/Source/shotwell/src/Photo.vala" _tmp56_ = prev; @@ -6228,7 +6239,7 @@ static void photo_develop_photo (Photo* self, RawDeveloper d) { _photo_preview_unref0 (prev); #line 746 "/home/jens/Source/shotwell/src/Photo.vala" _media_metadata_unref0 (meta); -#line 6232 "Photo.c" +#line 6243 "Photo.c" goto __catch269_g_error; } #line 747 "/home/jens/Source/shotwell/src/Photo.vala" @@ -6243,14 +6254,14 @@ static void photo_develop_photo (Photo* self, RawDeveloper d) { _photo_preview_unref0 (prev); #line 749 "/home/jens/Source/shotwell/src/Photo.vala" _media_metadata_unref0 (meta); -#line 6247 "Photo.c" +#line 6258 "Photo.c" { gboolean _tmp59_ = FALSE; #line 768 "/home/jens/Source/shotwell/src/Photo.vala" _tmp59_ = wrote_img_to_disk; #line 768 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp59_) { -#line 6254 "Photo.c" +#line 6265 "Photo.c" { RawDeveloper _tmp60_ = 0; BackingPhotoRow* _tmp61_ = NULL; @@ -6262,12 +6273,12 @@ static void photo_develop_photo (Photo* self, RawDeveloper d) { photo_add_backing_photo_for_development (self, _tmp60_, _tmp61_, &_inner_error_); #line 771 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 6266 "Photo.c" +#line 6277 "Photo.c" goto __catch272_g_error; } #line 773 "/home/jens/Source/shotwell/src/Photo.vala" photo_notify_raw_development_modified (self); -#line 6271 "Photo.c" +#line 6282 "Photo.c" } goto __finally272; __catch272_g_error: @@ -6287,12 +6298,12 @@ static void photo_develop_photo (Photo* self, RawDeveloper d) { g_debug ("Photo.vala:775: Error adding backing photo as development. Message: %s", _tmp63_); #line 769 "/home/jens/Source/shotwell/src/Photo.vala" _g_error_free0 (e); -#line 6291 "Photo.c" +#line 6302 "Photo.c" } __finally272: #line 769 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 6296 "Photo.c" +#line 6307 "Photo.c" goto __catch269_g_error; } } @@ -6301,7 +6312,7 @@ static void photo_develop_photo (Photo* self, RawDeveloper d) { _backing_photo_row_unref0 (bps); #line 749 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 6305 "Photo.c" +#line 6316 "Photo.c" } #line 753 "/home/jens/Source/shotwell/src/Photo.vala" _tmp65_ = d; @@ -6323,7 +6334,7 @@ static void photo_develop_photo (Photo* self, RawDeveloper d) { _photo_preview_unref0 (prev); #line 753 "/home/jens/Source/shotwell/src/Photo.vala" _media_metadata_unref0 (meta); -#line 6327 "Photo.c" +#line 6338 "Photo.c" goto __catch269_g_error; } #line 753 "/home/jens/Source/shotwell/src/Photo.vala" @@ -6352,7 +6363,7 @@ static void photo_develop_photo (Photo* self, RawDeveloper d) { _photo_preview_unref0 (prev); #line 754 "/home/jens/Source/shotwell/src/Photo.vala" _media_metadata_unref0 (meta); -#line 6356 "Photo.c" +#line 6367 "Photo.c" goto __catch269_g_error; } #line 755 "/home/jens/Source/shotwell/src/Photo.vala" @@ -6373,7 +6384,7 @@ static void photo_develop_photo (Photo* self, RawDeveloper d) { _photo_preview_unref0 (prev); #line 755 "/home/jens/Source/shotwell/src/Photo.vala" _media_metadata_unref0 (meta); -#line 6377 "Photo.c" +#line 6388 "Photo.c" goto __catch269_g_error; } #line 759 "/home/jens/Source/shotwell/src/Photo.vala" @@ -6398,7 +6409,7 @@ static void photo_develop_photo (Photo* self, RawDeveloper d) { _photo_preview_unref0 (prev); #line 762 "/home/jens/Source/shotwell/src/Photo.vala" _media_metadata_unref0 (meta); -#line 6402 "Photo.c" +#line 6413 "Photo.c" goto __catch269_g_error; } #line 763 "/home/jens/Source/shotwell/src/Photo.vala" @@ -6421,7 +6432,7 @@ static void photo_develop_photo (Photo* self, RawDeveloper d) { _photo_preview_unref0 (prev); #line 763 "/home/jens/Source/shotwell/src/Photo.vala" _media_metadata_unref0 (meta); -#line 6425 "Photo.c" +#line 6436 "Photo.c" goto __catch269_g_error; } #line 734 "/home/jens/Source/shotwell/src/Photo.vala" @@ -6436,7 +6447,7 @@ static void photo_develop_photo (Photo* self, RawDeveloper d) { _photo_preview_unref0 (prev); #line 734 "/home/jens/Source/shotwell/src/Photo.vala" _media_metadata_unref0 (meta); -#line 6440 "Photo.c" +#line 6451 "Photo.c" } goto __finally269; __catch269_g_error: @@ -6456,14 +6467,14 @@ static void photo_develop_photo (Photo* self, RawDeveloper d) { g_debug ("Photo.vala:765: Error accessing embedded preview. Message: %s", _tmp82_); #line 766 "/home/jens/Source/shotwell/src/Photo.vala" _g_error_free0 (e); -#line 6460 "Photo.c" +#line 6471 "Photo.c" { gboolean _tmp83_ = FALSE; #line 768 "/home/jens/Source/shotwell/src/Photo.vala" _tmp83_ = wrote_img_to_disk; #line 768 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp83_) { -#line 6467 "Photo.c" +#line 6478 "Photo.c" { RawDeveloper _tmp84_ = 0; BackingPhotoRow* _tmp85_ = NULL; @@ -6475,12 +6486,12 @@ static void photo_develop_photo (Photo* self, RawDeveloper d) { photo_add_backing_photo_for_development (self, _tmp84_, _tmp85_, &_inner_error_); #line 771 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 6479 "Photo.c" +#line 6490 "Photo.c" goto __catch273_g_error; } #line 773 "/home/jens/Source/shotwell/src/Photo.vala" photo_notify_raw_development_modified (self); -#line 6484 "Photo.c" +#line 6495 "Photo.c" } goto __finally273; __catch273_g_error: @@ -6500,14 +6511,14 @@ static void photo_develop_photo (Photo* self, RawDeveloper d) { g_debug ("Photo.vala:775: Error adding backing photo as development. Message: %s", _tmp87_); #line 769 "/home/jens/Source/shotwell/src/Photo.vala" _g_error_free0 (e); -#line 6504 "Photo.c" +#line 6515 "Photo.c" } __finally273: #line 769 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 769 "/home/jens/Source/shotwell/src/Photo.vala" _backing_photo_row_unref0 (bps); -#line 6511 "Photo.c" +#line 6522 "Photo.c" } } } @@ -6515,7 +6526,7 @@ static void photo_develop_photo (Photo* self, RawDeveloper d) { _backing_photo_row_unref0 (bps); #line 766 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 6519 "Photo.c" +#line 6530 "Photo.c" } __finally269: { @@ -6524,7 +6535,7 @@ static void photo_develop_photo (Photo* self, RawDeveloper d) { _tmp88_ = wrote_img_to_disk; #line 768 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp88_) { -#line 6528 "Photo.c" +#line 6539 "Photo.c" { RawDeveloper _tmp89_ = 0; BackingPhotoRow* _tmp90_ = NULL; @@ -6536,12 +6547,12 @@ static void photo_develop_photo (Photo* self, RawDeveloper d) { photo_add_backing_photo_for_development (self, _tmp89_, _tmp90_, &_inner_error_); #line 771 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 6540 "Photo.c" +#line 6551 "Photo.c" goto __catch274_g_error; } #line 773 "/home/jens/Source/shotwell/src/Photo.vala" photo_notify_raw_development_modified (self); -#line 6545 "Photo.c" +#line 6556 "Photo.c" } goto __finally274; __catch274_g_error: @@ -6561,7 +6572,7 @@ static void photo_develop_photo (Photo* self, RawDeveloper d) { g_debug ("Photo.vala:775: Error adding backing photo as development. Message: %s", _tmp92_); #line 769 "/home/jens/Source/shotwell/src/Photo.vala" _g_error_free0 (e); -#line 6565 "Photo.c" +#line 6576 "Photo.c" } __finally274: #line 769 "/home/jens/Source/shotwell/src/Photo.vala" @@ -6574,7 +6585,7 @@ static void photo_develop_photo (Photo* self, RawDeveloper d) { g_clear_error (&_inner_error_); #line 769 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 6578 "Photo.c" +#line 6589 "Photo.c" } } } @@ -6588,22 +6599,22 @@ static void photo_develop_photo (Photo* self, RawDeveloper d) { g_clear_error (&_inner_error_); #line 734 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 6592 "Photo.c" +#line 6603 "Photo.c" } #line 780 "/home/jens/Source/shotwell/src/Photo.vala" break; -#line 6596 "Photo.c" +#line 6607 "Photo.c" } default: { #line 783 "/home/jens/Source/shotwell/src/Photo.vala" g_assert_not_reached (); -#line 6602 "Photo.c" +#line 6613 "Photo.c" } } #line 670 "/home/jens/Source/shotwell/src/Photo.vala" _backing_photo_row_unref0 (bps); -#line 6607 "Photo.c" +#line 6618 "Photo.c" } @@ -6611,14 +6622,14 @@ void photo_set_default_raw_developer (Photo* self, RawDeveloper d) { GError * _inner_error_ = NULL; #line 788 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (IS_PHOTO (self)); -#line 6615 "Photo.c" +#line 6626 "Photo.c" { PhotoRow* _tmp0_ = NULL; #line 789 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = self->row; #line 789 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_row); -#line 6622 "Photo.c" +#line 6633 "Photo.c" { PhotoRow* _tmp1_ = NULL; RawDeveloper _tmp2_ = 0; @@ -6628,7 +6639,7 @@ void photo_set_default_raw_developer (Photo* self, RawDeveloper d) { _tmp2_ = d; #line 790 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_->developer = _tmp2_; -#line 6632 "Photo.c" +#line 6643 "Photo.c" } __finally275: { @@ -6637,7 +6648,7 @@ void photo_set_default_raw_developer (Photo* self, RawDeveloper d) { _tmp3_ = self->row; #line 789 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 6641 "Photo.c" +#line 6652 "Photo.c" } #line 789 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { @@ -6647,7 +6658,7 @@ void photo_set_default_raw_developer (Photo* self, RawDeveloper d) { g_clear_error (&_inner_error_); #line 789 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 6651 "Photo.c" +#line 6662 "Photo.c" } } } @@ -6669,29 +6680,29 @@ void photo_set_raw_developer (Photo* self, RawDeveloper d) { if (_tmp0_ != PHOTO_FILE_FORMAT_RAW) { #line 797 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 6673 "Photo.c" +#line 6684 "Photo.c" } #line 802 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = photo_is_raw_developer_available (self, RAW_DEVELOPER_CAMERA); #line 802 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp2_) { -#line 6679 "Photo.c" +#line 6690 "Photo.c" RawDeveloper _tmp3_ = 0; #line 802 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = d; #line 802 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = _tmp3_ == RAW_DEVELOPER_EMBEDDED; -#line 6685 "Photo.c" +#line 6696 "Photo.c" } else { #line 802 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = FALSE; -#line 6689 "Photo.c" +#line 6700 "Photo.c" } #line 802 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp1_) { #line 803 "/home/jens/Source/shotwell/src/Photo.vala" d = RAW_DEVELOPER_CAMERA; -#line 6695 "Photo.c" +#line 6706 "Photo.c" } #line 807 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = photo_is_raw_developer_available (self, RAW_DEVELOPER_EMBEDDED); @@ -6699,7 +6710,7 @@ void photo_set_raw_developer (Photo* self, RawDeveloper d) { if (!_tmp4_) { #line 808 "/home/jens/Source/shotwell/src/Photo.vala" d = RAW_DEVELOPER_SHOTWELL; -#line 6703 "Photo.c" +#line 6714 "Photo.c" } { GeeHashMap* _tmp5_ = NULL; @@ -6707,7 +6718,7 @@ void photo_set_raw_developer (Photo* self, RawDeveloper d) { _tmp5_ = self->priv->developments; #line 810 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_developments); -#line 6711 "Photo.c" +#line 6722 "Photo.c" { RawDeveloper stale_raw_developer = 0; PhotoRow* _tmp6_ = NULL; @@ -6744,13 +6755,13 @@ void photo_set_raw_developer (Photo* self, RawDeveloper d) { _tmp9_ = photo_is_raw_developer_complete (self, _tmp8_); #line 814 "/home/jens/Source/shotwell/src/Photo.vala" if (!_tmp9_) { -#line 6748 "Photo.c" +#line 6759 "Photo.c" RawDeveloper _tmp10_ = 0; #line 815 "/home/jens/Source/shotwell/src/Photo.vala" _tmp10_ = d; #line 815 "/home/jens/Source/shotwell/src/Photo.vala" photo_develop_photo (self, _tmp10_); -#line 6754 "Photo.c" +#line 6765 "Photo.c" } #line 817 "/home/jens/Source/shotwell/src/Photo.vala" _tmp11_ = self->priv->developments; @@ -6760,18 +6771,18 @@ void photo_set_raw_developer (Photo* self, RawDeveloper d) { _tmp13_ = gee_abstract_map_has_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), (gpointer) ((gintptr) _tmp12_)); #line 817 "/home/jens/Source/shotwell/src/Photo.vala" if (!_tmp13_) { -#line 6764 "Photo.c" +#line 6775 "Photo.c" { GeeHashMap* _tmp14_ = NULL; #line 810 "/home/jens/Source/shotwell/src/Photo.vala" _tmp14_ = self->priv->developments; #line 810 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_developments); -#line 6771 "Photo.c" +#line 6782 "Photo.c" } #line 818 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 6775 "Photo.c" +#line 6786 "Photo.c" } #line 821 "/home/jens/Source/shotwell/src/Photo.vala" photo_revert_to_master (self, FALSE); @@ -6807,7 +6818,7 @@ void photo_set_raw_developer (Photo* self, RawDeveloper d) { _photo_file_adapter_unref0 (_tmp20_->developer); #line 826 "/home/jens/Source/shotwell/src/Photo.vala" _tmp20_->developer = _tmp25_; -#line 6811 "Photo.c" +#line 6822 "Photo.c" { GdkPixbuf* _tmp26_ = NULL; GdkPixbuf* _tmp27_ = NULL; @@ -6819,7 +6830,7 @@ void photo_set_raw_developer (Photo* self, RawDeveloper d) { _g_object_unref0 (_tmp27_); #line 829 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 6823 "Photo.c" +#line 6834 "Photo.c" goto __catch277_g_error; } } @@ -6833,30 +6844,30 @@ void photo_set_raw_developer (Photo* self, RawDeveloper d) { _inner_error_ = NULL; #line 832 "/home/jens/Source/shotwell/src/Photo.vala" _g_error_free0 (e); -#line 6837 "Photo.c" +#line 6848 "Photo.c" { GeeHashMap* _tmp28_ = NULL; #line 810 "/home/jens/Source/shotwell/src/Photo.vala" _tmp28_ = self->priv->developments; #line 810 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_developments); -#line 6844 "Photo.c" +#line 6855 "Photo.c" } #line 832 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 6848 "Photo.c" +#line 6859 "Photo.c" } __finally277: #line 828 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 6853 "Photo.c" +#line 6864 "Photo.c" { GeeHashMap* _tmp29_ = NULL; #line 810 "/home/jens/Source/shotwell/src/Photo.vala" _tmp29_ = self->priv->developments; #line 810 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_developments); -#line 6860 "Photo.c" +#line 6871 "Photo.c" } #line 828 "/home/jens/Source/shotwell/src/Photo.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); @@ -6864,7 +6875,7 @@ void photo_set_raw_developer (Photo* self, RawDeveloper d) { g_clear_error (&_inner_error_); #line 828 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 6868 "Photo.c" +#line 6879 "Photo.c" } #line 835 "/home/jens/Source/shotwell/src/Photo.vala" _tmp30_ = self->backing_photo_row; @@ -6872,7 +6883,7 @@ void photo_set_raw_developer (Photo* self, RawDeveloper d) { _tmp31_ = _tmp30_->original_orientation; #line 835 "/home/jens/Source/shotwell/src/Photo.vala" photo_set_orientation (self, _tmp31_); -#line 6876 "Photo.c" +#line 6887 "Photo.c" { PhotoTable* _tmp32_ = NULL; PhotoTable* _tmp33_ = NULL; @@ -6898,7 +6909,7 @@ void photo_set_raw_developer (Photo* self, RawDeveloper d) { _database_table_unref0 (_tmp33_); #line 838 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 6902 "Photo.c" +#line 6913 "Photo.c" goto __catch278_g_error; } } @@ -6920,19 +6931,19 @@ void photo_set_raw_developer (Photo* self, RawDeveloper d) { g_warning ("Photo.vala:840: Error updating database: %s", _tmp39_); #line 837 "/home/jens/Source/shotwell/src/Photo.vala" _g_error_free0 (e); -#line 6924 "Photo.c" +#line 6935 "Photo.c" } __finally278: #line 837 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 6929 "Photo.c" +#line 6940 "Photo.c" { GeeHashMap* _tmp40_ = NULL; #line 810 "/home/jens/Source/shotwell/src/Photo.vala" _tmp40_ = self->priv->developments; #line 810 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_developments); -#line 6936 "Photo.c" +#line 6947 "Photo.c" } #line 837 "/home/jens/Source/shotwell/src/Photo.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); @@ -6940,13 +6951,13 @@ void photo_set_raw_developer (Photo* self, RawDeveloper d) { g_clear_error (&_inner_error_); #line 837 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 6944 "Photo.c" +#line 6955 "Photo.c" } #line 847 "/home/jens/Source/shotwell/src/Photo.vala" _tmp42_ = stale_raw_developer; #line 847 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp42_ != RAW_DEVELOPER_CAMERA) { -#line 6950 "Photo.c" +#line 6961 "Photo.c" RawDeveloper _tmp43_ = 0; PhotoRow* _tmp44_ = NULL; RawDeveloper _tmp45_ = 0; @@ -6958,21 +6969,21 @@ void photo_set_raw_developer (Photo* self, RawDeveloper d) { _tmp45_ = _tmp44_->developer; #line 848 "/home/jens/Source/shotwell/src/Photo.vala" _tmp41_ = _tmp43_ != _tmp45_; -#line 6962 "Photo.c" +#line 6973 "Photo.c" } else { #line 847 "/home/jens/Source/shotwell/src/Photo.vala" _tmp41_ = FALSE; -#line 6966 "Photo.c" +#line 6977 "Photo.c" } #line 847 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp41_) { -#line 6970 "Photo.c" +#line 6981 "Photo.c" RawDeveloper _tmp46_ = 0; #line 851 "/home/jens/Source/shotwell/src/Photo.vala" _tmp46_ = stale_raw_developer; #line 851 "/home/jens/Source/shotwell/src/Photo.vala" photo_delete_raw_development (self, _tmp46_); -#line 6976 "Photo.c" +#line 6987 "Photo.c" } } __finally276: @@ -6982,7 +6993,7 @@ void photo_set_raw_developer (Photo* self, RawDeveloper d) { _tmp47_ = self->priv->developments; #line 810 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_developments); -#line 6986 "Photo.c" +#line 6997 "Photo.c" } #line 810 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { @@ -6992,7 +7003,7 @@ void photo_set_raw_developer (Photo* self, RawDeveloper d) { g_clear_error (&_inner_error_); #line 810 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 6996 "Photo.c" +#line 7007 "Photo.c" } } #line 858 "/home/jens/Source/shotwell/src/Photo.vala" @@ -7005,7 +7016,7 @@ void photo_set_raw_developer (Photo* self, RawDeveloper d) { _alteration_unref0 (_tmp49_); #line 859 "/home/jens/Source/shotwell/src/Photo.vala" photo_discard_prefetched (self); -#line 7009 "Photo.c" +#line 7020 "Photo.c" } @@ -7023,7 +7034,7 @@ RawDeveloper photo_get_raw_developer (Photo* self) { result = _tmp1_; #line 863 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 7027 "Photo.c" +#line 7038 "Photo.c" } @@ -7035,14 +7046,14 @@ static gboolean photo_delete_raw_development (Photo* self, RawDeveloper d) { g_return_val_if_fail (IS_PHOTO (self), FALSE); #line 869 "/home/jens/Source/shotwell/src/Photo.vala" ret = FALSE; -#line 7039 "Photo.c" +#line 7050 "Photo.c" { GeeHashMap* _tmp0_ = NULL; #line 871 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = self->priv->developments; #line 871 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_developments); -#line 7046 "Photo.c" +#line 7057 "Photo.c" { GeeHashMap* _tmp1_ = NULL; RawDeveloper _tmp2_ = 0; @@ -7058,9 +7069,9 @@ static gboolean photo_delete_raw_development (Photo* self, RawDeveloper d) { gpointer _tmp12_ = NULL; BackingPhotoRow* _tmp13_ = NULL; const gchar* _tmp14_ = NULL; - GeeHashMap* _tmp37_ = NULL; - RawDeveloper _tmp38_ = 0; - gboolean _tmp39_ = FALSE; + GeeHashMap* _tmp39_ = NULL; + RawDeveloper _tmp40_ = 0; + gboolean _tmp41_ = FALSE; #line 872 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = self->priv->developments; #line 872 "/home/jens/Source/shotwell/src/Photo.vala" @@ -7071,18 +7082,18 @@ static gboolean photo_delete_raw_development (Photo* self, RawDeveloper d) { if (!_tmp3_) { #line 873 "/home/jens/Source/shotwell/src/Photo.vala" result = FALSE; -#line 7075 "Photo.c" +#line 7086 "Photo.c" { GeeHashMap* _tmp4_ = NULL; #line 871 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = self->priv->developments; #line 871 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_developments); -#line 7082 "Photo.c" +#line 7093 "Photo.c" } #line 873 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 7086 "Photo.c" +#line 7097 "Photo.c" } #line 877 "/home/jens/Source/shotwell/src/Photo.vala" _tmp5_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject)); @@ -7114,7 +7125,7 @@ static gboolean photo_delete_raw_development (Photo* self, RawDeveloper d) { _tmp14_ = _tmp13_->filepath; #line 879 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp14_ != NULL) { -#line 7118 "Photo.c" +#line 7129 "Photo.c" GFile* f = NULL; BackingPhotoRow* _tmp15_ = NULL; const gchar* _tmp16_ = NULL; @@ -7127,14 +7138,14 @@ static gboolean photo_delete_raw_development (Photo* self, RawDeveloper d) { _tmp17_ = g_file_new_for_path (_tmp16_); #line 880 "/home/jens/Source/shotwell/src/Photo.vala" f = _tmp17_; -#line 7131 "Photo.c" +#line 7142 "Photo.c" { RawDeveloper _tmp18_ = 0; #line 882 "/home/jens/Source/shotwell/src/Photo.vala" _tmp18_ = d; #line 882 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp18_ == RAW_DEVELOPER_CAMERA) { -#line 7138 "Photo.c" +#line 7149 "Photo.c" GFile* _tmp19_ = NULL; #line 883 "/home/jens/Source/shotwell/src/Photo.vala" _tmp19_ = f; @@ -7142,7 +7153,7 @@ static gboolean photo_delete_raw_development (Photo* self, RawDeveloper d) { g_file_trash (_tmp19_, NULL, &_inner_error_); #line 883 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 7146 "Photo.c" +#line 7157 "Photo.c" goto __catch280_g_error; } } else { @@ -7153,7 +7164,7 @@ static gboolean photo_delete_raw_development (Photo* self, RawDeveloper d) { g_file_delete (_tmp20_, NULL, &_inner_error_); #line 885 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 7157 "Photo.c" +#line 7168 "Photo.c" goto __catch280_g_error; } } @@ -7182,11 +7193,13 @@ static gboolean photo_delete_raw_development (Photo* self, RawDeveloper d) { g_warning ("Photo.vala:887: Unable to delete RAW development: %s error: %s", _tmp22_, _tmp24_); #line 881 "/home/jens/Source/shotwell/src/Photo.vala" _g_error_free0 (e); -#line 7186 "Photo.c" +#line 7197 "Photo.c" } __finally280: #line 881 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { +#line 7202 "Photo.c" + gboolean _tmp26_ = FALSE; #line 881 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (f); #line 881 "/home/jens/Source/shotwell/src/Photo.vala" @@ -7195,68 +7208,68 @@ static gboolean photo_delete_raw_development (Photo* self, RawDeveloper d) { _g_object_unref0 (f); #line 881 "/home/jens/Source/shotwell/src/Photo.vala" _backing_photo_row_unref0 (bpr); -#line 7199 "Photo.c" +#line 7212 "Photo.c" { GeeHashMap* _tmp25_ = NULL; #line 871 "/home/jens/Source/shotwell/src/Photo.vala" _tmp25_ = self->priv->developments; #line 871 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_developments); -#line 7206 "Photo.c" +#line 7219 "Photo.c" } #line 881 "/home/jens/Source/shotwell/src/Photo.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); #line 881 "/home/jens/Source/shotwell/src/Photo.vala" g_clear_error (&_inner_error_); #line 881 "/home/jens/Source/shotwell/src/Photo.vala" - return FALSE; -#line 7214 "Photo.c" + return _tmp26_; +#line 7227 "Photo.c" } #line 879 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (f); -#line 7218 "Photo.c" +#line 7231 "Photo.c" } { - PhotoTable* _tmp26_ = NULL; PhotoTable* _tmp27_ = NULL; - PhotoRow* _tmp28_ = NULL; - RawDeveloper _tmp29_ = 0; - BackingPhotoTable* _tmp30_ = NULL; + PhotoTable* _tmp28_ = NULL; + PhotoRow* _tmp29_ = NULL; + RawDeveloper _tmp30_ = 0; BackingPhotoTable* _tmp31_ = NULL; - BackingPhotoRow* _tmp32_ = NULL; - BackingPhotoID _tmp33_ = {0}; + BackingPhotoTable* _tmp32_ = NULL; + BackingPhotoRow* _tmp33_ = NULL; + BackingPhotoID _tmp34_ = {0}; #line 893 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp26_ = photo_table_get_instance (); + _tmp27_ = photo_table_get_instance (); #line 893 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp27_ = _tmp26_; + _tmp28_ = _tmp27_; #line 893 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp28_ = self->row; + _tmp29_ = self->row; #line 893 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp29_ = d; + _tmp30_ = d; #line 893 "/home/jens/Source/shotwell/src/Photo.vala" - photo_table_remove_development (_tmp27_, _tmp28_, _tmp29_, &_inner_error_); + photo_table_remove_development (_tmp28_, _tmp29_, _tmp30_, &_inner_error_); #line 893 "/home/jens/Source/shotwell/src/Photo.vala" - _database_table_unref0 (_tmp27_); + _database_table_unref0 (_tmp28_); #line 893 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 7243 "Photo.c" +#line 7256 "Photo.c" goto __catch281_g_error; } #line 894 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp30_ = backing_photo_table_get_instance (); + _tmp31_ = backing_photo_table_get_instance (); #line 894 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp31_ = _tmp30_; + _tmp32_ = _tmp31_; #line 894 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp32_ = bpr; + _tmp33_ = bpr; #line 894 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp33_ = _tmp32_->id; + _tmp34_ = _tmp33_->id; #line 894 "/home/jens/Source/shotwell/src/Photo.vala" - backing_photo_table_remove (_tmp31_, &_tmp33_, &_inner_error_); + backing_photo_table_remove (_tmp32_, &_tmp34_, &_inner_error_); #line 894 "/home/jens/Source/shotwell/src/Photo.vala" - _database_table_unref0 (_tmp31_); + _database_table_unref0 (_tmp32_); #line 894 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 7260 "Photo.c" +#line 7273 "Photo.c" goto __catch281_g_error; } } @@ -7264,76 +7277,80 @@ static gboolean photo_delete_raw_development (Photo* self, RawDeveloper d) { __catch281_g_error: { GError* e = NULL; - GError* _tmp34_ = NULL; - const gchar* _tmp35_ = NULL; + GError* _tmp35_ = NULL; + const gchar* _tmp36_ = NULL; #line 892 "/home/jens/Source/shotwell/src/Photo.vala" e = _inner_error_; #line 892 "/home/jens/Source/shotwell/src/Photo.vala" _inner_error_ = NULL; #line 896 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp34_ = e; + _tmp35_ = e; #line 896 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp35_ = _tmp34_->message; + _tmp36_ = _tmp35_->message; #line 896 "/home/jens/Source/shotwell/src/Photo.vala" - g_warning ("Photo.vala:896: Database error while deleting RAW development: %s", _tmp35_); + g_warning ("Photo.vala:896: Database error while deleting RAW development: %s", _tmp36_); #line 892 "/home/jens/Source/shotwell/src/Photo.vala" _g_error_free0 (e); -#line 7282 "Photo.c" +#line 7295 "Photo.c" } __finally281: #line 892 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { +#line 7300 "Photo.c" + gboolean _tmp38_ = FALSE; #line 892 "/home/jens/Source/shotwell/src/Photo.vala" _backing_photo_row_unref0 (bpr); #line 892 "/home/jens/Source/shotwell/src/Photo.vala" _backing_photo_row_unref0 (bpr); -#line 7291 "Photo.c" +#line 7306 "Photo.c" { - GeeHashMap* _tmp36_ = NULL; + GeeHashMap* _tmp37_ = NULL; #line 871 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp36_ = self->priv->developments; + _tmp37_ = self->priv->developments; #line 871 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_developments); -#line 7298 "Photo.c" +#line 7313 "Photo.c" } #line 892 "/home/jens/Source/shotwell/src/Photo.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); #line 892 "/home/jens/Source/shotwell/src/Photo.vala" g_clear_error (&_inner_error_); #line 892 "/home/jens/Source/shotwell/src/Photo.vala" - return FALSE; -#line 7306 "Photo.c" + return _tmp38_; +#line 7321 "Photo.c" } #line 899 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp37_ = self->priv->developments; + _tmp39_ = self->priv->developments; #line 899 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp38_ = d; + _tmp40_ = d; #line 899 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp39_ = gee_abstract_map_unset (G_TYPE_CHECK_INSTANCE_CAST (_tmp37_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), (gpointer) ((gintptr) _tmp38_), NULL); + _tmp41_ = gee_abstract_map_unset (G_TYPE_CHECK_INSTANCE_CAST (_tmp39_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), (gpointer) ((gintptr) _tmp40_), NULL); #line 899 "/home/jens/Source/shotwell/src/Photo.vala" - ret = _tmp39_; + ret = _tmp41_; #line 871 "/home/jens/Source/shotwell/src/Photo.vala" _backing_photo_row_unref0 (bpr); -#line 7318 "Photo.c" +#line 7333 "Photo.c" } __finally279: { - GeeHashMap* _tmp40_ = NULL; + GeeHashMap* _tmp42_ = NULL; #line 871 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp40_ = self->priv->developments; + _tmp42_ = self->priv->developments; #line 871 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_developments); -#line 7327 "Photo.c" +#line 7342 "Photo.c" } #line 871 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { +#line 7346 "Photo.c" + gboolean _tmp43_ = FALSE; #line 871 "/home/jens/Source/shotwell/src/Photo.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 871 "/home/jens/Source/shotwell/src/Photo.vala" g_clear_error (&_inner_error_); #line 871 "/home/jens/Source/shotwell/src/Photo.vala" - return FALSE; -#line 7337 "Photo.c" + return _tmp43_; +#line 7354 "Photo.c" } } #line 902 "/home/jens/Source/shotwell/src/Photo.vala" @@ -7342,7 +7359,7 @@ static gboolean photo_delete_raw_development (Photo* self, RawDeveloper d) { result = ret; #line 903 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 7346 "Photo.c" +#line 7363 "Photo.c" } @@ -7350,14 +7367,14 @@ void photo_redevelop_raw (Photo* self, RawDeveloper d) { GError * _inner_error_ = NULL; #line 907 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (IS_PHOTO (self)); -#line 7354 "Photo.c" +#line 7371 "Photo.c" { GeeHashMap* _tmp0_ = NULL; #line 908 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = self->priv->developments; #line 908 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_developments); -#line 7361 "Photo.c" +#line 7378 "Photo.c" { RawDeveloper _tmp1_ = 0; RawDeveloper dev = 0; @@ -7378,13 +7395,13 @@ void photo_redevelop_raw (Photo* self, RawDeveloper d) { if (_tmp3_ == RAW_DEVELOPER_CAMERA) { #line 912 "/home/jens/Source/shotwell/src/Photo.vala" dev = RAW_DEVELOPER_EMBEDDED; -#line 7382 "Photo.c" +#line 7399 "Photo.c" } #line 914 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = dev; #line 914 "/home/jens/Source/shotwell/src/Photo.vala" photo_set_raw_developer (self, _tmp4_); -#line 7388 "Photo.c" +#line 7405 "Photo.c" } __finally282: { @@ -7393,7 +7410,7 @@ void photo_redevelop_raw (Photo* self, RawDeveloper d) { _tmp5_ = self->priv->developments; #line 908 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_developments); -#line 7397 "Photo.c" +#line 7414 "Photo.c" } #line 908 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { @@ -7403,7 +7420,7 @@ void photo_redevelop_raw (Photo* self, RawDeveloper d) { g_clear_error (&_inner_error_); #line 908 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 7407 "Photo.c" +#line 7424 "Photo.c" } } } @@ -7416,13 +7433,13 @@ static void _vala_array_add85 (BackingFileState*** array, int* length, int* size *size = (*size) ? (2 * (*size)) : 4; #line 921 "/home/jens/Source/shotwell/src/Photo.vala" *array = g_renew (BackingFileState*, *array, (*size) + 1); -#line 7420 "Photo.c" +#line 7437 "Photo.c" } #line 921 "/home/jens/Source/shotwell/src/Photo.vala" (*array)[(*length)++] = value; #line 921 "/home/jens/Source/shotwell/src/Photo.vala" (*array)[*length] = NULL; -#line 7426 "Photo.c" +#line 7443 "Photo.c" } @@ -7433,13 +7450,13 @@ static void _vala_array_add86 (BackingFileState*** array, int* length, int* size *size = (*size) ? (2 * (*size)) : 4; #line 923 "/home/jens/Source/shotwell/src/Photo.vala" *array = g_renew (BackingFileState*, *array, (*size) + 1); -#line 7437 "Photo.c" +#line 7454 "Photo.c" } #line 923 "/home/jens/Source/shotwell/src/Photo.vala" (*array)[(*length)++] = value; #line 923 "/home/jens/Source/shotwell/src/Photo.vala" (*array)[*length] = NULL; -#line 7443 "Photo.c" +#line 7460 "Photo.c" } @@ -7450,13 +7467,13 @@ static void _vala_array_add87 (BackingFileState*** array, int* length, int* size *size = (*size) ? (2 * (*size)) : 4; #line 930 "/home/jens/Source/shotwell/src/Photo.vala" *array = g_renew (BackingFileState*, *array, (*size) + 1); -#line 7454 "Photo.c" +#line 7471 "Photo.c" } #line 930 "/home/jens/Source/shotwell/src/Photo.vala" (*array)[(*length)++] = value; #line 930 "/home/jens/Source/shotwell/src/Photo.vala" (*array)[*length] = NULL; -#line 7460 "Photo.c" +#line 7477 "Photo.c" } @@ -7480,14 +7497,14 @@ static BackingFileState** photo_real_get_backing_files_state (MediaSource* base, backing_length1 = 0; #line 919 "/home/jens/Source/shotwell/src/Photo.vala" _backing_size_ = backing_length1; -#line 7484 "Photo.c" +#line 7501 "Photo.c" { PhotoRow* _tmp1_ = NULL; #line 920 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = self->row; #line 920 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_row); -#line 7491 "Photo.c" +#line 7508 "Photo.c" { BackingFileState** _tmp2_ = NULL; gint _tmp2__length1 = 0; @@ -7518,7 +7535,7 @@ static BackingFileState** photo_real_get_backing_files_state (MediaSource* base, _tmp8_ = photo_has_editable (self); #line 922 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp8_) { -#line 7522 "Photo.c" +#line 7539 "Photo.c" BackingFileState** _tmp9_ = NULL; gint _tmp9__length1 = 0; BackingPhotoRow* _tmp10_ = NULL; @@ -7533,13 +7550,13 @@ static BackingFileState** photo_real_get_backing_files_state (MediaSource* base, _tmp11_ = backing_file_state_new_from_photo_row (_tmp10_, NULL); #line 923 "/home/jens/Source/shotwell/src/Photo.vala" _vala_array_add86 (&backing, &backing_length1, &_backing_size_, _tmp11_); -#line 7537 "Photo.c" +#line 7554 "Photo.c" } #line 925 "/home/jens/Source/shotwell/src/Photo.vala" _tmp12_ = photo_is_developed (self); #line 925 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp12_) { -#line 7543 "Photo.c" +#line 7560 "Photo.c" GeeCollection* dev_rows = NULL; GeeCollection* _tmp13_ = NULL; GeeCollection* _tmp14_ = NULL; @@ -7551,7 +7568,7 @@ static BackingFileState** photo_real_get_backing_files_state (MediaSource* base, _tmp14_ = dev_rows; #line 927 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp14_ != NULL) { -#line 7555 "Photo.c" +#line 7572 "Photo.c" { GeeIterator* _r_it = NULL; GeeCollection* _tmp15_ = NULL; @@ -7564,7 +7581,7 @@ static BackingFileState** photo_real_get_backing_files_state (MediaSource* base, _r_it = _tmp16_; #line 928 "/home/jens/Source/shotwell/src/Photo.vala" while (TRUE) { -#line 7568 "Photo.c" +#line 7585 "Photo.c" GeeIterator* _tmp17_ = NULL; gboolean _tmp18_ = FALSE; BackingPhotoRow* r = NULL; @@ -7584,7 +7601,7 @@ static BackingFileState** photo_real_get_backing_files_state (MediaSource* base, if (!_tmp18_) { #line 928 "/home/jens/Source/shotwell/src/Photo.vala" break; -#line 7588 "Photo.c" +#line 7605 "Photo.c" } #line 928 "/home/jens/Source/shotwell/src/Photo.vala" _tmp19_ = _r_it; @@ -7610,16 +7627,16 @@ static BackingFileState** photo_real_get_backing_files_state (MediaSource* base, _vala_array_add87 (&backing, &backing_length1, &_backing_size_, _tmp25_); #line 928 "/home/jens/Source/shotwell/src/Photo.vala" _backing_photo_row_unref0 (r); -#line 7614 "Photo.c" +#line 7631 "Photo.c" } #line 928 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_r_it); -#line 7618 "Photo.c" +#line 7635 "Photo.c" } } #line 925 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (dev_rows); -#line 7623 "Photo.c" +#line 7640 "Photo.c" } } __finally283: @@ -7629,7 +7646,7 @@ static BackingFileState** photo_real_get_backing_files_state (MediaSource* base, _tmp26_ = self->row; #line 920 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 7633 "Photo.c" +#line 7650 "Photo.c" } #line 920 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { @@ -7641,7 +7658,7 @@ static BackingFileState** photo_real_get_backing_files_state (MediaSource* base, g_clear_error (&_inner_error_); #line 920 "/home/jens/Source/shotwell/src/Photo.vala" return NULL; -#line 7645 "Photo.c" +#line 7662 "Photo.c" } } #line 936 "/home/jens/Source/shotwell/src/Photo.vala" @@ -7652,13 +7669,13 @@ static BackingFileState** photo_real_get_backing_files_state (MediaSource* base, if (result_length1) { #line 936 "/home/jens/Source/shotwell/src/Photo.vala" *result_length1 = _tmp27__length1; -#line 7656 "Photo.c" +#line 7673 "Photo.c" } #line 936 "/home/jens/Source/shotwell/src/Photo.vala" result = _tmp27_; #line 936 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 7662 "Photo.c" +#line 7679 "Photo.c" } @@ -7673,7 +7690,7 @@ static PhotoFileReader* photo_get_backing_reader (Photo* self, BackingFetchMode switch (_tmp0_) { #line 940 "/home/jens/Source/shotwell/src/Photo.vala" case BACKING_FETCH_MODE_MASTER: -#line 7677 "Photo.c" +#line 7694 "Photo.c" { PhotoFileReader* _tmp1_ = NULL; #line 942 "/home/jens/Source/shotwell/src/Photo.vala" @@ -7682,11 +7699,11 @@ static PhotoFileReader* photo_get_backing_reader (Photo* self, BackingFetchMode result = _tmp1_; #line 942 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 7686 "Photo.c" +#line 7703 "Photo.c" } #line 940 "/home/jens/Source/shotwell/src/Photo.vala" case BACKING_FETCH_MODE_BASELINE: -#line 7690 "Photo.c" +#line 7707 "Photo.c" { PhotoFileReader* _tmp2_ = NULL; #line 945 "/home/jens/Source/shotwell/src/Photo.vala" @@ -7695,11 +7712,11 @@ static PhotoFileReader* photo_get_backing_reader (Photo* self, BackingFetchMode result = _tmp2_; #line 945 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 7699 "Photo.c" +#line 7716 "Photo.c" } #line 940 "/home/jens/Source/shotwell/src/Photo.vala" case BACKING_FETCH_MODE_SOURCE: -#line 7703 "Photo.c" +#line 7720 "Photo.c" { PhotoFileReader* _tmp3_ = NULL; #line 948 "/home/jens/Source/shotwell/src/Photo.vala" @@ -7708,18 +7725,18 @@ static PhotoFileReader* photo_get_backing_reader (Photo* self, BackingFetchMode result = _tmp3_; #line 948 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 7712 "Photo.c" +#line 7729 "Photo.c" } #line 940 "/home/jens/Source/shotwell/src/Photo.vala" case BACKING_FETCH_MODE_UNMODIFIED: -#line 7716 "Photo.c" +#line 7733 "Photo.c" { PhotoFileFormat _tmp4_ = 0; #line 951 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = photo_get_master_file_format (self); #line 951 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp4_ == PHOTO_FILE_FORMAT_RAW) { -#line 7723 "Photo.c" +#line 7740 "Photo.c" PhotoFileReader* _tmp5_ = NULL; #line 952 "/home/jens/Source/shotwell/src/Photo.vala" _tmp5_ = photo_get_raw_developer_reader (self); @@ -7727,7 +7744,7 @@ static PhotoFileReader* photo_get_backing_reader (Photo* self, BackingFetchMode result = _tmp5_; #line 952 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 7731 "Photo.c" +#line 7748 "Photo.c" } else { PhotoFileReader* _tmp6_ = NULL; #line 954 "/home/jens/Source/shotwell/src/Photo.vala" @@ -7736,7 +7753,7 @@ static PhotoFileReader* photo_get_backing_reader (Photo* self, BackingFetchMode result = _tmp6_; #line 954 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 7740 "Photo.c" +#line 7757 "Photo.c" } } default: @@ -7749,7 +7766,7 @@ static PhotoFileReader* photo_get_backing_reader (Photo* self, BackingFetchMode _tmp8_ = g_enum_get_value (g_type_class_ref (TYPE_BACKING_FETCH_MODE), _tmp7_); #line 957 "/home/jens/Source/shotwell/src/Photo.vala" g_error ("Photo.vala:957: Unknown backing fetch mode %s", (_tmp8_ != NULL) ? _tmp8_->value_name : NULL); -#line 7753 "Photo.c" +#line 7770 "Photo.c" } } } @@ -7758,7 +7775,7 @@ static PhotoFileReader* photo_get_backing_reader (Photo* self, BackingFetchMode static gpointer _photo_file_adapter_ref0 (gpointer self) { #line 963 "/home/jens/Source/shotwell/src/Photo.vala" return self ? photo_file_adapter_ref (self) : NULL; -#line 7762 "Photo.c" +#line 7779 "Photo.c" } @@ -7767,14 +7784,14 @@ static PhotoFileReader* photo_get_master_reader (Photo* self) { GError * _inner_error_ = NULL; #line 961 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_PHOTO (self), NULL); -#line 7771 "Photo.c" +#line 7788 "Photo.c" { PhotoBackingReaders* _tmp0_ = NULL; #line 962 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = self->priv->readers; #line 962 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_readers); -#line 7778 "Photo.c" +#line 7795 "Photo.c" { PhotoBackingReaders* _tmp1_ = NULL; PhotoFileReader* _tmp2_ = NULL; @@ -7787,18 +7804,18 @@ static PhotoFileReader* photo_get_master_reader (Photo* self) { _tmp3_ = _photo_file_adapter_ref0 (_tmp2_); #line 963 "/home/jens/Source/shotwell/src/Photo.vala" result = _tmp3_; -#line 7791 "Photo.c" +#line 7808 "Photo.c" { PhotoBackingReaders* _tmp4_ = NULL; #line 962 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = self->priv->readers; #line 962 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_readers); -#line 7798 "Photo.c" +#line 7815 "Photo.c" } #line 963 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 7802 "Photo.c" +#line 7819 "Photo.c" } __finally284: { @@ -7807,7 +7824,7 @@ static PhotoFileReader* photo_get_master_reader (Photo* self) { _tmp5_ = self->priv->readers; #line 962 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_readers); -#line 7811 "Photo.c" +#line 7828 "Photo.c" } #line 962 "/home/jens/Source/shotwell/src/Photo.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); @@ -7815,7 +7832,7 @@ static PhotoFileReader* photo_get_master_reader (Photo* self) { g_clear_error (&_inner_error_); #line 962 "/home/jens/Source/shotwell/src/Photo.vala" return NULL; -#line 7819 "Photo.c" +#line 7836 "Photo.c" } } @@ -7825,14 +7842,14 @@ PhotoFileReader* photo_get_editable_reader (Photo* self) { GError * _inner_error_ = NULL; #line 967 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_PHOTO (self), NULL); -#line 7829 "Photo.c" +#line 7846 "Photo.c" { PhotoBackingReaders* _tmp0_ = NULL; #line 968 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = self->priv->readers; #line 968 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_readers); -#line 7836 "Photo.c" +#line 7853 "Photo.c" { PhotoBackingReaders* _tmp1_ = NULL; PhotoFileReader* _tmp2_ = NULL; @@ -7845,18 +7862,18 @@ PhotoFileReader* photo_get_editable_reader (Photo* self) { _tmp3_ = _photo_file_adapter_ref0 (_tmp2_); #line 969 "/home/jens/Source/shotwell/src/Photo.vala" result = _tmp3_; -#line 7849 "Photo.c" +#line 7866 "Photo.c" { PhotoBackingReaders* _tmp4_ = NULL; #line 968 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = self->priv->readers; #line 968 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_readers); -#line 7856 "Photo.c" +#line 7873 "Photo.c" } #line 969 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 7860 "Photo.c" +#line 7877 "Photo.c" } __finally285: { @@ -7865,7 +7882,7 @@ PhotoFileReader* photo_get_editable_reader (Photo* self) { _tmp5_ = self->priv->readers; #line 968 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_readers); -#line 7869 "Photo.c" +#line 7886 "Photo.c" } #line 968 "/home/jens/Source/shotwell/src/Photo.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); @@ -7873,7 +7890,7 @@ PhotoFileReader* photo_get_editable_reader (Photo* self) { g_clear_error (&_inner_error_); #line 968 "/home/jens/Source/shotwell/src/Photo.vala" return NULL; -#line 7877 "Photo.c" +#line 7894 "Photo.c" } } @@ -7883,14 +7900,14 @@ static PhotoFileReader* photo_get_baseline_reader (Photo* self) { GError * _inner_error_ = NULL; #line 974 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_PHOTO (self), NULL); -#line 7887 "Photo.c" +#line 7904 "Photo.c" { PhotoBackingReaders* _tmp0_ = NULL; #line 975 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = self->priv->readers; #line 975 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_readers); -#line 7894 "Photo.c" +#line 7911 "Photo.c" { PhotoBackingReaders* _tmp1_ = NULL; PhotoFileReader* _tmp2_ = NULL; @@ -7905,7 +7922,7 @@ static PhotoFileReader* photo_get_baseline_reader (Photo* self) { _tmp2_ = _tmp1_->editable; #line 976 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp2_ != NULL) { -#line 7909 "Photo.c" +#line 7926 "Photo.c" PhotoBackingReaders* _tmp3_ = NULL; PhotoFileReader* _tmp4_ = NULL; PhotoFileReader* _tmp5_ = NULL; @@ -7917,18 +7934,18 @@ static PhotoFileReader* photo_get_baseline_reader (Photo* self) { _tmp5_ = _photo_file_adapter_ref0 (_tmp4_); #line 977 "/home/jens/Source/shotwell/src/Photo.vala" result = _tmp5_; -#line 7921 "Photo.c" +#line 7938 "Photo.c" { PhotoBackingReaders* _tmp6_ = NULL; #line 975 "/home/jens/Source/shotwell/src/Photo.vala" _tmp6_ = self->priv->readers; #line 975 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_readers); -#line 7928 "Photo.c" +#line 7945 "Photo.c" } #line 977 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 7932 "Photo.c" +#line 7949 "Photo.c" } #line 979 "/home/jens/Source/shotwell/src/Photo.vala" _tmp7_ = self->priv->readers; @@ -7936,7 +7953,7 @@ static PhotoFileReader* photo_get_baseline_reader (Photo* self) { _tmp8_ = _tmp7_->developer; #line 979 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp8_ != NULL) { -#line 7940 "Photo.c" +#line 7957 "Photo.c" PhotoBackingReaders* _tmp9_ = NULL; PhotoFileReader* _tmp10_ = NULL; PhotoFileReader* _tmp11_ = NULL; @@ -7948,18 +7965,18 @@ static PhotoFileReader* photo_get_baseline_reader (Photo* self) { _tmp11_ = _photo_file_adapter_ref0 (_tmp10_); #line 980 "/home/jens/Source/shotwell/src/Photo.vala" result = _tmp11_; -#line 7952 "Photo.c" +#line 7969 "Photo.c" { PhotoBackingReaders* _tmp12_ = NULL; #line 975 "/home/jens/Source/shotwell/src/Photo.vala" _tmp12_ = self->priv->readers; #line 975 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_readers); -#line 7959 "Photo.c" +#line 7976 "Photo.c" } #line 980 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 7963 "Photo.c" +#line 7980 "Photo.c" } #line 982 "/home/jens/Source/shotwell/src/Photo.vala" _tmp13_ = self->priv->readers; @@ -7969,18 +7986,18 @@ static PhotoFileReader* photo_get_baseline_reader (Photo* self) { _tmp15_ = _photo_file_adapter_ref0 (_tmp14_); #line 982 "/home/jens/Source/shotwell/src/Photo.vala" result = _tmp15_; -#line 7973 "Photo.c" +#line 7990 "Photo.c" { PhotoBackingReaders* _tmp16_ = NULL; #line 975 "/home/jens/Source/shotwell/src/Photo.vala" _tmp16_ = self->priv->readers; #line 975 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_readers); -#line 7980 "Photo.c" +#line 7997 "Photo.c" } #line 982 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 7984 "Photo.c" +#line 8001 "Photo.c" } __finally286: { @@ -7989,7 +8006,7 @@ static PhotoFileReader* photo_get_baseline_reader (Photo* self) { _tmp17_ = self->priv->readers; #line 975 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_readers); -#line 7993 "Photo.c" +#line 8010 "Photo.c" } #line 975 "/home/jens/Source/shotwell/src/Photo.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); @@ -7997,7 +8014,7 @@ static PhotoFileReader* photo_get_baseline_reader (Photo* self) { g_clear_error (&_inner_error_); #line 975 "/home/jens/Source/shotwell/src/Photo.vala" return NULL; -#line 8001 "Photo.c" +#line 8018 "Photo.c" } } @@ -8007,14 +8024,14 @@ static PhotoFileReader* photo_get_source_reader (Photo* self) { GError * _inner_error_ = NULL; #line 987 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_PHOTO (self), NULL); -#line 8011 "Photo.c" +#line 8028 "Photo.c" { PhotoBackingReaders* _tmp0_ = NULL; #line 988 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = self->priv->readers; #line 988 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_readers); -#line 8018 "Photo.c" +#line 8035 "Photo.c" { PhotoBackingReaders* _tmp1_ = NULL; PhotoFileReader* _tmp2_ = NULL; @@ -8029,7 +8046,7 @@ static PhotoFileReader* photo_get_source_reader (Photo* self) { _tmp2_ = _tmp1_->editable; #line 989 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp2_ != NULL) { -#line 8033 "Photo.c" +#line 8050 "Photo.c" PhotoBackingReaders* _tmp3_ = NULL; PhotoFileReader* _tmp4_ = NULL; PhotoFileReader* _tmp5_ = NULL; @@ -8041,18 +8058,18 @@ static PhotoFileReader* photo_get_source_reader (Photo* self) { _tmp5_ = _photo_file_adapter_ref0 (_tmp4_); #line 990 "/home/jens/Source/shotwell/src/Photo.vala" result = _tmp5_; -#line 8045 "Photo.c" +#line 8062 "Photo.c" { PhotoBackingReaders* _tmp6_ = NULL; #line 988 "/home/jens/Source/shotwell/src/Photo.vala" _tmp6_ = self->priv->readers; #line 988 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_readers); -#line 8052 "Photo.c" +#line 8069 "Photo.c" } #line 990 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 8056 "Photo.c" +#line 8073 "Photo.c" } #line 992 "/home/jens/Source/shotwell/src/Photo.vala" _tmp7_ = self->priv->readers; @@ -8060,7 +8077,7 @@ static PhotoFileReader* photo_get_source_reader (Photo* self) { _tmp8_ = _tmp7_->developer; #line 992 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp8_ != NULL) { -#line 8064 "Photo.c" +#line 8081 "Photo.c" PhotoBackingReaders* _tmp9_ = NULL; PhotoFileReader* _tmp10_ = NULL; PhotoFileReader* _tmp11_ = NULL; @@ -8072,18 +8089,18 @@ static PhotoFileReader* photo_get_source_reader (Photo* self) { _tmp11_ = _photo_file_adapter_ref0 (_tmp10_); #line 993 "/home/jens/Source/shotwell/src/Photo.vala" result = _tmp11_; -#line 8076 "Photo.c" +#line 8093 "Photo.c" { PhotoBackingReaders* _tmp12_ = NULL; #line 988 "/home/jens/Source/shotwell/src/Photo.vala" _tmp12_ = self->priv->readers; #line 988 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_readers); -#line 8083 "Photo.c" +#line 8100 "Photo.c" } #line 993 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 8087 "Photo.c" +#line 8104 "Photo.c" } #line 995 "/home/jens/Source/shotwell/src/Photo.vala" _tmp13_ = self->priv->readers; @@ -8093,18 +8110,18 @@ static PhotoFileReader* photo_get_source_reader (Photo* self) { _tmp15_ = _photo_file_adapter_ref0 (_tmp14_); #line 995 "/home/jens/Source/shotwell/src/Photo.vala" result = _tmp15_; -#line 8097 "Photo.c" +#line 8114 "Photo.c" { PhotoBackingReaders* _tmp16_ = NULL; #line 988 "/home/jens/Source/shotwell/src/Photo.vala" _tmp16_ = self->priv->readers; #line 988 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_readers); -#line 8104 "Photo.c" +#line 8121 "Photo.c" } #line 995 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 8108 "Photo.c" +#line 8125 "Photo.c" } __finally287: { @@ -8113,7 +8130,7 @@ static PhotoFileReader* photo_get_source_reader (Photo* self) { _tmp17_ = self->priv->readers; #line 988 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_readers); -#line 8117 "Photo.c" +#line 8134 "Photo.c" } #line 988 "/home/jens/Source/shotwell/src/Photo.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); @@ -8121,7 +8138,7 @@ static PhotoFileReader* photo_get_source_reader (Photo* self) { g_clear_error (&_inner_error_); #line 988 "/home/jens/Source/shotwell/src/Photo.vala" return NULL; -#line 8125 "Photo.c" +#line 8142 "Photo.c" } } @@ -8131,14 +8148,14 @@ static PhotoFileReader* photo_get_raw_developer_reader (Photo* self) { GError * _inner_error_ = NULL; #line 1000 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_PHOTO (self), NULL); -#line 8135 "Photo.c" +#line 8152 "Photo.c" { PhotoBackingReaders* _tmp0_ = NULL; #line 1001 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = self->priv->readers; #line 1001 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_readers); -#line 8142 "Photo.c" +#line 8159 "Photo.c" { PhotoBackingReaders* _tmp1_ = NULL; PhotoFileReader* _tmp2_ = NULL; @@ -8151,18 +8168,18 @@ static PhotoFileReader* photo_get_raw_developer_reader (Photo* self) { _tmp3_ = _photo_file_adapter_ref0 (_tmp2_); #line 1002 "/home/jens/Source/shotwell/src/Photo.vala" result = _tmp3_; -#line 8155 "Photo.c" +#line 8172 "Photo.c" { PhotoBackingReaders* _tmp4_ = NULL; #line 1001 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = self->priv->readers; #line 1001 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_readers); -#line 8162 "Photo.c" +#line 8179 "Photo.c" } #line 1002 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 8166 "Photo.c" +#line 8183 "Photo.c" } __finally288: { @@ -8171,7 +8188,7 @@ static PhotoFileReader* photo_get_raw_developer_reader (Photo* self) { _tmp5_ = self->priv->readers; #line 1001 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_readers); -#line 8175 "Photo.c" +#line 8192 "Photo.c" } #line 1001 "/home/jens/Source/shotwell/src/Photo.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); @@ -8179,7 +8196,7 @@ static PhotoFileReader* photo_get_raw_developer_reader (Photo* self) { g_clear_error (&_inner_error_); #line 1001 "/home/jens/Source/shotwell/src/Photo.vala" return NULL; -#line 8183 "Photo.c" +#line 8200 "Photo.c" } } @@ -8189,14 +8206,15 @@ gboolean photo_is_developed (Photo* self) { GError * _inner_error_ = NULL; #line 1006 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_PHOTO (self), FALSE); -#line 8193 "Photo.c" +#line 8210 "Photo.c" { PhotoBackingReaders* _tmp0_ = NULL; + gboolean _tmp5_ = FALSE; #line 1007 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = self->priv->readers; #line 1007 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_readers); -#line 8200 "Photo.c" +#line 8218 "Photo.c" { PhotoBackingReaders* _tmp1_ = NULL; PhotoFileReader* _tmp2_ = NULL; @@ -8206,18 +8224,18 @@ gboolean photo_is_developed (Photo* self) { _tmp2_ = _tmp1_->developer; #line 1008 "/home/jens/Source/shotwell/src/Photo.vala" result = _tmp2_ != NULL; -#line 8210 "Photo.c" +#line 8228 "Photo.c" { PhotoBackingReaders* _tmp3_ = NULL; #line 1007 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = self->priv->readers; #line 1007 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_readers); -#line 8217 "Photo.c" +#line 8235 "Photo.c" } #line 1008 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 8221 "Photo.c" +#line 8239 "Photo.c" } __finally289: { @@ -8226,15 +8244,15 @@ gboolean photo_is_developed (Photo* self) { _tmp4_ = self->priv->readers; #line 1007 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_readers); -#line 8230 "Photo.c" +#line 8248 "Photo.c" } #line 1007 "/home/jens/Source/shotwell/src/Photo.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 1007 "/home/jens/Source/shotwell/src/Photo.vala" g_clear_error (&_inner_error_); #line 1007 "/home/jens/Source/shotwell/src/Photo.vala" - return FALSE; -#line 8238 "Photo.c" + return _tmp5_; +#line 8256 "Photo.c" } } @@ -8244,14 +8262,15 @@ gboolean photo_has_editable (Photo* self) { GError * _inner_error_ = NULL; #line 1012 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_PHOTO (self), FALSE); -#line 8248 "Photo.c" +#line 8266 "Photo.c" { PhotoBackingReaders* _tmp0_ = NULL; + gboolean _tmp5_ = FALSE; #line 1013 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = self->priv->readers; #line 1013 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_readers); -#line 8255 "Photo.c" +#line 8274 "Photo.c" { PhotoBackingReaders* _tmp1_ = NULL; PhotoFileReader* _tmp2_ = NULL; @@ -8261,18 +8280,18 @@ gboolean photo_has_editable (Photo* self) { _tmp2_ = _tmp1_->editable; #line 1014 "/home/jens/Source/shotwell/src/Photo.vala" result = _tmp2_ != NULL; -#line 8265 "Photo.c" +#line 8284 "Photo.c" { PhotoBackingReaders* _tmp3_ = NULL; #line 1013 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = self->priv->readers; #line 1013 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_readers); -#line 8272 "Photo.c" +#line 8291 "Photo.c" } #line 1014 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 8276 "Photo.c" +#line 8295 "Photo.c" } __finally290: { @@ -8281,15 +8300,15 @@ gboolean photo_has_editable (Photo* self) { _tmp4_ = self->priv->readers; #line 1013 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_readers); -#line 8285 "Photo.c" +#line 8304 "Photo.c" } #line 1013 "/home/jens/Source/shotwell/src/Photo.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 1013 "/home/jens/Source/shotwell/src/Photo.vala" g_clear_error (&_inner_error_); #line 1013 "/home/jens/Source/shotwell/src/Photo.vala" - return FALSE; -#line 8293 "Photo.c" + return _tmp5_; +#line 8312 "Photo.c" } } @@ -8299,14 +8318,15 @@ gboolean photo_does_master_exist (Photo* self) { GError * _inner_error_ = NULL; #line 1018 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_PHOTO (self), FALSE); -#line 8303 "Photo.c" +#line 8322 "Photo.c" { PhotoBackingReaders* _tmp0_ = NULL; + gboolean _tmp6_ = FALSE; #line 1019 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = self->priv->readers; #line 1019 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_readers); -#line 8310 "Photo.c" +#line 8330 "Photo.c" { PhotoBackingReaders* _tmp1_ = NULL; PhotoFileReader* _tmp2_ = NULL; @@ -8319,18 +8339,18 @@ gboolean photo_does_master_exist (Photo* self) { _tmp3_ = photo_file_adapter_file_exists (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter)); #line 1020 "/home/jens/Source/shotwell/src/Photo.vala" result = _tmp3_; -#line 8323 "Photo.c" +#line 8343 "Photo.c" { PhotoBackingReaders* _tmp4_ = NULL; #line 1019 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = self->priv->readers; #line 1019 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_readers); -#line 8330 "Photo.c" +#line 8350 "Photo.c" } #line 1020 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 8334 "Photo.c" +#line 8354 "Photo.c" } __finally291: { @@ -8339,15 +8359,15 @@ gboolean photo_does_master_exist (Photo* self) { _tmp5_ = self->priv->readers; #line 1019 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_readers); -#line 8343 "Photo.c" +#line 8363 "Photo.c" } #line 1019 "/home/jens/Source/shotwell/src/Photo.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 1019 "/home/jens/Source/shotwell/src/Photo.vala" g_clear_error (&_inner_error_); #line 1019 "/home/jens/Source/shotwell/src/Photo.vala" - return FALSE; -#line 8351 "Photo.c" + return _tmp6_; +#line 8371 "Photo.c" } } @@ -8357,14 +8377,15 @@ gboolean photo_does_editable_exist (Photo* self) { GError * _inner_error_ = NULL; #line 1025 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_PHOTO (self), FALSE); -#line 8361 "Photo.c" +#line 8381 "Photo.c" { PhotoBackingReaders* _tmp0_ = NULL; + gboolean _tmp9_ = FALSE; #line 1026 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = self->priv->readers; #line 1026 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_readers); -#line 8368 "Photo.c" +#line 8389 "Photo.c" { gboolean _tmp1_ = FALSE; PhotoBackingReaders* _tmp2_ = NULL; @@ -8375,7 +8396,7 @@ gboolean photo_does_editable_exist (Photo* self) { _tmp3_ = _tmp2_->editable; #line 1027 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp3_ != NULL) { -#line 8379 "Photo.c" +#line 8400 "Photo.c" PhotoBackingReaders* _tmp4_ = NULL; PhotoFileReader* _tmp5_ = NULL; gboolean _tmp6_ = FALSE; @@ -8387,26 +8408,26 @@ gboolean photo_does_editable_exist (Photo* self) { _tmp6_ = photo_file_adapter_file_exists (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter)); #line 1027 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = _tmp6_; -#line 8391 "Photo.c" +#line 8412 "Photo.c" } else { #line 1027 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = FALSE; -#line 8395 "Photo.c" +#line 8416 "Photo.c" } #line 1027 "/home/jens/Source/shotwell/src/Photo.vala" result = _tmp1_; -#line 8399 "Photo.c" +#line 8420 "Photo.c" { PhotoBackingReaders* _tmp7_ = NULL; #line 1026 "/home/jens/Source/shotwell/src/Photo.vala" _tmp7_ = self->priv->readers; #line 1026 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_readers); -#line 8406 "Photo.c" +#line 8427 "Photo.c" } #line 1027 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 8410 "Photo.c" +#line 8431 "Photo.c" } __finally292: { @@ -8415,15 +8436,15 @@ gboolean photo_does_editable_exist (Photo* self) { _tmp8_ = self->priv->readers; #line 1026 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_readers); -#line 8419 "Photo.c" +#line 8440 "Photo.c" } #line 1026 "/home/jens/Source/shotwell/src/Photo.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 1026 "/home/jens/Source/shotwell/src/Photo.vala" g_clear_error (&_inner_error_); #line 1026 "/home/jens/Source/shotwell/src/Photo.vala" - return FALSE; -#line 8427 "Photo.c" + return _tmp9_; +#line 8448 "Photo.c" } } @@ -8433,14 +8454,15 @@ gboolean photo_is_master_baseline (Photo* self) { GError * _inner_error_ = NULL; #line 1031 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_PHOTO (self), FALSE); -#line 8437 "Photo.c" +#line 8458 "Photo.c" { PhotoBackingReaders* _tmp0_ = NULL; + gboolean _tmp5_ = FALSE; #line 1032 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = self->priv->readers; #line 1032 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_readers); -#line 8444 "Photo.c" +#line 8466 "Photo.c" { PhotoBackingReaders* _tmp1_ = NULL; PhotoFileReader* _tmp2_ = NULL; @@ -8450,18 +8472,18 @@ gboolean photo_is_master_baseline (Photo* self) { _tmp2_ = _tmp1_->editable; #line 1033 "/home/jens/Source/shotwell/src/Photo.vala" result = _tmp2_ == NULL; -#line 8454 "Photo.c" +#line 8476 "Photo.c" { PhotoBackingReaders* _tmp3_ = NULL; #line 1032 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = self->priv->readers; #line 1032 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_readers); -#line 8461 "Photo.c" +#line 8483 "Photo.c" } #line 1033 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 8465 "Photo.c" +#line 8487 "Photo.c" } __finally293: { @@ -8470,15 +8492,15 @@ gboolean photo_is_master_baseline (Photo* self) { _tmp4_ = self->priv->readers; #line 1032 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_readers); -#line 8474 "Photo.c" +#line 8496 "Photo.c" } #line 1032 "/home/jens/Source/shotwell/src/Photo.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 1032 "/home/jens/Source/shotwell/src/Photo.vala" g_clear_error (&_inner_error_); #line 1032 "/home/jens/Source/shotwell/src/Photo.vala" - return FALSE; -#line 8482 "Photo.c" + return _tmp5_; +#line 8504 "Photo.c" } } @@ -8494,7 +8516,7 @@ gboolean photo_is_master_source (Photo* self) { result = !_tmp0_; #line 1038 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 8498 "Photo.c" +#line 8520 "Photo.c" } @@ -8503,14 +8525,15 @@ gboolean photo_is_editable_baseline (Photo* self) { GError * _inner_error_ = NULL; #line 1041 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_PHOTO (self), FALSE); -#line 8507 "Photo.c" +#line 8529 "Photo.c" { PhotoBackingReaders* _tmp0_ = NULL; + gboolean _tmp5_ = FALSE; #line 1042 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = self->priv->readers; #line 1042 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_readers); -#line 8514 "Photo.c" +#line 8537 "Photo.c" { PhotoBackingReaders* _tmp1_ = NULL; PhotoFileReader* _tmp2_ = NULL; @@ -8520,18 +8543,18 @@ gboolean photo_is_editable_baseline (Photo* self) { _tmp2_ = _tmp1_->editable; #line 1043 "/home/jens/Source/shotwell/src/Photo.vala" result = _tmp2_ != NULL; -#line 8524 "Photo.c" +#line 8547 "Photo.c" { PhotoBackingReaders* _tmp3_ = NULL; #line 1042 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = self->priv->readers; #line 1042 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_readers); -#line 8531 "Photo.c" +#line 8554 "Photo.c" } #line 1043 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 8535 "Photo.c" +#line 8558 "Photo.c" } __finally294: { @@ -8540,15 +8563,15 @@ gboolean photo_is_editable_baseline (Photo* self) { _tmp4_ = self->priv->readers; #line 1042 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_readers); -#line 8544 "Photo.c" +#line 8567 "Photo.c" } #line 1042 "/home/jens/Source/shotwell/src/Photo.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 1042 "/home/jens/Source/shotwell/src/Photo.vala" g_clear_error (&_inner_error_); #line 1042 "/home/jens/Source/shotwell/src/Photo.vala" - return FALSE; -#line 8552 "Photo.c" + return _tmp5_; +#line 8575 "Photo.c" } } @@ -8564,7 +8587,7 @@ gboolean photo_is_editable_source (Photo* self) { result = _tmp0_; #line 1048 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 8568 "Photo.c" +#line 8591 "Photo.c" } @@ -8573,14 +8596,14 @@ BackingPhotoRow* photo_get_master_photo_row (Photo* self) { GError * _inner_error_ = NULL; #line 1051 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_PHOTO (self), NULL); -#line 8577 "Photo.c" +#line 8600 "Photo.c" { PhotoRow* _tmp0_ = NULL; #line 1052 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = self->row; #line 1052 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_row); -#line 8584 "Photo.c" +#line 8607 "Photo.c" { PhotoRow* _tmp1_ = NULL; BackingPhotoRow* _tmp2_ = NULL; @@ -8593,18 +8616,18 @@ BackingPhotoRow* photo_get_master_photo_row (Photo* self) { _tmp3_ = _backing_photo_row_ref0 (_tmp2_); #line 1053 "/home/jens/Source/shotwell/src/Photo.vala" result = _tmp3_; -#line 8597 "Photo.c" +#line 8620 "Photo.c" { PhotoRow* _tmp4_ = NULL; #line 1052 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = self->row; #line 1052 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 8604 "Photo.c" +#line 8627 "Photo.c" } #line 1053 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 8608 "Photo.c" +#line 8631 "Photo.c" } __finally295: { @@ -8613,7 +8636,7 @@ BackingPhotoRow* photo_get_master_photo_row (Photo* self) { _tmp5_ = self->row; #line 1052 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 8617 "Photo.c" +#line 8640 "Photo.c" } #line 1052 "/home/jens/Source/shotwell/src/Photo.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); @@ -8621,7 +8644,7 @@ BackingPhotoRow* photo_get_master_photo_row (Photo* self) { g_clear_error (&_inner_error_); #line 1052 "/home/jens/Source/shotwell/src/Photo.vala" return NULL; -#line 8625 "Photo.c" +#line 8648 "Photo.c" } } @@ -8631,14 +8654,14 @@ BackingPhotoRow* photo_get_editable_photo_row (Photo* self) { GError * _inner_error_ = NULL; #line 1057 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_PHOTO (self), NULL); -#line 8635 "Photo.c" +#line 8658 "Photo.c" { PhotoRow* _tmp0_ = NULL; #line 1058 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = self->row; #line 1058 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_row); -#line 8642 "Photo.c" +#line 8665 "Photo.c" { PhotoRow* _tmp1_ = NULL; gboolean _tmp2_ = FALSE; @@ -8648,7 +8671,7 @@ BackingPhotoRow* photo_get_editable_photo_row (Photo* self) { _tmp2_ = backing_photo_id_is_valid (&_tmp1_->editable_id); #line 1060 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp2_) { -#line 8652 "Photo.c" +#line 8675 "Photo.c" BackingPhotoRow* _tmp3_ = NULL; BackingPhotoRow* _tmp4_ = NULL; #line 1061 "/home/jens/Source/shotwell/src/Photo.vala" @@ -8657,33 +8680,33 @@ BackingPhotoRow* photo_get_editable_photo_row (Photo* self) { _tmp4_ = _backing_photo_row_ref0 (_tmp3_); #line 1061 "/home/jens/Source/shotwell/src/Photo.vala" result = _tmp4_; -#line 8661 "Photo.c" +#line 8684 "Photo.c" { PhotoRow* _tmp5_ = NULL; #line 1058 "/home/jens/Source/shotwell/src/Photo.vala" _tmp5_ = self->row; #line 1058 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 8668 "Photo.c" +#line 8691 "Photo.c" } #line 1061 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 8672 "Photo.c" +#line 8695 "Photo.c" } else { #line 1063 "/home/jens/Source/shotwell/src/Photo.vala" result = NULL; -#line 8676 "Photo.c" +#line 8699 "Photo.c" { PhotoRow* _tmp6_ = NULL; #line 1058 "/home/jens/Source/shotwell/src/Photo.vala" _tmp6_ = self->row; #line 1058 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 8683 "Photo.c" +#line 8706 "Photo.c" } #line 1063 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 8687 "Photo.c" +#line 8710 "Photo.c" } } __finally296: @@ -8693,7 +8716,7 @@ BackingPhotoRow* photo_get_editable_photo_row (Photo* self) { _tmp7_ = self->row; #line 1058 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 8697 "Photo.c" +#line 8720 "Photo.c" } #line 1058 "/home/jens/Source/shotwell/src/Photo.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); @@ -8701,7 +8724,7 @@ BackingPhotoRow* photo_get_editable_photo_row (Photo* self) { g_clear_error (&_inner_error_); #line 1058 "/home/jens/Source/shotwell/src/Photo.vala" return NULL; -#line 8705 "Photo.c" +#line 8728 "Photo.c" } } @@ -8711,14 +8734,14 @@ GeeCollection* photo_get_raw_development_photo_rows (Photo* self) { GError * _inner_error_ = NULL; #line 1067 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_PHOTO (self), NULL); -#line 8715 "Photo.c" +#line 8738 "Photo.c" { PhotoRow* _tmp0_ = NULL; #line 1068 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = self->row; #line 1068 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_row); -#line 8722 "Photo.c" +#line 8745 "Photo.c" { GeeCollection* _tmp1_ = NULL; GeeHashMap* _tmp2_ = NULL; @@ -8726,42 +8749,42 @@ GeeCollection* photo_get_raw_development_photo_rows (Photo* self) { _tmp2_ = self->priv->developments; #line 1069 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp2_ != NULL) { -#line 8730 "Photo.c" +#line 8753 "Photo.c" GeeHashMap* _tmp3_ = NULL; GeeCollection* _tmp4_ = NULL; GeeCollection* _tmp5_ = NULL; #line 1069 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = self->priv->developments; #line 1069 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp4_ = gee_abstract_map_get_values (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_MAP, GeeMap)); + _tmp4_ = gee_abstract_map_get_values (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap)); #line 1069 "/home/jens/Source/shotwell/src/Photo.vala" _tmp5_ = _tmp4_; #line 1069 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_tmp1_); #line 1069 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = _tmp5_; -#line 8744 "Photo.c" +#line 8767 "Photo.c" } else { #line 1069 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_tmp1_); #line 1069 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = NULL; -#line 8750 "Photo.c" +#line 8773 "Photo.c" } #line 1069 "/home/jens/Source/shotwell/src/Photo.vala" result = _tmp1_; -#line 8754 "Photo.c" +#line 8777 "Photo.c" { PhotoRow* _tmp6_ = NULL; #line 1068 "/home/jens/Source/shotwell/src/Photo.vala" _tmp6_ = self->row; #line 1068 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 8761 "Photo.c" +#line 8784 "Photo.c" } #line 1069 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 8765 "Photo.c" +#line 8788 "Photo.c" } __finally297: { @@ -8770,7 +8793,7 @@ GeeCollection* photo_get_raw_development_photo_rows (Photo* self) { _tmp7_ = self->row; #line 1068 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 8774 "Photo.c" +#line 8797 "Photo.c" } #line 1068 "/home/jens/Source/shotwell/src/Photo.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); @@ -8778,7 +8801,7 @@ GeeCollection* photo_get_raw_development_photo_rows (Photo* self) { g_clear_error (&_inner_error_); #line 1068 "/home/jens/Source/shotwell/src/Photo.vala" return NULL; -#line 8782 "Photo.c" +#line 8805 "Photo.c" } } @@ -8788,14 +8811,14 @@ BackingPhotoRow* photo_get_raw_development_photo_row (Photo* self, RawDeveloper GError * _inner_error_ = NULL; #line 1073 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_PHOTO (self), NULL); -#line 8792 "Photo.c" +#line 8815 "Photo.c" { PhotoRow* _tmp0_ = NULL; #line 1074 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = self->row; #line 1074 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_row); -#line 8799 "Photo.c" +#line 8822 "Photo.c" { BackingPhotoRow* _tmp1_ = NULL; GeeHashMap* _tmp2_ = NULL; @@ -8803,7 +8826,7 @@ BackingPhotoRow* photo_get_raw_development_photo_row (Photo* self, RawDeveloper _tmp2_ = self->priv->developments; #line 1075 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp2_ != NULL) { -#line 8807 "Photo.c" +#line 8830 "Photo.c" GeeHashMap* _tmp3_ = NULL; RawDeveloper _tmp4_ = 0; gpointer _tmp5_ = NULL; @@ -8817,28 +8840,28 @@ BackingPhotoRow* photo_get_raw_development_photo_row (Photo* self, RawDeveloper _backing_photo_row_unref0 (_tmp1_); #line 1075 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = (BackingPhotoRow*) _tmp5_; -#line 8821 "Photo.c" +#line 8844 "Photo.c" } else { #line 1075 "/home/jens/Source/shotwell/src/Photo.vala" _backing_photo_row_unref0 (_tmp1_); #line 1075 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = NULL; -#line 8827 "Photo.c" +#line 8850 "Photo.c" } #line 1075 "/home/jens/Source/shotwell/src/Photo.vala" result = _tmp1_; -#line 8831 "Photo.c" +#line 8854 "Photo.c" { PhotoRow* _tmp6_ = NULL; #line 1074 "/home/jens/Source/shotwell/src/Photo.vala" _tmp6_ = self->row; #line 1074 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 8838 "Photo.c" +#line 8861 "Photo.c" } #line 1075 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 8842 "Photo.c" +#line 8865 "Photo.c" } __finally298: { @@ -8847,7 +8870,7 @@ BackingPhotoRow* photo_get_raw_development_photo_row (Photo* self, RawDeveloper _tmp7_ = self->row; #line 1074 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 8851 "Photo.c" +#line 8874 "Photo.c" } #line 1074 "/home/jens/Source/shotwell/src/Photo.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); @@ -8855,7 +8878,7 @@ BackingPhotoRow* photo_get_raw_development_photo_row (Photo* self, RawDeveloper g_clear_error (&_inner_error_); #line 1074 "/home/jens/Source/shotwell/src/Photo.vala" return NULL; -#line 8859 "Photo.c" +#line 8882 "Photo.c" } } @@ -8868,14 +8891,14 @@ static PhotoFileFormat* _photo_file_format_dup (PhotoFileFormat* self) { memcpy (dup, self, sizeof (PhotoFileFormat)); #line 1085 "/home/jens/Source/shotwell/src/Photo.vala" return dup; -#line 8872 "Photo.c" +#line 8895 "Photo.c" } static gpointer __photo_file_format_dup0 (gpointer self) { #line 1085 "/home/jens/Source/shotwell/src/Photo.vala" return self ? _photo_file_format_dup (self) : NULL; -#line 8879 "Photo.c" +#line 8902 "Photo.c" } @@ -8903,7 +8926,7 @@ PhotoFileFormat* photo_get_editable_file_format (Photo* self) { _photo_file_adapter_unref0 (reader); #line 1082 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 8907 "Photo.c" +#line 8930 "Photo.c" } #line 1085 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = reader; @@ -8917,7 +8940,7 @@ PhotoFileFormat* photo_get_editable_file_format (Photo* self) { _photo_file_adapter_unref0 (reader); #line 1085 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 8921 "Photo.c" +#line 8944 "Photo.c" } @@ -8943,7 +8966,7 @@ PhotoFileFormat photo_get_export_format_for_parameters (Photo* self, ExportForma switch (_tmp2_) { #line 1091 "/home/jens/Source/shotwell/src/Photo.vala" case EXPORT_FORMAT_MODE_UNMODIFIED: -#line 8947 "Photo.c" +#line 8970 "Photo.c" { PhotoFileFormat _tmp3_ = 0; #line 1093 "/home/jens/Source/shotwell/src/Photo.vala" @@ -8952,11 +8975,11 @@ PhotoFileFormat photo_get_export_format_for_parameters (Photo* self, ExportForma _result_ = _tmp3_; #line 1094 "/home/jens/Source/shotwell/src/Photo.vala" break; -#line 8956 "Photo.c" +#line 8979 "Photo.c" } #line 1091 "/home/jens/Source/shotwell/src/Photo.vala" case EXPORT_FORMAT_MODE_CURRENT: -#line 8960 "Photo.c" +#line 8983 "Photo.c" { PhotoFileFormat _tmp4_ = 0; #line 1097 "/home/jens/Source/shotwell/src/Photo.vala" @@ -8965,11 +8988,11 @@ PhotoFileFormat photo_get_export_format_for_parameters (Photo* self, ExportForma _result_ = _tmp4_; #line 1098 "/home/jens/Source/shotwell/src/Photo.vala" break; -#line 8969 "Photo.c" +#line 8992 "Photo.c" } #line 1091 "/home/jens/Source/shotwell/src/Photo.vala" case EXPORT_FORMAT_MODE_SPECIFIED: -#line 8973 "Photo.c" +#line 8996 "Photo.c" { ExportFormatParameters _tmp5_ = {0}; PhotoFileFormat _tmp6_ = 0; @@ -8981,21 +9004,21 @@ PhotoFileFormat photo_get_export_format_for_parameters (Photo* self, ExportForma _result_ = _tmp6_; #line 1102 "/home/jens/Source/shotwell/src/Photo.vala" break; -#line 8985 "Photo.c" +#line 9008 "Photo.c" } default: { #line 1105 "/home/jens/Source/shotwell/src/Photo.vala" g_error ("Photo.vala:1105: get_export_format_for_parameters: unsupported export " \ "format mode"); -#line 8991 "Photo.c" +#line 9014 "Photo.c" } } #line 1108 "/home/jens/Source/shotwell/src/Photo.vala" result = _result_; #line 1108 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 8998 "Photo.c" +#line 9021 "Photo.c" } @@ -9019,7 +9042,7 @@ gchar* photo_get_export_basename_for_parameters (Photo* self, ExportFormatParame switch (_tmp1_) { #line 1114 "/home/jens/Source/shotwell/src/Photo.vala" case EXPORT_FORMAT_MODE_UNMODIFIED: -#line 9022 "Photo.c" +#line 9045 "Photo.c" { GFile* _tmp2_ = NULL; GFile* _tmp3_ = NULL; @@ -9038,13 +9061,13 @@ gchar* photo_get_export_basename_for_parameters (Photo* self, ExportFormatParame _g_object_unref0 (_tmp3_); #line 1117 "/home/jens/Source/shotwell/src/Photo.vala" break; -#line 9041 "Photo.c" +#line 9064 "Photo.c" } #line 1114 "/home/jens/Source/shotwell/src/Photo.vala" case EXPORT_FORMAT_MODE_CURRENT: #line 1114 "/home/jens/Source/shotwell/src/Photo.vala" case EXPORT_FORMAT_MODE_SPECIFIED: -#line 9047 "Photo.c" +#line 9070 "Photo.c" { ExportFormatParameters _tmp5_ = {0}; PhotoFileFormat _tmp6_ = 0; @@ -9061,14 +9084,14 @@ gchar* photo_get_export_basename_for_parameters (Photo* self, ExportFormatParame _g_free0 (_result_); #line 1121 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 9064 "Photo.c" +#line 9087 "Photo.c" } default: { #line 1124 "/home/jens/Source/shotwell/src/Photo.vala" g_error ("Photo.vala:1124: get_export_basename_for_parameters: unsupported expor" \ "t format mode"); -#line 9070 "Photo.c" +#line 9093 "Photo.c" } } #line 1127 "/home/jens/Source/shotwell/src/Photo.vala" @@ -9079,7 +9102,7 @@ gchar* photo_get_export_basename_for_parameters (Photo* self, ExportFormatParame result = _result_; #line 1128 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 9081 "Photo.c" +#line 9104 "Photo.c" } @@ -9220,7 +9243,7 @@ ImportResult photo_prepare_for_import (PhotoImportParams* params) { file = _tmp2_; #line 1149 "/home/jens/Source/shotwell/src/Photo.vala" info = NULL; -#line 9222 "Photo.c" +#line 9245 "Photo.c" { GFileInfo* _tmp3_ = NULL; GFile* _tmp4_ = NULL; @@ -9234,7 +9257,7 @@ ImportResult photo_prepare_for_import (PhotoImportParams* params) { _tmp3_ = _tmp5_; #line 1151 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 9236 "Photo.c" +#line 9259 "Photo.c" goto __catch299_g_error; } #line 1151 "/home/jens/Source/shotwell/src/Photo.vala" @@ -9247,7 +9270,7 @@ ImportResult photo_prepare_for_import (PhotoImportParams* params) { info = _tmp6_; #line 1150 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_tmp3_); -#line 9249 "Photo.c" +#line 9272 "Photo.c" } goto __finally299; __catch299_g_error: @@ -9267,7 +9290,7 @@ ImportResult photo_prepare_for_import (PhotoImportParams* params) { _g_object_unref0 (file); #line 1154 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 9269 "Photo.c" +#line 9292 "Photo.c" } __finally299: #line 1150 "/home/jens/Source/shotwell/src/Photo.vala" @@ -9282,7 +9305,7 @@ ImportResult photo_prepare_for_import (PhotoImportParams* params) { g_clear_error (&_inner_error_); #line 1150 "/home/jens/Source/shotwell/src/Photo.vala" return 0; -#line 9284 "Photo.c" +#line 9307 "Photo.c" } #line 1157 "/home/jens/Source/shotwell/src/Photo.vala" _tmp7_ = info; @@ -9298,7 +9321,7 @@ ImportResult photo_prepare_for_import (PhotoImportParams* params) { _g_object_unref0 (file); #line 1158 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 9300 "Photo.c" +#line 9323 "Photo.c" } #line 1160 "/home/jens/Source/shotwell/src/Photo.vala" _tmp9_ = file; @@ -9306,7 +9329,7 @@ ImportResult photo_prepare_for_import (PhotoImportParams* params) { _tmp10_ = photo_is_file_image (_tmp9_); #line 1160 "/home/jens/Source/shotwell/src/Photo.vala" if (!_tmp10_) { -#line 9308 "Photo.c" +#line 9331 "Photo.c" GFile* _tmp11_ = NULL; gchar* _tmp12_ = NULL; gchar* _tmp13_ = NULL; @@ -9328,7 +9351,7 @@ ImportResult photo_prepare_for_import (PhotoImportParams* params) { _g_object_unref0 (file); #line 1163 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 9330 "Photo.c" +#line 9353 "Photo.c" } #line 1166 "/home/jens/Source/shotwell/src/Photo.vala" _tmp14_ = file; @@ -9336,7 +9359,7 @@ ImportResult photo_prepare_for_import (PhotoImportParams* params) { _tmp15_ = photo_file_format_is_file_supported (_tmp14_); #line 1166 "/home/jens/Source/shotwell/src/Photo.vala" if (!_tmp15_) { -#line 9338 "Photo.c" +#line 9361 "Photo.c" GFile* _tmp16_ = NULL; gchar* _tmp17_ = NULL; gchar* _tmp18_ = NULL; @@ -9358,7 +9381,7 @@ ImportResult photo_prepare_for_import (PhotoImportParams* params) { _g_object_unref0 (file); #line 1169 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 9360 "Photo.c" +#line 9383 "Photo.c" } #line 1172 "/home/jens/Source/shotwell/src/Photo.vala" _tmp19_ = info; @@ -9372,7 +9395,7 @@ ImportResult photo_prepare_for_import (PhotoImportParams* params) { _tmp24_ = _tmp23_->exif_md5; #line 1175 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp24_ != NULL) { -#line 9374 "Photo.c" +#line 9397 "Photo.c" PhotoImportParams* _tmp25_ = NULL; const gchar* _tmp26_ = NULL; #line 1175 "/home/jens/Source/shotwell/src/Photo.vala" @@ -9381,15 +9404,15 @@ ImportResult photo_prepare_for_import (PhotoImportParams* params) { _tmp26_ = _tmp25_->thumbnail_md5; #line 1175 "/home/jens/Source/shotwell/src/Photo.vala" _tmp22_ = _tmp26_ != NULL; -#line 9383 "Photo.c" +#line 9406 "Photo.c" } else { #line 1175 "/home/jens/Source/shotwell/src/Photo.vala" _tmp22_ = FALSE; -#line 9387 "Photo.c" +#line 9410 "Photo.c" } #line 1175 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp22_) { -#line 9391 "Photo.c" +#line 9414 "Photo.c" PhotoImportParams* _tmp27_ = NULL; const gchar* _tmp28_ = NULL; #line 1175 "/home/jens/Source/shotwell/src/Photo.vala" @@ -9398,15 +9421,15 @@ ImportResult photo_prepare_for_import (PhotoImportParams* params) { _tmp28_ = _tmp27_->full_md5; #line 1175 "/home/jens/Source/shotwell/src/Photo.vala" _tmp21_ = _tmp28_ != NULL; -#line 9400 "Photo.c" +#line 9423 "Photo.c" } else { #line 1175 "/home/jens/Source/shotwell/src/Photo.vala" _tmp21_ = FALSE; -#line 9404 "Photo.c" +#line 9427 "Photo.c" } #line 1175 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp21_) { -#line 9408 "Photo.c" +#line 9431 "Photo.c" PhotoImportParams* _tmp29_ = NULL; PhotoImportParams* _tmp30_ = NULL; PhotoFileSnifferOptions _tmp31_ = 0; @@ -9418,7 +9441,7 @@ ImportResult photo_prepare_for_import (PhotoImportParams* params) { _tmp31_ = _tmp30_->sniffer_options; #line 1176 "/home/jens/Source/shotwell/src/Photo.vala" _tmp30_->sniffer_options = _tmp31_ | PHOTO_FILE_SNIFFER_OPTIONS_NO_MD5; -#line 9420 "Photo.c" +#line 9443 "Photo.c" } #line 1179 "/home/jens/Source/shotwell/src/Photo.vala" _tmp32_ = file; @@ -9430,7 +9453,7 @@ ImportResult photo_prepare_for_import (PhotoImportParams* params) { _tmp35_ = photo_file_interrogator_new (_tmp32_, _tmp34_); #line 1179 "/home/jens/Source/shotwell/src/Photo.vala" interrogator = _tmp35_; -#line 9432 "Photo.c" +#line 9455 "Photo.c" { PhotoFileInterrogator* _tmp36_ = NULL; #line 1181 "/home/jens/Source/shotwell/src/Photo.vala" @@ -9439,7 +9462,7 @@ ImportResult photo_prepare_for_import (PhotoImportParams* params) { photo_file_interrogator_interrogate (_tmp36_, &_inner_error_); #line 1181 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 9441 "Photo.c" +#line 9464 "Photo.c" goto __catch300_g_error; } } @@ -9482,7 +9505,7 @@ ImportResult photo_prepare_for_import (PhotoImportParams* params) { _g_object_unref0 (file); #line 1185 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 9484 "Photo.c" +#line 9507 "Photo.c" } __finally300: #line 1180 "/home/jens/Source/shotwell/src/Photo.vala" @@ -9499,7 +9522,7 @@ ImportResult photo_prepare_for_import (PhotoImportParams* params) { g_clear_error (&_inner_error_); #line 1180 "/home/jens/Source/shotwell/src/Photo.vala" return 0; -#line 9501 "Photo.c" +#line 9524 "Photo.c" } #line 1188 "/home/jens/Source/shotwell/src/Photo.vala" _tmp42_ = interrogator; @@ -9517,7 +9540,7 @@ ImportResult photo_prepare_for_import (PhotoImportParams* params) { _g_object_unref0 (file); #line 1189 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 9519 "Photo.c" +#line 9542 "Photo.c" } #line 1192 "/home/jens/Source/shotwell/src/Photo.vala" _tmp44_ = interrogator; @@ -9531,7 +9554,7 @@ ImportResult photo_prepare_for_import (PhotoImportParams* params) { if (_tmp47_ == NULL) { #line 1193 "/home/jens/Source/shotwell/src/Photo.vala" _tmp46_ = TRUE; -#line 9533 "Photo.c" +#line 9556 "Photo.c" } else { DetectedPhotoInformation* _tmp48_ = NULL; PhotoFileFormat _tmp49_ = 0; @@ -9541,7 +9564,7 @@ ImportResult photo_prepare_for_import (PhotoImportParams* params) { _tmp49_ = _tmp48_->file_format; #line 1193 "/home/jens/Source/shotwell/src/Photo.vala" _tmp46_ = _tmp49_ == PHOTO_FILE_FORMAT_UNKNOWN; -#line 9543 "Photo.c" +#line 9566 "Photo.c" } #line 1193 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp46_) { @@ -9557,7 +9580,7 @@ ImportResult photo_prepare_for_import (PhotoImportParams* params) { _g_object_unref0 (file); #line 1194 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 9559 "Photo.c" +#line 9582 "Photo.c" } #line 1197 "/home/jens/Source/shotwell/src/Photo.vala" _tmp50_ = params; @@ -9565,7 +9588,7 @@ ImportResult photo_prepare_for_import (PhotoImportParams* params) { _tmp51_ = _tmp50_->sniffer_options; #line 1197 "/home/jens/Source/shotwell/src/Photo.vala" if ((_tmp51_ & PHOTO_FILE_SNIFFER_OPTIONS_NO_MD5) != 0) { -#line 9567 "Photo.c" +#line 9590 "Photo.c" DetectedPhotoInformation* _tmp52_ = NULL; PhotoImportParams* _tmp53_ = NULL; const gchar* _tmp54_ = NULL; @@ -9614,7 +9637,7 @@ ImportResult photo_prepare_for_import (PhotoImportParams* params) { _g_free0 (_tmp60_->md5); #line 1200 "/home/jens/Source/shotwell/src/Photo.vala" _tmp60_->md5 = _tmp63_; -#line 9616 "Photo.c" +#line 9639 "Photo.c" } #line 1203 "/home/jens/Source/shotwell/src/Photo.vala" orientation = ORIENTATION_TOP_LEFT; @@ -9636,7 +9659,7 @@ ImportResult photo_prepare_for_import (PhotoImportParams* params) { _tmp67_ = _tmp66_->metadata; #line 1214 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp67_ != NULL) { -#line 9638 "Photo.c" +#line 9661 "Photo.c" MetadataDateTime* date_time = NULL; DetectedPhotoInformation* _tmp68_ = NULL; PhotoMetadata* _tmp69_ = NULL; @@ -9670,7 +9693,7 @@ ImportResult photo_prepare_for_import (PhotoImportParams* params) { _tmp71_ = date_time; #line 1216 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp71_ != NULL) { -#line 9672 "Photo.c" +#line 9695 "Photo.c" MetadataDateTime* _tmp72_ = NULL; time_t _tmp73_ = 0; #line 1217 "/home/jens/Source/shotwell/src/Photo.vala" @@ -9679,7 +9702,7 @@ ImportResult photo_prepare_for_import (PhotoImportParams* params) { _tmp73_ = metadata_date_time_get_timestamp (_tmp72_); #line 1217 "/home/jens/Source/shotwell/src/Photo.vala" exposure_time = _tmp73_; -#line 9681 "Photo.c" +#line 9704 "Photo.c" } #line 1219 "/home/jens/Source/shotwell/src/Photo.vala" _tmp74_ = detected; @@ -9731,7 +9754,7 @@ ImportResult photo_prepare_for_import (PhotoImportParams* params) { rating = _tmp89_; #line 1214 "/home/jens/Source/shotwell/src/Photo.vala" _metadata_date_time_unref0 (date_time); -#line 9733 "Photo.c" +#line 9756 "Photo.c" } #line 1227 "/home/jens/Source/shotwell/src/Photo.vala" _tmp92_ = detected; @@ -9741,7 +9764,7 @@ ImportResult photo_prepare_for_import (PhotoImportParams* params) { if (_tmp93_ != GDK_COLORSPACE_RGB) { #line 1227 "/home/jens/Source/shotwell/src/Photo.vala" _tmp91_ = TRUE; -#line 9743 "Photo.c" +#line 9766 "Photo.c" } else { DetectedPhotoInformation* _tmp94_ = NULL; gint _tmp95_ = 0; @@ -9751,13 +9774,13 @@ ImportResult photo_prepare_for_import (PhotoImportParams* params) { _tmp95_ = _tmp94_->channels; #line 1228 "/home/jens/Source/shotwell/src/Photo.vala" _tmp91_ = _tmp95_ < 3; -#line 9753 "Photo.c" +#line 9776 "Photo.c" } #line 1227 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp91_) { #line 1227 "/home/jens/Source/shotwell/src/Photo.vala" _tmp90_ = TRUE; -#line 9759 "Photo.c" +#line 9782 "Photo.c" } else { DetectedPhotoInformation* _tmp96_ = NULL; gint _tmp97_ = 0; @@ -9767,11 +9790,11 @@ ImportResult photo_prepare_for_import (PhotoImportParams* params) { _tmp97_ = _tmp96_->bits_per_channel; #line 1229 "/home/jens/Source/shotwell/src/Photo.vala" _tmp90_ = _tmp97_ != 8; -#line 9769 "Photo.c" +#line 9792 "Photo.c" } #line 1227 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp90_) { -#line 9773 "Photo.c" +#line 9796 "Photo.c" GFile* _tmp98_ = NULL; gchar* _tmp99_ = NULL; gchar* _tmp100_ = NULL; @@ -9801,7 +9824,7 @@ ImportResult photo_prepare_for_import (PhotoImportParams* params) { _g_object_unref0 (file); #line 1232 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 9803 "Photo.c" +#line 9826 "Photo.c" } #line 1238 "/home/jens/Source/shotwell/src/Photo.vala" _tmp101_ = params; @@ -10013,7 +10036,7 @@ ImportResult photo_prepare_for_import (PhotoImportParams* params) { _tmp177_ = _tmp176_->thumbnails; #line 1259 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp177_ != NULL) { -#line 10015 "Photo.c" +#line 10038 "Photo.c" PhotoFileReader* reader = NULL; PhotoImportParams* _tmp178_ = NULL; PhotoRow* _tmp179_ = NULL; @@ -10049,7 +10072,7 @@ ImportResult photo_prepare_for_import (PhotoImportParams* params) { _tmp187_ = reader; #line 1262 "/home/jens/Source/shotwell/src/Photo.vala" photo_file_reader_set_role (_tmp187_, PHOTO_FILE_READER_ROLE_THUMBNAIL); -#line 10051 "Photo.c" +#line 10074 "Photo.c" { PhotoImportParams* _tmp188_ = NULL; Thumbnails* _tmp189_ = NULL; @@ -10085,7 +10108,7 @@ ImportResult photo_prepare_for_import (PhotoImportParams* params) { thumbnail_cache_generate_for_photo (_tmp189_, _tmp190_, _tmp193_, &_tmp197_, &_inner_error_); #line 1264 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 10087 "Photo.c" +#line 10110 "Photo.c" goto __catch301_g_error; } } @@ -10123,7 +10146,7 @@ ImportResult photo_prepare_for_import (PhotoImportParams* params) { _g_object_unref0 (file); #line 1267 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 10125 "Photo.c" +#line 10148 "Photo.c" } __finally301: #line 1263 "/home/jens/Source/shotwell/src/Photo.vala" @@ -10148,11 +10171,11 @@ ImportResult photo_prepare_for_import (PhotoImportParams* params) { g_clear_error (&_inner_error_); #line 1263 "/home/jens/Source/shotwell/src/Photo.vala" return 0; -#line 10150 "Photo.c" +#line 10173 "Photo.c" } #line 1259 "/home/jens/Source/shotwell/src/Photo.vala" _photo_file_adapter_unref0 (reader); -#line 10154 "Photo.c" +#line 10177 "Photo.c" } #line 1274 "/home/jens/Source/shotwell/src/Photo.vala" result = IMPORT_RESULT_SUCCESS; @@ -10170,7 +10193,7 @@ ImportResult photo_prepare_for_import (PhotoImportParams* params) { _g_object_unref0 (file); #line 1274 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 10172 "Photo.c" +#line 10195 "Photo.c" } @@ -10409,7 +10432,7 @@ void photo_create_pre_import (PhotoImportParams* params) { _tmp56_ = photo_file_interrogator_new (_tmp53_, _tmp55_); #line 1300 "/home/jens/Source/shotwell/src/Photo.vala" interrogator = _tmp56_; -#line 10411 "Photo.c" +#line 10434 "Photo.c" { DetectedPhotoInformation* detected = NULL; DetectedPhotoInformation* _tmp57_ = NULL; @@ -10420,7 +10443,7 @@ void photo_create_pre_import (PhotoImportParams* params) { photo_file_interrogator_interrogate (interrogator, &_inner_error_); #line 1302 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 10422 "Photo.c" +#line 10445 "Photo.c" goto __catch302_g_error; } #line 1303 "/home/jens/Source/shotwell/src/Photo.vala" @@ -10431,21 +10454,21 @@ void photo_create_pre_import (PhotoImportParams* params) { _tmp60_ = detected; #line 1304 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp60_ != NULL) { -#line 10433 "Photo.c" +#line 10456 "Photo.c" gboolean _tmp61_ = FALSE; #line 1304 "/home/jens/Source/shotwell/src/Photo.vala" _tmp61_ = photo_file_interrogator_get_is_photo_corrupted (interrogator); #line 1304 "/home/jens/Source/shotwell/src/Photo.vala" _tmp59_ = !_tmp61_; -#line 10439 "Photo.c" +#line 10462 "Photo.c" } else { #line 1304 "/home/jens/Source/shotwell/src/Photo.vala" _tmp59_ = FALSE; -#line 10443 "Photo.c" +#line 10466 "Photo.c" } #line 1304 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp59_) { -#line 10447 "Photo.c" +#line 10470 "Photo.c" DetectedPhotoInformation* _tmp62_ = NULL; PhotoFileFormat _tmp63_ = 0; #line 1304 "/home/jens/Source/shotwell/src/Photo.vala" @@ -10454,15 +10477,15 @@ void photo_create_pre_import (PhotoImportParams* params) { _tmp63_ = _tmp62_->file_format; #line 1304 "/home/jens/Source/shotwell/src/Photo.vala" _tmp58_ = _tmp63_ != PHOTO_FILE_FORMAT_UNKNOWN; -#line 10456 "Photo.c" +#line 10479 "Photo.c" } else { #line 1304 "/home/jens/Source/shotwell/src/Photo.vala" _tmp58_ = FALSE; -#line 10460 "Photo.c" +#line 10483 "Photo.c" } #line 1304 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp58_) { -#line 10464 "Photo.c" +#line 10487 "Photo.c" PhotoImportParams* _tmp64_ = NULL; PhotoRow* _tmp65_ = NULL; BackingPhotoRow* _tmp66_ = NULL; @@ -10480,11 +10503,11 @@ void photo_create_pre_import (PhotoImportParams* params) { _tmp68_ = _tmp67_->file_format; #line 1305 "/home/jens/Source/shotwell/src/Photo.vala" _tmp66_->file_format = _tmp68_; -#line 10482 "Photo.c" +#line 10505 "Photo.c" } #line 1301 "/home/jens/Source/shotwell/src/Photo.vala" _detected_photo_information_unref0 (detected); -#line 10486 "Photo.c" +#line 10509 "Photo.c" } goto __finally302; __catch302_g_error: @@ -10512,7 +10535,7 @@ void photo_create_pre_import (PhotoImportParams* params) { _g_free0 (_tmp70_); #line 1301 "/home/jens/Source/shotwell/src/Photo.vala" _g_error_free0 (err); -#line 10514 "Photo.c" +#line 10537 "Photo.c" } __finally302: #line 1301 "/home/jens/Source/shotwell/src/Photo.vala" @@ -10527,13 +10550,13 @@ void photo_create_pre_import (PhotoImportParams* params) { g_clear_error (&_inner_error_); #line 1301 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 10529 "Photo.c" +#line 10552 "Photo.c" } #line 1277 "/home/jens/Source/shotwell/src/Photo.vala" _photo_file_interrogator_unref0 (interrogator); #line 1277 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (file); -#line 10535 "Photo.c" +#line 10558 "Photo.c" } @@ -10589,7 +10612,7 @@ BackingPhotoRow* photo_query_backing_photo_row (Photo* self, GFile* file, PhotoF backing = _tmp0_; #line 1317 "/home/jens/Source/shotwell/src/Photo.vala" info = NULL; -#line 10591 "Photo.c" +#line 10614 "Photo.c" { GFileInfo* _tmp1_ = NULL; GFile* _tmp2_ = NULL; @@ -10603,7 +10626,7 @@ BackingPhotoRow* photo_query_backing_photo_row (Photo* self, GFile* file, PhotoF _tmp1_ = _tmp3_; #line 1319 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 10605 "Photo.c" +#line 10628 "Photo.c" goto __catch303_g_error; } #line 1319 "/home/jens/Source/shotwell/src/Photo.vala" @@ -10616,7 +10639,7 @@ BackingPhotoRow* photo_query_backing_photo_row (Photo* self, GFile* file, PhotoF info = _tmp4_; #line 1318 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_tmp1_); -#line 10618 "Photo.c" +#line 10641 "Photo.c" } goto __finally303; __catch303_g_error: @@ -10657,15 +10680,15 @@ BackingPhotoRow* photo_query_backing_photo_row (Photo* self, GFile* file, PhotoF if (detected) { #line 1324 "/home/jens/Source/shotwell/src/Photo.vala" *detected = _vala_detected; -#line 10659 "Photo.c" +#line 10682 "Photo.c" } else { #line 1324 "/home/jens/Source/shotwell/src/Photo.vala" _detected_photo_information_unref0 (_vala_detected); -#line 10663 "Photo.c" +#line 10686 "Photo.c" } #line 1324 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 10667 "Photo.c" +#line 10690 "Photo.c" } __finally303: #line 1318 "/home/jens/Source/shotwell/src/Photo.vala" @@ -10678,7 +10701,7 @@ BackingPhotoRow* photo_query_backing_photo_row (Photo* self, GFile* file, PhotoF _backing_photo_row_unref0 (backing); #line 1318 "/home/jens/Source/shotwell/src/Photo.vala" return NULL; -#line 10680 "Photo.c" +#line 10703 "Photo.c" } #line 1328 "/home/jens/Source/shotwell/src/Photo.vala" _tmp10_ = file; @@ -10704,7 +10727,7 @@ BackingPhotoRow* photo_query_backing_photo_row (Photo* self, GFile* file, PhotoF _backing_photo_row_unref0 (backing); #line 1329 "/home/jens/Source/shotwell/src/Photo.vala" return NULL; -#line 10706 "Photo.c" +#line 10729 "Photo.c" } #line 1330 "/home/jens/Source/shotwell/src/Photo.vala" _tmp14_ = interrogator; @@ -10720,7 +10743,7 @@ BackingPhotoRow* photo_query_backing_photo_row (Photo* self, GFile* file, PhotoF if (_tmp17_ == NULL) { #line 1331 "/home/jens/Source/shotwell/src/Photo.vala" _tmp16_ = TRUE; -#line 10722 "Photo.c" +#line 10745 "Photo.c" } else { PhotoFileInterrogator* _tmp18_ = NULL; gboolean _tmp19_ = FALSE; @@ -10730,11 +10753,11 @@ BackingPhotoRow* photo_query_backing_photo_row (Photo* self, GFile* file, PhotoF _tmp19_ = photo_file_interrogator_get_is_photo_corrupted (_tmp18_); #line 1331 "/home/jens/Source/shotwell/src/Photo.vala" _tmp16_ = _tmp19_; -#line 10732 "Photo.c" +#line 10755 "Photo.c" } #line 1331 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp16_) { -#line 10736 "Photo.c" +#line 10759 "Photo.c" gchar* _tmp20_ = NULL; gchar* _tmp21_ = NULL; #line 1332 "/home/jens/Source/shotwell/src/Photo.vala" @@ -10757,15 +10780,15 @@ BackingPhotoRow* photo_query_backing_photo_row (Photo* self, GFile* file, PhotoF if (detected) { #line 1334 "/home/jens/Source/shotwell/src/Photo.vala" *detected = _vala_detected; -#line 10759 "Photo.c" +#line 10782 "Photo.c" } else { #line 1334 "/home/jens/Source/shotwell/src/Photo.vala" _detected_photo_information_unref0 (_vala_detected); -#line 10763 "Photo.c" +#line 10786 "Photo.c" } #line 1334 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 10767 "Photo.c" +#line 10790 "Photo.c" } #line 1337 "/home/jens/Source/shotwell/src/Photo.vala" _tmp22_ = info; @@ -10821,7 +10844,7 @@ BackingPhotoRow* photo_query_backing_photo_row (Photo* self, GFile* file, PhotoF _tmp41_ = _tmp40_->metadata; #line 1344 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp41_ != NULL) { -#line 10823 "Photo.c" +#line 10846 "Photo.c" DetectedPhotoInformation* _tmp42_ = NULL; PhotoMetadata* _tmp43_ = NULL; Orientation _tmp44_ = 0; @@ -10833,11 +10856,11 @@ BackingPhotoRow* photo_query_backing_photo_row (Photo* self, GFile* file, PhotoF _tmp44_ = photo_metadata_get_orientation (_tmp43_); #line 1345 "/home/jens/Source/shotwell/src/Photo.vala" _tmp39_ = _tmp44_; -#line 10835 "Photo.c" +#line 10858 "Photo.c" } else { #line 1345 "/home/jens/Source/shotwell/src/Photo.vala" _tmp39_ = ORIENTATION_TOP_LEFT; -#line 10839 "Photo.c" +#line 10862 "Photo.c" } #line 1344 "/home/jens/Source/shotwell/src/Photo.vala" _tmp45_ = backing; @@ -10853,15 +10876,15 @@ BackingPhotoRow* photo_query_backing_photo_row (Photo* self, GFile* file, PhotoF if (detected) { #line 1347 "/home/jens/Source/shotwell/src/Photo.vala" *detected = _vala_detected; -#line 10855 "Photo.c" +#line 10878 "Photo.c" } else { #line 1347 "/home/jens/Source/shotwell/src/Photo.vala" _detected_photo_information_unref0 (_vala_detected); -#line 10859 "Photo.c" +#line 10882 "Photo.c" } #line 1347 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 10863 "Photo.c" +#line 10886 "Photo.c" } @@ -10872,13 +10895,13 @@ static void _vala_array_add88 (gchar*** array, int* length, int* size, gchar* va *size = (*size) ? (2 * (*size)) : 4; #line 1443 "/home/jens/Source/shotwell/src/Photo.vala" *array = g_renew (gchar*, *array, (*size) + 1); -#line 10874 "Photo.c" +#line 10897 "Photo.c" } #line 1443 "/home/jens/Source/shotwell/src/Photo.vala" (*array)[(*length)++] = value; #line 1443 "/home/jens/Source/shotwell/src/Photo.vala" (*array)[*length] = NULL; -#line 10880 "Photo.c" +#line 10903 "Photo.c" } @@ -10889,13 +10912,13 @@ static void _vala_array_add89 (gchar*** array, int* length, int* size, gchar* va *size = (*size) ? (2 * (*size)) : 4; #line 1446 "/home/jens/Source/shotwell/src/Photo.vala" *array = g_renew (gchar*, *array, (*size) + 1); -#line 10891 "Photo.c" +#line 10914 "Photo.c" } #line 1446 "/home/jens/Source/shotwell/src/Photo.vala" (*array)[(*length)++] = value; #line 1446 "/home/jens/Source/shotwell/src/Photo.vala" (*array)[*length] = NULL; -#line 10897 "Photo.c" +#line 10920 "Photo.c" } @@ -10906,13 +10929,13 @@ static void _vala_array_add90 (gchar*** array, int* length, int* size, gchar* va *size = (*size) ? (2 * (*size)) : 4; #line 1453 "/home/jens/Source/shotwell/src/Photo.vala" *array = g_renew (gchar*, *array, (*size) + 1); -#line 10908 "Photo.c" +#line 10931 "Photo.c" } #line 1453 "/home/jens/Source/shotwell/src/Photo.vala" (*array)[(*length)++] = value; #line 1453 "/home/jens/Source/shotwell/src/Photo.vala" (*array)[*length] = NULL; -#line 10914 "Photo.c" +#line 10937 "Photo.c" } @@ -10923,13 +10946,13 @@ static void _vala_array_add91 (gchar*** array, int* length, int* size, gchar* va *size = (*size) ? (2 * (*size)) : 4; #line 1456 "/home/jens/Source/shotwell/src/Photo.vala" *array = g_renew (gchar*, *array, (*size) + 1); -#line 10925 "Photo.c" +#line 10948 "Photo.c" } #line 1456 "/home/jens/Source/shotwell/src/Photo.vala" (*array)[(*length)++] = value; #line 1456 "/home/jens/Source/shotwell/src/Photo.vala" (*array)[*length] = NULL; -#line 10931 "Photo.c" +#line 10954 "Photo.c" } @@ -10940,13 +10963,13 @@ static void _vala_array_add92 (gchar*** array, int* length, int* size, gchar* va *size = (*size) ? (2 * (*size)) : 4; #line 1459 "/home/jens/Source/shotwell/src/Photo.vala" *array = g_renew (gchar*, *array, (*size) + 1); -#line 10942 "Photo.c" +#line 10965 "Photo.c" } #line 1459 "/home/jens/Source/shotwell/src/Photo.vala" (*array)[(*length)++] = value; #line 1459 "/home/jens/Source/shotwell/src/Photo.vala" (*array)[*length] = NULL; -#line 10948 "Photo.c" +#line 10971 "Photo.c" } @@ -10957,20 +10980,20 @@ static void _vala_array_add93 (gchar*** array, int* length, int* size, gchar* va *size = (*size) ? (2 * (*size)) : 4; #line 1462 "/home/jens/Source/shotwell/src/Photo.vala" *array = g_renew (gchar*, *array, (*size) + 1); -#line 10959 "Photo.c" +#line 10982 "Photo.c" } #line 1462 "/home/jens/Source/shotwell/src/Photo.vala" (*array)[(*length)++] = value; #line 1462 "/home/jens/Source/shotwell/src/Photo.vala" (*array)[*length] = NULL; -#line 10965 "Photo.c" +#line 10988 "Photo.c" } static gpointer _media_metadata_ref0 (gpointer self) { #line 1472 "/home/jens/Source/shotwell/src/Photo.vala" return self ? media_metadata_ref (self) : NULL; -#line 10972 "Photo.c" +#line 10995 "Photo.c" } @@ -10987,51 +11010,51 @@ gboolean photo_prepare_for_reimport_master (Photo* self, PhotoReimportMasterStat GFile* _tmp4_ = NULL; DetectedPhotoInformation* _tmp5_ = NULL; BackingPhotoRow* _tmp6_ = NULL; - BackingPhotoRow* _tmp7_ = NULL; - gboolean _tmp11_ = FALSE; + BackingPhotoRow* _tmp8_ = NULL; gboolean _tmp12_ = FALSE; - DetectedPhotoInformation* _tmp13_ = NULL; - GdkColorspace _tmp14_ = 0; + gboolean _tmp13_ = FALSE; + DetectedPhotoInformation* _tmp14_ = NULL; + GdkColorspace _tmp15_ = 0; PhotoRow* updated_row = NULL; - PhotoRow* _tmp22_ = NULL; + PhotoRow* _tmp23_ = NULL; gchar** list = NULL; - gchar** _tmp27_ = NULL; + gchar** _tmp29_ = NULL; gint list_length1 = 0; gint _list_size_ = 0; - PhotoRow* _tmp28_ = NULL; - const gchar* _tmp29_ = NULL; - DetectedPhotoInformation* _tmp30_ = NULL; + PhotoRow* _tmp30_ = NULL; const gchar* _tmp31_ = NULL; - PhotoRow* _tmp34_ = NULL; - BackingPhotoRow* _tmp35_ = NULL; - Orientation _tmp36_ = 0; + DetectedPhotoInformation* _tmp32_ = NULL; + const gchar* _tmp33_ = NULL; + PhotoRow* _tmp36_ = NULL; BackingPhotoRow* _tmp37_ = NULL; Orientation _tmp38_ = 0; - DetectedPhotoInformation* _tmp45_ = NULL; - PhotoMetadata* _tmp46_ = NULL; - PhotoRow* _tmp83_ = NULL; - BackingPhotoRow* _tmp84_ = NULL; - BackingPhotoRow* _tmp85_ = NULL; - PhotoRow* _tmp86_ = NULL; - DetectedPhotoInformation* _tmp87_ = NULL; - const gchar* _tmp88_ = NULL; - gchar* _tmp89_ = NULL; - PhotoRow* _tmp90_ = NULL; - DetectedPhotoInformation* _tmp91_ = NULL; - const gchar* _tmp92_ = NULL; - gchar* _tmp93_ = NULL; - PhotoRow* _tmp94_ = NULL; - DetectedPhotoInformation* _tmp95_ = NULL; - const gchar* _tmp96_ = NULL; - gchar* _tmp97_ = NULL; + BackingPhotoRow* _tmp39_ = NULL; + Orientation _tmp40_ = 0; + DetectedPhotoInformation* _tmp47_ = NULL; + PhotoMetadata* _tmp48_ = NULL; + PhotoRow* _tmp85_ = NULL; + BackingPhotoRow* _tmp86_ = NULL; + BackingPhotoRow* _tmp87_ = NULL; + PhotoRow* _tmp88_ = NULL; + DetectedPhotoInformation* _tmp89_ = NULL; + const gchar* _tmp90_ = NULL; + gchar* _tmp91_ = NULL; + PhotoRow* _tmp92_ = NULL; + DetectedPhotoInformation* _tmp93_ = NULL; + const gchar* _tmp94_ = NULL; + gchar* _tmp95_ = NULL; + PhotoRow* _tmp96_ = NULL; + DetectedPhotoInformation* _tmp97_ = NULL; + const gchar* _tmp98_ = NULL; + gchar* _tmp99_ = NULL; PhotoMetadata* metadata = NULL; - DetectedPhotoInformation* _tmp98_ = NULL; - PhotoMetadata* _tmp99_ = NULL; - PhotoRow* _tmp122_ = NULL; - PhotoMetadata* _tmp123_ = NULL; - gchar** _tmp124_ = NULL; - gint _tmp124__length1 = 0; - PhotoReimportMasterStateImpl* _tmp125_ = NULL; + DetectedPhotoInformation* _tmp100_ = NULL; + PhotoMetadata* _tmp101_ = NULL; + PhotoRow* _tmp124_ = NULL; + PhotoMetadata* _tmp125_ = NULL; + gchar** _tmp126_ = NULL; + gint _tmp126__length1 = 0; + PhotoReimportMasterStateImpl* _tmp127_ = NULL; GError * _inner_error_ = NULL; #line 1411 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_PHOTO (self), FALSE); @@ -11063,6 +11086,8 @@ gboolean photo_prepare_for_reimport_master (Photo* self, PhotoReimportMasterStat backing = _tmp6_; #line 1417 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { +#line 11088 "Photo.c" + gboolean _tmp7_ = FALSE; #line 1417 "/home/jens/Source/shotwell/src/Photo.vala" g_propagate_error (error, _inner_error_); #line 1417 "/home/jens/Source/shotwell/src/Photo.vala" @@ -11070,27 +11095,27 @@ gboolean photo_prepare_for_reimport_master (Photo* self, PhotoReimportMasterStat #line 1417 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (file); #line 1417 "/home/jens/Source/shotwell/src/Photo.vala" - return FALSE; -#line 11073 "Photo.c" + return _tmp7_; +#line 11098 "Photo.c" } #line 1419 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp7_ = backing; + _tmp8_ = backing; #line 1419 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp7_ == NULL) { -#line 11079 "Photo.c" - GFile* _tmp8_ = NULL; - gchar* _tmp9_ = NULL; + if (_tmp8_ == NULL) { +#line 11104 "Photo.c" + GFile* _tmp9_ = NULL; gchar* _tmp10_ = NULL; + gchar* _tmp11_ = NULL; #line 1420 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp8_ = file; + _tmp9_ = file; #line 1420 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp9_ = g_file_get_path (_tmp8_); + _tmp10_ = g_file_get_path (_tmp9_); #line 1420 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp10_ = _tmp9_; + _tmp11_ = _tmp10_; #line 1420 "/home/jens/Source/shotwell/src/Photo.vala" - g_warning ("Photo.vala:1420: Unable to retrieve photo state from %s for reimport", _tmp10_); + g_warning ("Photo.vala:1420: Unable to retrieve photo state from %s for reimport", _tmp11_); #line 1420 "/home/jens/Source/shotwell/src/Photo.vala" - _g_free0 (_tmp10_); + _g_free0 (_tmp11_); #line 1421 "/home/jens/Source/shotwell/src/Photo.vala" result = FALSE; #line 1421 "/home/jens/Source/shotwell/src/Photo.vala" @@ -11103,68 +11128,68 @@ gboolean photo_prepare_for_reimport_master (Photo* self, PhotoReimportMasterStat if (reimport_state) { #line 1421 "/home/jens/Source/shotwell/src/Photo.vala" *reimport_state = _vala_reimport_state; -#line 11105 "Photo.c" +#line 11130 "Photo.c" } else { #line 1421 "/home/jens/Source/shotwell/src/Photo.vala" _photo_reimport_master_state_unref0 (_vala_reimport_state); -#line 11109 "Photo.c" +#line 11134 "Photo.c" } #line 1421 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 11113 "Photo.c" +#line 11138 "Photo.c" } #line 1425 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp13_ = detected; + _tmp14_ = detected; #line 1425 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp14_ = _tmp13_->colorspace; + _tmp15_ = _tmp14_->colorspace; #line 1425 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp14_ != GDK_COLORSPACE_RGB) { + if (_tmp15_ != GDK_COLORSPACE_RGB) { #line 1425 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp12_ = TRUE; -#line 11123 "Photo.c" + _tmp13_ = TRUE; +#line 11148 "Photo.c" } else { - DetectedPhotoInformation* _tmp15_ = NULL; - gint _tmp16_ = 0; + DetectedPhotoInformation* _tmp16_ = NULL; + gint _tmp17_ = 0; #line 1426 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp15_ = detected; + _tmp16_ = detected; #line 1426 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp16_ = _tmp15_->channels; + _tmp17_ = _tmp16_->channels; #line 1426 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp12_ = _tmp16_ < 3; -#line 11133 "Photo.c" + _tmp13_ = _tmp17_ < 3; +#line 11158 "Photo.c" } #line 1425 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp12_) { + if (_tmp13_) { #line 1425 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp11_ = TRUE; -#line 11139 "Photo.c" + _tmp12_ = TRUE; +#line 11164 "Photo.c" } else { - DetectedPhotoInformation* _tmp17_ = NULL; - gint _tmp18_ = 0; + DetectedPhotoInformation* _tmp18_ = NULL; + gint _tmp19_ = 0; #line 1427 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp17_ = detected; + _tmp18_ = detected; #line 1427 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp18_ = _tmp17_->bits_per_channel; + _tmp19_ = _tmp18_->bits_per_channel; #line 1427 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp11_ = _tmp18_ != 8; -#line 11149 "Photo.c" + _tmp12_ = _tmp19_ != 8; +#line 11174 "Photo.c" } #line 1425 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp11_) { -#line 11153 "Photo.c" - GFile* _tmp19_ = NULL; - gchar* _tmp20_ = NULL; + if (_tmp12_) { +#line 11178 "Photo.c" + GFile* _tmp20_ = NULL; gchar* _tmp21_ = NULL; + gchar* _tmp22_ = NULL; #line 1428 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp19_ = file; + _tmp20_ = file; #line 1428 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp20_ = g_file_get_path (_tmp19_); + _tmp21_ = g_file_get_path (_tmp20_); #line 1428 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp21_ = _tmp20_; + _tmp22_ = _tmp21_; #line 1428 "/home/jens/Source/shotwell/src/Photo.vala" - g_warning ("Photo.vala:1428: Not re-importing %s: Unsupported color format", _tmp21_); + g_warning ("Photo.vala:1428: Not re-importing %s: Unsupported color format", _tmp22_); #line 1428 "/home/jens/Source/shotwell/src/Photo.vala" - _g_free0 (_tmp21_); + _g_free0 (_tmp22_); #line 1430 "/home/jens/Source/shotwell/src/Photo.vala" result = FALSE; #line 1430 "/home/jens/Source/shotwell/src/Photo.vala" @@ -11177,52 +11202,54 @@ gboolean photo_prepare_for_reimport_master (Photo* self, PhotoReimportMasterStat if (reimport_state) { #line 1430 "/home/jens/Source/shotwell/src/Photo.vala" *reimport_state = _vala_reimport_state; -#line 11179 "Photo.c" +#line 11204 "Photo.c" } else { #line 1430 "/home/jens/Source/shotwell/src/Photo.vala" _photo_reimport_master_state_unref0 (_vala_reimport_state); -#line 11183 "Photo.c" +#line 11208 "Photo.c" } #line 1430 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 11187 "Photo.c" +#line 11212 "Photo.c" } #line 1434 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp22_ = photo_row_new (); + _tmp23_ = photo_row_new (); #line 1434 "/home/jens/Source/shotwell/src/Photo.vala" - updated_row = _tmp22_; -#line 11193 "Photo.c" + updated_row = _tmp23_; +#line 11218 "Photo.c" { - PhotoRow* _tmp23_ = NULL; + PhotoRow* _tmp24_ = NULL; #line 1435 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp23_ = self->row; + _tmp24_ = self->row; #line 1435 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_row); -#line 11200 "Photo.c" +#line 11225 "Photo.c" { - PhotoRow* _tmp24_ = NULL; PhotoRow* _tmp25_ = NULL; + PhotoRow* _tmp26_ = NULL; #line 1436 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp24_ = self->row; + _tmp25_ = self->row; #line 1436 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp25_ = _photo_row_ref0 (_tmp24_); + _tmp26_ = _photo_row_ref0 (_tmp25_); #line 1436 "/home/jens/Source/shotwell/src/Photo.vala" _photo_row_unref0 (updated_row); #line 1436 "/home/jens/Source/shotwell/src/Photo.vala" - updated_row = _tmp25_; -#line 11212 "Photo.c" + updated_row = _tmp26_; +#line 11237 "Photo.c" } __finally304: { - PhotoRow* _tmp26_ = NULL; + PhotoRow* _tmp27_ = NULL; #line 1435 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp26_ = self->row; + _tmp27_ = self->row; #line 1435 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 11221 "Photo.c" +#line 11246 "Photo.c" } #line 1435 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { +#line 11250 "Photo.c" + gboolean _tmp28_ = FALSE; #line 1435 "/home/jens/Source/shotwell/src/Photo.vala" g_propagate_error (error, _inner_error_); #line 1435 "/home/jens/Source/shotwell/src/Photo.vala" @@ -11234,420 +11261,420 @@ gboolean photo_prepare_for_reimport_master (Photo* self, PhotoReimportMasterStat #line 1435 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (file); #line 1435 "/home/jens/Source/shotwell/src/Photo.vala" - return FALSE; -#line 11237 "Photo.c" + return _tmp28_; +#line 11264 "Photo.c" } } #line 1440 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp27_ = g_new0 (gchar*, 0 + 1); + _tmp29_ = g_new0 (gchar*, 0 + 1); #line 1440 "/home/jens/Source/shotwell/src/Photo.vala" - list = _tmp27_; + list = _tmp29_; #line 1440 "/home/jens/Source/shotwell/src/Photo.vala" list_length1 = 0; #line 1440 "/home/jens/Source/shotwell/src/Photo.vala" _list_size_ = list_length1; #line 1442 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp28_ = updated_row; + _tmp30_ = updated_row; #line 1442 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp29_ = _tmp28_->md5; + _tmp31_ = _tmp30_->md5; #line 1442 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp30_ = detected; + _tmp32_ = detected; #line 1442 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp31_ = _tmp30_->md5; + _tmp33_ = _tmp32_->md5; #line 1442 "/home/jens/Source/shotwell/src/Photo.vala" - if (g_strcmp0 (_tmp29_, _tmp31_) != 0) { -#line 11258 "Photo.c" - gchar** _tmp32_ = NULL; - gint _tmp32__length1 = 0; - gchar* _tmp33_ = NULL; + if (g_strcmp0 (_tmp31_, _tmp33_) != 0) { +#line 11285 "Photo.c" + gchar** _tmp34_ = NULL; + gint _tmp34__length1 = 0; + gchar* _tmp35_ = NULL; #line 1443 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp32_ = list; + _tmp34_ = list; #line 1443 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp32__length1 = list_length1; + _tmp34__length1 = list_length1; #line 1443 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp33_ = g_strdup ("metadata:md5"); + _tmp35_ = g_strdup ("metadata:md5"); #line 1443 "/home/jens/Source/shotwell/src/Photo.vala" - _vala_array_add88 (&list, &list_length1, &_list_size_, _tmp33_); -#line 11270 "Photo.c" + _vala_array_add88 (&list, &list_length1, &_list_size_, _tmp35_); +#line 11297 "Photo.c" } #line 1445 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp34_ = updated_row; + _tmp36_ = updated_row; #line 1445 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp35_ = _tmp34_->master; + _tmp37_ = _tmp36_->master; #line 1445 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp36_ = _tmp35_->original_orientation; + _tmp38_ = _tmp37_->original_orientation; #line 1445 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp37_ = backing; + _tmp39_ = backing; #line 1445 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp38_ = _tmp37_->original_orientation; + _tmp40_ = _tmp39_->original_orientation; #line 1445 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp36_ != _tmp38_) { -#line 11284 "Photo.c" - gchar** _tmp39_ = NULL; - gint _tmp39__length1 = 0; - gchar* _tmp40_ = NULL; - PhotoRow* _tmp41_ = NULL; - BackingPhotoRow* _tmp42_ = NULL; - BackingPhotoRow* _tmp43_ = NULL; - Orientation _tmp44_ = 0; + if (_tmp38_ != _tmp40_) { +#line 11311 "Photo.c" + gchar** _tmp41_ = NULL; + gint _tmp41__length1 = 0; + gchar* _tmp42_ = NULL; + PhotoRow* _tmp43_ = NULL; + BackingPhotoRow* _tmp44_ = NULL; + BackingPhotoRow* _tmp45_ = NULL; + Orientation _tmp46_ = 0; #line 1446 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp39_ = list; + _tmp41_ = list; #line 1446 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp39__length1 = list_length1; + _tmp41__length1 = list_length1; #line 1446 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp40_ = g_strdup ("image:orientation"); + _tmp42_ = g_strdup ("image:orientation"); #line 1446 "/home/jens/Source/shotwell/src/Photo.vala" - _vala_array_add89 (&list, &list_length1, &_list_size_, _tmp40_); + _vala_array_add89 (&list, &list_length1, &_list_size_, _tmp42_); #line 1447 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp41_ = updated_row; + _tmp43_ = updated_row; #line 1447 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp42_ = _tmp41_->master; + _tmp44_ = _tmp43_->master; #line 1447 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp43_ = backing; + _tmp45_ = backing; #line 1447 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp44_ = _tmp43_->original_orientation; + _tmp46_ = _tmp45_->original_orientation; #line 1447 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp42_->original_orientation = _tmp44_; -#line 11310 "Photo.c" + _tmp44_->original_orientation = _tmp46_; +#line 11337 "Photo.c" } #line 1450 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp45_ = detected; + _tmp47_ = detected; #line 1450 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp46_ = _tmp45_->metadata; + _tmp48_ = _tmp47_->metadata; #line 1450 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp46_ != NULL) { -#line 11318 "Photo.c" + if (_tmp48_ != NULL) { +#line 11345 "Photo.c" MetadataDateTime* date_time = NULL; - DetectedPhotoInformation* _tmp47_ = NULL; - PhotoMetadata* _tmp48_ = NULL; - MetadataDateTime* _tmp49_ = NULL; - gboolean _tmp50_ = FALSE; + DetectedPhotoInformation* _tmp49_ = NULL; + PhotoMetadata* _tmp50_ = NULL; MetadataDateTime* _tmp51_ = NULL; - PhotoRow* _tmp58_ = NULL; - const gchar* _tmp59_ = NULL; - DetectedPhotoInformation* _tmp60_ = NULL; - PhotoMetadata* _tmp61_ = NULL; - gchar* _tmp62_ = NULL; - gchar* _tmp63_ = NULL; - gboolean _tmp64_ = FALSE; - PhotoRow* _tmp67_ = NULL; - const gchar* _tmp68_ = NULL; - DetectedPhotoInformation* _tmp69_ = NULL; - PhotoMetadata* _tmp70_ = NULL; - gchar* _tmp71_ = NULL; - gchar* _tmp72_ = NULL; - gboolean _tmp73_ = FALSE; - PhotoRow* _tmp76_ = NULL; - Rating _tmp77_ = 0; - DetectedPhotoInformation* _tmp78_ = NULL; - PhotoMetadata* _tmp79_ = NULL; - Rating _tmp80_ = 0; + gboolean _tmp52_ = FALSE; + MetadataDateTime* _tmp53_ = NULL; + PhotoRow* _tmp60_ = NULL; + const gchar* _tmp61_ = NULL; + DetectedPhotoInformation* _tmp62_ = NULL; + PhotoMetadata* _tmp63_ = NULL; + gchar* _tmp64_ = NULL; + gchar* _tmp65_ = NULL; + gboolean _tmp66_ = FALSE; + PhotoRow* _tmp69_ = NULL; + const gchar* _tmp70_ = NULL; + DetectedPhotoInformation* _tmp71_ = NULL; + PhotoMetadata* _tmp72_ = NULL; + gchar* _tmp73_ = NULL; + gchar* _tmp74_ = NULL; + gboolean _tmp75_ = FALSE; + PhotoRow* _tmp78_ = NULL; + Rating _tmp79_ = 0; + DetectedPhotoInformation* _tmp80_ = NULL; + PhotoMetadata* _tmp81_ = NULL; + Rating _tmp82_ = 0; #line 1451 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp47_ = detected; + _tmp49_ = detected; #line 1451 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp48_ = _tmp47_->metadata; + _tmp50_ = _tmp49_->metadata; #line 1451 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp49_ = photo_metadata_get_exposure_date_time (_tmp48_); + _tmp51_ = photo_metadata_get_exposure_date_time (_tmp50_); #line 1451 "/home/jens/Source/shotwell/src/Photo.vala" - date_time = _tmp49_; + date_time = _tmp51_; #line 1452 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp51_ = date_time; + _tmp53_ = date_time; #line 1452 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp51_ != NULL) { -#line 11356 "Photo.c" - PhotoRow* _tmp52_ = NULL; - time_t _tmp53_ = 0; - MetadataDateTime* _tmp54_ = NULL; + if (_tmp53_ != NULL) { +#line 11383 "Photo.c" + PhotoRow* _tmp54_ = NULL; time_t _tmp55_ = 0; + MetadataDateTime* _tmp56_ = NULL; + time_t _tmp57_ = 0; #line 1452 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp52_ = updated_row; + _tmp54_ = updated_row; #line 1452 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp53_ = _tmp52_->exposure_time; + _tmp55_ = _tmp54_->exposure_time; #line 1452 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp54_ = date_time; + _tmp56_ = date_time; #line 1452 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp55_ = metadata_date_time_get_timestamp (_tmp54_); + _tmp57_ = metadata_date_time_get_timestamp (_tmp56_); #line 1452 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp50_ = _tmp53_ != _tmp55_; -#line 11371 "Photo.c" + _tmp52_ = _tmp55_ != _tmp57_; +#line 11398 "Photo.c" } else { #line 1452 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp50_ = FALSE; -#line 11375 "Photo.c" + _tmp52_ = FALSE; +#line 11402 "Photo.c" } #line 1452 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp50_) { -#line 11379 "Photo.c" - gchar** _tmp56_ = NULL; - gint _tmp56__length1 = 0; - gchar* _tmp57_ = NULL; + if (_tmp52_) { +#line 11406 "Photo.c" + gchar** _tmp58_ = NULL; + gint _tmp58__length1 = 0; + gchar* _tmp59_ = NULL; #line 1453 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp56_ = list; + _tmp58_ = list; #line 1453 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp56__length1 = list_length1; + _tmp58__length1 = list_length1; #line 1453 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp57_ = g_strdup ("metadata:exposure-time"); + _tmp59_ = g_strdup ("metadata:exposure-time"); #line 1453 "/home/jens/Source/shotwell/src/Photo.vala" - _vala_array_add90 (&list, &list_length1, &_list_size_, _tmp57_); -#line 11391 "Photo.c" + _vala_array_add90 (&list, &list_length1, &_list_size_, _tmp59_); +#line 11418 "Photo.c" } #line 1455 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp58_ = updated_row; + _tmp60_ = updated_row; #line 1455 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp59_ = _tmp58_->title; + _tmp61_ = _tmp60_->title; #line 1455 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp60_ = detected; + _tmp62_ = detected; #line 1455 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp61_ = _tmp60_->metadata; + _tmp63_ = _tmp62_->metadata; #line 1455 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp62_ = media_metadata_get_title (G_TYPE_CHECK_INSTANCE_CAST (_tmp61_, TYPE_MEDIA_METADATA, MediaMetadata)); + _tmp64_ = media_metadata_get_title (G_TYPE_CHECK_INSTANCE_CAST (_tmp63_, TYPE_MEDIA_METADATA, MediaMetadata)); #line 1455 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp63_ = _tmp62_; + _tmp65_ = _tmp64_; #line 1455 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp64_ = g_strcmp0 (_tmp59_, _tmp63_) != 0; + _tmp66_ = g_strcmp0 (_tmp61_, _tmp65_) != 0; #line 1455 "/home/jens/Source/shotwell/src/Photo.vala" - _g_free0 (_tmp63_); + _g_free0 (_tmp65_); #line 1455 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp64_) { -#line 11411 "Photo.c" - gchar** _tmp65_ = NULL; - gint _tmp65__length1 = 0; - gchar* _tmp66_ = NULL; + if (_tmp66_) { +#line 11438 "Photo.c" + gchar** _tmp67_ = NULL; + gint _tmp67__length1 = 0; + gchar* _tmp68_ = NULL; #line 1456 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp65_ = list; + _tmp67_ = list; #line 1456 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp65__length1 = list_length1; + _tmp67__length1 = list_length1; #line 1456 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp66_ = g_strdup ("metadata:name"); + _tmp68_ = g_strdup ("metadata:name"); #line 1456 "/home/jens/Source/shotwell/src/Photo.vala" - _vala_array_add91 (&list, &list_length1, &_list_size_, _tmp66_); -#line 11423 "Photo.c" + _vala_array_add91 (&list, &list_length1, &_list_size_, _tmp68_); +#line 11450 "Photo.c" } #line 1458 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp67_ = updated_row; + _tmp69_ = updated_row; #line 1458 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp68_ = _tmp67_->comment; + _tmp70_ = _tmp69_->comment; #line 1458 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp69_ = detected; + _tmp71_ = detected; #line 1458 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp70_ = _tmp69_->metadata; + _tmp72_ = _tmp71_->metadata; #line 1458 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp71_ = media_metadata_get_comment (G_TYPE_CHECK_INSTANCE_CAST (_tmp70_, TYPE_MEDIA_METADATA, MediaMetadata)); + _tmp73_ = media_metadata_get_comment (G_TYPE_CHECK_INSTANCE_CAST (_tmp72_, TYPE_MEDIA_METADATA, MediaMetadata)); #line 1458 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp72_ = _tmp71_; + _tmp74_ = _tmp73_; #line 1458 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp73_ = g_strcmp0 (_tmp68_, _tmp72_) != 0; + _tmp75_ = g_strcmp0 (_tmp70_, _tmp74_) != 0; #line 1458 "/home/jens/Source/shotwell/src/Photo.vala" - _g_free0 (_tmp72_); + _g_free0 (_tmp74_); #line 1458 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp73_) { -#line 11443 "Photo.c" - gchar** _tmp74_ = NULL; - gint _tmp74__length1 = 0; - gchar* _tmp75_ = NULL; + if (_tmp75_) { +#line 11470 "Photo.c" + gchar** _tmp76_ = NULL; + gint _tmp76__length1 = 0; + gchar* _tmp77_ = NULL; #line 1459 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp74_ = list; + _tmp76_ = list; #line 1459 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp74__length1 = list_length1; + _tmp76__length1 = list_length1; #line 1459 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp75_ = g_strdup ("metadata:comment"); + _tmp77_ = g_strdup ("metadata:comment"); #line 1459 "/home/jens/Source/shotwell/src/Photo.vala" - _vala_array_add92 (&list, &list_length1, &_list_size_, _tmp75_); -#line 11455 "Photo.c" + _vala_array_add92 (&list, &list_length1, &_list_size_, _tmp77_); +#line 11482 "Photo.c" } #line 1461 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp76_ = updated_row; + _tmp78_ = updated_row; #line 1461 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp77_ = _tmp76_->rating; + _tmp79_ = _tmp78_->rating; #line 1461 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp78_ = detected; + _tmp80_ = detected; #line 1461 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp79_ = _tmp78_->metadata; + _tmp81_ = _tmp80_->metadata; #line 1461 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp80_ = photo_metadata_get_rating (_tmp79_); + _tmp82_ = photo_metadata_get_rating (_tmp81_); #line 1461 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp77_ != _tmp80_) { -#line 11469 "Photo.c" - gchar** _tmp81_ = NULL; - gint _tmp81__length1 = 0; - gchar* _tmp82_ = NULL; + if (_tmp79_ != _tmp82_) { +#line 11496 "Photo.c" + gchar** _tmp83_ = NULL; + gint _tmp83__length1 = 0; + gchar* _tmp84_ = NULL; #line 1462 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp81_ = list; + _tmp83_ = list; #line 1462 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp81__length1 = list_length1; + _tmp83__length1 = list_length1; #line 1462 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp82_ = g_strdup ("metadata:rating"); + _tmp84_ = g_strdup ("metadata:rating"); #line 1462 "/home/jens/Source/shotwell/src/Photo.vala" - _vala_array_add93 (&list, &list_length1, &_list_size_, _tmp82_); -#line 11481 "Photo.c" + _vala_array_add93 (&list, &list_length1, &_list_size_, _tmp84_); +#line 11508 "Photo.c" } #line 1450 "/home/jens/Source/shotwell/src/Photo.vala" _metadata_date_time_unref0 (date_time); -#line 11485 "Photo.c" +#line 11512 "Photo.c" } #line 1465 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp83_ = updated_row; + _tmp85_ = updated_row; #line 1465 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp84_ = backing; + _tmp86_ = backing; #line 1465 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp85_ = _backing_photo_row_ref0 (_tmp84_); + _tmp87_ = _backing_photo_row_ref0 (_tmp86_); #line 1465 "/home/jens/Source/shotwell/src/Photo.vala" - _backing_photo_row_unref0 (_tmp83_->master); + _backing_photo_row_unref0 (_tmp85_->master); #line 1465 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp83_->master = _tmp85_; + _tmp85_->master = _tmp87_; #line 1466 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp86_ = updated_row; + _tmp88_ = updated_row; #line 1466 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp87_ = detected; + _tmp89_ = detected; #line 1466 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp88_ = _tmp87_->md5; + _tmp90_ = _tmp89_->md5; #line 1466 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp89_ = g_strdup (_tmp88_); + _tmp91_ = g_strdup (_tmp90_); #line 1466 "/home/jens/Source/shotwell/src/Photo.vala" - _g_free0 (_tmp86_->md5); + _g_free0 (_tmp88_->md5); #line 1466 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp86_->md5 = _tmp89_; + _tmp88_->md5 = _tmp91_; #line 1467 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp90_ = updated_row; + _tmp92_ = updated_row; #line 1467 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp91_ = detected; + _tmp93_ = detected; #line 1467 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp92_ = _tmp91_->exif_md5; + _tmp94_ = _tmp93_->exif_md5; #line 1467 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp93_ = g_strdup (_tmp92_); + _tmp95_ = g_strdup (_tmp94_); #line 1467 "/home/jens/Source/shotwell/src/Photo.vala" - _g_free0 (_tmp90_->exif_md5); + _g_free0 (_tmp92_->exif_md5); #line 1467 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp90_->exif_md5 = _tmp93_; + _tmp92_->exif_md5 = _tmp95_; #line 1468 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp94_ = updated_row; + _tmp96_ = updated_row; #line 1468 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp95_ = detected; + _tmp97_ = detected; #line 1468 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp96_ = _tmp95_->thumbnail_md5; + _tmp98_ = _tmp97_->thumbnail_md5; #line 1468 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp97_ = g_strdup (_tmp96_); + _tmp99_ = g_strdup (_tmp98_); #line 1468 "/home/jens/Source/shotwell/src/Photo.vala" - _g_free0 (_tmp94_->thumbnail_md5); + _g_free0 (_tmp96_->thumbnail_md5); #line 1468 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp94_->thumbnail_md5 = _tmp97_; + _tmp96_->thumbnail_md5 = _tmp99_; #line 1470 "/home/jens/Source/shotwell/src/Photo.vala" metadata = NULL; #line 1471 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp98_ = detected; + _tmp100_ = detected; #line 1471 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp99_ = _tmp98_->metadata; + _tmp101_ = _tmp100_->metadata; #line 1471 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp99_ != NULL) { -#line 11541 "Photo.c" - DetectedPhotoInformation* _tmp100_ = NULL; - PhotoMetadata* _tmp101_ = NULL; - PhotoMetadata* _tmp102_ = NULL; - MetadataDateTime* date_time = NULL; - DetectedPhotoInformation* _tmp103_ = NULL; + if (_tmp101_ != NULL) { +#line 11568 "Photo.c" + DetectedPhotoInformation* _tmp102_ = NULL; + PhotoMetadata* _tmp103_ = NULL; PhotoMetadata* _tmp104_ = NULL; - MetadataDateTime* _tmp105_ = NULL; - MetadataDateTime* _tmp106_ = NULL; - PhotoRow* _tmp110_ = NULL; - DetectedPhotoInformation* _tmp111_ = NULL; - PhotoMetadata* _tmp112_ = NULL; - gchar* _tmp113_ = NULL; - PhotoRow* _tmp114_ = NULL; - DetectedPhotoInformation* _tmp115_ = NULL; - PhotoMetadata* _tmp116_ = NULL; - gchar* _tmp117_ = NULL; - PhotoRow* _tmp118_ = NULL; - DetectedPhotoInformation* _tmp119_ = NULL; - PhotoMetadata* _tmp120_ = NULL; - Rating _tmp121_ = 0; + MetadataDateTime* date_time = NULL; + DetectedPhotoInformation* _tmp105_ = NULL; + PhotoMetadata* _tmp106_ = NULL; + MetadataDateTime* _tmp107_ = NULL; + MetadataDateTime* _tmp108_ = NULL; + PhotoRow* _tmp112_ = NULL; + DetectedPhotoInformation* _tmp113_ = NULL; + PhotoMetadata* _tmp114_ = NULL; + gchar* _tmp115_ = NULL; + PhotoRow* _tmp116_ = NULL; + DetectedPhotoInformation* _tmp117_ = NULL; + PhotoMetadata* _tmp118_ = NULL; + gchar* _tmp119_ = NULL; + PhotoRow* _tmp120_ = NULL; + DetectedPhotoInformation* _tmp121_ = NULL; + PhotoMetadata* _tmp122_ = NULL; + Rating _tmp123_ = 0; #line 1472 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp100_ = detected; + _tmp102_ = detected; #line 1472 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp101_ = _tmp100_->metadata; + _tmp103_ = _tmp102_->metadata; #line 1472 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp102_ = _media_metadata_ref0 (_tmp101_); + _tmp104_ = _media_metadata_ref0 (_tmp103_); #line 1472 "/home/jens/Source/shotwell/src/Photo.vala" _media_metadata_unref0 (metadata); #line 1472 "/home/jens/Source/shotwell/src/Photo.vala" - metadata = _tmp102_; + metadata = _tmp104_; #line 1474 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp103_ = detected; + _tmp105_ = detected; #line 1474 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp104_ = _tmp103_->metadata; + _tmp106_ = _tmp105_->metadata; #line 1474 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp105_ = photo_metadata_get_exposure_date_time (_tmp104_); + _tmp107_ = photo_metadata_get_exposure_date_time (_tmp106_); #line 1474 "/home/jens/Source/shotwell/src/Photo.vala" - date_time = _tmp105_; + date_time = _tmp107_; #line 1475 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp106_ = date_time; + _tmp108_ = date_time; #line 1475 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp106_ != NULL) { -#line 11584 "Photo.c" - PhotoRow* _tmp107_ = NULL; - MetadataDateTime* _tmp108_ = NULL; - time_t _tmp109_ = 0; + if (_tmp108_ != NULL) { +#line 11611 "Photo.c" + PhotoRow* _tmp109_ = NULL; + MetadataDateTime* _tmp110_ = NULL; + time_t _tmp111_ = 0; #line 1476 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp107_ = updated_row; + _tmp109_ = updated_row; #line 1476 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp108_ = date_time; + _tmp110_ = date_time; #line 1476 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp109_ = metadata_date_time_get_timestamp (_tmp108_); + _tmp111_ = metadata_date_time_get_timestamp (_tmp110_); #line 1476 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp107_->exposure_time = _tmp109_; -#line 11596 "Photo.c" + _tmp109_->exposure_time = _tmp111_; +#line 11623 "Photo.c" } #line 1478 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp110_ = updated_row; + _tmp112_ = updated_row; #line 1478 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp111_ = detected; + _tmp113_ = detected; #line 1478 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp112_ = _tmp111_->metadata; + _tmp114_ = _tmp113_->metadata; #line 1478 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp113_ = media_metadata_get_title (G_TYPE_CHECK_INSTANCE_CAST (_tmp112_, TYPE_MEDIA_METADATA, MediaMetadata)); + _tmp115_ = media_metadata_get_title (G_TYPE_CHECK_INSTANCE_CAST (_tmp114_, TYPE_MEDIA_METADATA, MediaMetadata)); #line 1478 "/home/jens/Source/shotwell/src/Photo.vala" - _g_free0 (_tmp110_->title); + _g_free0 (_tmp112_->title); #line 1478 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp110_->title = _tmp113_; + _tmp112_->title = _tmp115_; #line 1479 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp114_ = updated_row; + _tmp116_ = updated_row; #line 1479 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp115_ = detected; + _tmp117_ = detected; #line 1479 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp116_ = _tmp115_->metadata; + _tmp118_ = _tmp117_->metadata; #line 1479 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp117_ = media_metadata_get_comment (G_TYPE_CHECK_INSTANCE_CAST (_tmp116_, TYPE_MEDIA_METADATA, MediaMetadata)); + _tmp119_ = media_metadata_get_comment (G_TYPE_CHECK_INSTANCE_CAST (_tmp118_, TYPE_MEDIA_METADATA, MediaMetadata)); #line 1479 "/home/jens/Source/shotwell/src/Photo.vala" - _g_free0 (_tmp114_->comment); + _g_free0 (_tmp116_->comment); #line 1479 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp114_->comment = _tmp117_; + _tmp116_->comment = _tmp119_; #line 1480 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp118_ = updated_row; + _tmp120_ = updated_row; #line 1480 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp119_ = detected; + _tmp121_ = detected; #line 1480 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp120_ = _tmp119_->metadata; + _tmp122_ = _tmp121_->metadata; #line 1480 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp121_ = photo_metadata_get_rating (_tmp120_); + _tmp123_ = photo_metadata_get_rating (_tmp122_); #line 1480 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp118_->rating = _tmp121_; + _tmp120_->rating = _tmp123_; #line 1471 "/home/jens/Source/shotwell/src/Photo.vala" _metadata_date_time_unref0 (date_time); -#line 11634 "Photo.c" +#line 11661 "Photo.c" } #line 1483 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp122_ = updated_row; + _tmp124_ = updated_row; #line 1483 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp123_ = metadata; + _tmp125_ = metadata; #line 1483 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp124_ = list; + _tmp126_ = list; #line 1483 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp124__length1 = list_length1; + _tmp126__length1 = list_length1; #line 1483 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp125_ = photo_reimport_master_state_impl_new (_tmp122_, _tmp123_, _tmp124_, _tmp124__length1); + _tmp127_ = photo_reimport_master_state_impl_new (_tmp124_, _tmp125_, _tmp126_, _tmp126__length1); #line 1483 "/home/jens/Source/shotwell/src/Photo.vala" _photo_reimport_master_state_unref0 (_vala_reimport_state); #line 1483 "/home/jens/Source/shotwell/src/Photo.vala" - _vala_reimport_state = G_TYPE_CHECK_INSTANCE_CAST (_tmp125_, PHOTO_TYPE_REIMPORT_MASTER_STATE, PhotoReimportMasterState); + _vala_reimport_state = G_TYPE_CHECK_INSTANCE_CAST (_tmp127_, PHOTO_TYPE_REIMPORT_MASTER_STATE, PhotoReimportMasterState); #line 1485 "/home/jens/Source/shotwell/src/Photo.vala" result = TRUE; #line 1485 "/home/jens/Source/shotwell/src/Photo.vala" @@ -11666,15 +11693,15 @@ gboolean photo_prepare_for_reimport_master (Photo* self, PhotoReimportMasterStat if (reimport_state) { #line 1485 "/home/jens/Source/shotwell/src/Photo.vala" *reimport_state = _vala_reimport_state; -#line 11668 "Photo.c" +#line 11695 "Photo.c" } else { #line 1485 "/home/jens/Source/shotwell/src/Photo.vala" _photo_reimport_master_state_unref0 (_vala_reimport_state); -#line 11672 "Photo.c" +#line 11699 "Photo.c" } #line 1485 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 11676 "Photo.c" +#line 11703 "Photo.c" } @@ -11683,7 +11710,7 @@ static void photo_real_apply_user_metadata_for_reimport (Photo* self, PhotoMetad g_critical ("Type `%s' does not implement abstract method `photo_apply_user_metadata_for_reimport'", g_type_name (G_TYPE_FROM_INSTANCE (self))); #line 1488 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 11685 "Photo.c" +#line 11712 "Photo.c" } @@ -11692,14 +11719,14 @@ void photo_apply_user_metadata_for_reimport (Photo* self, PhotoMetadata* metadat g_return_if_fail (IS_PHOTO (self)); #line 1488 "/home/jens/Source/shotwell/src/Photo.vala" PHOTO_GET_CLASS (self)->apply_user_metadata_for_reimport (self, metadata); -#line 11694 "Photo.c" +#line 11721 "Photo.c" } static gpointer _photo_reimport_master_state_ref0 (gpointer self) { #line 1492 "/home/jens/Source/shotwell/src/Photo.vala" return self ? photo_reimport_master_state_ref (self) : NULL; -#line 11701 "Photo.c" +#line 11728 "Photo.c" } @@ -11710,13 +11737,13 @@ static void _vala_array_add94 (gchar*** array, int* length, int* size, gchar* va *size = (*size) ? (2 * (*size)) : 4; #line 1510 "/home/jens/Source/shotwell/src/Photo.vala" *array = g_renew (gchar*, *array, (*size) + 1); -#line 11712 "Photo.c" +#line 11739 "Photo.c" } #line 1510 "/home/jens/Source/shotwell/src/Photo.vala" (*array)[(*length)++] = value; #line 1510 "/home/jens/Source/shotwell/src/Photo.vala" (*array)[*length] = NULL; -#line 11718 "Photo.c" +#line 11745 "Photo.c" } @@ -11727,13 +11754,13 @@ static void _vala_array_add95 (gchar*** array, int* length, int* size, gchar* va *size = (*size) ? (2 * (*size)) : 4; #line 1512 "/home/jens/Source/shotwell/src/Photo.vala" *array = g_renew (gchar*, *array, (*size) + 1); -#line 11729 "Photo.c" +#line 11756 "Photo.c" } #line 1512 "/home/jens/Source/shotwell/src/Photo.vala" (*array)[(*length)++] = value; #line 1512 "/home/jens/Source/shotwell/src/Photo.vala" (*array)[*length] = NULL; -#line 11735 "Photo.c" +#line 11762 "Photo.c" } @@ -11782,7 +11809,7 @@ void photo_finish_reimport_master (Photo* self, PhotoReimportMasterState* state, _photo_reimport_master_state_unref0 (reimport_state); #line 1494 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 11784 "Photo.c" +#line 11811 "Photo.c" } else { #line 1494 "/home/jens/Source/shotwell/src/Photo.vala" _photo_reimport_master_state_unref0 (reimport_state); @@ -11792,7 +11819,7 @@ void photo_finish_reimport_master (Photo* self, PhotoReimportMasterState* state, g_clear_error (&_inner_error_); #line 1494 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 11794 "Photo.c" +#line 11821 "Photo.c" } } { @@ -11801,7 +11828,7 @@ void photo_finish_reimport_master (Photo* self, PhotoReimportMasterState* state, _tmp5_ = self->row; #line 1496 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_row); -#line 11803 "Photo.c" +#line 11830 "Photo.c" { BackingPhotoRow* original_master = NULL; PhotoRow* _tmp6_ = NULL; @@ -11859,11 +11886,11 @@ void photo_finish_reimport_master (Photo* self, PhotoReimportMasterState* state, if (!_tmp18_) { #line 1503 "/home/jens/Source/shotwell/src/Photo.vala" photo_internal_remove_all_transformations (self, FALSE); -#line 11861 "Photo.c" +#line 11888 "Photo.c" } #line 1496 "/home/jens/Source/shotwell/src/Photo.vala" _backing_photo_row_unref0 (original_master); -#line 11865 "Photo.c" +#line 11892 "Photo.c" } __finally305: { @@ -11872,7 +11899,7 @@ void photo_finish_reimport_master (Photo* self, PhotoReimportMasterState* state, _tmp19_ = self->row; #line 1496 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 11874 "Photo.c" +#line 11901 "Photo.c" } #line 1496 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { @@ -11884,7 +11911,7 @@ void photo_finish_reimport_master (Photo* self, PhotoReimportMasterState* state, _photo_reimport_master_state_unref0 (reimport_state); #line 1496 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 11886 "Photo.c" +#line 11913 "Photo.c" } else { #line 1496 "/home/jens/Source/shotwell/src/Photo.vala" _photo_reimport_master_state_unref0 (reimport_state); @@ -11894,7 +11921,7 @@ void photo_finish_reimport_master (Photo* self, PhotoReimportMasterState* state, g_clear_error (&_inner_error_); #line 1496 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 11896 "Photo.c" +#line 11923 "Photo.c" } } } @@ -11902,19 +11929,19 @@ void photo_finish_reimport_master (Photo* self, PhotoReimportMasterState* state, _tmp20_ = reimport_state->metadata; #line 1506 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp20_ != NULL) { -#line 11904 "Photo.c" +#line 11931 "Photo.c" PhotoMetadata* _tmp21_ = NULL; #line 1507 "/home/jens/Source/shotwell/src/Photo.vala" _tmp21_ = reimport_state->metadata; #line 1507 "/home/jens/Source/shotwell/src/Photo.vala" photo_apply_user_metadata_for_reimport (self, _tmp21_); -#line 11910 "Photo.c" +#line 11937 "Photo.c" } #line 1509 "/home/jens/Source/shotwell/src/Photo.vala" _tmp22_ = reimport_state->metadata_only; #line 1509 "/home/jens/Source/shotwell/src/Photo.vala" if (!_tmp22_) { -#line 11916 "Photo.c" +#line 11943 "Photo.c" gchar** _tmp23_ = NULL; gint _tmp23__length1 = 0; gchar* _tmp24_ = NULL; @@ -11931,7 +11958,7 @@ void photo_finish_reimport_master (Photo* self, PhotoReimportMasterState* state, _tmp25_ = photo_is_master_baseline (self); #line 1511 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp25_) { -#line 11933 "Photo.c" +#line 11960 "Photo.c" gchar** _tmp26_ = NULL; gint _tmp26__length1 = 0; gchar* _tmp27_ = NULL; @@ -11943,7 +11970,7 @@ void photo_finish_reimport_master (Photo* self, PhotoReimportMasterState* state, _tmp27_ = g_strdup ("image:baseline"); #line 1512 "/home/jens/Source/shotwell/src/Photo.vala" _vala_array_add95 (&reimport_state->alterations, &reimport_state->alterations_length1, &reimport_state->_alterations_size_, _tmp27_); -#line 11945 "Photo.c" +#line 11972 "Photo.c" } } #line 1515 "/home/jens/Source/shotwell/src/Photo.vala" @@ -11952,7 +11979,7 @@ void photo_finish_reimport_master (Photo* self, PhotoReimportMasterState* state, _tmp28__length1 = reimport_state->alterations_length1; #line 1515 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp28__length1 > 0) { -#line 11954 "Photo.c" +#line 11981 "Photo.c" gchar** _tmp29_ = NULL; gint _tmp29__length1 = 0; Alteration* _tmp30_ = NULL; @@ -11969,7 +11996,7 @@ void photo_finish_reimport_master (Photo* self, PhotoReimportMasterState* state, data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp31_); #line 1516 "/home/jens/Source/shotwell/src/Photo.vala" _alteration_unref0 (_tmp31_); -#line 11971 "Photo.c" +#line 11998 "Photo.c" } #line 1518 "/home/jens/Source/shotwell/src/Photo.vala" _tmp32_ = reimport_state->metadata; @@ -11979,29 +12006,29 @@ void photo_finish_reimport_master (Photo* self, PhotoReimportMasterState* state, _tmp33_ = photo_is_master_baseline (self); #line 1520 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp33_) { -#line 11981 "Photo.c" +#line 12008 "Photo.c" PhotoMetadata* _tmp34_ = NULL; #line 1521 "/home/jens/Source/shotwell/src/Photo.vala" _tmp34_ = reimport_state->metadata; #line 1521 "/home/jens/Source/shotwell/src/Photo.vala" photo_notify_baseline_reimported (self, _tmp34_); -#line 11987 "Photo.c" +#line 12014 "Photo.c" } #line 1523 "/home/jens/Source/shotwell/src/Photo.vala" _tmp35_ = photo_is_master_source (self); #line 1523 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp35_) { -#line 11993 "Photo.c" +#line 12020 "Photo.c" PhotoMetadata* _tmp36_ = NULL; #line 1524 "/home/jens/Source/shotwell/src/Photo.vala" _tmp36_ = reimport_state->metadata; #line 1524 "/home/jens/Source/shotwell/src/Photo.vala" photo_notify_source_reimported (self, _tmp36_); -#line 11999 "Photo.c" +#line 12026 "Photo.c" } #line 1491 "/home/jens/Source/shotwell/src/Photo.vala" _photo_reimport_master_state_unref0 (reimport_state); -#line 12003 "Photo.c" +#line 12030 "Photo.c" } @@ -12013,12 +12040,12 @@ static gboolean photo_verify_file_for_reimport (Photo* self, GFile* file, Backin GFile* _tmp1_ = NULL; DetectedPhotoInformation* _tmp2_ = NULL; BackingPhotoRow* _tmp3_ = NULL; - BackingPhotoRow* _tmp4_ = NULL; BackingPhotoRow* _tmp5_ = NULL; - gboolean _tmp6_ = FALSE; + BackingPhotoRow* _tmp6_ = NULL; gboolean _tmp7_ = FALSE; - DetectedPhotoInformation* _tmp8_ = NULL; - GdkColorspace _tmp9_ = 0; + gboolean _tmp8_ = FALSE; + DetectedPhotoInformation* _tmp9_ = NULL; + GdkColorspace _tmp10_ = 0; GError * _inner_error_ = NULL; #line 1528 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_PHOTO (self), FALSE); @@ -12036,24 +12063,26 @@ static gboolean photo_verify_file_for_reimport (Photo* self, GFile* file, Backin _tmp0_ = _tmp3_; #line 1530 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { +#line 12065 "Photo.c" + gboolean _tmp4_ = FALSE; #line 1530 "/home/jens/Source/shotwell/src/Photo.vala" g_propagate_error (error, _inner_error_); #line 1530 "/home/jens/Source/shotwell/src/Photo.vala" - return FALSE; -#line 12042 "Photo.c" + return _tmp4_; +#line 12071 "Photo.c" } #line 1530 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp4_ = _tmp0_; + _tmp5_ = _tmp0_; #line 1530 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = NULL; #line 1530 "/home/jens/Source/shotwell/src/Photo.vala" _backing_photo_row_unref0 (_vala_backing); #line 1530 "/home/jens/Source/shotwell/src/Photo.vala" - _vala_backing = _tmp4_; + _vala_backing = _tmp5_; #line 1532 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp5_ = _vala_backing; + _tmp6_ = _vala_backing; #line 1532 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp5_ == NULL) { + if (_tmp6_ == NULL) { #line 1533 "/home/jens/Source/shotwell/src/Photo.vala" result = FALSE; #line 1533 "/home/jens/Source/shotwell/src/Photo.vala" @@ -12062,78 +12091,78 @@ static gboolean photo_verify_file_for_reimport (Photo* self, GFile* file, Backin if (backing) { #line 1533 "/home/jens/Source/shotwell/src/Photo.vala" *backing = _vala_backing; -#line 12064 "Photo.c" +#line 12093 "Photo.c" } else { #line 1533 "/home/jens/Source/shotwell/src/Photo.vala" _backing_photo_row_unref0 (_vala_backing); -#line 12068 "Photo.c" +#line 12097 "Photo.c" } #line 1533 "/home/jens/Source/shotwell/src/Photo.vala" if (detected) { #line 1533 "/home/jens/Source/shotwell/src/Photo.vala" *detected = _vala_detected; -#line 12074 "Photo.c" +#line 12103 "Photo.c" } else { #line 1533 "/home/jens/Source/shotwell/src/Photo.vala" _detected_photo_information_unref0 (_vala_detected); -#line 12078 "Photo.c" +#line 12107 "Photo.c" } #line 1533 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 12082 "Photo.c" +#line 12111 "Photo.c" } #line 1537 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp8_ = _vala_detected; + _tmp9_ = _vala_detected; #line 1537 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp9_ = _tmp8_->colorspace; + _tmp10_ = _tmp9_->colorspace; #line 1537 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp9_ != GDK_COLORSPACE_RGB) { + if (_tmp10_ != GDK_COLORSPACE_RGB) { #line 1537 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp7_ = TRUE; -#line 12092 "Photo.c" + _tmp8_ = TRUE; +#line 12121 "Photo.c" } else { - DetectedPhotoInformation* _tmp10_ = NULL; - gint _tmp11_ = 0; + DetectedPhotoInformation* _tmp11_ = NULL; + gint _tmp12_ = 0; #line 1538 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp10_ = _vala_detected; + _tmp11_ = _vala_detected; #line 1538 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp11_ = _tmp10_->channels; + _tmp12_ = _tmp11_->channels; #line 1538 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp7_ = _tmp11_ < 3; -#line 12102 "Photo.c" + _tmp8_ = _tmp12_ < 3; +#line 12131 "Photo.c" } #line 1537 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp7_) { + if (_tmp8_) { #line 1537 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp6_ = TRUE; -#line 12108 "Photo.c" + _tmp7_ = TRUE; +#line 12137 "Photo.c" } else { - DetectedPhotoInformation* _tmp12_ = NULL; - gint _tmp13_ = 0; + DetectedPhotoInformation* _tmp13_ = NULL; + gint _tmp14_ = 0; #line 1539 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp12_ = _vala_detected; + _tmp13_ = _vala_detected; #line 1539 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp13_ = _tmp12_->bits_per_channel; + _tmp14_ = _tmp13_->bits_per_channel; #line 1539 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp6_ = _tmp13_ != 8; -#line 12118 "Photo.c" + _tmp7_ = _tmp14_ != 8; +#line 12147 "Photo.c" } #line 1537 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp6_) { -#line 12122 "Photo.c" - GFile* _tmp14_ = NULL; - gchar* _tmp15_ = NULL; + if (_tmp7_) { +#line 12151 "Photo.c" + GFile* _tmp15_ = NULL; gchar* _tmp16_ = NULL; + gchar* _tmp17_ = NULL; #line 1540 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp14_ = file; + _tmp15_ = file; #line 1540 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp15_ = g_file_get_path (_tmp14_); + _tmp16_ = g_file_get_path (_tmp15_); #line 1540 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp16_ = _tmp15_; + _tmp17_ = _tmp16_; #line 1540 "/home/jens/Source/shotwell/src/Photo.vala" - g_warning ("Photo.vala:1540: Not re-importing %s: Unsupported color format", _tmp16_); + g_warning ("Photo.vala:1540: Not re-importing %s: Unsupported color format", _tmp17_); #line 1540 "/home/jens/Source/shotwell/src/Photo.vala" - _g_free0 (_tmp16_); + _g_free0 (_tmp17_); #line 1542 "/home/jens/Source/shotwell/src/Photo.vala" result = FALSE; #line 1542 "/home/jens/Source/shotwell/src/Photo.vala" @@ -12142,25 +12171,25 @@ static gboolean photo_verify_file_for_reimport (Photo* self, GFile* file, Backin if (backing) { #line 1542 "/home/jens/Source/shotwell/src/Photo.vala" *backing = _vala_backing; -#line 12144 "Photo.c" +#line 12173 "Photo.c" } else { #line 1542 "/home/jens/Source/shotwell/src/Photo.vala" _backing_photo_row_unref0 (_vala_backing); -#line 12148 "Photo.c" +#line 12177 "Photo.c" } #line 1542 "/home/jens/Source/shotwell/src/Photo.vala" if (detected) { #line 1542 "/home/jens/Source/shotwell/src/Photo.vala" *detected = _vala_detected; -#line 12154 "Photo.c" +#line 12183 "Photo.c" } else { #line 1542 "/home/jens/Source/shotwell/src/Photo.vala" _detected_photo_information_unref0 (_vala_detected); -#line 12158 "Photo.c" +#line 12187 "Photo.c" } #line 1542 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 12162 "Photo.c" +#line 12191 "Photo.c" } #line 1545 "/home/jens/Source/shotwell/src/Photo.vala" result = TRUE; @@ -12170,25 +12199,25 @@ static gboolean photo_verify_file_for_reimport (Photo* self, GFile* file, Backin if (backing) { #line 1545 "/home/jens/Source/shotwell/src/Photo.vala" *backing = _vala_backing; -#line 12172 "Photo.c" +#line 12201 "Photo.c" } else { #line 1545 "/home/jens/Source/shotwell/src/Photo.vala" _backing_photo_row_unref0 (_vala_backing); -#line 12176 "Photo.c" +#line 12205 "Photo.c" } #line 1545 "/home/jens/Source/shotwell/src/Photo.vala" if (detected) { #line 1545 "/home/jens/Source/shotwell/src/Photo.vala" *detected = _vala_detected; -#line 12182 "Photo.c" +#line 12211 "Photo.c" } else { #line 1545 "/home/jens/Source/shotwell/src/Photo.vala" _detected_photo_information_unref0 (_vala_detected); -#line 12186 "Photo.c" +#line 12215 "Photo.c" } #line 1545 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 12190 "Photo.c" +#line 12219 "Photo.c" } @@ -12205,10 +12234,10 @@ gboolean photo_prepare_for_reimport_editable (Photo* self, PhotoReimportEditable BackingPhotoRow* _tmp4_ = NULL; DetectedPhotoInformation* _tmp5_ = NULL; gboolean _tmp6_ = FALSE; - BackingPhotoRow* _tmp7_ = NULL; - DetectedPhotoInformation* _tmp8_ = NULL; - PhotoMetadata* _tmp9_ = NULL; - PhotoReimportEditableStateImpl* _tmp10_ = NULL; + BackingPhotoRow* _tmp8_ = NULL; + DetectedPhotoInformation* _tmp9_ = NULL; + PhotoMetadata* _tmp10_ = NULL; + PhotoReimportEditableStateImpl* _tmp11_ = NULL; GError * _inner_error_ = NULL; #line 1549 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_PHOTO (self), FALSE); @@ -12232,15 +12261,15 @@ gboolean photo_prepare_for_reimport_editable (Photo* self, PhotoReimportEditable if (state) { #line 1554 "/home/jens/Source/shotwell/src/Photo.vala" *state = _vala_state; -#line 12234 "Photo.c" +#line 12263 "Photo.c" } else { #line 1554 "/home/jens/Source/shotwell/src/Photo.vala" _photo_reimport_editable_state_unref0 (_vala_state); -#line 12238 "Photo.c" +#line 12267 "Photo.c" } #line 1554 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 12242 "Photo.c" +#line 12271 "Photo.c" } #line 1558 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = file; @@ -12258,6 +12287,8 @@ gboolean photo_prepare_for_reimport_editable (Photo* self, PhotoReimportEditable _tmp2_ = _tmp6_; #line 1558 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { +#line 12289 "Photo.c" + gboolean _tmp7_ = FALSE; #line 1558 "/home/jens/Source/shotwell/src/Photo.vala" g_propagate_error (error, _inner_error_); #line 1558 "/home/jens/Source/shotwell/src/Photo.vala" @@ -12267,8 +12298,8 @@ gboolean photo_prepare_for_reimport_editable (Photo* self, PhotoReimportEditable #line 1558 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (file); #line 1558 "/home/jens/Source/shotwell/src/Photo.vala" - return FALSE; -#line 12270 "Photo.c" + return _tmp7_; +#line 12301 "Photo.c" } #line 1558 "/home/jens/Source/shotwell/src/Photo.vala" if (!_tmp2_) { @@ -12284,28 +12315,28 @@ gboolean photo_prepare_for_reimport_editable (Photo* self, PhotoReimportEditable if (state) { #line 1559 "/home/jens/Source/shotwell/src/Photo.vala" *state = _vala_state; -#line 12286 "Photo.c" +#line 12317 "Photo.c" } else { #line 1559 "/home/jens/Source/shotwell/src/Photo.vala" _photo_reimport_editable_state_unref0 (_vala_state); -#line 12290 "Photo.c" +#line 12321 "Photo.c" } #line 1559 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 12294 "Photo.c" +#line 12325 "Photo.c" } #line 1561 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp7_ = backing; + _tmp8_ = backing; #line 1561 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp8_ = detected; + _tmp9_ = detected; #line 1561 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp9_ = _tmp8_->metadata; + _tmp10_ = _tmp9_->metadata; #line 1561 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp10_ = photo_reimport_editable_state_impl_new (_tmp7_, _tmp9_); + _tmp11_ = photo_reimport_editable_state_impl_new (_tmp8_, _tmp10_); #line 1561 "/home/jens/Source/shotwell/src/Photo.vala" _photo_reimport_editable_state_unref0 (_vala_state); #line 1561 "/home/jens/Source/shotwell/src/Photo.vala" - _vala_state = G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, PHOTO_TYPE_REIMPORT_EDITABLE_STATE, PhotoReimportEditableState); + _vala_state = G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, PHOTO_TYPE_REIMPORT_EDITABLE_STATE, PhotoReimportEditableState); #line 1563 "/home/jens/Source/shotwell/src/Photo.vala" result = TRUE; #line 1563 "/home/jens/Source/shotwell/src/Photo.vala" @@ -12318,22 +12349,22 @@ gboolean photo_prepare_for_reimport_editable (Photo* self, PhotoReimportEditable if (state) { #line 1563 "/home/jens/Source/shotwell/src/Photo.vala" *state = _vala_state; -#line 12320 "Photo.c" +#line 12351 "Photo.c" } else { #line 1563 "/home/jens/Source/shotwell/src/Photo.vala" _photo_reimport_editable_state_unref0 (_vala_state); -#line 12324 "Photo.c" +#line 12355 "Photo.c" } #line 1563 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 12328 "Photo.c" +#line 12359 "Photo.c" } static gpointer _photo_reimport_editable_state_ref0 (gpointer self) { #line 1572 "/home/jens/Source/shotwell/src/Photo.vala" return self ? photo_reimport_editable_state_ref (self) : NULL; -#line 12335 "Photo.c" +#line 12366 "Photo.c" } @@ -12374,7 +12405,7 @@ void photo_finish_reimport_editable (Photo* self, PhotoReimportEditableState* st if (_tmp1_) { #line 1570 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 12376 "Photo.c" +#line 12407 "Photo.c" } #line 1572 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = state; @@ -12388,7 +12419,7 @@ void photo_finish_reimport_editable (Photo* self, PhotoReimportEditableState* st _tmp5_ = _tmp4_->metadata_only; #line 1574 "/home/jens/Source/shotwell/src/Photo.vala" if (!_tmp5_) { -#line 12390 "Photo.c" +#line 12421 "Photo.c" BackingPhotoTable* _tmp6_ = NULL; BackingPhotoTable* _tmp7_ = NULL; PhotoReimportEditableStateImpl* _tmp8_ = NULL; @@ -12415,7 +12446,7 @@ void photo_finish_reimport_editable (Photo* self, PhotoReimportEditableState* st _photo_reimport_editable_state_unref0 (reimport_state); #line 1575 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 12417 "Photo.c" +#line 12448 "Photo.c" } else { #line 1575 "/home/jens/Source/shotwell/src/Photo.vala" _photo_reimport_editable_state_unref0 (reimport_state); @@ -12425,7 +12456,7 @@ void photo_finish_reimport_editable (Photo* self, PhotoReimportEditableState* st g_clear_error (&_inner_error_); #line 1575 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 12427 "Photo.c" +#line 12458 "Photo.c" } } { @@ -12434,7 +12465,7 @@ void photo_finish_reimport_editable (Photo* self, PhotoReimportEditableState* st _tmp10_ = self->row; #line 1577 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_row); -#line 12436 "Photo.c" +#line 12467 "Photo.c" { PhotoReimportEditableStateImpl* _tmp11_ = NULL; BackingPhotoRow* _tmp12_ = NULL; @@ -12462,7 +12493,7 @@ void photo_finish_reimport_editable (Photo* self, PhotoReimportEditableState* st photo_set_orientation (self, _tmp16_); #line 1580 "/home/jens/Source/shotwell/src/Photo.vala" photo_internal_remove_all_transformations (self, FALSE); -#line 12464 "Photo.c" +#line 12495 "Photo.c" } __finally306: { @@ -12471,7 +12502,7 @@ void photo_finish_reimport_editable (Photo* self, PhotoReimportEditableState* st _tmp17_ = self->row; #line 1577 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 12473 "Photo.c" +#line 12504 "Photo.c" } #line 1577 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { @@ -12483,7 +12514,7 @@ void photo_finish_reimport_editable (Photo* self, PhotoReimportEditableState* st _photo_reimport_editable_state_unref0 (reimport_state); #line 1577 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 12485 "Photo.c" +#line 12516 "Photo.c" } else { #line 1577 "/home/jens/Source/shotwell/src/Photo.vala" _photo_reimport_editable_state_unref0 (reimport_state); @@ -12493,7 +12524,7 @@ void photo_finish_reimport_editable (Photo* self, PhotoReimportEditableState* st g_clear_error (&_inner_error_); #line 1577 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 12495 "Photo.c" +#line 12526 "Photo.c" } } } @@ -12509,7 +12540,7 @@ void photo_finish_reimport_editable (Photo* self, PhotoReimportEditableState* st _tmp20_ = _tmp19_->original_orientation; #line 1583 "/home/jens/Source/shotwell/src/Photo.vala" photo_set_orientation (self, _tmp20_); -#line 12511 "Photo.c" +#line 12542 "Photo.c" } #line 1586 "/home/jens/Source/shotwell/src/Photo.vala" _tmp21_ = reimport_state; @@ -12517,7 +12548,7 @@ void photo_finish_reimport_editable (Photo* self, PhotoReimportEditableState* st _tmp22_ = _tmp21_->metadata; #line 1586 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp22_ != NULL) { -#line 12519 "Photo.c" +#line 12550 "Photo.c" PhotoReimportEditableStateImpl* _tmp23_ = NULL; PhotoMetadata* _tmp24_ = NULL; gchar* _tmp25_ = NULL; @@ -12569,7 +12600,7 @@ void photo_finish_reimport_editable (Photo* self, PhotoReimportEditableState* st _tmp35_ = _tmp34_->metadata; #line 1590 "/home/jens/Source/shotwell/src/Photo.vala" photo_apply_user_metadata_for_reimport (self, _tmp35_); -#line 12571 "Photo.c" +#line 12602 "Photo.c" } #line 1593 "/home/jens/Source/shotwell/src/Photo.vala" _tmp36_ = g_strdup ("metadata:name,image:orientation,metadata:rating,metadata:exposure-time"); @@ -12581,7 +12612,7 @@ void photo_finish_reimport_editable (Photo* self, PhotoReimportEditableState* st _tmp38_ = _tmp37_->metadata_only; #line 1594 "/home/jens/Source/shotwell/src/Photo.vala" if (!_tmp38_) { -#line 12583 "Photo.c" +#line 12614 "Photo.c" const gchar* _tmp39_ = NULL; gchar* _tmp40_ = NULL; #line 1595 "/home/jens/Source/shotwell/src/Photo.vala" @@ -12592,7 +12623,7 @@ void photo_finish_reimport_editable (Photo* self, PhotoReimportEditableState* st _g_free0 (list); #line 1595 "/home/jens/Source/shotwell/src/Photo.vala" list = _tmp40_; -#line 12594 "Photo.c" +#line 12625 "Photo.c" } #line 1597 "/home/jens/Source/shotwell/src/Photo.vala" _tmp41_ = list; @@ -12614,7 +12645,7 @@ void photo_finish_reimport_editable (Photo* self, PhotoReimportEditableState* st _tmp46_ = photo_is_editable_baseline (self); #line 1601 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp46_) { -#line 12616 "Photo.c" +#line 12647 "Photo.c" PhotoReimportEditableStateImpl* _tmp47_ = NULL; PhotoMetadata* _tmp48_ = NULL; #line 1602 "/home/jens/Source/shotwell/src/Photo.vala" @@ -12623,13 +12654,13 @@ void photo_finish_reimport_editable (Photo* self, PhotoReimportEditableState* st _tmp48_ = _tmp47_->metadata; #line 1602 "/home/jens/Source/shotwell/src/Photo.vala" photo_notify_baseline_reimported (self, _tmp48_); -#line 12625 "Photo.c" +#line 12656 "Photo.c" } #line 1604 "/home/jens/Source/shotwell/src/Photo.vala" _tmp49_ = photo_is_editable_source (self); #line 1604 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp49_) { -#line 12631 "Photo.c" +#line 12662 "Photo.c" PhotoReimportEditableStateImpl* _tmp50_ = NULL; PhotoMetadata* _tmp51_ = NULL; #line 1605 "/home/jens/Source/shotwell/src/Photo.vala" @@ -12638,20 +12669,20 @@ void photo_finish_reimport_editable (Photo* self, PhotoReimportEditableState* st _tmp51_ = _tmp50_->metadata; #line 1605 "/home/jens/Source/shotwell/src/Photo.vala" photo_notify_source_reimported (self, _tmp51_); -#line 12640 "Photo.c" +#line 12671 "Photo.c" } #line 1567 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (list); #line 1567 "/home/jens/Source/shotwell/src/Photo.vala" _photo_reimport_editable_state_unref0 (reimport_state); -#line 12646 "Photo.c" +#line 12677 "Photo.c" } static gpointer _photo_reimport_raw_development_state_ref0 (gpointer self) { #line 1627 "/home/jens/Source/shotwell/src/Photo.vala" return self ? photo_reimport_raw_development_state_ref (self) : NULL; -#line 12653 "Photo.c" +#line 12684 "Photo.c" } @@ -12663,10 +12694,10 @@ gboolean photo_prepare_for_reimport_raw_development (Photo* self, PhotoReimportR GeeCollection* _tmp1_ = NULL; PhotoReimportRawDevelopmentStateImpl* reimport_state = NULL; PhotoReimportRawDevelopmentStateImpl* _tmp2_ = NULL; - PhotoReimportRawDevelopmentStateImpl* _tmp18_ = NULL; - PhotoReimportRawDevelopmentState* _tmp19_ = NULL; - PhotoReimportRawDevelopmentStateImpl* _tmp20_ = NULL; - gint _tmp21_ = 0; + PhotoReimportRawDevelopmentStateImpl* _tmp19_ = NULL; + PhotoReimportRawDevelopmentState* _tmp20_ = NULL; + PhotoReimportRawDevelopmentStateImpl* _tmp21_ = NULL; + gint _tmp22_ = 0; GError * _inner_error_ = NULL; #line 1609 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_PHOTO (self), FALSE); @@ -12690,21 +12721,21 @@ gboolean photo_prepare_for_reimport_raw_development (Photo* self, PhotoReimportR if (state) { #line 1614 "/home/jens/Source/shotwell/src/Photo.vala" *state = _vala_state; -#line 12692 "Photo.c" +#line 12723 "Photo.c" } else { #line 1614 "/home/jens/Source/shotwell/src/Photo.vala" _photo_reimport_raw_development_state_unref0 (_vala_state); -#line 12696 "Photo.c" +#line 12727 "Photo.c" } #line 1614 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 12700 "Photo.c" +#line 12731 "Photo.c" } #line 1616 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = photo_reimport_raw_development_state_impl_new (); #line 1616 "/home/jens/Source/shotwell/src/Photo.vala" reimport_state = _tmp2_; -#line 12706 "Photo.c" +#line 12737 "Photo.c" { GeeIterator* _file_it = NULL; GeeCollection* _tmp3_ = NULL; @@ -12717,7 +12748,7 @@ gboolean photo_prepare_for_reimport_raw_development (Photo* self, PhotoReimportR _file_it = _tmp4_; #line 1618 "/home/jens/Source/shotwell/src/Photo.vala" while (TRUE) { -#line 12719 "Photo.c" +#line 12750 "Photo.c" GeeIterator* _tmp5_ = NULL; gboolean _tmp6_ = FALSE; GFile* file = NULL; @@ -12730,10 +12761,10 @@ gboolean photo_prepare_for_reimport_raw_development (Photo* self, PhotoReimportR BackingPhotoRow* _tmp11_ = NULL; DetectedPhotoInformation* _tmp12_ = NULL; gboolean _tmp13_ = FALSE; - PhotoReimportRawDevelopmentStateImpl* _tmp14_ = NULL; - BackingPhotoRow* _tmp15_ = NULL; - DetectedPhotoInformation* _tmp16_ = NULL; - PhotoMetadata* _tmp17_ = NULL; + PhotoReimportRawDevelopmentStateImpl* _tmp15_ = NULL; + BackingPhotoRow* _tmp16_ = NULL; + DetectedPhotoInformation* _tmp17_ = NULL; + PhotoMetadata* _tmp18_ = NULL; #line 1618 "/home/jens/Source/shotwell/src/Photo.vala" _tmp5_ = _file_it; #line 1618 "/home/jens/Source/shotwell/src/Photo.vala" @@ -12742,7 +12773,7 @@ gboolean photo_prepare_for_reimport_raw_development (Photo* self, PhotoReimportR if (!_tmp6_) { #line 1618 "/home/jens/Source/shotwell/src/Photo.vala" break; -#line 12744 "Photo.c" +#line 12775 "Photo.c" } #line 1618 "/home/jens/Source/shotwell/src/Photo.vala" _tmp7_ = _file_it; @@ -12766,6 +12797,8 @@ gboolean photo_prepare_for_reimport_raw_development (Photo* self, PhotoReimportR _tmp9_ = _tmp13_; #line 1621 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { +#line 12799 "Photo.c" + gboolean _tmp14_ = FALSE; #line 1621 "/home/jens/Source/shotwell/src/Photo.vala" g_propagate_error (error, _inner_error_); #line 1621 "/home/jens/Source/shotwell/src/Photo.vala" @@ -12781,8 +12814,8 @@ gboolean photo_prepare_for_reimport_raw_development (Photo* self, PhotoReimportR #line 1621 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (files); #line 1621 "/home/jens/Source/shotwell/src/Photo.vala" - return FALSE; -#line 12784 "Photo.c" + return _tmp14_; +#line 12817 "Photo.c" } #line 1621 "/home/jens/Source/shotwell/src/Photo.vala" if (!_tmp9_) { @@ -12794,44 +12827,44 @@ gboolean photo_prepare_for_reimport_raw_development (Photo* self, PhotoReimportR _g_object_unref0 (file); #line 1622 "/home/jens/Source/shotwell/src/Photo.vala" continue; -#line 12796 "Photo.c" +#line 12829 "Photo.c" } #line 1624 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp14_ = reimport_state; + _tmp15_ = reimport_state; #line 1624 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp15_ = backing; + _tmp16_ = backing; #line 1624 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp16_ = detected; + _tmp17_ = detected; #line 1624 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp17_ = _tmp16_->metadata; + _tmp18_ = _tmp17_->metadata; #line 1624 "/home/jens/Source/shotwell/src/Photo.vala" - photo_reimport_raw_development_state_impl_add (_tmp14_, _tmp15_, _tmp17_); + photo_reimport_raw_development_state_impl_add (_tmp15_, _tmp16_, _tmp18_); #line 1618 "/home/jens/Source/shotwell/src/Photo.vala" _backing_photo_row_unref0 (backing); #line 1618 "/home/jens/Source/shotwell/src/Photo.vala" _detected_photo_information_unref0 (detected); #line 1618 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (file); -#line 12814 "Photo.c" +#line 12847 "Photo.c" } #line 1618 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_file_it); -#line 12818 "Photo.c" +#line 12851 "Photo.c" } #line 1627 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp18_ = reimport_state; + _tmp19_ = reimport_state; #line 1627 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp19_ = _photo_reimport_raw_development_state_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, PHOTO_TYPE_REIMPORT_RAW_DEVELOPMENT_STATE, PhotoReimportRawDevelopmentState)); + _tmp20_ = _photo_reimport_raw_development_state_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, PHOTO_TYPE_REIMPORT_RAW_DEVELOPMENT_STATE, PhotoReimportRawDevelopmentState)); #line 1627 "/home/jens/Source/shotwell/src/Photo.vala" _photo_reimport_raw_development_state_unref0 (_vala_state); #line 1627 "/home/jens/Source/shotwell/src/Photo.vala" - _vala_state = _tmp19_; + _vala_state = _tmp20_; #line 1628 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp20_ = reimport_state; + _tmp21_ = reimport_state; #line 1628 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp21_ = photo_reimport_raw_development_state_impl_get_size (_tmp20_); + _tmp22_ = photo_reimport_raw_development_state_impl_get_size (_tmp21_); #line 1628 "/home/jens/Source/shotwell/src/Photo.vala" - result = _tmp21_ > 0; + result = _tmp22_ > 0; #line 1628 "/home/jens/Source/shotwell/src/Photo.vala" _photo_reimport_raw_development_state_unref0 (reimport_state); #line 1628 "/home/jens/Source/shotwell/src/Photo.vala" @@ -12840,15 +12873,15 @@ gboolean photo_prepare_for_reimport_raw_development (Photo* self, PhotoReimportR if (state) { #line 1628 "/home/jens/Source/shotwell/src/Photo.vala" *state = _vala_state; -#line 12842 "Photo.c" +#line 12875 "Photo.c" } else { #line 1628 "/home/jens/Source/shotwell/src/Photo.vala" _photo_reimport_raw_development_state_unref0 (_vala_state); -#line 12846 "Photo.c" +#line 12879 "Photo.c" } #line 1628 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 12850 "Photo.c" +#line 12883 "Photo.c" } @@ -12875,7 +12908,7 @@ void photo_finish_reimport_raw_development (Photo* self, PhotoReimportRawDevelop if (_tmp0_ != PHOTO_FILE_FORMAT_RAW) { #line 1634 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 12877 "Photo.c" +#line 12910 "Photo.c" } #line 1636 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = state; @@ -12883,7 +12916,7 @@ void photo_finish_reimport_raw_development (Photo* self, PhotoReimportRawDevelop _tmp2_ = _photo_reimport_raw_development_state_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, PHOTO_TYPE_REIMPORT_RAW_DEVELOPMENT_STATE_IMPL, PhotoReimportRawDevelopmentStateImpl)); #line 1636 "/home/jens/Source/shotwell/src/Photo.vala" reimport_state = _tmp2_; -#line 12885 "Photo.c" +#line 12918 "Photo.c" { GeeIterator* _dev_it = NULL; PhotoReimportRawDevelopmentStateImpl* _tmp3_ = NULL; @@ -12899,7 +12932,7 @@ void photo_finish_reimport_raw_development (Photo* self, PhotoReimportRawDevelop _dev_it = _tmp5_; #line 1638 "/home/jens/Source/shotwell/src/Photo.vala" while (TRUE) { -#line 12901 "Photo.c" +#line 12934 "Photo.c" GeeIterator* _tmp6_ = NULL; gboolean _tmp7_ = FALSE; PhotoReimportRawDevelopmentStateImplDevToReimport* dev = NULL; @@ -12915,7 +12948,7 @@ void photo_finish_reimport_raw_development (Photo* self, PhotoReimportRawDevelop if (!_tmp7_) { #line 1638 "/home/jens/Source/shotwell/src/Photo.vala" break; -#line 12917 "Photo.c" +#line 12950 "Photo.c" } #line 1638 "/home/jens/Source/shotwell/src/Photo.vala" _tmp8_ = _dev_it; @@ -12929,7 +12962,7 @@ void photo_finish_reimport_raw_development (Photo* self, PhotoReimportRawDevelop _tmp11_ = _tmp10_->metadata_only; #line 1639 "/home/jens/Source/shotwell/src/Photo.vala" if (!_tmp11_) { -#line 12931 "Photo.c" +#line 12964 "Photo.c" BackingPhotoTable* _tmp12_ = NULL; BackingPhotoTable* _tmp13_ = NULL; PhotoReimportRawDevelopmentStateImplDevToReimport* _tmp14_ = NULL; @@ -12960,7 +12993,7 @@ void photo_finish_reimport_raw_development (Photo* self, PhotoReimportRawDevelop _photo_reimport_raw_development_state_unref0 (reimport_state); #line 1640 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 12962 "Photo.c" +#line 12995 "Photo.c" } else { #line 1640 "/home/jens/Source/shotwell/src/Photo.vala" _photo_reimport_raw_development_state_impl_dev_to_reimport_unref0 (dev); @@ -12974,7 +13007,7 @@ void photo_finish_reimport_raw_development (Photo* self, PhotoReimportRawDevelop g_clear_error (&_inner_error_); #line 1640 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 12976 "Photo.c" +#line 13009 "Photo.c" } } { @@ -12983,13 +13016,13 @@ void photo_finish_reimport_raw_development (Photo* self, PhotoReimportRawDevelop _tmp16_ = self->row; #line 1642 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_row); -#line 12985 "Photo.c" +#line 13018 "Photo.c" { gint _tmp17_ = 0; RawDeveloper* _tmp18_ = NULL; #line 1644 "/home/jens/Source/shotwell/src/Photo.vala" _tmp18_ = raw_developer_as_array (&_tmp17_); -#line 12991 "Photo.c" +#line 13024 "Photo.c" { RawDeveloper* d_collection = NULL; gint d_collection_length1 = 0; @@ -13001,11 +13034,11 @@ void photo_finish_reimport_raw_development (Photo* self, PhotoReimportRawDevelop d_collection_length1 = _tmp17_; #line 1644 "/home/jens/Source/shotwell/src/Photo.vala" for (d_it = 0; d_it < _tmp17_; d_it = d_it + 1) { -#line 13003 "Photo.c" +#line 13036 "Photo.c" RawDeveloper d = 0; #line 1644 "/home/jens/Source/shotwell/src/Photo.vala" d = d_collection[d_it]; -#line 13007 "Photo.c" +#line 13040 "Photo.c" { BackingPhotoID id = {0}; PhotoRow* _tmp19_ = NULL; @@ -13033,7 +13066,7 @@ void photo_finish_reimport_raw_development (Photo* self, PhotoReimportRawDevelop _tmp24_ = _tmp23_.id; #line 1646 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp24_ != BACKING_PHOTO_ID_INVALID) { -#line 13035 "Photo.c" +#line 13068 "Photo.c" BackingPhotoRow* bpr = NULL; BackingPhotoID _tmp25_ = {0}; BackingPhotoRow* _tmp26_ = NULL; @@ -13048,7 +13081,7 @@ void photo_finish_reimport_raw_development (Photo* self, PhotoReimportRawDevelop _tmp27_ = bpr; #line 1648 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp27_ != NULL) { -#line 13050 "Photo.c" +#line 13083 "Photo.c" GeeHashMap* _tmp28_ = NULL; RawDeveloper _tmp29_ = 0; BackingPhotoRow* _tmp30_ = NULL; @@ -13060,17 +13093,17 @@ void photo_finish_reimport_raw_development (Photo* self, PhotoReimportRawDevelop _tmp30_ = bpr; #line 1649 "/home/jens/Source/shotwell/src/Photo.vala" gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp28_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), (gpointer) ((gintptr) _tmp29_), _tmp30_); -#line 13062 "Photo.c" +#line 13095 "Photo.c" } #line 1646 "/home/jens/Source/shotwell/src/Photo.vala" _backing_photo_row_unref0 (bpr); -#line 13066 "Photo.c" +#line 13099 "Photo.c" } } } #line 1644 "/home/jens/Source/shotwell/src/Photo.vala" d_collection = (g_free (d_collection), NULL); -#line 13072 "Photo.c" +#line 13105 "Photo.c" } } __finally307: @@ -13080,7 +13113,7 @@ void photo_finish_reimport_raw_development (Photo* self, PhotoReimportRawDevelop _tmp31_ = self->row; #line 1642 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 13082 "Photo.c" +#line 13115 "Photo.c" } #line 1642 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { @@ -13096,7 +13129,7 @@ void photo_finish_reimport_raw_development (Photo* self, PhotoReimportRawDevelop _photo_reimport_raw_development_state_unref0 (reimport_state); #line 1642 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 13098 "Photo.c" +#line 13131 "Photo.c" } else { #line 1642 "/home/jens/Source/shotwell/src/Photo.vala" _photo_reimport_raw_development_state_impl_dev_to_reimport_unref0 (dev); @@ -13110,18 +13143,18 @@ void photo_finish_reimport_raw_development (Photo* self, PhotoReimportRawDevelop g_clear_error (&_inner_error_); #line 1642 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 13112 "Photo.c" +#line 13145 "Photo.c" } } } } #line 1638 "/home/jens/Source/shotwell/src/Photo.vala" _photo_reimport_raw_development_state_impl_dev_to_reimport_unref0 (dev); -#line 13119 "Photo.c" +#line 13152 "Photo.c" } #line 1638 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_dev_it); -#line 13123 "Photo.c" +#line 13156 "Photo.c" } #line 1656 "/home/jens/Source/shotwell/src/Photo.vala" _tmp32_ = g_strdup ("metadata:name,image:orientation,metadata:rating,metadata:exposure-time"); @@ -13133,7 +13166,7 @@ void photo_finish_reimport_raw_development (Photo* self, PhotoReimportRawDevelop _tmp34_ = _tmp33_->metadata_only; #line 1657 "/home/jens/Source/shotwell/src/Photo.vala" if (!_tmp34_) { -#line 13135 "Photo.c" +#line 13168 "Photo.c" const gchar* _tmp35_ = NULL; gchar* _tmp36_ = NULL; #line 1658 "/home/jens/Source/shotwell/src/Photo.vala" @@ -13144,7 +13177,7 @@ void photo_finish_reimport_raw_development (Photo* self, PhotoReimportRawDevelop _g_free0 (list); #line 1658 "/home/jens/Source/shotwell/src/Photo.vala" list = _tmp36_; -#line 13146 "Photo.c" +#line 13179 "Photo.c" } #line 1660 "/home/jens/Source/shotwell/src/Photo.vala" _tmp37_ = list; @@ -13162,7 +13195,7 @@ void photo_finish_reimport_raw_development (Photo* self, PhotoReimportRawDevelop _g_free0 (list); #line 1632 "/home/jens/Source/shotwell/src/Photo.vala" _photo_reimport_raw_development_state_unref0 (reimport_state); -#line 13164 "Photo.c" +#line 13197 "Photo.c" } @@ -13178,7 +13211,7 @@ static gchar* photo_real_get_typename (DataSource* base) { result = _tmp0_; #line 1666 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 13180 "Photo.c" +#line 13213 "Photo.c" } @@ -13197,7 +13230,7 @@ static gint64 photo_real_get_instance_id (DataSource* base) { result = _tmp1_; #line 1670 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 13199 "Photo.c" +#line 13232 "Photo.c" } @@ -13227,7 +13260,7 @@ static gchar* photo_real_get_source_id (DataSource* base) { result = _tmp4_; #line 1677 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 13229 "Photo.c" +#line 13262 "Photo.c" } @@ -13247,7 +13280,7 @@ void photo_set_master_timestamp (Photo* self, GFileInfo* info) { g_file_info_get_modification_time (_tmp0_, &_tmp1_); #line 1682 "/home/jens/Source/shotwell/src/Photo.vala" modification = _tmp1_; -#line 13249 "Photo.c" +#line 13282 "Photo.c" { { PhotoRow* _tmp2_ = NULL; @@ -13255,7 +13288,7 @@ void photo_set_master_timestamp (Photo* self, GFileInfo* info) { _tmp2_ = self->row; #line 1685 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_row); -#line 13257 "Photo.c" +#line 13290 "Photo.c" { PhotoRow* _tmp3_ = NULL; BackingPhotoRow* _tmp4_ = NULL; @@ -13284,18 +13317,18 @@ void photo_set_master_timestamp (Photo* self, GFileInfo* info) { _tmp7_ = _tmp6_.tv_sec; #line 1686 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp5_ == ((time_t) _tmp7_)) { -#line 13286 "Photo.c" +#line 13319 "Photo.c" { PhotoRow* _tmp8_ = NULL; #line 1685 "/home/jens/Source/shotwell/src/Photo.vala" _tmp8_ = self->row; #line 1685 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 13293 "Photo.c" +#line 13326 "Photo.c" } #line 1687 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 13297 "Photo.c" +#line 13330 "Photo.c" } #line 1689 "/home/jens/Source/shotwell/src/Photo.vala" _tmp9_ = photo_table_get_instance (); @@ -13315,7 +13348,7 @@ void photo_set_master_timestamp (Photo* self, GFileInfo* info) { _database_table_unref0 (_tmp10_); #line 1689 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 13317 "Photo.c" +#line 13350 "Photo.c" goto __finally309; } #line 1690 "/home/jens/Source/shotwell/src/Photo.vala" @@ -13328,7 +13361,7 @@ void photo_set_master_timestamp (Photo* self, GFileInfo* info) { _tmp18_ = _tmp17_.tv_sec; #line 1690 "/home/jens/Source/shotwell/src/Photo.vala" _tmp16_->timestamp = (time_t) _tmp18_; -#line 13330 "Photo.c" +#line 13363 "Photo.c" } __finally309: { @@ -13337,13 +13370,13 @@ void photo_set_master_timestamp (Photo* self, GFileInfo* info) { _tmp19_ = self->row; #line 1685 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 13339 "Photo.c" +#line 13372 "Photo.c" } #line 1685 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 1685 "/home/jens/Source/shotwell/src/Photo.vala" if (_inner_error_->domain == DATABASE_ERROR) { -#line 13345 "Photo.c" +#line 13378 "Photo.c" goto __catch308_database_error; } #line 1685 "/home/jens/Source/shotwell/src/Photo.vala" @@ -13352,7 +13385,7 @@ void photo_set_master_timestamp (Photo* self, GFileInfo* info) { g_clear_error (&_inner_error_); #line 1685 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 13354 "Photo.c" +#line 13387 "Photo.c" } } } @@ -13373,7 +13406,7 @@ void photo_set_master_timestamp (Photo* self, GFileInfo* info) { _g_error_free0 (err); #line 1695 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 13375 "Photo.c" +#line 13408 "Photo.c" } __finally308: #line 1684 "/home/jens/Source/shotwell/src/Photo.vala" @@ -13384,13 +13417,13 @@ void photo_set_master_timestamp (Photo* self, GFileInfo* info) { g_clear_error (&_inner_error_); #line 1684 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 13386 "Photo.c" +#line 13419 "Photo.c" } #line 1698 "/home/jens/Source/shotwell/src/Photo.vala" _tmp21_ = photo_is_master_baseline (self); #line 1698 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp21_) { -#line 13392 "Photo.c" +#line 13425 "Photo.c" Alteration* _tmp22_ = NULL; Alteration* _tmp23_ = NULL; #line 1699 "/home/jens/Source/shotwell/src/Photo.vala" @@ -13401,7 +13434,7 @@ void photo_set_master_timestamp (Photo* self, GFileInfo* info) { data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp23_); #line 1699 "/home/jens/Source/shotwell/src/Photo.vala" _alteration_unref0 (_tmp23_); -#line 13403 "Photo.c" +#line 13436 "Photo.c" } else { Alteration* _tmp24_ = NULL; Alteration* _tmp25_ = NULL; @@ -13413,7 +13446,7 @@ void photo_set_master_timestamp (Photo* self, GFileInfo* info) { data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp25_); #line 1701 "/home/jens/Source/shotwell/src/Photo.vala" _alteration_unref0 (_tmp25_); -#line 13415 "Photo.c" +#line 13448 "Photo.c" } } @@ -13437,14 +13470,14 @@ void photo_update_editable_modification_time (Photo* self, GFileInfo* info, GErr modification = _tmp1_; #line 1708 "/home/jens/Source/shotwell/src/Photo.vala" altered = FALSE; -#line 13439 "Photo.c" +#line 13472 "Photo.c" { PhotoRow* _tmp2_ = NULL; #line 1709 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = self->row; #line 1709 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_row); -#line 13446 "Photo.c" +#line 13479 "Photo.c" { gboolean _tmp3_ = FALSE; PhotoRow* _tmp4_ = NULL; @@ -13455,7 +13488,7 @@ void photo_update_editable_modification_time (Photo* self, GFileInfo* info, GErr _tmp5_ = backing_photo_id_is_valid (&_tmp4_->editable_id); #line 1710 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp5_) { -#line 13457 "Photo.c" +#line 13490 "Photo.c" BackingPhotoRow* _tmp6_ = NULL; time_t _tmp7_ = 0; GTimeVal _tmp8_ = {0}; @@ -13470,15 +13503,15 @@ void photo_update_editable_modification_time (Photo* self, GFileInfo* info, GErr _tmp9_ = _tmp8_.tv_sec; #line 1710 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = _tmp7_ != ((time_t) _tmp9_); -#line 13472 "Photo.c" +#line 13505 "Photo.c" } else { #line 1710 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = FALSE; -#line 13476 "Photo.c" +#line 13509 "Photo.c" } #line 1710 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp3_) { -#line 13480 "Photo.c" +#line 13513 "Photo.c" BackingPhotoTable* _tmp10_ = NULL; BackingPhotoTable* _tmp11_ = NULL; PhotoRow* _tmp12_ = NULL; @@ -13506,7 +13539,7 @@ void photo_update_editable_modification_time (Photo* self, GFileInfo* info, GErr _database_table_unref0 (_tmp11_); #line 1711 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 13508 "Photo.c" +#line 13541 "Photo.c" goto __finally310; } #line 1713 "/home/jens/Source/shotwell/src/Photo.vala" @@ -13519,7 +13552,7 @@ void photo_update_editable_modification_time (Photo* self, GFileInfo* info, GErr _tmp16_->timestamp = (time_t) _tmp18_; #line 1714 "/home/jens/Source/shotwell/src/Photo.vala" altered = TRUE; -#line 13521 "Photo.c" +#line 13554 "Photo.c" } } __finally310: @@ -13529,7 +13562,7 @@ void photo_update_editable_modification_time (Photo* self, GFileInfo* info, GErr _tmp19_ = self->row; #line 1709 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 13531 "Photo.c" +#line 13564 "Photo.c" } #line 1709 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { @@ -13539,7 +13572,7 @@ void photo_update_editable_modification_time (Photo* self, GFileInfo* info, GErr g_propagate_error (error, _inner_error_); #line 1709 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 13541 "Photo.c" +#line 13574 "Photo.c" } else { #line 1709 "/home/jens/Source/shotwell/src/Photo.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); @@ -13547,7 +13580,7 @@ void photo_update_editable_modification_time (Photo* self, GFileInfo* info, GErr g_clear_error (&_inner_error_); #line 1709 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 13549 "Photo.c" +#line 13582 "Photo.c" } } } @@ -13555,7 +13588,7 @@ void photo_update_editable_modification_time (Photo* self, GFileInfo* info, GErr _tmp20_ = altered; #line 1718 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp20_) { -#line 13557 "Photo.c" +#line 13590 "Photo.c" Alteration* _tmp21_ = NULL; Alteration* _tmp22_ = NULL; #line 1719 "/home/jens/Source/shotwell/src/Photo.vala" @@ -13566,7 +13599,7 @@ void photo_update_editable_modification_time (Photo* self, GFileInfo* info, GErr data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp22_); #line 1719 "/home/jens/Source/shotwell/src/Photo.vala" _alteration_unref0 (_tmp22_); -#line 13568 "Photo.c" +#line 13601 "Photo.c" } } @@ -13577,7 +13610,7 @@ void photo_update_many_editable_timestamps (GeeMap* map, GError** error) { g_return_if_fail (GEE_IS_MAP (map)); #line 1725 "/home/jens/Source/shotwell/src/Photo.vala" database_table_begin_transaction (); -#line 13579 "Photo.c" +#line 13612 "Photo.c" { GeeIterator* _photo_it = NULL; GeeMap* _tmp0_ = NULL; @@ -13604,7 +13637,7 @@ void photo_update_many_editable_timestamps (GeeMap* map, GError** error) { _photo_it = _tmp5_; #line 1726 "/home/jens/Source/shotwell/src/Photo.vala" while (TRUE) { -#line 13606 "Photo.c" +#line 13639 "Photo.c" GeeIterator* _tmp6_ = NULL; gboolean _tmp7_ = FALSE; Photo* photo = NULL; @@ -13623,7 +13656,7 @@ void photo_update_many_editable_timestamps (GeeMap* map, GError** error) { if (!_tmp7_) { #line 1726 "/home/jens/Source/shotwell/src/Photo.vala" break; -#line 13625 "Photo.c" +#line 13658 "Photo.c" } #line 1726 "/home/jens/Source/shotwell/src/Photo.vala" _tmp8_ = _photo_it; @@ -13657,7 +13690,7 @@ void photo_update_many_editable_timestamps (GeeMap* map, GError** error) { _g_object_unref0 (_photo_it); #line 1727 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 13659 "Photo.c" +#line 13692 "Photo.c" } else { #line 1727 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (photo); @@ -13669,16 +13702,16 @@ void photo_update_many_editable_timestamps (GeeMap* map, GError** error) { g_clear_error (&_inner_error_); #line 1727 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 13671 "Photo.c" +#line 13704 "Photo.c" } } #line 1726 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (photo); -#line 13676 "Photo.c" +#line 13709 "Photo.c" } #line 1726 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_photo_it); -#line 13680 "Photo.c" +#line 13713 "Photo.c" } #line 1728 "/home/jens/Source/shotwell/src/Photo.vala" database_table_commit_transaction (&_inner_error_); @@ -13690,7 +13723,7 @@ void photo_update_many_editable_timestamps (GeeMap* map, GError** error) { g_propagate_error (error, _inner_error_); #line 1728 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 13692 "Photo.c" +#line 13725 "Photo.c" } else { #line 1728 "/home/jens/Source/shotwell/src/Photo.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); @@ -13698,7 +13731,7 @@ void photo_update_many_editable_timestamps (GeeMap* map, GError** error) { g_clear_error (&_inner_error_); #line 1728 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 13700 "Photo.c" +#line 13733 "Photo.c" } } } @@ -13718,26 +13751,26 @@ static PhotoFileFormat photo_real_get_preferred_thumbnail_format (ThumbnailSourc _tmp2_ = photo_file_format_can_write_image (_tmp1_); #line 1732 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp2_) { -#line 13720 "Photo.c" +#line 13753 "Photo.c" PhotoFileFormat _tmp3_ = 0; #line 1732 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = photo_get_file_format (self); #line 1732 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = _tmp3_; -#line 13726 "Photo.c" +#line 13759 "Photo.c" } else { PhotoFileFormat _tmp4_ = 0; #line 1733 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = photo_file_format_get_system_default_format (); #line 1733 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = _tmp4_; -#line 13733 "Photo.c" +#line 13766 "Photo.c" } #line 1732 "/home/jens/Source/shotwell/src/Photo.vala" result = _tmp0_; #line 1732 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 13739 "Photo.c" +#line 13772 "Photo.c" } @@ -13766,7 +13799,7 @@ static GdkPixbuf* photo_real_create_thumbnail (ThumbnailSource* base, gint scale g_propagate_error (error, _inner_error_); #line 1737 "/home/jens/Source/shotwell/src/Photo.vala" return NULL; -#line 13768 "Photo.c" +#line 13801 "Photo.c" } #line 1737 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = _tmp0_; @@ -13778,7 +13811,7 @@ static GdkPixbuf* photo_real_create_thumbnail (ThumbnailSource* base, gint scale _g_object_unref0 (_tmp0_); #line 1737 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 13780 "Photo.c" +#line 13813 "Photo.c" } @@ -13797,7 +13830,7 @@ gboolean photo_is_file_image (GFile* file) { if (_tmp2_) { #line 1745 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = TRUE; -#line 13799 "Photo.c" +#line 13832 "Photo.c" } else { GFile* _tmp3_ = NULL; gchar* _tmp4_ = NULL; @@ -13815,13 +13848,13 @@ gboolean photo_is_file_image (GFile* file) { _tmp0_ = _tmp6_; #line 1745 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (_tmp5_); -#line 13817 "Photo.c" +#line 13850 "Photo.c" } #line 1744 "/home/jens/Source/shotwell/src/Photo.vala" result = _tmp0_; #line 1744 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 13823 "Photo.c" +#line 13856 "Photo.c" } @@ -13863,7 +13896,7 @@ static gboolean photo_is_extension_found (const gchar* basename, gchar** extensi _g_free0 (name); #line 1752 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 13865 "Photo.c" +#line 13898 "Photo.c" } #line 1755 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = ext; @@ -13877,7 +13910,7 @@ static gboolean photo_is_extension_found (const gchar* basename, gchar** extensi _tmp6_ = extensions; #line 1758 "/home/jens/Source/shotwell/src/Photo.vala" _tmp6__length1 = extensions_length1; -#line 13879 "Photo.c" +#line 13912 "Photo.c" { gchar** extension_collection = NULL; gint extension_collection_length1 = 0; @@ -13889,14 +13922,14 @@ static gboolean photo_is_extension_found (const gchar* basename, gchar** extensi extension_collection_length1 = _tmp6__length1; #line 1758 "/home/jens/Source/shotwell/src/Photo.vala" for (extension_it = 0; extension_it < _tmp6__length1; extension_it = extension_it + 1) { -#line 13891 "Photo.c" +#line 13924 "Photo.c" gchar* _tmp7_ = NULL; gchar* extension = NULL; #line 1758 "/home/jens/Source/shotwell/src/Photo.vala" _tmp7_ = g_strdup (extension_collection[extension_it]); #line 1758 "/home/jens/Source/shotwell/src/Photo.vala" extension = _tmp7_; -#line 13898 "Photo.c" +#line 13931 "Photo.c" { const gchar* _tmp8_ = NULL; const gchar* _tmp9_ = NULL; @@ -13916,11 +13949,11 @@ static gboolean photo_is_extension_found (const gchar* basename, gchar** extensi _g_free0 (name); #line 1760 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 13918 "Photo.c" +#line 13951 "Photo.c" } #line 1758 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (extension); -#line 13922 "Photo.c" +#line 13955 "Photo.c" } } } @@ -13932,7 +13965,7 @@ static gboolean photo_is_extension_found (const gchar* basename, gchar** extensi _g_free0 (name); #line 1763 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 13934 "Photo.c" +#line 13967 "Photo.c" } @@ -13970,7 +14003,7 @@ gboolean photo_is_duplicate (GFile* file, const gchar* thumbnail_md5, const gcha result = _tmp7_; #line 1772 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 13972 "Photo.c" +#line 14005 "Photo.c" } @@ -14018,13 +14051,13 @@ PhotoID* photo_get_duplicate_ids (GFile* file, const gchar* thumbnail_md5, const if (result_length1) { #line 1781 "/home/jens/Source/shotwell/src/Photo.vala" *result_length1 = _tmp9__length1; -#line 14020 "Photo.c" +#line 14053 "Photo.c" } #line 1781 "/home/jens/Source/shotwell/src/Photo.vala" result = _tmp9_; #line 1781 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 14026 "Photo.c" +#line 14059 "Photo.c" } @@ -14045,7 +14078,7 @@ gint64 photo_get_photo_key (DataSource* source) { result = _tmp2_; #line 1789 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 14047 "Photo.c" +#line 14080 "Photo.c" } @@ -14072,7 +14105,7 @@ static GFile* photo_real_get_file (MediaSource* base) { result = _tmp3_; #line 1808 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 14074 "Photo.c" +#line 14107 "Photo.c" } @@ -14083,13 +14116,13 @@ static void _vala_array_add96 (gchar*** array, int* length, int* size, gchar* va *size = (*size) ? (2 * (*size)) : 4; #line 1851 "/home/jens/Source/shotwell/src/Photo.vala" *array = g_renew (gchar*, *array, (*size) + 1); -#line 14085 "Photo.c" +#line 14118 "Photo.c" } #line 1851 "/home/jens/Source/shotwell/src/Photo.vala" (*array)[(*length)++] = value; #line 1851 "/home/jens/Source/shotwell/src/Photo.vala" (*array)[*length] = NULL; -#line 14091 "Photo.c" +#line 14124 "Photo.c" } @@ -14100,13 +14133,13 @@ static void _vala_array_add97 (gchar*** array, int* length, int* size, gchar* va *size = (*size) ? (2 * (*size)) : 4; #line 1856 "/home/jens/Source/shotwell/src/Photo.vala" *array = g_renew (gchar*, *array, (*size) + 1); -#line 14102 "Photo.c" +#line 14135 "Photo.c" } #line 1856 "/home/jens/Source/shotwell/src/Photo.vala" (*array)[(*length)++] = value; #line 1856 "/home/jens/Source/shotwell/src/Photo.vala" (*array)[*length] = NULL; -#line 14108 "Photo.c" +#line 14141 "Photo.c" } @@ -14117,13 +14150,13 @@ static void _vala_array_add98 (gchar*** array, int* length, int* size, gchar* va *size = (*size) ? (2 * (*size)) : 4; #line 1859 "/home/jens/Source/shotwell/src/Photo.vala" *array = g_renew (gchar*, *array, (*size) + 1); -#line 14119 "Photo.c" +#line 14152 "Photo.c" } #line 1859 "/home/jens/Source/shotwell/src/Photo.vala" (*array)[(*length)++] = value; #line 1859 "/home/jens/Source/shotwell/src/Photo.vala" (*array)[*length] = NULL; -#line 14125 "Photo.c" +#line 14158 "Photo.c" } @@ -14134,13 +14167,13 @@ static void _vala_array_add99 (gchar*** array, int* length, int* size, gchar* va *size = (*size) ? (2 * (*size)) : 4; #line 1862 "/home/jens/Source/shotwell/src/Photo.vala" *array = g_renew (gchar*, *array, (*size) + 1); -#line 14136 "Photo.c" +#line 14169 "Photo.c" } #line 1862 "/home/jens/Source/shotwell/src/Photo.vala" (*array)[(*length)++] = value; #line 1862 "/home/jens/Source/shotwell/src/Photo.vala" (*array)[*length] = NULL; -#line 14142 "Photo.c" +#line 14175 "Photo.c" } @@ -14175,7 +14208,7 @@ void photo_set_master_file (Photo* self, GFile* file) { name_changed = FALSE; #line 1820 "/home/jens/Source/shotwell/src/Photo.vala" old_file = NULL; -#line 14177 "Photo.c" +#line 14210 "Photo.c" { { PhotoRow* _tmp2_ = NULL; @@ -14183,7 +14216,7 @@ void photo_set_master_file (Photo* self, GFile* file) { _tmp2_ = self->row; #line 1822 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_row); -#line 14185 "Photo.c" +#line 14218 "Photo.c" { { PhotoBackingReaders* _tmp3_ = NULL; @@ -14191,7 +14224,7 @@ void photo_set_master_file (Photo* self, GFile* file) { _tmp3_ = self->priv->readers; #line 1823 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_readers); -#line 14193 "Photo.c" +#line 14226 "Photo.c" { PhotoBackingReaders* _tmp4_ = NULL; PhotoFileReader* _tmp5_ = NULL; @@ -14217,7 +14250,7 @@ void photo_set_master_file (Photo* self, GFile* file) { _tmp9_ = g_file_equal (_tmp7_, _tmp8_); #line 1825 "/home/jens/Source/shotwell/src/Photo.vala" if (!_tmp9_) { -#line 14219 "Photo.c" +#line 14252 "Photo.c" PhotoTable* _tmp10_ = NULL; PhotoTable* _tmp11_ = NULL; PhotoID _tmp12_ = {0}; @@ -14254,7 +14287,7 @@ void photo_set_master_file (Photo* self, GFile* file) { _database_table_unref0 (_tmp11_); #line 1826 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 14256 "Photo.c" +#line 14289 "Photo.c" goto __finally313; } #line 1828 "/home/jens/Source/shotwell/src/Photo.vala" @@ -14311,7 +14344,7 @@ void photo_set_master_file (Photo* self, GFile* file) { _tmp31_ = is_string_empty (_tmp30_); #line 1835 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp31_) { -#line 14313 "Photo.c" +#line 14346 "Photo.c" GFile* _tmp32_ = NULL; gchar* _tmp33_ = NULL; gchar* _tmp34_ = NULL; @@ -14336,15 +14369,15 @@ void photo_set_master_file (Photo* self, GFile* file) { _g_free0 (_tmp37_); #line 1836 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (_tmp34_); -#line 14338 "Photo.c" +#line 14371 "Photo.c" } else { #line 1835 "/home/jens/Source/shotwell/src/Photo.vala" _tmp28_ = FALSE; -#line 14342 "Photo.c" +#line 14375 "Photo.c" } #line 1835 "/home/jens/Source/shotwell/src/Photo.vala" name_changed = _tmp28_; -#line 14346 "Photo.c" +#line 14379 "Photo.c" } } __finally313: @@ -14354,11 +14387,11 @@ void photo_set_master_file (Photo* self, GFile* file) { _tmp38_ = self->priv->readers; #line 1823 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_readers); -#line 14356 "Photo.c" +#line 14389 "Photo.c" } #line 1823 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 14360 "Photo.c" +#line 14393 "Photo.c" goto __finally312; } } @@ -14370,13 +14403,13 @@ void photo_set_master_file (Photo* self, GFile* file) { _tmp39_ = self->row; #line 1822 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 14372 "Photo.c" +#line 14405 "Photo.c" } #line 1822 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 1822 "/home/jens/Source/shotwell/src/Photo.vala" if (_inner_error_->domain == DATABASE_ERROR) { -#line 14378 "Photo.c" +#line 14411 "Photo.c" goto __catch311_database_error; } #line 1822 "/home/jens/Source/shotwell/src/Photo.vala" @@ -14389,7 +14422,7 @@ void photo_set_master_file (Photo* self, GFile* file) { g_clear_error (&_inner_error_); #line 1822 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 14391 "Photo.c" +#line 14424 "Photo.c" } } } @@ -14408,7 +14441,7 @@ void photo_set_master_file (Photo* self, GFile* file) { app_window_database_error (_tmp40_); #line 1821 "/home/jens/Source/shotwell/src/Photo.vala" _g_error_free0 (err); -#line 14410 "Photo.c" +#line 14443 "Photo.c" } __finally311: #line 1821 "/home/jens/Source/shotwell/src/Photo.vala" @@ -14423,13 +14456,13 @@ void photo_set_master_file (Photo* self, GFile* file) { g_clear_error (&_inner_error_); #line 1821 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 14425 "Photo.c" +#line 14458 "Photo.c" } #line 1844 "/home/jens/Source/shotwell/src/Photo.vala" _tmp41_ = altered; #line 1844 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp41_) { -#line 14431 "Photo.c" +#line 14464 "Photo.c" GFile* _tmp42_ = NULL; GFile* _tmp43_ = NULL; gboolean _tmp44_ = FALSE; @@ -14459,7 +14492,7 @@ void photo_set_master_file (Photo* self, GFile* file) { if (_tmp44_) { #line 1848 "/home/jens/Source/shotwell/src/Photo.vala" photo_notify_baseline_replaced (self); -#line 14461 "Photo.c" +#line 14494 "Photo.c" } #line 1850 "/home/jens/Source/shotwell/src/Photo.vala" _tmp45_ = g_new0 (gchar*, 0 + 1); @@ -14481,7 +14514,7 @@ void photo_set_master_file (Photo* self, GFile* file) { _tmp48_ = name_changed; #line 1855 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp48_) { -#line 14483 "Photo.c" +#line 14516 "Photo.c" gchar** _tmp49_ = NULL; gint _tmp49__length1 = 0; gchar* _tmp50_ = NULL; @@ -14493,13 +14526,13 @@ void photo_set_master_file (Photo* self, GFile* file) { _tmp50_ = g_strdup ("metadata:name"); #line 1856 "/home/jens/Source/shotwell/src/Photo.vala" _vala_array_add97 (&alteration_list, &alteration_list_length1, &_alteration_list_size_, _tmp50_); -#line 14495 "Photo.c" +#line 14528 "Photo.c" } #line 1858 "/home/jens/Source/shotwell/src/Photo.vala" _tmp51_ = is_source; #line 1858 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp51_) { -#line 14501 "Photo.c" +#line 14534 "Photo.c" gchar** _tmp52_ = NULL; gint _tmp52__length1 = 0; gchar* _tmp53_ = NULL; @@ -14511,13 +14544,13 @@ void photo_set_master_file (Photo* self, GFile* file) { _tmp53_ = g_strdup ("backing:source"); #line 1859 "/home/jens/Source/shotwell/src/Photo.vala" _vala_array_add98 (&alteration_list, &alteration_list_length1, &_alteration_list_size_, _tmp53_); -#line 14513 "Photo.c" +#line 14546 "Photo.c" } #line 1861 "/home/jens/Source/shotwell/src/Photo.vala" _tmp54_ = is_baseline; #line 1861 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp54_) { -#line 14519 "Photo.c" +#line 14552 "Photo.c" gchar** _tmp55_ = NULL; gint _tmp55__length1 = 0; gchar* _tmp56_ = NULL; @@ -14529,7 +14562,7 @@ void photo_set_master_file (Photo* self, GFile* file) { _tmp56_ = g_strdup ("backing:baseline"); #line 1862 "/home/jens/Source/shotwell/src/Photo.vala" _vala_array_add99 (&alteration_list, &alteration_list_length1, &_alteration_list_size_, _tmp56_); -#line 14531 "Photo.c" +#line 14564 "Photo.c" } #line 1864 "/home/jens/Source/shotwell/src/Photo.vala" _tmp57_ = alteration_list; @@ -14545,13 +14578,13 @@ void photo_set_master_file (Photo* self, GFile* file) { _alteration_unref0 (_tmp59_); #line 1844 "/home/jens/Source/shotwell/src/Photo.vala" alteration_list = (_vala_array_free (alteration_list, alteration_list_length1, (GDestroyNotify) g_free), NULL); -#line 14547 "Photo.c" +#line 14580 "Photo.c" } #line 1813 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (old_file); #line 1813 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (filepath); -#line 14553 "Photo.c" +#line 14586 "Photo.c" } @@ -14562,13 +14595,13 @@ static void _vala_array_add100 (gchar*** array, int* length, int* size, gchar* v *size = (*size) ? (2 * (*size)) : 4; #line 1904 "/home/jens/Source/shotwell/src/Photo.vala" *array = g_renew (gchar*, *array, (*size) + 1); -#line 14564 "Photo.c" +#line 14597 "Photo.c" } #line 1904 "/home/jens/Source/shotwell/src/Photo.vala" (*array)[(*length)++] = value; #line 1904 "/home/jens/Source/shotwell/src/Photo.vala" (*array)[*length] = NULL; -#line 14570 "Photo.c" +#line 14603 "Photo.c" } @@ -14579,13 +14612,13 @@ static void _vala_array_add101 (gchar*** array, int* length, int* size, gchar* v *size = (*size) ? (2 * (*size)) : 4; #line 1907 "/home/jens/Source/shotwell/src/Photo.vala" *array = g_renew (gchar*, *array, (*size) + 1); -#line 14581 "Photo.c" +#line 14614 "Photo.c" } #line 1907 "/home/jens/Source/shotwell/src/Photo.vala" (*array)[(*length)++] = value; #line 1907 "/home/jens/Source/shotwell/src/Photo.vala" (*array)[*length] = NULL; -#line 14587 "Photo.c" +#line 14620 "Photo.c" } @@ -14596,13 +14629,13 @@ static void _vala_array_add102 (gchar*** array, int* length, int* size, gchar* v *size = (*size) ? (2 * (*size)) : 4; #line 1910 "/home/jens/Source/shotwell/src/Photo.vala" *array = g_renew (gchar*, *array, (*size) + 1); -#line 14598 "Photo.c" +#line 14631 "Photo.c" } #line 1910 "/home/jens/Source/shotwell/src/Photo.vala" (*array)[(*length)++] = value; #line 1910 "/home/jens/Source/shotwell/src/Photo.vala" (*array)[*length] = NULL; -#line 14604 "Photo.c" +#line 14637 "Photo.c" } @@ -14634,7 +14667,7 @@ void photo_set_editable_file (Photo* self, GFile* file) { is_source = FALSE; #line 1876 "/home/jens/Source/shotwell/src/Photo.vala" old_file = NULL; -#line 14636 "Photo.c" +#line 14669 "Photo.c" { { PhotoRow* _tmp2_ = NULL; @@ -14642,7 +14675,7 @@ void photo_set_editable_file (Photo* self, GFile* file) { _tmp2_ = self->row; #line 1878 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_row); -#line 14644 "Photo.c" +#line 14677 "Photo.c" { { PhotoBackingReaders* _tmp3_ = NULL; @@ -14650,7 +14683,7 @@ void photo_set_editable_file (Photo* self, GFile* file) { _tmp3_ = self->priv->readers; #line 1879 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_readers); -#line 14652 "Photo.c" +#line 14685 "Photo.c" { GFile* _tmp4_ = NULL; PhotoBackingReaders* _tmp5_ = NULL; @@ -14664,7 +14697,7 @@ void photo_set_editable_file (Photo* self, GFile* file) { _tmp6_ = _tmp5_->editable; #line 1880 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp6_ != NULL) { -#line 14666 "Photo.c" +#line 14699 "Photo.c" PhotoBackingReaders* _tmp7_ = NULL; PhotoFileReader* _tmp8_ = NULL; GFile* _tmp9_ = NULL; @@ -14678,13 +14711,13 @@ void photo_set_editable_file (Photo* self, GFile* file) { _g_object_unref0 (_tmp4_); #line 1880 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = _tmp9_; -#line 14680 "Photo.c" +#line 14713 "Photo.c" } else { #line 1880 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_tmp4_); #line 1880 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = NULL; -#line 14686 "Photo.c" +#line 14719 "Photo.c" } #line 1880 "/home/jens/Source/shotwell/src/Photo.vala" _tmp10_ = _g_object_ref0 (_tmp4_); @@ -14696,7 +14729,7 @@ void photo_set_editable_file (Photo* self, GFile* file) { _tmp12_ = old_file; #line 1881 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp12_ != NULL) { -#line 14698 "Photo.c" +#line 14731 "Photo.c" GFile* _tmp13_ = NULL; GFile* _tmp14_ = NULL; gboolean _tmp15_ = FALSE; @@ -14708,15 +14741,15 @@ void photo_set_editable_file (Photo* self, GFile* file) { _tmp15_ = g_file_equal (_tmp13_, _tmp14_); #line 1881 "/home/jens/Source/shotwell/src/Photo.vala" _tmp11_ = !_tmp15_; -#line 14710 "Photo.c" +#line 14743 "Photo.c" } else { #line 1881 "/home/jens/Source/shotwell/src/Photo.vala" _tmp11_ = FALSE; -#line 14714 "Photo.c" +#line 14747 "Photo.c" } #line 1881 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp11_) { -#line 14718 "Photo.c" +#line 14751 "Photo.c" BackingPhotoTable* _tmp16_ = NULL; BackingPhotoTable* _tmp17_ = NULL; PhotoRow* _tmp18_ = NULL; @@ -14750,7 +14783,7 @@ void photo_set_editable_file (Photo* self, GFile* file) { if (G_UNLIKELY (_inner_error_ != NULL)) { #line 1882 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_tmp4_); -#line 14752 "Photo.c" +#line 14785 "Photo.c" goto __finally316; } #line 1884 "/home/jens/Source/shotwell/src/Photo.vala" @@ -14787,11 +14820,11 @@ void photo_set_editable_file (Photo* self, GFile* file) { _tmp30_ = photo_is_editable_source (self); #line 1889 "/home/jens/Source/shotwell/src/Photo.vala" is_source = _tmp30_; -#line 14789 "Photo.c" +#line 14822 "Photo.c" } #line 1879 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_tmp4_); -#line 14793 "Photo.c" +#line 14826 "Photo.c" } __finally316: { @@ -14800,11 +14833,11 @@ void photo_set_editable_file (Photo* self, GFile* file) { _tmp31_ = self->priv->readers; #line 1879 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_readers); -#line 14802 "Photo.c" +#line 14835 "Photo.c" } #line 1879 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 14806 "Photo.c" +#line 14839 "Photo.c" goto __finally315; } } @@ -14816,13 +14849,13 @@ void photo_set_editable_file (Photo* self, GFile* file) { _tmp32_ = self->row; #line 1878 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 14818 "Photo.c" +#line 14851 "Photo.c" } #line 1878 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 1878 "/home/jens/Source/shotwell/src/Photo.vala" if (_inner_error_->domain == DATABASE_ERROR) { -#line 14824 "Photo.c" +#line 14857 "Photo.c" goto __catch314_database_error; } #line 1878 "/home/jens/Source/shotwell/src/Photo.vala" @@ -14835,7 +14868,7 @@ void photo_set_editable_file (Photo* self, GFile* file) { g_clear_error (&_inner_error_); #line 1878 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 14837 "Photo.c" +#line 14870 "Photo.c" } } } @@ -14854,7 +14887,7 @@ void photo_set_editable_file (Photo* self, GFile* file) { app_window_database_error (_tmp33_); #line 1877 "/home/jens/Source/shotwell/src/Photo.vala" _g_error_free0 (err); -#line 14856 "Photo.c" +#line 14889 "Photo.c" } __finally314: #line 1877 "/home/jens/Source/shotwell/src/Photo.vala" @@ -14869,13 +14902,13 @@ void photo_set_editable_file (Photo* self, GFile* file) { g_clear_error (&_inner_error_); #line 1877 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 14871 "Photo.c" +#line 14904 "Photo.c" } #line 1897 "/home/jens/Source/shotwell/src/Photo.vala" _tmp34_ = altered; #line 1897 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp34_) { -#line 14877 "Photo.c" +#line 14910 "Photo.c" GFile* _tmp35_ = NULL; GFile* _tmp36_ = NULL; gboolean _tmp37_ = FALSE; @@ -14904,7 +14937,7 @@ void photo_set_editable_file (Photo* self, GFile* file) { if (_tmp37_) { #line 1901 "/home/jens/Source/shotwell/src/Photo.vala" photo_notify_baseline_replaced (self); -#line 14906 "Photo.c" +#line 14939 "Photo.c" } #line 1903 "/home/jens/Source/shotwell/src/Photo.vala" _tmp38_ = g_new0 (gchar*, 0 + 1); @@ -14926,7 +14959,7 @@ void photo_set_editable_file (Photo* self, GFile* file) { _tmp41_ = is_baseline; #line 1906 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp41_) { -#line 14928 "Photo.c" +#line 14961 "Photo.c" gchar** _tmp42_ = NULL; gint _tmp42__length1 = 0; gchar* _tmp43_ = NULL; @@ -14938,13 +14971,13 @@ void photo_set_editable_file (Photo* self, GFile* file) { _tmp43_ = g_strdup ("backing:baseline"); #line 1907 "/home/jens/Source/shotwell/src/Photo.vala" _vala_array_add101 (&alteration_list, &alteration_list_length1, &_alteration_list_size_, _tmp43_); -#line 14940 "Photo.c" +#line 14973 "Photo.c" } #line 1909 "/home/jens/Source/shotwell/src/Photo.vala" _tmp44_ = is_source; #line 1909 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp44_) { -#line 14946 "Photo.c" +#line 14979 "Photo.c" gchar** _tmp45_ = NULL; gint _tmp45__length1 = 0; gchar* _tmp46_ = NULL; @@ -14956,7 +14989,7 @@ void photo_set_editable_file (Photo* self, GFile* file) { _tmp46_ = g_strdup ("backing:source"); #line 1910 "/home/jens/Source/shotwell/src/Photo.vala" _vala_array_add102 (&alteration_list, &alteration_list_length1, &_alteration_list_size_, _tmp46_); -#line 14958 "Photo.c" +#line 14991 "Photo.c" } #line 1912 "/home/jens/Source/shotwell/src/Photo.vala" _tmp47_ = alteration_list; @@ -14972,13 +15005,13 @@ void photo_set_editable_file (Photo* self, GFile* file) { _alteration_unref0 (_tmp49_); #line 1897 "/home/jens/Source/shotwell/src/Photo.vala" alteration_list = (_vala_array_free (alteration_list, alteration_list_length1, (GDestroyNotify) g_free), NULL); -#line 14974 "Photo.c" +#line 15007 "Photo.c" } #line 1870 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (old_file); #line 1870 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (filepath); -#line 14980 "Photo.c" +#line 15013 "Photo.c" } @@ -14999,7 +15032,7 @@ void photo_set_many_editable_file (GeeMap* map, GError** error) { map_iter = _tmp1_; #line 1921 "/home/jens/Source/shotwell/src/Photo.vala" while (TRUE) { -#line 15001 "Photo.c" +#line 15034 "Photo.c" GeeMapIterator* _tmp2_ = NULL; gboolean _tmp3_ = FALSE; GeeMapIterator* _tmp4_ = NULL; @@ -15016,7 +15049,7 @@ void photo_set_many_editable_file (GeeMap* map, GError** error) { if (!_tmp3_) { #line 1921 "/home/jens/Source/shotwell/src/Photo.vala" break; -#line 15018 "Photo.c" +#line 15051 "Photo.c" } #line 1922 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = map_iter; @@ -15036,7 +15069,7 @@ void photo_set_many_editable_file (GeeMap* map, GError** error) { _g_object_unref0 (_tmp9_); #line 1922 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_tmp6_); -#line 15038 "Photo.c" +#line 15071 "Photo.c" } #line 1924 "/home/jens/Source/shotwell/src/Photo.vala" database_table_commit_transaction (&_inner_error_); @@ -15050,7 +15083,7 @@ void photo_set_many_editable_file (GeeMap* map, GError** error) { _g_object_unref0 (map_iter); #line 1924 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 15052 "Photo.c" +#line 15085 "Photo.c" } else { #line 1924 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (map_iter); @@ -15060,12 +15093,12 @@ void photo_set_many_editable_file (GeeMap* map, GError** error) { g_clear_error (&_inner_error_); #line 1924 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 15062 "Photo.c" +#line 15095 "Photo.c" } } #line 1917 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (map_iter); -#line 15067 "Photo.c" +#line 15100 "Photo.c" } @@ -15091,7 +15124,7 @@ GFile* photo_get_actual_file (Photo* self) { result = _tmp3_; #line 1930 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 15093 "Photo.c" +#line 15126 "Photo.c" } @@ -15118,7 +15151,7 @@ static GFile* photo_real_get_master_file (MediaSource* base) { result = _tmp3_; #line 1934 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 15120 "Photo.c" +#line 15153 "Photo.c" } @@ -15138,7 +15171,7 @@ GFile* photo_get_editable_file (Photo* self) { _tmp2_ = reader; #line 1940 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp2_ != NULL) { -#line 15140 "Photo.c" +#line 15173 "Photo.c" PhotoFileReader* _tmp3_ = NULL; GFile* _tmp4_ = NULL; #line 1940 "/home/jens/Source/shotwell/src/Photo.vala" @@ -15149,13 +15182,13 @@ GFile* photo_get_editable_file (Photo* self) { _g_object_unref0 (_tmp1_); #line 1940 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = _tmp4_; -#line 15151 "Photo.c" +#line 15184 "Photo.c" } else { #line 1940 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_tmp1_); #line 1940 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = NULL; -#line 15157 "Photo.c" +#line 15190 "Photo.c" } #line 1940 "/home/jens/Source/shotwell/src/Photo.vala" result = _tmp1_; @@ -15163,7 +15196,7 @@ GFile* photo_get_editable_file (Photo* self) { _photo_file_adapter_unref0 (reader); #line 1940 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 15165 "Photo.c" +#line 15198 "Photo.c" } @@ -15183,20 +15216,20 @@ GeeCollection* photo_get_raw_developer_files (Photo* self) { result = NULL; #line 1945 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 15185 "Photo.c" +#line 15218 "Photo.c" } #line 1947 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp1_ = gee_array_list_new (g_file_get_type (), (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL); + _tmp1_ = gee_array_list_new (g_file_get_type (), (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL); #line 1947 "/home/jens/Source/shotwell/src/Photo.vala" ret = _tmp1_; -#line 15191 "Photo.c" +#line 15224 "Photo.c" { PhotoRow* _tmp2_ = NULL; #line 1948 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = self->row; #line 1948 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_row); -#line 15198 "Photo.c" +#line 15231 "Photo.c" { { GeeIterator* _row_it = NULL; @@ -15209,7 +15242,7 @@ GeeCollection* photo_get_raw_developer_files (Photo* self) { #line 1949 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = self->priv->developments; #line 1949 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp4_ = gee_abstract_map_get_values (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_MAP, GeeMap)); + _tmp4_ = gee_abstract_map_get_values (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap)); #line 1949 "/home/jens/Source/shotwell/src/Photo.vala" _tmp5_ = _tmp4_; #line 1949 "/home/jens/Source/shotwell/src/Photo.vala" @@ -15224,7 +15257,7 @@ GeeCollection* photo_get_raw_developer_files (Photo* self) { _row_it = _tmp8_; #line 1949 "/home/jens/Source/shotwell/src/Photo.vala" while (TRUE) { -#line 15226 "Photo.c" +#line 15259 "Photo.c" GeeIterator* _tmp9_ = NULL; gboolean _tmp10_ = FALSE; BackingPhotoRow* row = NULL; @@ -15243,7 +15276,7 @@ GeeCollection* photo_get_raw_developer_files (Photo* self) { if (!_tmp10_) { #line 1949 "/home/jens/Source/shotwell/src/Photo.vala" break; -#line 15245 "Photo.c" +#line 15278 "Photo.c" } #line 1949 "/home/jens/Source/shotwell/src/Photo.vala" _tmp11_ = _row_it; @@ -15267,11 +15300,11 @@ GeeCollection* photo_get_raw_developer_files (Photo* self) { _g_object_unref0 (_tmp17_); #line 1949 "/home/jens/Source/shotwell/src/Photo.vala" _backing_photo_row_unref0 (row); -#line 15269 "Photo.c" +#line 15302 "Photo.c" } #line 1949 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_row_it); -#line 15273 "Photo.c" +#line 15306 "Photo.c" } } __finally317: @@ -15281,7 +15314,7 @@ GeeCollection* photo_get_raw_developer_files (Photo* self) { _tmp18_ = self->row; #line 1948 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 15283 "Photo.c" +#line 15316 "Photo.c" } #line 1948 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { @@ -15293,14 +15326,14 @@ GeeCollection* photo_get_raw_developer_files (Photo* self) { g_clear_error (&_inner_error_); #line 1948 "/home/jens/Source/shotwell/src/Photo.vala" return NULL; -#line 15295 "Photo.c" +#line 15328 "Photo.c" } } #line 1953 "/home/jens/Source/shotwell/src/Photo.vala" result = G_TYPE_CHECK_INSTANCE_CAST (ret, GEE_TYPE_COLLECTION, GeeCollection); #line 1953 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 15302 "Photo.c" +#line 15335 "Photo.c" } @@ -15326,7 +15359,7 @@ GFile* photo_get_source_file (Photo* self) { result = _tmp3_; #line 1957 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 15328 "Photo.c" +#line 15361 "Photo.c" } @@ -15335,14 +15368,14 @@ PhotoFileFormat photo_get_file_format (Photo* self) { GError * _inner_error_ = NULL; #line 1960 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_PHOTO (self), 0); -#line 15337 "Photo.c" +#line 15370 "Photo.c" { PhotoRow* _tmp0_ = NULL; #line 1961 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = self->row; #line 1961 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_row); -#line 15344 "Photo.c" +#line 15377 "Photo.c" { BackingPhotoRow* _tmp1_ = NULL; PhotoFileFormat _tmp2_ = 0; @@ -15352,18 +15385,18 @@ PhotoFileFormat photo_get_file_format (Photo* self) { _tmp2_ = _tmp1_->file_format; #line 1962 "/home/jens/Source/shotwell/src/Photo.vala" result = _tmp2_; -#line 15354 "Photo.c" +#line 15387 "Photo.c" { PhotoRow* _tmp3_ = NULL; #line 1961 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = self->row; #line 1961 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 15361 "Photo.c" +#line 15394 "Photo.c" } #line 1962 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 15365 "Photo.c" +#line 15398 "Photo.c" } __finally318: { @@ -15372,7 +15405,7 @@ PhotoFileFormat photo_get_file_format (Photo* self) { _tmp4_ = self->row; #line 1961 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 15374 "Photo.c" +#line 15407 "Photo.c" } #line 1961 "/home/jens/Source/shotwell/src/Photo.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); @@ -15380,7 +15413,7 @@ PhotoFileFormat photo_get_file_format (Photo* self) { g_clear_error (&_inner_error_); #line 1961 "/home/jens/Source/shotwell/src/Photo.vala" return 0; -#line 15382 "Photo.c" +#line 15415 "Photo.c" } } @@ -15403,19 +15436,19 @@ PhotoFileFormat photo_get_best_export_file_format (Photo* self) { _tmp2_ = photo_file_format_can_write (_tmp1_); #line 1968 "/home/jens/Source/shotwell/src/Photo.vala" if (!_tmp2_) { -#line 15405 "Photo.c" +#line 15438 "Photo.c" PhotoFileFormat _tmp3_ = 0; #line 1969 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = photo_file_format_get_system_default_format (); #line 1969 "/home/jens/Source/shotwell/src/Photo.vala" file_format = _tmp3_; -#line 15411 "Photo.c" +#line 15444 "Photo.c" } #line 1971 "/home/jens/Source/shotwell/src/Photo.vala" result = file_format; #line 1971 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 15417 "Photo.c" +#line 15450 "Photo.c" } @@ -15424,14 +15457,14 @@ PhotoFileFormat photo_get_master_file_format (Photo* self) { GError * _inner_error_ = NULL; #line 1974 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_PHOTO (self), 0); -#line 15426 "Photo.c" +#line 15459 "Photo.c" { PhotoRow* _tmp0_ = NULL; #line 1975 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = self->row; #line 1975 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_row); -#line 15433 "Photo.c" +#line 15466 "Photo.c" { PhotoBackingReaders* _tmp1_ = NULL; PhotoFileReader* _tmp2_ = NULL; @@ -15444,18 +15477,18 @@ PhotoFileFormat photo_get_master_file_format (Photo* self) { _tmp3_ = photo_file_adapter_get_file_format (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter)); #line 1976 "/home/jens/Source/shotwell/src/Photo.vala" result = _tmp3_; -#line 15446 "Photo.c" +#line 15479 "Photo.c" { PhotoRow* _tmp4_ = NULL; #line 1975 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = self->row; #line 1975 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 15453 "Photo.c" +#line 15486 "Photo.c" } #line 1976 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 15457 "Photo.c" +#line 15490 "Photo.c" } __finally319: { @@ -15464,7 +15497,7 @@ PhotoFileFormat photo_get_master_file_format (Photo* self) { _tmp5_ = self->row; #line 1975 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 15466 "Photo.c" +#line 15499 "Photo.c" } #line 1975 "/home/jens/Source/shotwell/src/Photo.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); @@ -15472,7 +15505,7 @@ PhotoFileFormat photo_get_master_file_format (Photo* self) { g_clear_error (&_inner_error_); #line 1975 "/home/jens/Source/shotwell/src/Photo.vala" return 0; -#line 15474 "Photo.c" +#line 15507 "Photo.c" } } @@ -15483,14 +15516,15 @@ static time_t photo_real_get_timestamp (MediaSource* base) { GError * _inner_error_ = NULL; #line 1980 "/home/jens/Source/shotwell/src/Photo.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PHOTO, Photo); -#line 15485 "Photo.c" +#line 15518 "Photo.c" { PhotoRow* _tmp0_ = NULL; + time_t _tmp5_ = 0; #line 1981 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = self->row; #line 1981 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_row); -#line 15492 "Photo.c" +#line 15526 "Photo.c" { BackingPhotoRow* _tmp1_ = NULL; time_t _tmp2_ = 0; @@ -15500,18 +15534,18 @@ static time_t photo_real_get_timestamp (MediaSource* base) { _tmp2_ = _tmp1_->timestamp; #line 1982 "/home/jens/Source/shotwell/src/Photo.vala" result = _tmp2_; -#line 15502 "Photo.c" +#line 15536 "Photo.c" { PhotoRow* _tmp3_ = NULL; #line 1981 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = self->row; #line 1981 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 15509 "Photo.c" +#line 15543 "Photo.c" } #line 1982 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 15513 "Photo.c" +#line 15547 "Photo.c" } __finally320: { @@ -15520,15 +15554,15 @@ static time_t photo_real_get_timestamp (MediaSource* base) { _tmp4_ = self->row; #line 1981 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 15522 "Photo.c" +#line 15556 "Photo.c" } #line 1981 "/home/jens/Source/shotwell/src/Photo.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 1981 "/home/jens/Source/shotwell/src/Photo.vala" g_clear_error (&_inner_error_); #line 1981 "/home/jens/Source/shotwell/src/Photo.vala" - return 0; -#line 15530 "Photo.c" + return _tmp5_; +#line 15564 "Photo.c" } } @@ -15537,14 +15571,14 @@ void photo_get_photo_id (Photo* self, PhotoID* result) { GError * _inner_error_ = NULL; #line 1986 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (IS_PHOTO (self)); -#line 15539 "Photo.c" +#line 15573 "Photo.c" { PhotoRow* _tmp0_ = NULL; #line 1987 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = self->row; #line 1987 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_row); -#line 15546 "Photo.c" +#line 15580 "Photo.c" { PhotoRow* _tmp1_ = NULL; PhotoID _tmp2_ = {0}; @@ -15554,18 +15588,18 @@ void photo_get_photo_id (Photo* self, PhotoID* result) { _tmp2_ = _tmp1_->photo_id; #line 1988 "/home/jens/Source/shotwell/src/Photo.vala" *result = _tmp2_; -#line 15556 "Photo.c" +#line 15590 "Photo.c" { PhotoRow* _tmp3_ = NULL; #line 1987 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = self->row; #line 1987 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 15563 "Photo.c" +#line 15597 "Photo.c" } #line 1988 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 15567 "Photo.c" +#line 15601 "Photo.c" } __finally321: { @@ -15574,7 +15608,7 @@ void photo_get_photo_id (Photo* self, PhotoID* result) { _tmp4_ = self->row; #line 1987 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 15576 "Photo.c" +#line 15610 "Photo.c" } #line 1987 "/home/jens/Source/shotwell/src/Photo.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); @@ -15582,7 +15616,7 @@ void photo_get_photo_id (Photo* self, PhotoID* result) { g_clear_error (&_inner_error_); #line 1987 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 15584 "Photo.c" +#line 15618 "Photo.c" } } @@ -15601,7 +15635,7 @@ static inline void photo_real_get_event_id (MediaSource* base, EventID* result) *result = _tmp1_; #line 1994 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 15603 "Photo.c" +#line 15637 "Photo.c" } @@ -15622,7 +15656,7 @@ inline gint64 photo_get_raw_event_id (Photo* self) { result = _tmp2_; #line 1999 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 15624 "Photo.c" +#line 15658 "Photo.c" } @@ -15631,14 +15665,14 @@ static void photo_real_get_import_id (MediaSource* base, ImportID* result) { GError * _inner_error_ = NULL; #line 2002 "/home/jens/Source/shotwell/src/Photo.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PHOTO, Photo); -#line 15633 "Photo.c" +#line 15667 "Photo.c" { PhotoRow* _tmp0_ = NULL; #line 2003 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = self->row; #line 2003 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_row); -#line 15640 "Photo.c" +#line 15674 "Photo.c" { PhotoRow* _tmp1_ = NULL; ImportID _tmp2_ = {0}; @@ -15648,18 +15682,18 @@ static void photo_real_get_import_id (MediaSource* base, ImportID* result) { _tmp2_ = _tmp1_->import_id; #line 2004 "/home/jens/Source/shotwell/src/Photo.vala" *result = _tmp2_; -#line 15650 "Photo.c" +#line 15684 "Photo.c" { PhotoRow* _tmp3_ = NULL; #line 2003 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = self->row; #line 2003 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 15657 "Photo.c" +#line 15691 "Photo.c" } #line 2004 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 15661 "Photo.c" +#line 15695 "Photo.c" } __finally322: { @@ -15668,7 +15702,7 @@ static void photo_real_get_import_id (MediaSource* base, ImportID* result) { _tmp4_ = self->row; #line 2003 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 15670 "Photo.c" +#line 15704 "Photo.c" } #line 2003 "/home/jens/Source/shotwell/src/Photo.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); @@ -15676,7 +15710,7 @@ static void photo_real_get_import_id (MediaSource* base, ImportID* result) { g_clear_error (&_inner_error_); #line 2003 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 15678 "Photo.c" +#line 15712 "Photo.c" } } @@ -15685,14 +15719,14 @@ void photo_get_editable_id (Photo* self, BackingPhotoID* result) { GError * _inner_error_ = NULL; #line 2008 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (IS_PHOTO (self)); -#line 15687 "Photo.c" +#line 15721 "Photo.c" { PhotoRow* _tmp0_ = NULL; #line 2009 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = self->row; #line 2009 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_row); -#line 15694 "Photo.c" +#line 15728 "Photo.c" { PhotoRow* _tmp1_ = NULL; BackingPhotoID _tmp2_ = {0}; @@ -15702,18 +15736,18 @@ void photo_get_editable_id (Photo* self, BackingPhotoID* result) { _tmp2_ = _tmp1_->editable_id; #line 2010 "/home/jens/Source/shotwell/src/Photo.vala" *result = _tmp2_; -#line 15704 "Photo.c" +#line 15738 "Photo.c" { PhotoRow* _tmp3_ = NULL; #line 2009 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = self->row; #line 2009 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 15711 "Photo.c" +#line 15745 "Photo.c" } #line 2010 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 15715 "Photo.c" +#line 15749 "Photo.c" } __finally323: { @@ -15722,7 +15756,7 @@ void photo_get_editable_id (Photo* self, BackingPhotoID* result) { _tmp4_ = self->row; #line 2009 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 15724 "Photo.c" +#line 15758 "Photo.c" } #line 2009 "/home/jens/Source/shotwell/src/Photo.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); @@ -15730,7 +15764,7 @@ void photo_get_editable_id (Photo* self, BackingPhotoID* result) { g_clear_error (&_inner_error_); #line 2009 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 15732 "Photo.c" +#line 15766 "Photo.c" } } @@ -15741,14 +15775,14 @@ static gchar* photo_real_get_master_md5 (MediaSource* base) { GError * _inner_error_ = NULL; #line 2014 "/home/jens/Source/shotwell/src/Photo.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PHOTO, Photo); -#line 15743 "Photo.c" +#line 15777 "Photo.c" { PhotoRow* _tmp0_ = NULL; #line 2015 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = self->row; #line 2015 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_row); -#line 15750 "Photo.c" +#line 15784 "Photo.c" { PhotoRow* _tmp1_ = NULL; const gchar* _tmp2_ = NULL; @@ -15761,18 +15795,18 @@ static gchar* photo_real_get_master_md5 (MediaSource* base) { _tmp3_ = g_strdup (_tmp2_); #line 2016 "/home/jens/Source/shotwell/src/Photo.vala" result = _tmp3_; -#line 15763 "Photo.c" +#line 15797 "Photo.c" { PhotoRow* _tmp4_ = NULL; #line 2015 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = self->row; #line 2015 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 15770 "Photo.c" +#line 15804 "Photo.c" } #line 2016 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 15774 "Photo.c" +#line 15808 "Photo.c" } __finally324: { @@ -15781,7 +15815,7 @@ static gchar* photo_real_get_master_md5 (MediaSource* base) { _tmp5_ = self->row; #line 2015 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 15783 "Photo.c" +#line 15817 "Photo.c" } #line 2015 "/home/jens/Source/shotwell/src/Photo.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); @@ -15789,7 +15823,7 @@ static gchar* photo_real_get_master_md5 (MediaSource* base) { g_clear_error (&_inner_error_); #line 2015 "/home/jens/Source/shotwell/src/Photo.vala" return NULL; -#line 15791 "Photo.c" +#line 15825 "Photo.c" } } @@ -15799,14 +15833,15 @@ guint64 photo_get_flags (Photo* self) { GError * _inner_error_ = NULL; #line 2022 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_PHOTO (self), 0ULL); -#line 15801 "Photo.c" +#line 15835 "Photo.c" { PhotoRow* _tmp0_ = NULL; + guint64 _tmp5_ = 0ULL; #line 2023 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = self->row; #line 2023 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_row); -#line 15808 "Photo.c" +#line 15843 "Photo.c" { PhotoRow* _tmp1_ = NULL; guint64 _tmp2_ = 0ULL; @@ -15816,18 +15851,18 @@ guint64 photo_get_flags (Photo* self) { _tmp2_ = _tmp1_->flags; #line 2024 "/home/jens/Source/shotwell/src/Photo.vala" result = _tmp2_; -#line 15818 "Photo.c" +#line 15853 "Photo.c" { PhotoRow* _tmp3_ = NULL; #line 2023 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = self->row; #line 2023 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 15825 "Photo.c" +#line 15860 "Photo.c" } #line 2024 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 15829 "Photo.c" +#line 15864 "Photo.c" } __finally325: { @@ -15836,15 +15871,15 @@ guint64 photo_get_flags (Photo* self) { _tmp4_ = self->row; #line 2023 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 15838 "Photo.c" +#line 15873 "Photo.c" } #line 2023 "/home/jens/Source/shotwell/src/Photo.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 2023 "/home/jens/Source/shotwell/src/Photo.vala" g_clear_error (&_inner_error_); #line 2023 "/home/jens/Source/shotwell/src/Photo.vala" - return 0ULL; -#line 15846 "Photo.c" + return _tmp5_; +#line 15881 "Photo.c" } } @@ -15866,7 +15901,7 @@ static void photo_notify_flags_altered (Photo* self, Alteration* additional_alte _tmp1_ = additional_alteration; #line 2030 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp1_ != NULL) { -#line 15868 "Photo.c" +#line 15903 "Photo.c" Alteration* _tmp2_ = NULL; Alteration* _tmp3_ = NULL; Alteration* _tmp4_ = NULL; @@ -15880,7 +15915,7 @@ static void photo_notify_flags_altered (Photo* self, Alteration* additional_alte _alteration_unref0 (alteration); #line 2031 "/home/jens/Source/shotwell/src/Photo.vala" alteration = _tmp4_; -#line 15882 "Photo.c" +#line 15917 "Photo.c" } #line 2033 "/home/jens/Source/shotwell/src/Photo.vala" _tmp5_ = alteration; @@ -15888,28 +15923,28 @@ static void photo_notify_flags_altered (Photo* self, Alteration* additional_alte data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp5_); #line 2028 "/home/jens/Source/shotwell/src/Photo.vala" _alteration_unref0 (alteration); -#line 15890 "Photo.c" +#line 15925 "Photo.c" } guint64 photo_replace_flags (Photo* self, guint64 flags, Alteration* additional_alteration) { guint64 result = 0ULL; gboolean committed = FALSE; - gboolean _tmp10_ = FALSE; - guint64 _tmp12_ = 0ULL; + gboolean _tmp11_ = FALSE; + guint64 _tmp13_ = 0ULL; GError * _inner_error_ = NULL; #line 2036 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_PHOTO (self), 0ULL); #line 2036 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail ((additional_alteration == NULL) || IS_ALTERATION (additional_alteration), 0ULL); -#line 15904 "Photo.c" +#line 15939 "Photo.c" { PhotoRow* _tmp0_ = NULL; #line 2038 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = self->row; #line 2038 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_row); -#line 15911 "Photo.c" +#line 15946 "Photo.c" { PhotoTable* _tmp1_ = NULL; PhotoTable* _tmp2_ = NULL; @@ -15935,7 +15970,7 @@ guint64 photo_replace_flags (Photo* self, guint64 flags, Alteration* additional_ _tmp6_ = committed; #line 2040 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp6_) { -#line 15937 "Photo.c" +#line 15972 "Photo.c" PhotoRow* _tmp7_ = NULL; guint64 _tmp8_ = 0ULL; #line 2041 "/home/jens/Source/shotwell/src/Photo.vala" @@ -15944,7 +15979,7 @@ guint64 photo_replace_flags (Photo* self, guint64 flags, Alteration* additional_ _tmp8_ = flags; #line 2041 "/home/jens/Source/shotwell/src/Photo.vala" _tmp7_->flags = _tmp8_; -#line 15946 "Photo.c" +#line 15981 "Photo.c" } } __finally326: @@ -15954,38 +15989,40 @@ guint64 photo_replace_flags (Photo* self, guint64 flags, Alteration* additional_ _tmp9_ = self->row; #line 2038 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 15956 "Photo.c" +#line 15991 "Photo.c" } #line 2038 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { +#line 15995 "Photo.c" + guint64 _tmp10_ = 0ULL; #line 2038 "/home/jens/Source/shotwell/src/Photo.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 2038 "/home/jens/Source/shotwell/src/Photo.vala" g_clear_error (&_inner_error_); #line 2038 "/home/jens/Source/shotwell/src/Photo.vala" - return 0ULL; -#line 15966 "Photo.c" + return _tmp10_; +#line 16003 "Photo.c" } } #line 2044 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp10_ = committed; + _tmp11_ = committed; #line 2044 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp10_) { -#line 15973 "Photo.c" - Alteration* _tmp11_ = NULL; + if (_tmp11_) { +#line 16010 "Photo.c" + Alteration* _tmp12_ = NULL; #line 2045 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp11_ = additional_alteration; + _tmp12_ = additional_alteration; #line 2045 "/home/jens/Source/shotwell/src/Photo.vala" - photo_notify_flags_altered (self, _tmp11_); -#line 15979 "Photo.c" + photo_notify_flags_altered (self, _tmp12_); +#line 16016 "Photo.c" } #line 2047 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp12_ = flags; + _tmp13_ = flags; #line 2047 "/home/jens/Source/shotwell/src/Photo.vala" - result = _tmp12_; + result = _tmp13_; #line 2047 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 15987 "Photo.c" +#line 16024 "Photo.c" } @@ -15994,14 +16031,15 @@ gboolean photo_is_flag_set (Photo* self, guint64 mask) { GError * _inner_error_ = NULL; #line 2050 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_PHOTO (self), FALSE); -#line 15996 "Photo.c" +#line 16033 "Photo.c" { PhotoRow* _tmp0_ = NULL; + gboolean _tmp7_ = FALSE; #line 2051 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = self->row; #line 2051 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_row); -#line 16003 "Photo.c" +#line 16041 "Photo.c" { PhotoRow* _tmp1_ = NULL; guint64 _tmp2_ = 0ULL; @@ -16017,18 +16055,18 @@ gboolean photo_is_flag_set (Photo* self, guint64 mask) { _tmp4_ = media_source_internal_is_flag_set (_tmp2_, _tmp3_); #line 2052 "/home/jens/Source/shotwell/src/Photo.vala" result = _tmp4_; -#line 16019 "Photo.c" +#line 16057 "Photo.c" { PhotoRow* _tmp5_ = NULL; #line 2051 "/home/jens/Source/shotwell/src/Photo.vala" _tmp5_ = self->row; #line 2051 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 16026 "Photo.c" +#line 16064 "Photo.c" } #line 2052 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 16030 "Photo.c" +#line 16068 "Photo.c" } __finally327: { @@ -16037,15 +16075,15 @@ gboolean photo_is_flag_set (Photo* self, guint64 mask) { _tmp6_ = self->row; #line 2051 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 16039 "Photo.c" +#line 16077 "Photo.c" } #line 2051 "/home/jens/Source/shotwell/src/Photo.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 2051 "/home/jens/Source/shotwell/src/Photo.vala" g_clear_error (&_inner_error_); #line 2051 "/home/jens/Source/shotwell/src/Photo.vala" - return FALSE; -#line 16047 "Photo.c" + return _tmp7_; +#line 16085 "Photo.c" } } @@ -16054,7 +16092,7 @@ guint64 photo_add_flags (Photo* self, guint64 mask, Alteration* additional_alter guint64 result = 0ULL; guint64 flags = 0ULL; gboolean committed = FALSE; - gboolean _tmp17_ = FALSE; + gboolean _tmp18_ = FALSE; GError * _inner_error_ = NULL; #line 2056 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_PHOTO (self), 0ULL); @@ -16064,14 +16102,14 @@ guint64 photo_add_flags (Photo* self, guint64 mask, Alteration* additional_alter flags = (guint64) 0; #line 2059 "/home/jens/Source/shotwell/src/Photo.vala" committed = FALSE; -#line 16066 "Photo.c" +#line 16104 "Photo.c" { PhotoRow* _tmp0_ = NULL; #line 2060 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = self->row; #line 2060 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_row); -#line 16073 "Photo.c" +#line 16111 "Photo.c" { PhotoRow* _tmp1_ = NULL; guint64 _tmp2_ = 0ULL; @@ -16098,7 +16136,7 @@ guint64 photo_add_flags (Photo* self, guint64 mask, Alteration* additional_alter _tmp7_ = flags; #line 2062 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp6_ != _tmp7_) { -#line 16100 "Photo.c" +#line 16138 "Photo.c" PhotoTable* _tmp8_ = NULL; PhotoTable* _tmp9_ = NULL; PhotoID _tmp10_ = {0}; @@ -16123,7 +16161,7 @@ guint64 photo_add_flags (Photo* self, guint64 mask, Alteration* additional_alter _tmp13_ = committed; #line 2064 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp13_) { -#line 16125 "Photo.c" +#line 16163 "Photo.c" PhotoRow* _tmp14_ = NULL; guint64 _tmp15_ = 0ULL; #line 2065 "/home/jens/Source/shotwell/src/Photo.vala" @@ -16132,7 +16170,7 @@ guint64 photo_add_flags (Photo* self, guint64 mask, Alteration* additional_alter _tmp15_ = flags; #line 2065 "/home/jens/Source/shotwell/src/Photo.vala" _tmp14_->flags = _tmp15_; -#line 16134 "Photo.c" +#line 16172 "Photo.c" } } } @@ -16143,36 +16181,38 @@ guint64 photo_add_flags (Photo* self, guint64 mask, Alteration* additional_alter _tmp16_ = self->row; #line 2060 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 16145 "Photo.c" +#line 16183 "Photo.c" } #line 2060 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { +#line 16187 "Photo.c" + guint64 _tmp17_ = 0ULL; #line 2060 "/home/jens/Source/shotwell/src/Photo.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 2060 "/home/jens/Source/shotwell/src/Photo.vala" g_clear_error (&_inner_error_); #line 2060 "/home/jens/Source/shotwell/src/Photo.vala" - return 0ULL; -#line 16155 "Photo.c" + return _tmp17_; +#line 16195 "Photo.c" } } #line 2069 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp17_ = committed; + _tmp18_ = committed; #line 2069 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp17_) { -#line 16162 "Photo.c" - Alteration* _tmp18_ = NULL; + if (_tmp18_) { +#line 16202 "Photo.c" + Alteration* _tmp19_ = NULL; #line 2070 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp18_ = additional_alteration; + _tmp19_ = additional_alteration; #line 2070 "/home/jens/Source/shotwell/src/Photo.vala" - photo_notify_flags_altered (self, _tmp18_); -#line 16168 "Photo.c" + photo_notify_flags_altered (self, _tmp19_); +#line 16208 "Photo.c" } #line 2072 "/home/jens/Source/shotwell/src/Photo.vala" result = flags; #line 2072 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 16174 "Photo.c" +#line 16214 "Photo.c" } @@ -16180,7 +16220,7 @@ guint64 photo_remove_flags (Photo* self, guint64 mask, Alteration* additional_al guint64 result = 0ULL; guint64 flags = 0ULL; gboolean committed = FALSE; - gboolean _tmp17_ = FALSE; + gboolean _tmp18_ = FALSE; GError * _inner_error_ = NULL; #line 2075 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_PHOTO (self), 0ULL); @@ -16190,14 +16230,14 @@ guint64 photo_remove_flags (Photo* self, guint64 mask, Alteration* additional_al flags = (guint64) 0; #line 2078 "/home/jens/Source/shotwell/src/Photo.vala" committed = FALSE; -#line 16192 "Photo.c" +#line 16232 "Photo.c" { PhotoRow* _tmp0_ = NULL; #line 2079 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = self->row; #line 2079 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_row); -#line 16199 "Photo.c" +#line 16239 "Photo.c" { PhotoRow* _tmp1_ = NULL; guint64 _tmp2_ = 0ULL; @@ -16224,7 +16264,7 @@ guint64 photo_remove_flags (Photo* self, guint64 mask, Alteration* additional_al _tmp7_ = flags; #line 2081 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp6_ != _tmp7_) { -#line 16226 "Photo.c" +#line 16266 "Photo.c" PhotoTable* _tmp8_ = NULL; PhotoTable* _tmp9_ = NULL; PhotoID _tmp10_ = {0}; @@ -16249,7 +16289,7 @@ guint64 photo_remove_flags (Photo* self, guint64 mask, Alteration* additional_al _tmp13_ = committed; #line 2083 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp13_) { -#line 16251 "Photo.c" +#line 16291 "Photo.c" PhotoRow* _tmp14_ = NULL; guint64 _tmp15_ = 0ULL; #line 2084 "/home/jens/Source/shotwell/src/Photo.vala" @@ -16258,7 +16298,7 @@ guint64 photo_remove_flags (Photo* self, guint64 mask, Alteration* additional_al _tmp15_ = flags; #line 2084 "/home/jens/Source/shotwell/src/Photo.vala" _tmp14_->flags = _tmp15_; -#line 16260 "Photo.c" +#line 16300 "Photo.c" } } } @@ -16269,36 +16309,38 @@ guint64 photo_remove_flags (Photo* self, guint64 mask, Alteration* additional_al _tmp16_ = self->row; #line 2079 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 16271 "Photo.c" +#line 16311 "Photo.c" } #line 2079 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { +#line 16315 "Photo.c" + guint64 _tmp17_ = 0ULL; #line 2079 "/home/jens/Source/shotwell/src/Photo.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 2079 "/home/jens/Source/shotwell/src/Photo.vala" g_clear_error (&_inner_error_); #line 2079 "/home/jens/Source/shotwell/src/Photo.vala" - return 0ULL; -#line 16281 "Photo.c" + return _tmp17_; +#line 16323 "Photo.c" } } #line 2088 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp17_ = committed; + _tmp18_ = committed; #line 2088 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp17_) { -#line 16288 "Photo.c" - Alteration* _tmp18_ = NULL; + if (_tmp18_) { +#line 16330 "Photo.c" + Alteration* _tmp19_ = NULL; #line 2089 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp18_ = additional_alteration; + _tmp19_ = additional_alteration; #line 2089 "/home/jens/Source/shotwell/src/Photo.vala" - photo_notify_flags_altered (self, _tmp18_); -#line 16294 "Photo.c" + photo_notify_flags_altered (self, _tmp19_); +#line 16336 "Photo.c" } #line 2091 "/home/jens/Source/shotwell/src/Photo.vala" result = flags; #line 2091 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 16300 "Photo.c" +#line 16342 "Photo.c" } @@ -16306,7 +16348,7 @@ guint64 photo_add_remove_flags (Photo* self, guint64 add, guint64 remove, Altera guint64 result = 0ULL; guint64 flags = 0ULL; gboolean committed = FALSE; - gboolean _tmp17_ = FALSE; + gboolean _tmp18_ = FALSE; GError * _inner_error_ = NULL; #line 2094 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_PHOTO (self), 0ULL); @@ -16316,14 +16358,14 @@ guint64 photo_add_remove_flags (Photo* self, guint64 add, guint64 remove, Altera flags = (guint64) 0; #line 2097 "/home/jens/Source/shotwell/src/Photo.vala" committed = FALSE; -#line 16318 "Photo.c" +#line 16360 "Photo.c" { PhotoRow* _tmp0_ = NULL; #line 2098 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = self->row; #line 2098 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_row); -#line 16325 "Photo.c" +#line 16367 "Photo.c" { PhotoRow* _tmp1_ = NULL; guint64 _tmp2_ = 0ULL; @@ -16350,7 +16392,7 @@ guint64 photo_add_remove_flags (Photo* self, guint64 add, guint64 remove, Altera _tmp7_ = flags; #line 2100 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp6_ != _tmp7_) { -#line 16352 "Photo.c" +#line 16394 "Photo.c" PhotoTable* _tmp8_ = NULL; PhotoTable* _tmp9_ = NULL; PhotoID _tmp10_ = {0}; @@ -16375,7 +16417,7 @@ guint64 photo_add_remove_flags (Photo* self, guint64 add, guint64 remove, Altera _tmp13_ = committed; #line 2102 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp13_) { -#line 16377 "Photo.c" +#line 16419 "Photo.c" PhotoRow* _tmp14_ = NULL; guint64 _tmp15_ = 0ULL; #line 2103 "/home/jens/Source/shotwell/src/Photo.vala" @@ -16384,7 +16426,7 @@ guint64 photo_add_remove_flags (Photo* self, guint64 add, guint64 remove, Altera _tmp15_ = flags; #line 2103 "/home/jens/Source/shotwell/src/Photo.vala" _tmp14_->flags = _tmp15_; -#line 16386 "Photo.c" +#line 16428 "Photo.c" } } } @@ -16395,36 +16437,38 @@ guint64 photo_add_remove_flags (Photo* self, guint64 add, guint64 remove, Altera _tmp16_ = self->row; #line 2098 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 16397 "Photo.c" +#line 16439 "Photo.c" } #line 2098 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { +#line 16443 "Photo.c" + guint64 _tmp17_ = 0ULL; #line 2098 "/home/jens/Source/shotwell/src/Photo.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 2098 "/home/jens/Source/shotwell/src/Photo.vala" g_clear_error (&_inner_error_); #line 2098 "/home/jens/Source/shotwell/src/Photo.vala" - return 0ULL; -#line 16407 "Photo.c" + return _tmp17_; +#line 16451 "Photo.c" } } #line 2107 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp17_ = committed; + _tmp18_ = committed; #line 2107 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp17_) { -#line 16414 "Photo.c" - Alteration* _tmp18_ = NULL; + if (_tmp18_) { +#line 16458 "Photo.c" + Alteration* _tmp19_ = NULL; #line 2108 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp18_ = additional_alteration; + _tmp19_ = additional_alteration; #line 2108 "/home/jens/Source/shotwell/src/Photo.vala" - photo_notify_flags_altered (self, _tmp18_); -#line 16420 "Photo.c" + photo_notify_flags_altered (self, _tmp19_); +#line 16464 "Photo.c" } #line 2110 "/home/jens/Source/shotwell/src/Photo.vala" result = flags; #line 2110 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 16426 "Photo.c" +#line 16470 "Photo.c" } @@ -16446,7 +16490,7 @@ void photo_add_remove_many_flags (GeeCollection* add, guint64 add_mask, Alterati _tmp0_ = add; #line 2118 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp0_ != NULL) { -#line 16448 "Photo.c" +#line 16492 "Photo.c" { GeeIterator* _photo_it = NULL; GeeCollection* _tmp1_ = NULL; @@ -16459,7 +16503,7 @@ void photo_add_remove_many_flags (GeeCollection* add, guint64 add_mask, Alterati _photo_it = _tmp2_; #line 2119 "/home/jens/Source/shotwell/src/Photo.vala" while (TRUE) { -#line 16461 "Photo.c" +#line 16505 "Photo.c" GeeIterator* _tmp3_ = NULL; gboolean _tmp4_ = FALSE; Photo* photo = NULL; @@ -16476,7 +16520,7 @@ void photo_add_remove_many_flags (GeeCollection* add, guint64 add_mask, Alterati if (!_tmp4_) { #line 2119 "/home/jens/Source/shotwell/src/Photo.vala" break; -#line 16478 "Photo.c" +#line 16522 "Photo.c" } #line 2119 "/home/jens/Source/shotwell/src/Photo.vala" _tmp5_ = _photo_it; @@ -16494,18 +16538,18 @@ void photo_add_remove_many_flags (GeeCollection* add, guint64 add_mask, Alterati photo_add_flags (_tmp7_, _tmp8_, _tmp9_); #line 2119 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (photo); -#line 16496 "Photo.c" +#line 16540 "Photo.c" } #line 2119 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_photo_it); -#line 16500 "Photo.c" +#line 16544 "Photo.c" } } #line 2123 "/home/jens/Source/shotwell/src/Photo.vala" _tmp10_ = remove; #line 2123 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp10_ != NULL) { -#line 16507 "Photo.c" +#line 16551 "Photo.c" { GeeIterator* _photo_it = NULL; GeeCollection* _tmp11_ = NULL; @@ -16518,7 +16562,7 @@ void photo_add_remove_many_flags (GeeCollection* add, guint64 add_mask, Alterati _photo_it = _tmp12_; #line 2124 "/home/jens/Source/shotwell/src/Photo.vala" while (TRUE) { -#line 16520 "Photo.c" +#line 16564 "Photo.c" GeeIterator* _tmp13_ = NULL; gboolean _tmp14_ = FALSE; Photo* photo = NULL; @@ -16535,7 +16579,7 @@ void photo_add_remove_many_flags (GeeCollection* add, guint64 add_mask, Alterati if (!_tmp14_) { #line 2124 "/home/jens/Source/shotwell/src/Photo.vala" break; -#line 16537 "Photo.c" +#line 16581 "Photo.c" } #line 2124 "/home/jens/Source/shotwell/src/Photo.vala" _tmp15_ = _photo_it; @@ -16553,11 +16597,11 @@ void photo_add_remove_many_flags (GeeCollection* add, guint64 add_mask, Alterati photo_remove_flags (_tmp17_, _tmp18_, _tmp19_); #line 2124 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (photo); -#line 16555 "Photo.c" +#line 16599 "Photo.c" } #line 2124 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_photo_it); -#line 16559 "Photo.c" +#line 16603 "Photo.c" } } #line 2128 "/home/jens/Source/shotwell/src/Photo.vala" @@ -16570,7 +16614,7 @@ void photo_add_remove_many_flags (GeeCollection* add, guint64 add_mask, Alterati g_propagate_error (error, _inner_error_); #line 2128 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 16572 "Photo.c" +#line 16616 "Photo.c" } else { #line 2128 "/home/jens/Source/shotwell/src/Photo.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); @@ -16578,7 +16622,7 @@ void photo_add_remove_many_flags (GeeCollection* add, guint64 add_mask, Alterati g_clear_error (&_inner_error_); #line 2128 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 16580 "Photo.c" +#line 16624 "Photo.c" } } } @@ -16588,7 +16632,7 @@ guint64 photo_toggle_flags (Photo* self, guint64 mask, Alteration* additional_al guint64 result = 0ULL; guint64 flags = 0ULL; gboolean committed = FALSE; - gboolean _tmp16_ = FALSE; + gboolean _tmp17_ = FALSE; GError * _inner_error_ = NULL; #line 2131 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_PHOTO (self), 0ULL); @@ -16598,14 +16642,14 @@ guint64 photo_toggle_flags (Photo* self, guint64 mask, Alteration* additional_al flags = (guint64) 0; #line 2134 "/home/jens/Source/shotwell/src/Photo.vala" committed = FALSE; -#line 16600 "Photo.c" +#line 16644 "Photo.c" { PhotoRow* _tmp0_ = NULL; #line 2135 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = self->row; #line 2135 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_row); -#line 16607 "Photo.c" +#line 16651 "Photo.c" { PhotoRow* _tmp1_ = NULL; guint64 _tmp2_ = 0ULL; @@ -16629,7 +16673,7 @@ guint64 photo_toggle_flags (Photo* self, guint64 mask, Alteration* additional_al _tmp6_ = flags; #line 2137 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp5_ != _tmp6_) { -#line 16631 "Photo.c" +#line 16675 "Photo.c" PhotoTable* _tmp7_ = NULL; PhotoTable* _tmp8_ = NULL; PhotoID _tmp9_ = {0}; @@ -16654,7 +16698,7 @@ guint64 photo_toggle_flags (Photo* self, guint64 mask, Alteration* additional_al _tmp12_ = committed; #line 2139 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp12_) { -#line 16656 "Photo.c" +#line 16700 "Photo.c" PhotoRow* _tmp13_ = NULL; guint64 _tmp14_ = 0ULL; #line 2140 "/home/jens/Source/shotwell/src/Photo.vala" @@ -16663,7 +16707,7 @@ guint64 photo_toggle_flags (Photo* self, guint64 mask, Alteration* additional_al _tmp14_ = flags; #line 2140 "/home/jens/Source/shotwell/src/Photo.vala" _tmp13_->flags = _tmp14_; -#line 16665 "Photo.c" +#line 16709 "Photo.c" } } } @@ -16674,36 +16718,38 @@ guint64 photo_toggle_flags (Photo* self, guint64 mask, Alteration* additional_al _tmp15_ = self->row; #line 2135 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 16676 "Photo.c" +#line 16720 "Photo.c" } #line 2135 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { +#line 16724 "Photo.c" + guint64 _tmp16_ = 0ULL; #line 2135 "/home/jens/Source/shotwell/src/Photo.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 2135 "/home/jens/Source/shotwell/src/Photo.vala" g_clear_error (&_inner_error_); #line 2135 "/home/jens/Source/shotwell/src/Photo.vala" - return 0ULL; -#line 16686 "Photo.c" + return _tmp16_; +#line 16732 "Photo.c" } } #line 2144 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp16_ = committed; + _tmp17_ = committed; #line 2144 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp16_) { -#line 16693 "Photo.c" - Alteration* _tmp17_ = NULL; + if (_tmp17_) { +#line 16739 "Photo.c" + Alteration* _tmp18_ = NULL; #line 2145 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp17_ = additional_alteration; + _tmp18_ = additional_alteration; #line 2145 "/home/jens/Source/shotwell/src/Photo.vala" - photo_notify_flags_altered (self, _tmp17_); -#line 16699 "Photo.c" + photo_notify_flags_altered (self, _tmp18_); +#line 16745 "Photo.c" } #line 2147 "/home/jens/Source/shotwell/src/Photo.vala" result = flags; #line 2147 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 16705 "Photo.c" +#line 16751 "Photo.c" } @@ -16712,14 +16758,15 @@ gboolean photo_is_master_metadata_dirty (Photo* self) { GError * _inner_error_ = NULL; #line 2150 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_PHOTO (self), FALSE); -#line 16714 "Photo.c" +#line 16760 "Photo.c" { PhotoRow* _tmp0_ = NULL; + gboolean _tmp5_ = FALSE; #line 2151 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = self->row; #line 2151 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_row); -#line 16721 "Photo.c" +#line 16768 "Photo.c" { PhotoRow* _tmp1_ = NULL; gboolean _tmp2_ = FALSE; @@ -16729,18 +16776,18 @@ gboolean photo_is_master_metadata_dirty (Photo* self) { _tmp2_ = _tmp1_->metadata_dirty; #line 2152 "/home/jens/Source/shotwell/src/Photo.vala" result = _tmp2_; -#line 16731 "Photo.c" +#line 16778 "Photo.c" { PhotoRow* _tmp3_ = NULL; #line 2151 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = self->row; #line 2151 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 16738 "Photo.c" +#line 16785 "Photo.c" } #line 2152 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 16742 "Photo.c" +#line 16789 "Photo.c" } __finally332: { @@ -16749,15 +16796,15 @@ gboolean photo_is_master_metadata_dirty (Photo* self) { _tmp4_ = self->row; #line 2151 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 16751 "Photo.c" +#line 16798 "Photo.c" } #line 2151 "/home/jens/Source/shotwell/src/Photo.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 2151 "/home/jens/Source/shotwell/src/Photo.vala" g_clear_error (&_inner_error_); #line 2151 "/home/jens/Source/shotwell/src/Photo.vala" - return FALSE; -#line 16759 "Photo.c" + return _tmp5_; +#line 16806 "Photo.c" } } @@ -16770,14 +16817,14 @@ void photo_set_master_metadata_dirty (Photo* self, gboolean dirty, GError** erro g_return_if_fail (IS_PHOTO (self)); #line 2157 "/home/jens/Source/shotwell/src/Photo.vala" committed = FALSE; -#line 16772 "Photo.c" +#line 16819 "Photo.c" { PhotoRow* _tmp0_ = NULL; #line 2158 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = self->row; #line 2158 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_row); -#line 16779 "Photo.c" +#line 16826 "Photo.c" { PhotoRow* _tmp1_ = NULL; gboolean _tmp2_ = FALSE; @@ -16790,7 +16837,7 @@ void photo_set_master_metadata_dirty (Photo* self, gboolean dirty, GError** erro _tmp3_ = dirty; #line 2159 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp2_ != _tmp3_) { -#line 16792 "Photo.c" +#line 16839 "Photo.c" PhotoTable* _tmp4_ = NULL; PhotoTable* _tmp5_ = NULL; PhotoID _tmp6_ = {0}; @@ -16811,7 +16858,7 @@ void photo_set_master_metadata_dirty (Photo* self, gboolean dirty, GError** erro _database_table_unref0 (_tmp5_); #line 2160 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 16813 "Photo.c" +#line 16860 "Photo.c" goto __finally333; } #line 2161 "/home/jens/Source/shotwell/src/Photo.vala" @@ -16822,7 +16869,7 @@ void photo_set_master_metadata_dirty (Photo* self, gboolean dirty, GError** erro _tmp8_->metadata_dirty = _tmp9_; #line 2162 "/home/jens/Source/shotwell/src/Photo.vala" committed = TRUE; -#line 16824 "Photo.c" +#line 16871 "Photo.c" } } __finally333: @@ -16832,7 +16879,7 @@ void photo_set_master_metadata_dirty (Photo* self, gboolean dirty, GError** erro _tmp10_ = self->row; #line 2158 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 16834 "Photo.c" +#line 16881 "Photo.c" } #line 2158 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { @@ -16842,7 +16889,7 @@ void photo_set_master_metadata_dirty (Photo* self, gboolean dirty, GError** erro g_propagate_error (error, _inner_error_); #line 2158 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 16844 "Photo.c" +#line 16891 "Photo.c" } else { #line 2158 "/home/jens/Source/shotwell/src/Photo.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); @@ -16850,7 +16897,7 @@ void photo_set_master_metadata_dirty (Photo* self, gboolean dirty, GError** erro g_clear_error (&_inner_error_); #line 2158 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 16852 "Photo.c" +#line 16899 "Photo.c" } } } @@ -16858,7 +16905,7 @@ void photo_set_master_metadata_dirty (Photo* self, gboolean dirty, GError** erro _tmp11_ = committed; #line 2166 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp11_) { -#line 16860 "Photo.c" +#line 16907 "Photo.c" Alteration* _tmp12_ = NULL; Alteration* _tmp13_ = NULL; #line 2167 "/home/jens/Source/shotwell/src/Photo.vala" @@ -16869,7 +16916,7 @@ void photo_set_master_metadata_dirty (Photo* self, gboolean dirty, GError** erro data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp13_); #line 2167 "/home/jens/Source/shotwell/src/Photo.vala" _alteration_unref0 (_tmp13_); -#line 16871 "Photo.c" +#line 16918 "Photo.c" } } @@ -16880,14 +16927,14 @@ static Rating photo_real_get_rating (MediaSource* base) { GError * _inner_error_ = NULL; #line 2170 "/home/jens/Source/shotwell/src/Photo.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PHOTO, Photo); -#line 16882 "Photo.c" +#line 16929 "Photo.c" { PhotoRow* _tmp0_ = NULL; #line 2171 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = self->row; #line 2171 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_row); -#line 16889 "Photo.c" +#line 16936 "Photo.c" { PhotoRow* _tmp1_ = NULL; Rating _tmp2_ = 0; @@ -16897,18 +16944,18 @@ static Rating photo_real_get_rating (MediaSource* base) { _tmp2_ = _tmp1_->rating; #line 2172 "/home/jens/Source/shotwell/src/Photo.vala" result = _tmp2_; -#line 16899 "Photo.c" +#line 16946 "Photo.c" { PhotoRow* _tmp3_ = NULL; #line 2171 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = self->row; #line 2171 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 16906 "Photo.c" +#line 16953 "Photo.c" } #line 2172 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 16910 "Photo.c" +#line 16957 "Photo.c" } __finally334: { @@ -16917,7 +16964,7 @@ static Rating photo_real_get_rating (MediaSource* base) { _tmp4_ = self->row; #line 2171 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 16919 "Photo.c" +#line 16966 "Photo.c" } #line 2171 "/home/jens/Source/shotwell/src/Photo.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); @@ -16925,7 +16972,7 @@ static Rating photo_real_get_rating (MediaSource* base) { g_clear_error (&_inner_error_); #line 2171 "/home/jens/Source/shotwell/src/Photo.vala" return 0; -#line 16927 "Photo.c" +#line 16974 "Photo.c" } } @@ -16939,14 +16986,14 @@ static void photo_real_set_rating (MediaSource* base, Rating rating) { self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PHOTO, Photo); #line 2177 "/home/jens/Source/shotwell/src/Photo.vala" committed = FALSE; -#line 16941 "Photo.c" +#line 16988 "Photo.c" { PhotoRow* _tmp0_ = NULL; #line 2179 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = self->row; #line 2179 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_row); -#line 16948 "Photo.c" +#line 16995 "Photo.c" { gboolean _tmp1_ = FALSE; Rating _tmp2_ = 0; @@ -16960,7 +17007,7 @@ static void photo_real_set_rating (MediaSource* base, Rating rating) { _tmp4_ = _tmp3_->rating; #line 2180 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp2_ != _tmp4_) { -#line 16962 "Photo.c" +#line 17009 "Photo.c" Rating _tmp5_ = 0; gboolean _tmp6_ = FALSE; #line 2180 "/home/jens/Source/shotwell/src/Photo.vala" @@ -16969,15 +17016,15 @@ static void photo_real_set_rating (MediaSource* base, Rating rating) { _tmp6_ = rating_is_valid (_tmp5_); #line 2180 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = _tmp6_; -#line 16971 "Photo.c" +#line 17018 "Photo.c" } else { #line 2180 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = FALSE; -#line 16975 "Photo.c" +#line 17022 "Photo.c" } #line 2180 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp1_) { -#line 16979 "Photo.c" +#line 17026 "Photo.c" PhotoTable* _tmp7_ = NULL; PhotoTable* _tmp8_ = NULL; PhotoID _tmp9_ = {0}; @@ -17002,7 +17049,7 @@ static void photo_real_set_rating (MediaSource* base, Rating rating) { _tmp12_ = committed; #line 2182 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp12_) { -#line 17004 "Photo.c" +#line 17051 "Photo.c" PhotoRow* _tmp13_ = NULL; Rating _tmp14_ = 0; #line 2183 "/home/jens/Source/shotwell/src/Photo.vala" @@ -17011,7 +17058,7 @@ static void photo_real_set_rating (MediaSource* base, Rating rating) { _tmp14_ = rating; #line 2183 "/home/jens/Source/shotwell/src/Photo.vala" _tmp13_->rating = _tmp14_; -#line 17013 "Photo.c" +#line 17060 "Photo.c" } } } @@ -17022,7 +17069,7 @@ static void photo_real_set_rating (MediaSource* base, Rating rating) { _tmp15_ = self->row; #line 2179 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 17024 "Photo.c" +#line 17071 "Photo.c" } #line 2179 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { @@ -17032,14 +17079,14 @@ static void photo_real_set_rating (MediaSource* base, Rating rating) { g_clear_error (&_inner_error_); #line 2179 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 17034 "Photo.c" +#line 17081 "Photo.c" } } #line 2187 "/home/jens/Source/shotwell/src/Photo.vala" _tmp16_ = committed; #line 2187 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp16_) { -#line 17041 "Photo.c" +#line 17088 "Photo.c" Alteration* _tmp17_ = NULL; Alteration* _tmp18_ = NULL; #line 2188 "/home/jens/Source/shotwell/src/Photo.vala" @@ -17050,7 +17097,7 @@ static void photo_real_set_rating (MediaSource* base, Rating rating) { data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp18_); #line 2188 "/home/jens/Source/shotwell/src/Photo.vala" _alteration_unref0 (_tmp18_); -#line 17052 "Photo.c" +#line 17099 "Photo.c" } } @@ -17060,14 +17107,14 @@ static void photo_real_increase_rating (MediaSource* base) { GError * _inner_error_ = NULL; #line 2191 "/home/jens/Source/shotwell/src/Photo.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PHOTO, Photo); -#line 17062 "Photo.c" +#line 17109 "Photo.c" { PhotoRow* _tmp0_ = NULL; #line 2192 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = self->row; #line 2192 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_row); -#line 17069 "Photo.c" +#line 17116 "Photo.c" { PhotoRow* _tmp1_ = NULL; Rating _tmp2_ = 0; @@ -17080,7 +17127,7 @@ static void photo_real_increase_rating (MediaSource* base) { _tmp3_ = rating_increase (_tmp2_); #line 2193 "/home/jens/Source/shotwell/src/Photo.vala" media_source_set_rating (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource), _tmp3_); -#line 17082 "Photo.c" +#line 17129 "Photo.c" } __finally336: { @@ -17089,7 +17136,7 @@ static void photo_real_increase_rating (MediaSource* base) { _tmp4_ = self->row; #line 2192 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 17091 "Photo.c" +#line 17138 "Photo.c" } #line 2192 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { @@ -17099,7 +17146,7 @@ static void photo_real_increase_rating (MediaSource* base) { g_clear_error (&_inner_error_); #line 2192 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 17101 "Photo.c" +#line 17148 "Photo.c" } } } @@ -17110,14 +17157,14 @@ static void photo_real_decrease_rating (MediaSource* base) { GError * _inner_error_ = NULL; #line 2197 "/home/jens/Source/shotwell/src/Photo.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PHOTO, Photo); -#line 17112 "Photo.c" +#line 17159 "Photo.c" { PhotoRow* _tmp0_ = NULL; #line 2198 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = self->row; #line 2198 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_row); -#line 17119 "Photo.c" +#line 17166 "Photo.c" { PhotoRow* _tmp1_ = NULL; Rating _tmp2_ = 0; @@ -17130,7 +17177,7 @@ static void photo_real_decrease_rating (MediaSource* base) { _tmp3_ = rating_decrease (_tmp2_); #line 2199 "/home/jens/Source/shotwell/src/Photo.vala" media_source_set_rating (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource), _tmp3_); -#line 17132 "Photo.c" +#line 17179 "Photo.c" } __finally337: { @@ -17139,7 +17186,7 @@ static void photo_real_decrease_rating (MediaSource* base) { _tmp4_ = self->row; #line 2198 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 17141 "Photo.c" +#line 17188 "Photo.c" } #line 2198 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { @@ -17149,7 +17196,7 @@ static void photo_real_decrease_rating (MediaSource* base) { g_clear_error (&_inner_error_); #line 2198 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 17151 "Photo.c" +#line 17198 "Photo.c" } } } @@ -17162,7 +17209,7 @@ static void photo_real_commit_backlinks (DataSource* base, SourceCollection* sou self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PHOTO, Photo); #line 2203 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail ((sources == NULL) || IS_SOURCE_COLLECTION (sources)); -#line 17164 "Photo.c" +#line 17211 "Photo.c" { PhotoTable* _tmp0_ = NULL; PhotoTable* _tmp1_ = NULL; @@ -17184,7 +17231,7 @@ static void photo_real_commit_backlinks (DataSource* base, SourceCollection* sou if (G_UNLIKELY (_inner_error_ != NULL)) { #line 2208 "/home/jens/Source/shotwell/src/Photo.vala" if (_inner_error_->domain == DATABASE_ERROR) { -#line 17186 "Photo.c" +#line 17233 "Photo.c" goto __catch338_database_error; } #line 2208 "/home/jens/Source/shotwell/src/Photo.vala" @@ -17193,7 +17240,7 @@ static void photo_real_commit_backlinks (DataSource* base, SourceCollection* sou g_clear_error (&_inner_error_); #line 2208 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 17195 "Photo.c" +#line 17242 "Photo.c" } { PhotoRow* _tmp4_ = NULL; @@ -17201,7 +17248,7 @@ static void photo_real_commit_backlinks (DataSource* base, SourceCollection* sou _tmp4_ = self->row; #line 2209 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_row); -#line 17203 "Photo.c" +#line 17250 "Photo.c" { PhotoRow* _tmp5_ = NULL; const gchar* _tmp6_ = NULL; @@ -17216,7 +17263,7 @@ static void photo_real_commit_backlinks (DataSource* base, SourceCollection* sou _g_free0 (_tmp5_->backlinks); #line 2210 "/home/jens/Source/shotwell/src/Photo.vala" _tmp5_->backlinks = _tmp7_; -#line 17218 "Photo.c" +#line 17265 "Photo.c" } __finally339: { @@ -17225,13 +17272,13 @@ static void photo_real_commit_backlinks (DataSource* base, SourceCollection* sou _tmp8_ = self->row; #line 2209 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 17227 "Photo.c" +#line 17274 "Photo.c" } #line 2209 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 2209 "/home/jens/Source/shotwell/src/Photo.vala" if (_inner_error_->domain == DATABASE_ERROR) { -#line 17233 "Photo.c" +#line 17280 "Photo.c" goto __catch338_database_error; } #line 2209 "/home/jens/Source/shotwell/src/Photo.vala" @@ -17240,7 +17287,7 @@ static void photo_real_commit_backlinks (DataSource* base, SourceCollection* sou g_clear_error (&_inner_error_); #line 2209 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 17242 "Photo.c" +#line 17289 "Photo.c" } } } @@ -17270,7 +17317,7 @@ static void photo_real_commit_backlinks (DataSource* base, SourceCollection* sou _g_free0 (_tmp10_); #line 2207 "/home/jens/Source/shotwell/src/Photo.vala" _g_error_free0 (err); -#line 17272 "Photo.c" +#line 17319 "Photo.c" } __finally338: #line 2207 "/home/jens/Source/shotwell/src/Photo.vala" @@ -17281,7 +17328,7 @@ static void photo_real_commit_backlinks (DataSource* base, SourceCollection* sou g_clear_error (&_inner_error_); #line 2207 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 17283 "Photo.c" +#line 17330 "Photo.c" } } @@ -17294,14 +17341,15 @@ static gboolean photo_real_set_event_id (MediaSource* base, EventID* event_id) { self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PHOTO, Photo); #line 2221 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (event_id != NULL, FALSE); -#line 17296 "Photo.c" +#line 17343 "Photo.c" { PhotoRow* _tmp0_ = NULL; + gboolean _tmp13_ = FALSE; #line 2222 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = self->row; #line 2222 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_row); -#line 17303 "Photo.c" +#line 17351 "Photo.c" { gboolean committed = FALSE; PhotoTable* _tmp1_ = NULL; @@ -17334,7 +17382,7 @@ static gboolean photo_real_set_event_id (MediaSource* base, EventID* event_id) { _tmp8_ = committed; #line 2225 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp8_) { -#line 17336 "Photo.c" +#line 17384 "Photo.c" PhotoRow* _tmp9_ = NULL; EventID _tmp10_ = {0}; #line 2226 "/home/jens/Source/shotwell/src/Photo.vala" @@ -17343,22 +17391,22 @@ static gboolean photo_real_set_event_id (MediaSource* base, EventID* event_id) { _tmp10_ = *event_id; #line 2226 "/home/jens/Source/shotwell/src/Photo.vala" _tmp9_->event_id = _tmp10_; -#line 17345 "Photo.c" +#line 17393 "Photo.c" } #line 2228 "/home/jens/Source/shotwell/src/Photo.vala" result = committed; -#line 17349 "Photo.c" +#line 17397 "Photo.c" { PhotoRow* _tmp11_ = NULL; #line 2222 "/home/jens/Source/shotwell/src/Photo.vala" _tmp11_ = self->row; #line 2222 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 17356 "Photo.c" +#line 17404 "Photo.c" } #line 2228 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 17360 "Photo.c" +#line 17408 "Photo.c" } __finally340: { @@ -17367,15 +17415,15 @@ static gboolean photo_real_set_event_id (MediaSource* base, EventID* event_id) { _tmp12_ = self->row; #line 2222 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 17369 "Photo.c" +#line 17417 "Photo.c" } #line 2222 "/home/jens/Source/shotwell/src/Photo.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 2222 "/home/jens/Source/shotwell/src/Photo.vala" g_clear_error (&_inner_error_); #line 2222 "/home/jens/Source/shotwell/src/Photo.vala" - return FALSE; -#line 17377 "Photo.c" + return _tmp13_; +#line 17425 "Photo.c" } } @@ -17401,7 +17449,7 @@ static gchar* photo_real_to_string (DataObject* base) { _tmp1_ = photo_is_master_baseline (self); #line 2234 "/home/jens/Source/shotwell/src/Photo.vala" if (!_tmp1_) { -#line 17403 "Photo.c" +#line 17451 "Photo.c" GFile* _tmp2_ = NULL; GFile* _tmp3_ = NULL; gchar* _tmp4_ = NULL; @@ -17433,7 +17481,7 @@ static gchar* photo_real_to_string (DataObject* base) { _g_free0 (_tmp5_); #line 2234 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_tmp3_); -#line 17435 "Photo.c" +#line 17483 "Photo.c" } else { gchar* _tmp9_ = NULL; #line 2234 "/home/jens/Source/shotwell/src/Photo.vala" @@ -17442,7 +17490,7 @@ static gchar* photo_real_to_string (DataObject* base) { _g_free0 (_tmp0_); #line 2234 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = _tmp9_; -#line 17444 "Photo.c" +#line 17492 "Photo.c" } #line 2233 "/home/jens/Source/shotwell/src/Photo.vala" photo_get_photo_id (self, &_tmp10_); @@ -17476,7 +17524,7 @@ static gchar* photo_real_to_string (DataObject* base) { _g_free0 (_tmp0_); #line 2233 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 17478 "Photo.c" +#line 17526 "Photo.c" } @@ -17503,7 +17551,7 @@ static gboolean photo_real_equals (DataSource* base, DataSource* source) { _tmp2_ = photo; #line 2240 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp2_ != NULL) { -#line 17505 "Photo.c" +#line 17553 "Photo.c" PhotoID photo_id = {0}; PhotoID _tmp3_ = {0}; PhotoID other_photo_id = {0}; @@ -17525,7 +17573,7 @@ static gboolean photo_real_equals (DataSource* base, DataSource* source) { _tmp7_ = photo; #line 2244 "/home/jens/Source/shotwell/src/Photo.vala" if (self != _tmp7_) { -#line 17527 "Photo.c" +#line 17575 "Photo.c" PhotoID _tmp8_ = {0}; gint64 _tmp9_ = 0LL; #line 2244 "/home/jens/Source/shotwell/src/Photo.vala" @@ -17534,15 +17582,15 @@ static gboolean photo_real_equals (DataSource* base, DataSource* source) { _tmp9_ = _tmp8_.id; #line 2244 "/home/jens/Source/shotwell/src/Photo.vala" _tmp6_ = _tmp9_ != PHOTO_ID_INVALID; -#line 17536 "Photo.c" +#line 17584 "Photo.c" } else { #line 2244 "/home/jens/Source/shotwell/src/Photo.vala" _tmp6_ = FALSE; -#line 17540 "Photo.c" +#line 17588 "Photo.c" } #line 2244 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp6_) { -#line 17544 "Photo.c" +#line 17592 "Photo.c" PhotoID _tmp10_ = {0}; gint64 _tmp11_ = 0LL; PhotoID _tmp12_ = {0}; @@ -17557,7 +17605,7 @@ static gboolean photo_real_equals (DataSource* base, DataSource* source) { _tmp13_ = _tmp12_.id; #line 2245 "/home/jens/Source/shotwell/src/Photo.vala" _vala_assert (_tmp11_ != _tmp13_, "photo_id.id != other_photo_id.id"); -#line 17559 "Photo.c" +#line 17607 "Photo.c" } } #line 2249 "/home/jens/Source/shotwell/src/Photo.vala" @@ -17570,7 +17618,7 @@ static gboolean photo_real_equals (DataSource* base, DataSource* source) { _g_object_unref0 (photo); #line 2249 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 17572 "Photo.c" +#line 17620 "Photo.c" } @@ -17598,7 +17646,7 @@ static void photo_file_exif_updated (Photo* self) { file = _tmp0_; #line 2256 "/home/jens/Source/shotwell/src/Photo.vala" info = NULL; -#line 17600 "Photo.c" +#line 17648 "Photo.c" { GFileInfo* _tmp1_ = NULL; GFileInfo* _tmp2_ = NULL; @@ -17609,7 +17657,7 @@ static void photo_file_exif_updated (Photo* self) { _tmp1_ = _tmp2_; #line 2258 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 17611 "Photo.c" +#line 17659 "Photo.c" goto __catch341_g_error; } #line 2258 "/home/jens/Source/shotwell/src/Photo.vala" @@ -17622,7 +17670,7 @@ static void photo_file_exif_updated (Photo* self) { info = _tmp3_; #line 2257 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_tmp1_); -#line 17624 "Photo.c" +#line 17672 "Photo.c" } goto __finally341; __catch341_g_error: @@ -17647,7 +17695,7 @@ static void photo_file_exif_updated (Photo* self) { _g_free0 (_tmp5_); #line 2257 "/home/jens/Source/shotwell/src/Photo.vala" _g_error_free0 (err); -#line 17649 "Photo.c" +#line 17697 "Photo.c" } __finally341: #line 2257 "/home/jens/Source/shotwell/src/Photo.vala" @@ -17662,7 +17710,7 @@ static void photo_file_exif_updated (Photo* self) { g_clear_error (&_inner_error_); #line 2257 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 17664 "Photo.c" +#line 17712 "Photo.c" } #line 2264 "/home/jens/Source/shotwell/src/Photo.vala" _tmp7_ = info; @@ -17674,13 +17722,13 @@ static void photo_file_exif_updated (Photo* self) { _tmp9_ = photo_file_interrogator_new (file, PHOTO_FILE_SNIFFER_OPTIONS_GET_ALL); #line 2267 "/home/jens/Source/shotwell/src/Photo.vala" interrogator = _tmp9_; -#line 17676 "Photo.c" +#line 17724 "Photo.c" { #line 2269 "/home/jens/Source/shotwell/src/Photo.vala" photo_file_interrogator_interrogate (interrogator, &_inner_error_); #line 2269 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 17682 "Photo.c" +#line 17730 "Photo.c" goto __catch342_g_error; } } @@ -17710,7 +17758,7 @@ static void photo_file_exif_updated (Photo* self) { _g_free0 (_tmp11_); #line 2268 "/home/jens/Source/shotwell/src/Photo.vala" _g_error_free0 (err); -#line 17712 "Photo.c" +#line 17760 "Photo.c" } __finally342: #line 2268 "/home/jens/Source/shotwell/src/Photo.vala" @@ -17727,7 +17775,7 @@ static void photo_file_exif_updated (Photo* self) { g_clear_error (&_inner_error_); #line 2268 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 17729 "Photo.c" +#line 17777 "Photo.c" } #line 2274 "/home/jens/Source/shotwell/src/Photo.vala" _tmp14_ = photo_file_interrogator_get_detected_photo_information (interrogator); @@ -17739,18 +17787,18 @@ static void photo_file_exif_updated (Photo* self) { if (_tmp16_ == NULL) { #line 2275 "/home/jens/Source/shotwell/src/Photo.vala" _tmp15_ = TRUE; -#line 17741 "Photo.c" +#line 17789 "Photo.c" } else { gboolean _tmp17_ = FALSE; #line 2275 "/home/jens/Source/shotwell/src/Photo.vala" _tmp17_ = photo_file_interrogator_get_is_photo_corrupted (interrogator); #line 2275 "/home/jens/Source/shotwell/src/Photo.vala" _tmp15_ = _tmp17_; -#line 17748 "Photo.c" +#line 17796 "Photo.c" } #line 2275 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp15_) { -#line 17752 "Photo.c" +#line 17800 "Photo.c" gchar* _tmp18_ = NULL; gchar* _tmp19_ = NULL; #line 2276 "/home/jens/Source/shotwell/src/Photo.vala" @@ -17771,7 +17819,7 @@ static void photo_file_exif_updated (Photo* self) { _g_object_unref0 (file); #line 2278 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 17773 "Photo.c" +#line 17821 "Photo.c" } { PhotoRow* _tmp20_ = NULL; @@ -17779,7 +17827,7 @@ static void photo_file_exif_updated (Photo* self) { _tmp20_ = self->row; #line 2282 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_row); -#line 17781 "Photo.c" +#line 17829 "Photo.c" { PhotoTable* _tmp21_ = NULL; PhotoTable* _tmp22_ = NULL; @@ -17830,7 +17878,7 @@ static void photo_file_exif_updated (Photo* self) { success = _tmp35_; #line 2283 "/home/jens/Source/shotwell/src/Photo.vala" _database_table_unref0 (_tmp22_); -#line 17832 "Photo.c" +#line 17880 "Photo.c" } __finally343: { @@ -17839,7 +17887,7 @@ static void photo_file_exif_updated (Photo* self) { _tmp36_ = self->row; #line 2282 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 17841 "Photo.c" +#line 17889 "Photo.c" } #line 2282 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { @@ -17857,14 +17905,14 @@ static void photo_file_exif_updated (Photo* self) { g_clear_error (&_inner_error_); #line 2282 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 17859 "Photo.c" +#line 17907 "Photo.c" } } #line 2287 "/home/jens/Source/shotwell/src/Photo.vala" _tmp37_ = success; #line 2287 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp37_) { -#line 17866 "Photo.c" +#line 17914 "Photo.c" Alteration* _tmp38_ = NULL; Alteration* _tmp39_ = NULL; #line 2288 "/home/jens/Source/shotwell/src/Photo.vala" @@ -17875,7 +17923,7 @@ static void photo_file_exif_updated (Photo* self) { data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp39_); #line 2288 "/home/jens/Source/shotwell/src/Photo.vala" _alteration_unref0 (_tmp39_); -#line 17877 "Photo.c" +#line 17925 "Photo.c" } #line 2253 "/home/jens/Source/shotwell/src/Photo.vala" _detected_photo_information_unref0 (detected); @@ -17885,7 +17933,7 @@ static void photo_file_exif_updated (Photo* self) { _g_object_unref0 (info); #line 2253 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (file); -#line 17887 "Photo.c" +#line 17935 "Photo.c" } @@ -17895,14 +17943,15 @@ static guint64 photo_real_get_filesize (MediaSource* base) { GError * _inner_error_ = NULL; #line 2293 "/home/jens/Source/shotwell/src/Photo.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PHOTO, Photo); -#line 17897 "Photo.c" +#line 17945 "Photo.c" { PhotoRow* _tmp0_ = NULL; + guint64 _tmp5_ = 0ULL; #line 2294 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = self->row; #line 2294 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_row); -#line 17904 "Photo.c" +#line 17953 "Photo.c" { BackingPhotoRow* _tmp1_ = NULL; gint64 _tmp2_ = 0LL; @@ -17912,18 +17961,18 @@ static guint64 photo_real_get_filesize (MediaSource* base) { _tmp2_ = _tmp1_->filesize; #line 2295 "/home/jens/Source/shotwell/src/Photo.vala" result = (guint64) _tmp2_; -#line 17914 "Photo.c" +#line 17963 "Photo.c" { PhotoRow* _tmp3_ = NULL; #line 2294 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = self->row; #line 2294 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 17921 "Photo.c" +#line 17970 "Photo.c" } #line 2295 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 17925 "Photo.c" +#line 17974 "Photo.c" } __finally344: { @@ -17932,15 +17981,15 @@ static guint64 photo_real_get_filesize (MediaSource* base) { _tmp4_ = self->row; #line 2294 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 17934 "Photo.c" +#line 17983 "Photo.c" } #line 2294 "/home/jens/Source/shotwell/src/Photo.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 2294 "/home/jens/Source/shotwell/src/Photo.vala" g_clear_error (&_inner_error_); #line 2294 "/home/jens/Source/shotwell/src/Photo.vala" - return 0ULL; -#line 17942 "Photo.c" + return _tmp5_; +#line 17991 "Photo.c" } } @@ -17951,14 +18000,15 @@ static guint64 photo_real_get_master_filesize (MediaSource* base) { GError * _inner_error_ = NULL; #line 2299 "/home/jens/Source/shotwell/src/Photo.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PHOTO, Photo); -#line 17953 "Photo.c" +#line 18002 "Photo.c" { PhotoRow* _tmp0_ = NULL; + guint64 _tmp6_ = 0ULL; #line 2300 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = self->row; #line 2300 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_row); -#line 17960 "Photo.c" +#line 18010 "Photo.c" { PhotoRow* _tmp1_ = NULL; BackingPhotoRow* _tmp2_ = NULL; @@ -17971,18 +18021,18 @@ static guint64 photo_real_get_master_filesize (MediaSource* base) { _tmp3_ = _tmp2_->filesize; #line 2301 "/home/jens/Source/shotwell/src/Photo.vala" result = (guint64) _tmp3_; -#line 17973 "Photo.c" +#line 18023 "Photo.c" { PhotoRow* _tmp4_ = NULL; #line 2300 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = self->row; #line 2300 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 17980 "Photo.c" +#line 18030 "Photo.c" } #line 2301 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 17984 "Photo.c" +#line 18034 "Photo.c" } __finally345: { @@ -17991,15 +18041,15 @@ static guint64 photo_real_get_master_filesize (MediaSource* base) { _tmp5_ = self->row; #line 2300 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 17993 "Photo.c" +#line 18043 "Photo.c" } #line 2300 "/home/jens/Source/shotwell/src/Photo.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 2300 "/home/jens/Source/shotwell/src/Photo.vala" g_clear_error (&_inner_error_); #line 2300 "/home/jens/Source/shotwell/src/Photo.vala" - return 0ULL; -#line 18001 "Photo.c" + return _tmp6_; +#line 18051 "Photo.c" } } @@ -18009,14 +18059,15 @@ guint64 photo_get_editable_filesize (Photo* self) { GError * _inner_error_ = NULL; #line 2305 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_PHOTO (self), 0ULL); -#line 18011 "Photo.c" +#line 18061 "Photo.c" { PhotoRow* _tmp0_ = NULL; + guint64 _tmp5_ = 0ULL; #line 2306 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = self->row; #line 2306 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_row); -#line 18018 "Photo.c" +#line 18069 "Photo.c" { BackingPhotoRow* _tmp1_ = NULL; gint64 _tmp2_ = 0LL; @@ -18026,18 +18077,18 @@ guint64 photo_get_editable_filesize (Photo* self) { _tmp2_ = _tmp1_->filesize; #line 2307 "/home/jens/Source/shotwell/src/Photo.vala" result = (guint64) _tmp2_; -#line 18028 "Photo.c" +#line 18079 "Photo.c" { PhotoRow* _tmp3_ = NULL; #line 2306 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = self->row; #line 2306 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 18035 "Photo.c" +#line 18086 "Photo.c" } #line 2307 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 18039 "Photo.c" +#line 18090 "Photo.c" } __finally346: { @@ -18046,15 +18097,15 @@ guint64 photo_get_editable_filesize (Photo* self) { _tmp4_ = self->row; #line 2306 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 18048 "Photo.c" +#line 18099 "Photo.c" } #line 2306 "/home/jens/Source/shotwell/src/Photo.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 2306 "/home/jens/Source/shotwell/src/Photo.vala" g_clear_error (&_inner_error_); #line 2306 "/home/jens/Source/shotwell/src/Photo.vala" - return 0ULL; -#line 18056 "Photo.c" + return _tmp5_; +#line 18107 "Photo.c" } } @@ -18071,7 +18122,7 @@ static time_t photo_real_get_exposure_time (Dateable* base) { result = _tmp0_; #line 2312 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 18073 "Photo.c" +#line 18124 "Photo.c" } @@ -18081,14 +18132,14 @@ static gchar* photo_real_get_basename (MediaSource* base) { GError * _inner_error_ = NULL; #line 2315 "/home/jens/Source/shotwell/src/Photo.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PHOTO, Photo); -#line 18083 "Photo.c" +#line 18134 "Photo.c" { PhotoRow* _tmp0_ = NULL; #line 2316 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = self->row; #line 2316 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_row); -#line 18090 "Photo.c" +#line 18141 "Photo.c" { const gchar* _tmp1_ = NULL; gchar* _tmp2_ = NULL; @@ -18098,18 +18149,18 @@ static gchar* photo_real_get_basename (MediaSource* base) { _tmp2_ = g_strdup (_tmp1_); #line 2317 "/home/jens/Source/shotwell/src/Photo.vala" result = _tmp2_; -#line 18100 "Photo.c" +#line 18151 "Photo.c" { PhotoRow* _tmp3_ = NULL; #line 2316 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = self->row; #line 2316 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 18107 "Photo.c" +#line 18158 "Photo.c" } #line 2317 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 18111 "Photo.c" +#line 18162 "Photo.c" } __finally347: { @@ -18118,7 +18169,7 @@ static gchar* photo_real_get_basename (MediaSource* base) { _tmp4_ = self->row; #line 2316 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 18120 "Photo.c" +#line 18171 "Photo.c" } #line 2316 "/home/jens/Source/shotwell/src/Photo.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); @@ -18126,7 +18177,7 @@ static gchar* photo_real_get_basename (MediaSource* base) { g_clear_error (&_inner_error_); #line 2316 "/home/jens/Source/shotwell/src/Photo.vala" return NULL; -#line 18128 "Photo.c" +#line 18179 "Photo.c" } } @@ -18137,14 +18188,14 @@ static gchar* photo_real_get_title (MediaSource* base) { GError * _inner_error_ = NULL; #line 2321 "/home/jens/Source/shotwell/src/Photo.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PHOTO, Photo); -#line 18139 "Photo.c" +#line 18190 "Photo.c" { PhotoRow* _tmp0_ = NULL; #line 2322 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = self->row; #line 2322 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_row); -#line 18146 "Photo.c" +#line 18197 "Photo.c" { PhotoRow* _tmp1_ = NULL; const gchar* _tmp2_ = NULL; @@ -18157,18 +18208,18 @@ static gchar* photo_real_get_title (MediaSource* base) { _tmp3_ = g_strdup (_tmp2_); #line 2323 "/home/jens/Source/shotwell/src/Photo.vala" result = _tmp3_; -#line 18159 "Photo.c" +#line 18210 "Photo.c" { PhotoRow* _tmp4_ = NULL; #line 2322 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = self->row; #line 2322 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 18166 "Photo.c" +#line 18217 "Photo.c" } #line 2323 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 18170 "Photo.c" +#line 18221 "Photo.c" } __finally348: { @@ -18177,7 +18228,7 @@ static gchar* photo_real_get_title (MediaSource* base) { _tmp5_ = self->row; #line 2322 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 18179 "Photo.c" +#line 18230 "Photo.c" } #line 2322 "/home/jens/Source/shotwell/src/Photo.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); @@ -18185,7 +18236,7 @@ static gchar* photo_real_get_title (MediaSource* base) { g_clear_error (&_inner_error_); #line 2322 "/home/jens/Source/shotwell/src/Photo.vala" return NULL; -#line 18187 "Photo.c" +#line 18238 "Photo.c" } } @@ -18196,14 +18247,14 @@ static gchar* photo_real_get_comment (MediaSource* base) { GError * _inner_error_ = NULL; #line 2327 "/home/jens/Source/shotwell/src/Photo.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PHOTO, Photo); -#line 18198 "Photo.c" +#line 18249 "Photo.c" { PhotoRow* _tmp0_ = NULL; #line 2328 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = self->row; #line 2328 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_row); -#line 18205 "Photo.c" +#line 18256 "Photo.c" { PhotoRow* _tmp1_ = NULL; const gchar* _tmp2_ = NULL; @@ -18216,18 +18267,18 @@ static gchar* photo_real_get_comment (MediaSource* base) { _tmp3_ = g_strdup (_tmp2_); #line 2329 "/home/jens/Source/shotwell/src/Photo.vala" result = _tmp3_; -#line 18218 "Photo.c" +#line 18269 "Photo.c" { PhotoRow* _tmp4_ = NULL; #line 2328 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = self->row; #line 2328 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 18225 "Photo.c" +#line 18276 "Photo.c" } #line 2329 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 18229 "Photo.c" +#line 18280 "Photo.c" } __finally349: { @@ -18236,7 +18287,7 @@ static gchar* photo_real_get_comment (MediaSource* base) { _tmp5_ = self->row; #line 2328 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 18238 "Photo.c" +#line 18289 "Photo.c" } #line 2328 "/home/jens/Source/shotwell/src/Photo.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); @@ -18244,7 +18295,7 @@ static gchar* photo_real_get_comment (MediaSource* base) { g_clear_error (&_inner_error_); #line 2328 "/home/jens/Source/shotwell/src/Photo.vala" return NULL; -#line 18246 "Photo.c" +#line 18297 "Photo.c" } } @@ -18267,14 +18318,14 @@ static void photo_real_set_title (MediaSource* base, const gchar* title) { new_title = _tmp1_; #line 2336 "/home/jens/Source/shotwell/src/Photo.vala" committed = FALSE; -#line 18269 "Photo.c" +#line 18320 "Photo.c" { PhotoRow* _tmp2_ = NULL; #line 2337 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = self->row; #line 2337 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_row); -#line 18276 "Photo.c" +#line 18327 "Photo.c" { const gchar* _tmp3_ = NULL; PhotoRow* _tmp4_ = NULL; @@ -18294,20 +18345,20 @@ static void photo_real_set_title (MediaSource* base, const gchar* title) { _tmp5_ = _tmp4_->title; #line 2338 "/home/jens/Source/shotwell/src/Photo.vala" if (g_strcmp0 (_tmp3_, _tmp5_) == 0) { -#line 18296 "Photo.c" +#line 18347 "Photo.c" { PhotoRow* _tmp6_ = NULL; #line 2337 "/home/jens/Source/shotwell/src/Photo.vala" _tmp6_ = self->row; #line 2337 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 18303 "Photo.c" +#line 18354 "Photo.c" } #line 2339 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (new_title); #line 2339 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 18309 "Photo.c" +#line 18360 "Photo.c" } #line 2341 "/home/jens/Source/shotwell/src/Photo.vala" _tmp7_ = photo_table_get_instance (); @@ -18329,7 +18380,7 @@ static void photo_real_set_title (MediaSource* base, const gchar* title) { _tmp13_ = committed; #line 2342 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp13_) { -#line 18331 "Photo.c" +#line 18382 "Photo.c" PhotoRow* _tmp14_ = NULL; const gchar* _tmp15_ = NULL; gchar* _tmp16_ = NULL; @@ -18343,7 +18394,7 @@ static void photo_real_set_title (MediaSource* base, const gchar* title) { _g_free0 (_tmp14_->title); #line 2343 "/home/jens/Source/shotwell/src/Photo.vala" _tmp14_->title = _tmp16_; -#line 18345 "Photo.c" +#line 18396 "Photo.c" } } __finally350: @@ -18353,7 +18404,7 @@ static void photo_real_set_title (MediaSource* base, const gchar* title) { _tmp17_ = self->row; #line 2337 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 18355 "Photo.c" +#line 18406 "Photo.c" } #line 2337 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { @@ -18365,14 +18416,14 @@ static void photo_real_set_title (MediaSource* base, const gchar* title) { g_clear_error (&_inner_error_); #line 2337 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 18367 "Photo.c" +#line 18418 "Photo.c" } } #line 2346 "/home/jens/Source/shotwell/src/Photo.vala" _tmp18_ = committed; #line 2346 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp18_) { -#line 18374 "Photo.c" +#line 18425 "Photo.c" Alteration* _tmp19_ = NULL; Alteration* _tmp20_ = NULL; #line 2347 "/home/jens/Source/shotwell/src/Photo.vala" @@ -18383,11 +18434,11 @@ static void photo_real_set_title (MediaSource* base, const gchar* title) { data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp20_); #line 2347 "/home/jens/Source/shotwell/src/Photo.vala" _alteration_unref0 (_tmp20_); -#line 18385 "Photo.c" +#line 18436 "Photo.c" } #line 2333 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (new_title); -#line 18389 "Photo.c" +#line 18440 "Photo.c" } @@ -18398,7 +18449,7 @@ static gboolean photo_real_set_comment (MediaSource* base, const gchar* comment) const gchar* _tmp0_ = NULL; gchar* _tmp1_ = NULL; gboolean committed = FALSE; - gboolean _tmp18_ = FALSE; + gboolean _tmp19_ = FALSE; GError * _inner_error_ = NULL; #line 2350 "/home/jens/Source/shotwell/src/Photo.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PHOTO, Photo); @@ -18410,14 +18461,14 @@ static gboolean photo_real_set_comment (MediaSource* base, const gchar* comment) new_comment = _tmp1_; #line 2353 "/home/jens/Source/shotwell/src/Photo.vala" committed = FALSE; -#line 18412 "Photo.c" +#line 18463 "Photo.c" { PhotoRow* _tmp2_ = NULL; #line 2354 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = self->row; #line 2354 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_row); -#line 18419 "Photo.c" +#line 18470 "Photo.c" { const gchar* _tmp3_ = NULL; PhotoRow* _tmp4_ = NULL; @@ -18439,20 +18490,20 @@ static gboolean photo_real_set_comment (MediaSource* base, const gchar* comment) if (g_strcmp0 (_tmp3_, _tmp5_) == 0) { #line 2356 "/home/jens/Source/shotwell/src/Photo.vala" result = TRUE; -#line 18441 "Photo.c" +#line 18492 "Photo.c" { PhotoRow* _tmp6_ = NULL; #line 2354 "/home/jens/Source/shotwell/src/Photo.vala" _tmp6_ = self->row; #line 2354 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 18448 "Photo.c" +#line 18499 "Photo.c" } #line 2356 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (new_comment); #line 2356 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 18454 "Photo.c" +#line 18505 "Photo.c" } #line 2358 "/home/jens/Source/shotwell/src/Photo.vala" _tmp7_ = photo_table_get_instance (); @@ -18474,7 +18525,7 @@ static gboolean photo_real_set_comment (MediaSource* base, const gchar* comment) _tmp13_ = committed; #line 2359 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp13_) { -#line 18476 "Photo.c" +#line 18527 "Photo.c" PhotoRow* _tmp14_ = NULL; const gchar* _tmp15_ = NULL; gchar* _tmp16_ = NULL; @@ -18488,7 +18539,7 @@ static gboolean photo_real_set_comment (MediaSource* base, const gchar* comment) _g_free0 (_tmp14_->comment); #line 2360 "/home/jens/Source/shotwell/src/Photo.vala" _tmp14_->comment = _tmp16_; -#line 18490 "Photo.c" +#line 18541 "Photo.c" } } __finally351: @@ -18498,10 +18549,12 @@ static gboolean photo_real_set_comment (MediaSource* base, const gchar* comment) _tmp17_ = self->row; #line 2354 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 18500 "Photo.c" +#line 18551 "Photo.c" } #line 2354 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { +#line 18555 "Photo.c" + gboolean _tmp18_ = FALSE; #line 2354 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (new_comment); #line 2354 "/home/jens/Source/shotwell/src/Photo.vala" @@ -18509,26 +18562,26 @@ static gboolean photo_real_set_comment (MediaSource* base, const gchar* comment) #line 2354 "/home/jens/Source/shotwell/src/Photo.vala" g_clear_error (&_inner_error_); #line 2354 "/home/jens/Source/shotwell/src/Photo.vala" - return FALSE; -#line 18512 "Photo.c" + return _tmp18_; +#line 18565 "Photo.c" } } #line 2363 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp18_ = committed; + _tmp19_ = committed; #line 2363 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp18_) { -#line 18519 "Photo.c" - Alteration* _tmp19_ = NULL; + if (_tmp19_) { +#line 18572 "Photo.c" Alteration* _tmp20_ = NULL; + Alteration* _tmp21_ = NULL; #line 2364 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp19_ = alteration_new ("metadata", "comment"); + _tmp20_ = alteration_new ("metadata", "comment"); #line 2364 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp20_ = _tmp19_; + _tmp21_ = _tmp20_; #line 2364 "/home/jens/Source/shotwell/src/Photo.vala" - data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp20_); + data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp21_); #line 2364 "/home/jens/Source/shotwell/src/Photo.vala" - _alteration_unref0 (_tmp20_); -#line 18530 "Photo.c" + _alteration_unref0 (_tmp21_); +#line 18583 "Photo.c" } #line 2366 "/home/jens/Source/shotwell/src/Photo.vala" result = committed; @@ -18536,14 +18589,14 @@ static gboolean photo_real_set_comment (MediaSource* base, const gchar* comment) _g_free0 (new_comment); #line 2366 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 18538 "Photo.c" +#line 18591 "Photo.c" } static gpointer _g_error_copy0 (gpointer self) { #line 2376 "/home/jens/Source/shotwell/src/Photo.vala" return self ? g_error_copy (self) : NULL; -#line 18545 "Photo.c" +#line 18598 "Photo.c" } @@ -18557,14 +18610,14 @@ void photo_set_import_id (Photo* self, ImportID* import_id) { g_return_if_fail (import_id != NULL); #line 2370 "/home/jens/Source/shotwell/src/Photo.vala" dberr = NULL; -#line 18559 "Photo.c" +#line 18612 "Photo.c" { PhotoRow* _tmp0_ = NULL; #line 2371 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = self->row; #line 2371 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_row); -#line 18566 "Photo.c" +#line 18619 "Photo.c" { { PhotoTable* _tmp1_ = NULL; @@ -18592,7 +18645,7 @@ void photo_set_import_id (Photo* self, ImportID* import_id) { if (G_UNLIKELY (_inner_error_ != NULL)) { #line 2373 "/home/jens/Source/shotwell/src/Photo.vala" if (_inner_error_->domain == DATABASE_ERROR) { -#line 18594 "Photo.c" +#line 18647 "Photo.c" goto __catch353_database_error; } { @@ -18601,7 +18654,7 @@ void photo_set_import_id (Photo* self, ImportID* import_id) { _tmp6_ = self->row; #line 2371 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 18603 "Photo.c" +#line 18656 "Photo.c" } #line 2373 "/home/jens/Source/shotwell/src/Photo.vala" _g_error_free0 (dberr); @@ -18611,7 +18664,7 @@ void photo_set_import_id (Photo* self, ImportID* import_id) { g_clear_error (&_inner_error_); #line 2373 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 18613 "Photo.c" +#line 18666 "Photo.c" } #line 2374 "/home/jens/Source/shotwell/src/Photo.vala" _tmp7_ = self->row; @@ -18619,7 +18672,7 @@ void photo_set_import_id (Photo* self, ImportID* import_id) { _tmp8_ = *import_id; #line 2374 "/home/jens/Source/shotwell/src/Photo.vala" _tmp7_->import_id = _tmp8_; -#line 18621 "Photo.c" +#line 18674 "Photo.c" } goto __finally353; __catch353_database_error: @@ -18641,19 +18694,19 @@ void photo_set_import_id (Photo* self, ImportID* import_id) { dberr = _tmp10_; #line 2372 "/home/jens/Source/shotwell/src/Photo.vala" _g_error_free0 (err); -#line 18643 "Photo.c" +#line 18696 "Photo.c" } __finally353: #line 2372 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 18648 "Photo.c" +#line 18701 "Photo.c" { PhotoRow* _tmp11_ = NULL; #line 2371 "/home/jens/Source/shotwell/src/Photo.vala" _tmp11_ = self->row; #line 2371 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 18655 "Photo.c" +#line 18708 "Photo.c" } #line 2372 "/home/jens/Source/shotwell/src/Photo.vala" _g_error_free0 (dberr); @@ -18663,7 +18716,7 @@ void photo_set_import_id (Photo* self, ImportID* import_id) { g_clear_error (&_inner_error_); #line 2372 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 18665 "Photo.c" +#line 18718 "Photo.c" } } __finally352: @@ -18673,7 +18726,7 @@ void photo_set_import_id (Photo* self, ImportID* import_id) { _tmp12_ = self->row; #line 2371 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 18675 "Photo.c" +#line 18728 "Photo.c" } #line 2371 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { @@ -18685,14 +18738,14 @@ void photo_set_import_id (Photo* self, ImportID* import_id) { g_clear_error (&_inner_error_); #line 2371 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 18687 "Photo.c" +#line 18740 "Photo.c" } } #line 2380 "/home/jens/Source/shotwell/src/Photo.vala" _tmp13_ = dberr; #line 2380 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp13_ == NULL) { -#line 18694 "Photo.c" +#line 18747 "Photo.c" Alteration* _tmp14_ = NULL; Alteration* _tmp15_ = NULL; #line 2381 "/home/jens/Source/shotwell/src/Photo.vala" @@ -18703,7 +18756,7 @@ void photo_set_import_id (Photo* self, ImportID* import_id) { data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp15_); #line 2381 "/home/jens/Source/shotwell/src/Photo.vala" _alteration_unref0 (_tmp15_); -#line 18705 "Photo.c" +#line 18758 "Photo.c" } else { gchar* _tmp16_ = NULL; gchar* _tmp17_ = NULL; @@ -18721,11 +18774,11 @@ void photo_set_import_id (Photo* self, ImportID* import_id) { g_warning ("Photo.vala:2383: Unable to write import ID for %s: %s", _tmp17_, _tmp19_); #line 2383 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (_tmp17_); -#line 18723 "Photo.c" +#line 18776 "Photo.c" } #line 2369 "/home/jens/Source/shotwell/src/Photo.vala" _g_error_free0 (dberr); -#line 18727 "Photo.c" +#line 18780 "Photo.c" } @@ -18762,7 +18815,7 @@ void photo_set_title_persistent (Photo* self, const gchar* title, GError** error _tmp3_ = photo_file_format_can_write_metadata (_tmp2_); #line 2390 "/home/jens/Source/shotwell/src/Photo.vala" if (!_tmp3_) { -#line 18764 "Photo.c" +#line 18817 "Photo.c" PhotoFileReader* _tmp4_ = NULL; gchar* _tmp5_ = NULL; gchar* _tmp6_ = NULL; @@ -18785,7 +18838,7 @@ void photo_set_title_persistent (Photo* self, const gchar* title, GError** error _photo_file_adapter_unref0 (source); #line 2395 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 18787 "Photo.c" +#line 18840 "Photo.c" } #line 2398 "/home/jens/Source/shotwell/src/Photo.vala" _tmp8_ = source; @@ -18801,7 +18854,7 @@ void photo_set_title_persistent (Photo* self, const gchar* title, GError** error _photo_file_adapter_unref0 (source); #line 2398 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 18803 "Photo.c" +#line 18856 "Photo.c" } #line 2399 "/home/jens/Source/shotwell/src/Photo.vala" _tmp10_ = metadata; @@ -18825,7 +18878,7 @@ void photo_set_title_persistent (Photo* self, const gchar* title, GError** error _photo_file_adapter_unref0 (source); #line 2401 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 18827 "Photo.c" +#line 18880 "Photo.c" } #line 2402 "/home/jens/Source/shotwell/src/Photo.vala" _tmp14_ = source; @@ -18837,7 +18890,7 @@ void photo_set_title_persistent (Photo* self, const gchar* title, GError** error library_monitor_blacklist_file (_tmp16_, "Photo.set_persistent_title"); #line 2402 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_tmp16_); -#line 18839 "Photo.c" +#line 18892 "Photo.c" { PhotoFileMetadataWriter* _tmp17_ = NULL; PhotoMetadata* _tmp18_ = NULL; @@ -18849,7 +18902,7 @@ void photo_set_title_persistent (Photo* self, const gchar* title, GError** error photo_file_metadata_writer_write_metadata (_tmp17_, _tmp18_, &_inner_error_); #line 2404 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 18851 "Photo.c" +#line 18904 "Photo.c" goto __finally354; } } @@ -18868,7 +18921,7 @@ void photo_set_title_persistent (Photo* self, const gchar* title, GError** error library_monitor_unblacklist_file (_tmp21_); #line 2406 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_tmp21_); -#line 18870 "Photo.c" +#line 18923 "Photo.c" } #line 2403 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { @@ -18882,7 +18935,7 @@ void photo_set_title_persistent (Photo* self, const gchar* title, GError** error _photo_file_adapter_unref0 (source); #line 2403 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 18884 "Photo.c" +#line 18937 "Photo.c" } #line 2409 "/home/jens/Source/shotwell/src/Photo.vala" _tmp22_ = title; @@ -18896,7 +18949,7 @@ void photo_set_title_persistent (Photo* self, const gchar* title, GError** error _media_metadata_unref0 (metadata); #line 2386 "/home/jens/Source/shotwell/src/Photo.vala" _photo_file_adapter_unref0 (source); -#line 18898 "Photo.c" +#line 18951 "Photo.c" } @@ -18933,7 +18986,7 @@ void photo_set_comment_persistent (Photo* self, const gchar* comment, GError** e _tmp3_ = photo_file_format_can_write_metadata (_tmp2_); #line 2418 "/home/jens/Source/shotwell/src/Photo.vala" if (!_tmp3_) { -#line 18935 "Photo.c" +#line 18988 "Photo.c" PhotoFileReader* _tmp4_ = NULL; gchar* _tmp5_ = NULL; gchar* _tmp6_ = NULL; @@ -18956,7 +19009,7 @@ void photo_set_comment_persistent (Photo* self, const gchar* comment, GError** e _photo_file_adapter_unref0 (source); #line 2423 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 18958 "Photo.c" +#line 19011 "Photo.c" } #line 2426 "/home/jens/Source/shotwell/src/Photo.vala" _tmp8_ = source; @@ -18972,7 +19025,7 @@ void photo_set_comment_persistent (Photo* self, const gchar* comment, GError** e _photo_file_adapter_unref0 (source); #line 2426 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 18974 "Photo.c" +#line 19027 "Photo.c" } #line 2427 "/home/jens/Source/shotwell/src/Photo.vala" _tmp10_ = metadata; @@ -18996,7 +19049,7 @@ void photo_set_comment_persistent (Photo* self, const gchar* comment, GError** e _photo_file_adapter_unref0 (source); #line 2429 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 18998 "Photo.c" +#line 19051 "Photo.c" } #line 2430 "/home/jens/Source/shotwell/src/Photo.vala" _tmp14_ = source; @@ -19008,7 +19061,7 @@ void photo_set_comment_persistent (Photo* self, const gchar* comment, GError** e library_monitor_blacklist_file (_tmp16_, "Photo.set_persistent_comment"); #line 2430 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_tmp16_); -#line 19010 "Photo.c" +#line 19063 "Photo.c" { PhotoFileMetadataWriter* _tmp17_ = NULL; PhotoMetadata* _tmp18_ = NULL; @@ -19020,7 +19073,7 @@ void photo_set_comment_persistent (Photo* self, const gchar* comment, GError** e photo_file_metadata_writer_write_metadata (_tmp17_, _tmp18_, &_inner_error_); #line 2432 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 19022 "Photo.c" +#line 19075 "Photo.c" goto __finally355; } } @@ -19039,7 +19092,7 @@ void photo_set_comment_persistent (Photo* self, const gchar* comment, GError** e library_monitor_unblacklist_file (_tmp21_); #line 2434 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_tmp21_); -#line 19041 "Photo.c" +#line 19094 "Photo.c" } #line 2431 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { @@ -19053,7 +19106,7 @@ void photo_set_comment_persistent (Photo* self, const gchar* comment, GError** e _photo_file_adapter_unref0 (source); #line 2431 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 19055 "Photo.c" +#line 19108 "Photo.c" } #line 2437 "/home/jens/Source/shotwell/src/Photo.vala" _tmp22_ = comment; @@ -19067,7 +19120,7 @@ void photo_set_comment_persistent (Photo* self, const gchar* comment, GError** e _media_metadata_unref0 (metadata); #line 2414 "/home/jens/Source/shotwell/src/Photo.vala" _photo_file_adapter_unref0 (source); -#line 19069 "Photo.c" +#line 19122 "Photo.c" } @@ -19078,14 +19131,14 @@ static void photo_real_set_exposure_time (Dateable* base, time_t time) { GError * _inner_error_ = NULL; #line 2442 "/home/jens/Source/shotwell/src/Photo.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PHOTO, Photo); -#line 19080 "Photo.c" +#line 19133 "Photo.c" { PhotoRow* _tmp0_ = NULL; #line 2444 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = self->row; #line 2444 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_row); -#line 19087 "Photo.c" +#line 19140 "Photo.c" { PhotoTable* _tmp1_ = NULL; PhotoTable* _tmp2_ = NULL; @@ -19114,7 +19167,7 @@ static void photo_real_set_exposure_time (Dateable* base, time_t time) { _tmp7_ = committed; #line 2446 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp7_) { -#line 19116 "Photo.c" +#line 19169 "Photo.c" PhotoRow* _tmp8_ = NULL; time_t _tmp9_ = 0; time_t _tmp10_ = 0; @@ -19128,7 +19181,7 @@ static void photo_real_set_exposure_time (Dateable* base, time_t time) { _tmp10_ = time; #line 2448 "/home/jens/Source/shotwell/src/Photo.vala" self->priv->cached_exposure_time = _tmp10_; -#line 19130 "Photo.c" +#line 19183 "Photo.c" } } __finally356: @@ -19138,7 +19191,7 @@ static void photo_real_set_exposure_time (Dateable* base, time_t time) { _tmp11_ = self->row; #line 2444 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 19140 "Photo.c" +#line 19193 "Photo.c" } #line 2444 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { @@ -19148,14 +19201,14 @@ static void photo_real_set_exposure_time (Dateable* base, time_t time) { g_clear_error (&_inner_error_); #line 2444 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 19150 "Photo.c" +#line 19203 "Photo.c" } } #line 2452 "/home/jens/Source/shotwell/src/Photo.vala" _tmp12_ = committed; #line 2452 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp12_) { -#line 19157 "Photo.c" +#line 19210 "Photo.c" Alteration* _tmp13_ = NULL; Alteration* _tmp14_ = NULL; #line 2453 "/home/jens/Source/shotwell/src/Photo.vala" @@ -19166,7 +19219,7 @@ static void photo_real_set_exposure_time (Dateable* base, time_t time) { data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp14_); #line 2453 "/home/jens/Source/shotwell/src/Photo.vala" _alteration_unref0 (_tmp14_); -#line 19168 "Photo.c" +#line 19221 "Photo.c" } } @@ -19206,7 +19259,7 @@ void photo_set_exposure_time_persistent (Photo* self, time_t time, GError** erro _tmp3_ = photo_file_format_can_write_metadata (_tmp2_); #line 2460 "/home/jens/Source/shotwell/src/Photo.vala" if (!_tmp3_) { -#line 19208 "Photo.c" +#line 19261 "Photo.c" PhotoFileReader* _tmp4_ = NULL; gchar* _tmp5_ = NULL; gchar* _tmp6_ = NULL; @@ -19229,7 +19282,7 @@ void photo_set_exposure_time_persistent (Photo* self, time_t time, GError** erro _photo_file_adapter_unref0 (source); #line 2465 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 19231 "Photo.c" +#line 19284 "Photo.c" } #line 2468 "/home/jens/Source/shotwell/src/Photo.vala" _tmp8_ = source; @@ -19245,7 +19298,7 @@ void photo_set_exposure_time_persistent (Photo* self, time_t time, GError** erro _photo_file_adapter_unref0 (source); #line 2468 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 19247 "Photo.c" +#line 19300 "Photo.c" } #line 2469 "/home/jens/Source/shotwell/src/Photo.vala" _tmp10_ = metadata; @@ -19275,7 +19328,7 @@ void photo_set_exposure_time_persistent (Photo* self, time_t time, GError** erro _photo_file_adapter_unref0 (source); #line 2471 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 19277 "Photo.c" +#line 19330 "Photo.c" } #line 2472 "/home/jens/Source/shotwell/src/Photo.vala" _tmp16_ = source; @@ -19287,7 +19340,7 @@ void photo_set_exposure_time_persistent (Photo* self, time_t time, GError** erro library_monitor_blacklist_file (_tmp18_, "Photo.set_exposure_time_persistent"); #line 2472 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_tmp18_); -#line 19289 "Photo.c" +#line 19342 "Photo.c" { PhotoFileMetadataWriter* _tmp19_ = NULL; PhotoMetadata* _tmp20_ = NULL; @@ -19299,7 +19352,7 @@ void photo_set_exposure_time_persistent (Photo* self, time_t time, GError** erro photo_file_metadata_writer_write_metadata (_tmp19_, _tmp20_, &_inner_error_); #line 2474 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 19301 "Photo.c" +#line 19354 "Photo.c" goto __finally357; } } @@ -19318,7 +19371,7 @@ void photo_set_exposure_time_persistent (Photo* self, time_t time, GError** erro library_monitor_unblacklist_file (_tmp23_); #line 2476 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_tmp23_); -#line 19320 "Photo.c" +#line 19373 "Photo.c" } #line 2473 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { @@ -19332,7 +19385,7 @@ void photo_set_exposure_time_persistent (Photo* self, time_t time, GError** erro _photo_file_adapter_unref0 (source); #line 2473 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 19334 "Photo.c" +#line 19387 "Photo.c" } #line 2479 "/home/jens/Source/shotwell/src/Photo.vala" _tmp24_ = time; @@ -19346,7 +19399,7 @@ void photo_set_exposure_time_persistent (Photo* self, time_t time, GError** erro _media_metadata_unref0 (metadata); #line 2456 "/home/jens/Source/shotwell/src/Photo.vala" _photo_file_adapter_unref0 (source); -#line 19348 "Photo.c" +#line 19401 "Photo.c" } @@ -19385,7 +19438,7 @@ static void photo_real_get_dimensions (MediaSource* base, PhotoException disallo _tmp2_ = photo_exception_allows (_tmp1_, PHOTO_EXCEPTION_ORIENTATION); #line 2502 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp2_) { -#line 19387 "Photo.c" +#line 19440 "Photo.c" Orientation ori_tmp = 0; Orientation _tmp3_ = 0; Orientation _tmp4_ = 0; @@ -19405,7 +19458,7 @@ static void photo_real_get_dimensions (MediaSource* base, PhotoException disallo case ORIENTATION_LEFT_BOTTOM: #line 2506 "/home/jens/Source/shotwell/src/Photo.vala" case ORIENTATION_RIGHT_BOTTOM: -#line 19407 "Photo.c" +#line 19460 "Photo.c" { gint width_tmp = 0; Dimensions _tmp5_ = {0}; @@ -19431,13 +19484,13 @@ static void photo_real_get_dimensions (MediaSource* base, PhotoException disallo returned_dims.height = _tmp9_; #line 2516 "/home/jens/Source/shotwell/src/Photo.vala" break; -#line 19433 "Photo.c" +#line 19486 "Photo.c" } default: { #line 2520 "/home/jens/Source/shotwell/src/Photo.vala" break; -#line 19439 "Photo.c" +#line 19492 "Photo.c" } } } @@ -19447,7 +19500,7 @@ static void photo_real_get_dimensions (MediaSource* base, PhotoException disallo _tmp11_ = photo_exception_allows (_tmp10_, PHOTO_EXCEPTION_STRAIGHTEN); #line 2525 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp11_) { -#line 19449 "Photo.c" +#line 19502 "Photo.c" gdouble x_size = 0.0; gdouble y_size = 0.0; gdouble angle = 0.0; @@ -19491,7 +19544,7 @@ static void photo_real_get_dimensions (MediaSource* base, PhotoException disallo _tmp21_ = y_size; #line 2534 "/home/jens/Source/shotwell/src/Photo.vala" returned_dims.height = (gint) _tmp21_; -#line 19493 "Photo.c" +#line 19546 "Photo.c" } #line 2538 "/home/jens/Source/shotwell/src/Photo.vala" _tmp22_ = disallowed_steps; @@ -19499,7 +19552,7 @@ static void photo_real_get_dimensions (MediaSource* base, PhotoException disallo _tmp23_ = photo_exception_allows (_tmp22_, PHOTO_EXCEPTION_CROP); #line 2538 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp23_) { -#line 19501 "Photo.c" +#line 19554 "Photo.c" Box crop = {0}; PhotoException _tmp24_ = 0; Box _tmp25_ = {0}; @@ -19512,20 +19565,20 @@ static void photo_real_get_dimensions (MediaSource* base, PhotoException disallo crop = _tmp25_; #line 2540 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp26_) { -#line 19514 "Photo.c" +#line 19567 "Photo.c" Dimensions _tmp27_ = {0}; #line 2541 "/home/jens/Source/shotwell/src/Photo.vala" box_get_dimensions (&crop, &_tmp27_); #line 2541 "/home/jens/Source/shotwell/src/Photo.vala" returned_dims = _tmp27_; -#line 19520 "Photo.c" +#line 19573 "Photo.c" } } #line 2544 "/home/jens/Source/shotwell/src/Photo.vala" *result = returned_dims; #line 2544 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 19527 "Photo.c" +#line 19580 "Photo.c" } @@ -19552,13 +19605,13 @@ static void photo_locked_create_adjustments_from_data (Photo* self) { _tmp2_ = map; #line 2552 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp2_ == NULL) { -#line 19554 "Photo.c" +#line 19607 "Photo.c" PixelTransformationBundle* _tmp3_ = NULL; #line 2553 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = self->priv->adjustments; #line 2553 "/home/jens/Source/shotwell/src/Photo.vala" pixel_transformation_bundle_set_to_identity (_tmp3_); -#line 19560 "Photo.c" +#line 19613 "Photo.c" } else { PixelTransformationBundle* _tmp4_ = NULL; KeyValueMap* _tmp5_ = NULL; @@ -19568,7 +19621,7 @@ static void photo_locked_create_adjustments_from_data (Photo* self) { _tmp5_ = map; #line 2555 "/home/jens/Source/shotwell/src/Photo.vala" pixel_transformation_bundle_load (_tmp4_, _tmp5_); -#line 19570 "Photo.c" +#line 19623 "Photo.c" } #line 2557 "/home/jens/Source/shotwell/src/Photo.vala" _tmp6_ = self->priv->adjustments; @@ -19580,7 +19633,7 @@ static void photo_locked_create_adjustments_from_data (Photo* self) { self->priv->transformer = _tmp7_; #line 2548 "/home/jens/Source/shotwell/src/Photo.vala" _key_value_map_unref0 (map); -#line 19582 "Photo.c" +#line 19635 "Photo.c" } @@ -19589,14 +19642,14 @@ PixelTransformationBundle* photo_get_color_adjustments (Photo* self) { GError * _inner_error_ = NULL; #line 2561 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_PHOTO (self), NULL); -#line 19591 "Photo.c" +#line 19644 "Photo.c" { PhotoRow* _tmp0_ = NULL; #line 2562 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = self->row; #line 2562 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_row); -#line 19598 "Photo.c" +#line 19651 "Photo.c" { PixelTransformationBundle* _tmp1_ = NULL; PixelTransformationBundle* _tmp2_ = NULL; @@ -19607,7 +19660,7 @@ PixelTransformationBundle* photo_get_color_adjustments (Photo* self) { if (_tmp1_ == NULL) { #line 2564 "/home/jens/Source/shotwell/src/Photo.vala" photo_locked_create_adjustments_from_data (self); -#line 19609 "Photo.c" +#line 19662 "Photo.c" } #line 2566 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = self->priv->adjustments; @@ -19615,18 +19668,18 @@ PixelTransformationBundle* photo_get_color_adjustments (Photo* self) { _tmp3_ = pixel_transformation_bundle_copy (_tmp2_); #line 2566 "/home/jens/Source/shotwell/src/Photo.vala" result = _tmp3_; -#line 19617 "Photo.c" +#line 19670 "Photo.c" { PhotoRow* _tmp4_ = NULL; #line 2562 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = self->row; #line 2562 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 19624 "Photo.c" +#line 19677 "Photo.c" } #line 2566 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 19628 "Photo.c" +#line 19681 "Photo.c" } __finally358: { @@ -19635,7 +19688,7 @@ PixelTransformationBundle* photo_get_color_adjustments (Photo* self) { _tmp5_ = self->row; #line 2562 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 19637 "Photo.c" +#line 19690 "Photo.c" } #line 2562 "/home/jens/Source/shotwell/src/Photo.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); @@ -19643,7 +19696,7 @@ PixelTransformationBundle* photo_get_color_adjustments (Photo* self) { g_clear_error (&_inner_error_); #line 2562 "/home/jens/Source/shotwell/src/Photo.vala" return NULL; -#line 19645 "Photo.c" +#line 19698 "Photo.c" } } @@ -19653,14 +19706,14 @@ PixelTransformer* photo_get_pixel_transformer (Photo* self) { GError * _inner_error_ = NULL; #line 2570 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_PHOTO (self), NULL); -#line 19655 "Photo.c" +#line 19708 "Photo.c" { PhotoRow* _tmp0_ = NULL; #line 2571 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = self->row; #line 2571 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_row); -#line 19662 "Photo.c" +#line 19715 "Photo.c" { PixelTransformer* _tmp1_ = NULL; PixelTransformer* _tmp2_ = NULL; @@ -19671,7 +19724,7 @@ PixelTransformer* photo_get_pixel_transformer (Photo* self) { if (_tmp1_ == NULL) { #line 2573 "/home/jens/Source/shotwell/src/Photo.vala" photo_locked_create_adjustments_from_data (self); -#line 19673 "Photo.c" +#line 19726 "Photo.c" } #line 2575 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = self->priv->transformer; @@ -19679,18 +19732,18 @@ PixelTransformer* photo_get_pixel_transformer (Photo* self) { _tmp3_ = pixel_transformer_copy (_tmp2_); #line 2575 "/home/jens/Source/shotwell/src/Photo.vala" result = _tmp3_; -#line 19681 "Photo.c" +#line 19734 "Photo.c" { PhotoRow* _tmp4_ = NULL; #line 2571 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = self->row; #line 2571 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 19688 "Photo.c" +#line 19741 "Photo.c" } #line 2575 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 19692 "Photo.c" +#line 19745 "Photo.c" } __finally359: { @@ -19699,7 +19752,7 @@ PixelTransformer* photo_get_pixel_transformer (Photo* self) { _tmp5_ = self->row; #line 2571 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 19701 "Photo.c" +#line 19754 "Photo.c" } #line 2571 "/home/jens/Source/shotwell/src/Photo.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); @@ -19707,7 +19760,7 @@ PixelTransformer* photo_get_pixel_transformer (Photo* self) { g_clear_error (&_inner_error_); #line 2571 "/home/jens/Source/shotwell/src/Photo.vala" return NULL; -#line 19709 "Photo.c" +#line 19762 "Photo.c" } } @@ -19723,7 +19776,7 @@ gboolean photo_has_color_adjustments (Photo* self) { result = _tmp0_; #line 2580 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 19725 "Photo.c" +#line 19778 "Photo.c" } @@ -19752,7 +19805,7 @@ PixelTransformation* photo_get_color_adjustment (Photo* self, PixelTransformatio result = _tmp4_; #line 2584 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 19754 "Photo.c" +#line 19807 "Photo.c" } @@ -19775,7 +19828,7 @@ void photo_set_color_adjustments (Photo* self, PixelTransformationBundle* new_ad _tmp1_ = pixel_transformation_bundle_is_identity (_tmp0_); #line 2590 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp1_) { -#line 19777 "Photo.c" +#line 19830 "Photo.c" gboolean _result_ = FALSE; gboolean _tmp5_ = FALSE; { @@ -19784,7 +19837,7 @@ void photo_set_color_adjustments (Photo* self, PixelTransformationBundle* new_ad _tmp2_ = self->row; #line 2592 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_row); -#line 19786 "Photo.c" +#line 19839 "Photo.c" { gboolean _tmp3_ = FALSE; #line 2593 "/home/jens/Source/shotwell/src/Photo.vala" @@ -19799,7 +19852,7 @@ void photo_set_color_adjustments (Photo* self, PixelTransformationBundle* new_ad _pixel_transformer_unref0 (self->priv->transformer); #line 2595 "/home/jens/Source/shotwell/src/Photo.vala" self->priv->transformer = NULL; -#line 19801 "Photo.c" +#line 19854 "Photo.c" } __finally360: { @@ -19808,7 +19861,7 @@ void photo_set_color_adjustments (Photo* self, PixelTransformationBundle* new_ad _tmp4_ = self->row; #line 2592 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 19810 "Photo.c" +#line 19863 "Photo.c" } #line 2592 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { @@ -19818,14 +19871,14 @@ void photo_set_color_adjustments (Photo* self, PixelTransformationBundle* new_ad g_clear_error (&_inner_error_); #line 2592 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 19820 "Photo.c" +#line 19873 "Photo.c" } } #line 2598 "/home/jens/Source/shotwell/src/Photo.vala" _tmp5_ = _result_; #line 2598 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp5_) { -#line 19827 "Photo.c" +#line 19880 "Photo.c" Alteration* _tmp6_ = NULL; Alteration* _tmp7_ = NULL; #line 2599 "/home/jens/Source/shotwell/src/Photo.vala" @@ -19836,11 +19889,11 @@ void photo_set_color_adjustments (Photo* self, PixelTransformationBundle* new_ad data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp7_); #line 2599 "/home/jens/Source/shotwell/src/Photo.vala" _alteration_unref0 (_tmp7_); -#line 19838 "Photo.c" +#line 19891 "Photo.c" } #line 2601 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 19842 "Photo.c" +#line 19895 "Photo.c" } #line 2605 "/home/jens/Source/shotwell/src/Photo.vala" _tmp8_ = new_adjustments; @@ -19848,14 +19901,14 @@ void photo_set_color_adjustments (Photo* self, PixelTransformationBundle* new_ad _tmp9_ = pixel_transformation_bundle_save (_tmp8_, "adjustments"); #line 2605 "/home/jens/Source/shotwell/src/Photo.vala" map = _tmp9_; -#line 19850 "Photo.c" +#line 19903 "Photo.c" { PhotoRow* _tmp10_ = NULL; #line 2608 "/home/jens/Source/shotwell/src/Photo.vala" _tmp10_ = self->row; #line 2608 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_row); -#line 19857 "Photo.c" +#line 19910 "Photo.c" { gboolean _tmp11_ = FALSE; PixelTransformer* _tmp12_ = NULL; @@ -19867,18 +19920,18 @@ void photo_set_color_adjustments (Photo* self, PixelTransformationBundle* new_ad if (_tmp12_ == NULL) { #line 2609 "/home/jens/Source/shotwell/src/Photo.vala" _tmp11_ = TRUE; -#line 19869 "Photo.c" +#line 19922 "Photo.c" } else { PixelTransformationBundle* _tmp13_ = NULL; #line 2609 "/home/jens/Source/shotwell/src/Photo.vala" _tmp13_ = self->priv->adjustments; #line 2609 "/home/jens/Source/shotwell/src/Photo.vala" _tmp11_ = _tmp13_ == NULL; -#line 19876 "Photo.c" +#line 19929 "Photo.c" } #line 2609 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp11_) { -#line 19880 "Photo.c" +#line 19933 "Photo.c" PixelTransformationBundle* _tmp14_ = NULL; PixelTransformationBundle* _tmp15_ = NULL; PixelTransformationBundle* _tmp16_ = NULL; @@ -19899,7 +19952,7 @@ void photo_set_color_adjustments (Photo* self, PixelTransformationBundle* new_ad _pixel_transformer_unref0 (self->priv->transformer); #line 2612 "/home/jens/Source/shotwell/src/Photo.vala" self->priv->transformer = _tmp17_; -#line 19901 "Photo.c" +#line 19954 "Photo.c" } else { PixelTransformationBundle* _tmp34_ = NULL; PixelTransformationBundle* _tmp35_ = NULL; @@ -19926,7 +19979,7 @@ void photo_set_color_adjustments (Photo* self, PixelTransformationBundle* new_ad _transformation_it = _tmp22_; #line 2615 "/home/jens/Source/shotwell/src/Photo.vala" while (TRUE) { -#line 19928 "Photo.c" +#line 19981 "Photo.c" GeeIterator* _tmp23_ = NULL; gboolean _tmp24_ = FALSE; PixelTransformation* transformation = NULL; @@ -19947,7 +20000,7 @@ void photo_set_color_adjustments (Photo* self, PixelTransformationBundle* new_ad if (!_tmp24_) { #line 2615 "/home/jens/Source/shotwell/src/Photo.vala" break; -#line 19949 "Photo.c" +#line 20002 "Photo.c" } #line 2615 "/home/jens/Source/shotwell/src/Photo.vala" _tmp25_ = _transformation_it; @@ -19975,11 +20028,11 @@ void photo_set_color_adjustments (Photo* self, PixelTransformationBundle* new_ad _pixel_transformation_unref0 (_tmp32_); #line 2615 "/home/jens/Source/shotwell/src/Photo.vala" _pixel_transformation_unref0 (transformation); -#line 19977 "Photo.c" +#line 20030 "Photo.c" } #line 2615 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_transformation_it); -#line 19981 "Photo.c" +#line 20034 "Photo.c" } #line 2621 "/home/jens/Source/shotwell/src/Photo.vala" _tmp34_ = new_adjustments; @@ -19989,7 +20042,7 @@ void photo_set_color_adjustments (Photo* self, PixelTransformationBundle* new_ad _pixel_transformation_bundle_unref0 (self->priv->adjustments); #line 2621 "/home/jens/Source/shotwell/src/Photo.vala" self->priv->adjustments = _tmp35_; -#line 19991 "Photo.c" +#line 20044 "Photo.c" } #line 2624 "/home/jens/Source/shotwell/src/Photo.vala" _tmp36_ = map; @@ -19997,7 +20050,7 @@ void photo_set_color_adjustments (Photo* self, PixelTransformationBundle* new_ad _tmp37_ = photo_set_transformation (self, _tmp36_); #line 2624 "/home/jens/Source/shotwell/src/Photo.vala" committed = _tmp37_; -#line 19999 "Photo.c" +#line 20052 "Photo.c" } __finally361: { @@ -20006,7 +20059,7 @@ void photo_set_color_adjustments (Photo* self, PixelTransformationBundle* new_ad _tmp38_ = self->row; #line 2608 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 20008 "Photo.c" +#line 20061 "Photo.c" } #line 2608 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { @@ -20018,14 +20071,14 @@ void photo_set_color_adjustments (Photo* self, PixelTransformationBundle* new_ad g_clear_error (&_inner_error_); #line 2608 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 20020 "Photo.c" +#line 20073 "Photo.c" } } #line 2627 "/home/jens/Source/shotwell/src/Photo.vala" _tmp39_ = committed; #line 2627 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp39_) { -#line 20027 "Photo.c" +#line 20080 "Photo.c" Alteration* _tmp40_ = NULL; Alteration* _tmp41_ = NULL; #line 2628 "/home/jens/Source/shotwell/src/Photo.vala" @@ -20036,11 +20089,11 @@ void photo_set_color_adjustments (Photo* self, PixelTransformationBundle* new_ad data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp41_); #line 2628 "/home/jens/Source/shotwell/src/Photo.vala" _alteration_unref0 (_tmp41_); -#line 20038 "Photo.c" +#line 20091 "Photo.c" } #line 2587 "/home/jens/Source/shotwell/src/Photo.vala" _key_value_map_unref0 (map); -#line 20042 "Photo.c" +#line 20095 "Photo.c" } @@ -20050,7 +20103,7 @@ static PhotoMetadata* photo_real_get_metadata (PhotoSource* base) { GError * _inner_error_ = NULL; #line 2632 "/home/jens/Source/shotwell/src/Photo.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PHOTO, Photo); -#line 20052 "Photo.c" +#line 20105 "Photo.c" { PhotoMetadata* _tmp0_ = NULL; PhotoFileReader* _tmp1_ = NULL; @@ -20072,7 +20125,7 @@ static PhotoMetadata* photo_real_get_metadata (PhotoSource* base) { _tmp0_ = _tmp4_; #line 2634 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 20074 "Photo.c" +#line 20127 "Photo.c" goto __catch362_g_error; } #line 2634 "/home/jens/Source/shotwell/src/Photo.vala" @@ -20085,7 +20138,7 @@ static PhotoMetadata* photo_real_get_metadata (PhotoSource* base) { _media_metadata_unref0 (_tmp0_); #line 2634 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 20087 "Photo.c" +#line 20140 "Photo.c" } goto __finally362; __catch362_g_error: @@ -20109,7 +20162,7 @@ static PhotoMetadata* photo_real_get_metadata (PhotoSource* base) { _g_error_free0 (err); #line 2638 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 20111 "Photo.c" +#line 20164 "Photo.c" } __finally362: #line 2633 "/home/jens/Source/shotwell/src/Photo.vala" @@ -20118,7 +20171,7 @@ static PhotoMetadata* photo_real_get_metadata (PhotoSource* base) { g_clear_error (&_inner_error_); #line 2633 "/home/jens/Source/shotwell/src/Photo.vala" return NULL; -#line 20120 "Photo.c" +#line 20173 "Photo.c" } @@ -20151,7 +20204,7 @@ PhotoMetadata* photo_get_master_metadata (Photo* self, GError** error) { g_propagate_error (error, _inner_error_); #line 2643 "/home/jens/Source/shotwell/src/Photo.vala" return NULL; -#line 20153 "Photo.c" +#line 20206 "Photo.c" } #line 2643 "/home/jens/Source/shotwell/src/Photo.vala" _tmp5_ = _tmp0_; @@ -20163,7 +20216,7 @@ PhotoMetadata* photo_get_master_metadata (Photo* self, GError** error) { _media_metadata_unref0 (_tmp0_); #line 2643 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 20165 "Photo.c" +#line 20218 "Photo.c" } @@ -20184,7 +20237,7 @@ PhotoMetadata* photo_get_editable_metadata (Photo* self, GError** error) { _tmp2_ = reader; #line 2649 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp2_ != NULL) { -#line 20186 "Photo.c" +#line 20239 "Photo.c" PhotoFileReader* _tmp3_ = NULL; PhotoMetadata* _tmp4_ = NULL; #line 2649 "/home/jens/Source/shotwell/src/Photo.vala" @@ -20205,14 +20258,14 @@ PhotoMetadata* photo_get_editable_metadata (Photo* self, GError** error) { _photo_file_adapter_unref0 (reader); #line 2649 "/home/jens/Source/shotwell/src/Photo.vala" return NULL; -#line 20207 "Photo.c" +#line 20260 "Photo.c" } } else { #line 2649 "/home/jens/Source/shotwell/src/Photo.vala" _media_metadata_unref0 (_tmp1_); #line 2649 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = NULL; -#line 20214 "Photo.c" +#line 20267 "Photo.c" } #line 2649 "/home/jens/Source/shotwell/src/Photo.vala" result = _tmp1_; @@ -20220,7 +20273,7 @@ PhotoMetadata* photo_get_editable_metadata (Photo* self, GError** error) { _photo_file_adapter_unref0 (reader); #line 2649 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 20222 "Photo.c" +#line 20275 "Photo.c" } @@ -20235,13 +20288,13 @@ gboolean photo_persist_master_metadata (Photo* self, PhotoMetadata* metadata, Ph PhotoFileMetadataWriter* _tmp4_ = NULL; PhotoFileReader* _tmp5_ = NULL; PhotoFileMetadataWriter* _tmp6_ = NULL; - PhotoFileMetadataWriter* _tmp7_ = NULL; PhotoFileMetadataWriter* _tmp8_ = NULL; - PhotoMetadata* _tmp9_ = NULL; - gboolean _tmp10_ = FALSE; - PhotoReimportMasterState* _tmp11_ = NULL; + PhotoFileMetadataWriter* _tmp9_ = NULL; + PhotoMetadata* _tmp10_ = NULL; gboolean _tmp12_ = FALSE; PhotoReimportMasterState* _tmp13_ = NULL; + gboolean _tmp14_ = FALSE; + PhotoReimportMasterState* _tmp16_ = NULL; GError * _inner_error_ = NULL; #line 2655 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_PHOTO (self), FALSE); @@ -20271,15 +20324,15 @@ gboolean photo_persist_master_metadata (Photo* self, PhotoMetadata* metadata, Ph if (state) { #line 2662 "/home/jens/Source/shotwell/src/Photo.vala" *state = _vala_state; -#line 20273 "Photo.c" +#line 20326 "Photo.c" } else { #line 2662 "/home/jens/Source/shotwell/src/Photo.vala" _photo_reimport_master_state_unref0 (_vala_state); -#line 20277 "Photo.c" +#line 20330 "Photo.c" } #line 2662 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 20281 "Photo.c" +#line 20334 "Photo.c" } #line 2664 "/home/jens/Source/shotwell/src/Photo.vala" _tmp5_ = master_reader; @@ -20289,28 +20342,32 @@ gboolean photo_persist_master_metadata (Photo* self, PhotoMetadata* metadata, Ph _tmp4_ = _tmp6_; #line 2664 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { +#line 20344 "Photo.c" + gboolean _tmp7_ = FALSE; #line 2664 "/home/jens/Source/shotwell/src/Photo.vala" g_propagate_error (error, _inner_error_); #line 2664 "/home/jens/Source/shotwell/src/Photo.vala" _photo_file_adapter_unref0 (master_reader); #line 2664 "/home/jens/Source/shotwell/src/Photo.vala" - return FALSE; -#line 20297 "Photo.c" + return _tmp7_; +#line 20352 "Photo.c" } #line 2664 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp7_ = _tmp4_; + _tmp8_ = _tmp4_; #line 2664 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = NULL; #line 2664 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp8_ = _tmp7_; + _tmp9_ = _tmp8_; #line 2664 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp9_ = metadata; + _tmp10_ = metadata; #line 2664 "/home/jens/Source/shotwell/src/Photo.vala" - photo_file_metadata_writer_write_metadata (_tmp8_, _tmp9_, &_inner_error_); + photo_file_metadata_writer_write_metadata (_tmp9_, _tmp10_, &_inner_error_); #line 2664 "/home/jens/Source/shotwell/src/Photo.vala" - _photo_file_adapter_unref0 (_tmp8_); + _photo_file_adapter_unref0 (_tmp9_); #line 2664 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { +#line 20368 "Photo.c" + gboolean _tmp11_ = FALSE; #line 2664 "/home/jens/Source/shotwell/src/Photo.vala" g_propagate_error (error, _inner_error_); #line 2664 "/home/jens/Source/shotwell/src/Photo.vala" @@ -20318,19 +20375,21 @@ gboolean photo_persist_master_metadata (Photo* self, PhotoMetadata* metadata, Ph #line 2664 "/home/jens/Source/shotwell/src/Photo.vala" _photo_file_adapter_unref0 (master_reader); #line 2664 "/home/jens/Source/shotwell/src/Photo.vala" - return FALSE; -#line 20321 "Photo.c" + return _tmp11_; +#line 20378 "Photo.c" } #line 2666 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp12_ = photo_prepare_for_reimport_master (self, &_tmp11_, &_inner_error_); + _tmp14_ = photo_prepare_for_reimport_master (self, &_tmp13_, &_inner_error_); #line 2666 "/home/jens/Source/shotwell/src/Photo.vala" _photo_reimport_master_state_unref0 (_vala_state); #line 2666 "/home/jens/Source/shotwell/src/Photo.vala" - _vala_state = _tmp11_; + _vala_state = _tmp13_; #line 2666 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp10_ = _tmp12_; + _tmp12_ = _tmp14_; #line 2666 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { +#line 20390 "Photo.c" + gboolean _tmp15_ = FALSE; #line 2666 "/home/jens/Source/shotwell/src/Photo.vala" g_propagate_error (error, _inner_error_); #line 2666 "/home/jens/Source/shotwell/src/Photo.vala" @@ -20338,11 +20397,11 @@ gboolean photo_persist_master_metadata (Photo* self, PhotoMetadata* metadata, Ph #line 2666 "/home/jens/Source/shotwell/src/Photo.vala" _photo_file_adapter_unref0 (master_reader); #line 2666 "/home/jens/Source/shotwell/src/Photo.vala" - return FALSE; -#line 20341 "Photo.c" + return _tmp15_; +#line 20400 "Photo.c" } #line 2666 "/home/jens/Source/shotwell/src/Photo.vala" - if (!_tmp10_) { + if (!_tmp12_) { #line 2667 "/home/jens/Source/shotwell/src/Photo.vala" result = FALSE; #line 2667 "/home/jens/Source/shotwell/src/Photo.vala" @@ -20353,20 +20412,20 @@ gboolean photo_persist_master_metadata (Photo* self, PhotoMetadata* metadata, Ph if (state) { #line 2667 "/home/jens/Source/shotwell/src/Photo.vala" *state = _vala_state; -#line 20355 "Photo.c" +#line 20414 "Photo.c" } else { #line 2667 "/home/jens/Source/shotwell/src/Photo.vala" _photo_reimport_master_state_unref0 (_vala_state); -#line 20359 "Photo.c" +#line 20418 "Photo.c" } #line 2667 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 20363 "Photo.c" +#line 20422 "Photo.c" } #line 2669 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp13_ = _vala_state; + _tmp16_ = _vala_state; #line 2669 "/home/jens/Source/shotwell/src/Photo.vala" - G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, PHOTO_TYPE_REIMPORT_MASTER_STATE_IMPL, PhotoReimportMasterStateImpl)->metadata_only = TRUE; + G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, PHOTO_TYPE_REIMPORT_MASTER_STATE_IMPL, PhotoReimportMasterStateImpl)->metadata_only = TRUE; #line 2671 "/home/jens/Source/shotwell/src/Photo.vala" result = TRUE; #line 2671 "/home/jens/Source/shotwell/src/Photo.vala" @@ -20377,15 +20436,15 @@ gboolean photo_persist_master_metadata (Photo* self, PhotoMetadata* metadata, Ph if (state) { #line 2671 "/home/jens/Source/shotwell/src/Photo.vala" *state = _vala_state; -#line 20379 "Photo.c" +#line 20438 "Photo.c" } else { #line 2671 "/home/jens/Source/shotwell/src/Photo.vala" _photo_reimport_master_state_unref0 (_vala_state); -#line 20383 "Photo.c" +#line 20442 "Photo.c" } #line 2671 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 20387 "Photo.c" +#line 20446 "Photo.c" } @@ -20408,7 +20467,7 @@ void photo_finish_update_master_metadata (Photo* self, PhotoReimportMasterState* g_propagate_error (error, _inner_error_); #line 2675 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 20410 "Photo.c" +#line 20469 "Photo.c" } else { #line 2675 "/home/jens/Source/shotwell/src/Photo.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); @@ -20416,7 +20475,7 @@ void photo_finish_update_master_metadata (Photo* self, PhotoReimportMasterState* g_clear_error (&_inner_error_); #line 2675 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 20418 "Photo.c" +#line 20477 "Photo.c" } } } @@ -20434,13 +20493,13 @@ gboolean photo_persist_editable_metadata (Photo* self, PhotoMetadata* metadata, PhotoFileMetadataWriter* _tmp5_ = NULL; PhotoFileReader* _tmp6_ = NULL; PhotoFileMetadataWriter* _tmp7_ = NULL; - PhotoFileMetadataWriter* _tmp8_ = NULL; PhotoFileMetadataWriter* _tmp9_ = NULL; - PhotoMetadata* _tmp10_ = NULL; - gboolean _tmp11_ = FALSE; - PhotoReimportEditableState* _tmp12_ = NULL; + PhotoFileMetadataWriter* _tmp10_ = NULL; + PhotoMetadata* _tmp11_ = NULL; gboolean _tmp13_ = FALSE; PhotoReimportEditableState* _tmp14_ = NULL; + gboolean _tmp15_ = FALSE; + PhotoReimportEditableState* _tmp17_ = NULL; GError * _inner_error_ = NULL; #line 2678 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_PHOTO (self), FALSE); @@ -20466,15 +20525,15 @@ gboolean photo_persist_editable_metadata (Photo* self, PhotoMetadata* metadata, if (state) { #line 2684 "/home/jens/Source/shotwell/src/Photo.vala" *state = _vala_state; -#line 20468 "Photo.c" +#line 20527 "Photo.c" } else { #line 2684 "/home/jens/Source/shotwell/src/Photo.vala" _photo_reimport_editable_state_unref0 (_vala_state); -#line 20472 "Photo.c" +#line 20531 "Photo.c" } #line 2684 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 20476 "Photo.c" +#line 20535 "Photo.c" } #line 2686 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = editable_reader; @@ -20492,15 +20551,15 @@ gboolean photo_persist_editable_metadata (Photo* self, PhotoMetadata* metadata, if (state) { #line 2687 "/home/jens/Source/shotwell/src/Photo.vala" *state = _vala_state; -#line 20494 "Photo.c" +#line 20553 "Photo.c" } else { #line 2687 "/home/jens/Source/shotwell/src/Photo.vala" _photo_reimport_editable_state_unref0 (_vala_state); -#line 20498 "Photo.c" +#line 20557 "Photo.c" } #line 2687 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 20502 "Photo.c" +#line 20561 "Photo.c" } #line 2689 "/home/jens/Source/shotwell/src/Photo.vala" _tmp6_ = editable_reader; @@ -20510,28 +20569,32 @@ gboolean photo_persist_editable_metadata (Photo* self, PhotoMetadata* metadata, _tmp5_ = _tmp7_; #line 2689 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { +#line 20571 "Photo.c" + gboolean _tmp8_ = FALSE; #line 2689 "/home/jens/Source/shotwell/src/Photo.vala" g_propagate_error (error, _inner_error_); #line 2689 "/home/jens/Source/shotwell/src/Photo.vala" _photo_file_adapter_unref0 (editable_reader); #line 2689 "/home/jens/Source/shotwell/src/Photo.vala" - return FALSE; -#line 20518 "Photo.c" + return _tmp8_; +#line 20579 "Photo.c" } #line 2689 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp8_ = _tmp5_; + _tmp9_ = _tmp5_; #line 2689 "/home/jens/Source/shotwell/src/Photo.vala" _tmp5_ = NULL; #line 2689 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp9_ = _tmp8_; + _tmp10_ = _tmp9_; #line 2689 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp10_ = metadata; + _tmp11_ = metadata; #line 2689 "/home/jens/Source/shotwell/src/Photo.vala" - photo_file_metadata_writer_write_metadata (_tmp9_, _tmp10_, &_inner_error_); + photo_file_metadata_writer_write_metadata (_tmp10_, _tmp11_, &_inner_error_); #line 2689 "/home/jens/Source/shotwell/src/Photo.vala" - _photo_file_adapter_unref0 (_tmp9_); + _photo_file_adapter_unref0 (_tmp10_); #line 2689 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { +#line 20595 "Photo.c" + gboolean _tmp12_ = FALSE; #line 2689 "/home/jens/Source/shotwell/src/Photo.vala" g_propagate_error (error, _inner_error_); #line 2689 "/home/jens/Source/shotwell/src/Photo.vala" @@ -20539,19 +20602,21 @@ gboolean photo_persist_editable_metadata (Photo* self, PhotoMetadata* metadata, #line 2689 "/home/jens/Source/shotwell/src/Photo.vala" _photo_file_adapter_unref0 (editable_reader); #line 2689 "/home/jens/Source/shotwell/src/Photo.vala" - return FALSE; -#line 20542 "Photo.c" + return _tmp12_; +#line 20605 "Photo.c" } #line 2691 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp13_ = photo_prepare_for_reimport_editable (self, &_tmp12_, &_inner_error_); + _tmp15_ = photo_prepare_for_reimport_editable (self, &_tmp14_, &_inner_error_); #line 2691 "/home/jens/Source/shotwell/src/Photo.vala" _photo_reimport_editable_state_unref0 (_vala_state); #line 2691 "/home/jens/Source/shotwell/src/Photo.vala" - _vala_state = _tmp12_; + _vala_state = _tmp14_; #line 2691 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp11_ = _tmp13_; + _tmp13_ = _tmp15_; #line 2691 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { +#line 20617 "Photo.c" + gboolean _tmp16_ = FALSE; #line 2691 "/home/jens/Source/shotwell/src/Photo.vala" g_propagate_error (error, _inner_error_); #line 2691 "/home/jens/Source/shotwell/src/Photo.vala" @@ -20559,11 +20624,11 @@ gboolean photo_persist_editable_metadata (Photo* self, PhotoMetadata* metadata, #line 2691 "/home/jens/Source/shotwell/src/Photo.vala" _photo_file_adapter_unref0 (editable_reader); #line 2691 "/home/jens/Source/shotwell/src/Photo.vala" - return FALSE; -#line 20562 "Photo.c" + return _tmp16_; +#line 20627 "Photo.c" } #line 2691 "/home/jens/Source/shotwell/src/Photo.vala" - if (!_tmp11_) { + if (!_tmp13_) { #line 2692 "/home/jens/Source/shotwell/src/Photo.vala" result = FALSE; #line 2692 "/home/jens/Source/shotwell/src/Photo.vala" @@ -20574,20 +20639,20 @@ gboolean photo_persist_editable_metadata (Photo* self, PhotoMetadata* metadata, if (state) { #line 2692 "/home/jens/Source/shotwell/src/Photo.vala" *state = _vala_state; -#line 20576 "Photo.c" +#line 20641 "Photo.c" } else { #line 2692 "/home/jens/Source/shotwell/src/Photo.vala" _photo_reimport_editable_state_unref0 (_vala_state); -#line 20580 "Photo.c" +#line 20645 "Photo.c" } #line 2692 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 20584 "Photo.c" +#line 20649 "Photo.c" } #line 2694 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp14_ = _vala_state; + _tmp17_ = _vala_state; #line 2694 "/home/jens/Source/shotwell/src/Photo.vala" - G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, PHOTO_TYPE_REIMPORT_EDITABLE_STATE_IMPL, PhotoReimportEditableStateImpl)->metadata_only = TRUE; + G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, PHOTO_TYPE_REIMPORT_EDITABLE_STATE_IMPL, PhotoReimportEditableStateImpl)->metadata_only = TRUE; #line 2696 "/home/jens/Source/shotwell/src/Photo.vala" result = TRUE; #line 2696 "/home/jens/Source/shotwell/src/Photo.vala" @@ -20598,15 +20663,15 @@ gboolean photo_persist_editable_metadata (Photo* self, PhotoMetadata* metadata, if (state) { #line 2696 "/home/jens/Source/shotwell/src/Photo.vala" *state = _vala_state; -#line 20600 "Photo.c" +#line 20665 "Photo.c" } else { #line 2696 "/home/jens/Source/shotwell/src/Photo.vala" _photo_reimport_editable_state_unref0 (_vala_state); -#line 20604 "Photo.c" +#line 20669 "Photo.c" } #line 2696 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 20608 "Photo.c" +#line 20673 "Photo.c" } @@ -20629,7 +20694,7 @@ void photo_finish_update_editable_metadata (Photo* self, PhotoReimportEditableSt g_propagate_error (error, _inner_error_); #line 2700 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 20631 "Photo.c" +#line 20696 "Photo.c" } else { #line 2700 "/home/jens/Source/shotwell/src/Photo.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); @@ -20637,7 +20702,7 @@ void photo_finish_update_editable_metadata (Photo* self, PhotoReimportEditableSt g_clear_error (&_inner_error_); #line 2700 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 20639 "Photo.c" +#line 20704 "Photo.c" } } } @@ -20647,14 +20712,14 @@ void photo_get_raw_dimensions (Photo* self, Dimensions* result) { GError * _inner_error_ = NULL; #line 2705 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (IS_PHOTO (self)); -#line 20649 "Photo.c" +#line 20714 "Photo.c" { PhotoRow* _tmp0_ = NULL; #line 2706 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = self->row; #line 2706 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_row); -#line 20656 "Photo.c" +#line 20721 "Photo.c" { BackingPhotoRow* _tmp1_ = NULL; Dimensions _tmp2_ = {0}; @@ -20664,18 +20729,18 @@ void photo_get_raw_dimensions (Photo* self, Dimensions* result) { _tmp2_ = _tmp1_->dim; #line 2707 "/home/jens/Source/shotwell/src/Photo.vala" *result = _tmp2_; -#line 20666 "Photo.c" +#line 20731 "Photo.c" { PhotoRow* _tmp3_ = NULL; #line 2706 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = self->row; #line 2706 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 20673 "Photo.c" +#line 20738 "Photo.c" } #line 2707 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 20677 "Photo.c" +#line 20742 "Photo.c" } __finally363: { @@ -20684,7 +20749,7 @@ void photo_get_raw_dimensions (Photo* self, Dimensions* result) { _tmp4_ = self->row; #line 2706 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 20686 "Photo.c" +#line 20751 "Photo.c" } #line 2706 "/home/jens/Source/shotwell/src/Photo.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); @@ -20692,7 +20757,7 @@ void photo_get_raw_dimensions (Photo* self, Dimensions* result) { g_clear_error (&_inner_error_); #line 2706 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 20694 "Photo.c" +#line 20759 "Photo.c" } } @@ -20702,14 +20767,15 @@ gboolean photo_has_transformations (Photo* self) { GError * _inner_error_ = NULL; #line 2711 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_PHOTO (self), FALSE); -#line 20704 "Photo.c" +#line 20769 "Photo.c" { PhotoRow* _tmp0_ = NULL; + gboolean _tmp10_ = FALSE; #line 2712 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = self->row; #line 2712 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_row); -#line 20711 "Photo.c" +#line 20777 "Photo.c" { gboolean _tmp1_ = FALSE; PhotoRow* _tmp2_ = NULL; @@ -20728,7 +20794,7 @@ gboolean photo_has_transformations (Photo* self) { if (_tmp3_ != _tmp5_) { #line 2714 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = TRUE; -#line 20730 "Photo.c" +#line 20796 "Photo.c" } else { PhotoRow* _tmp6_ = NULL; GeeHashMap* _tmp7_ = NULL; @@ -20738,22 +20804,22 @@ gboolean photo_has_transformations (Photo* self) { _tmp7_ = _tmp6_->transformations; #line 2715 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = _tmp7_ != NULL; -#line 20740 "Photo.c" +#line 20806 "Photo.c" } #line 2713 "/home/jens/Source/shotwell/src/Photo.vala" result = _tmp1_; -#line 20744 "Photo.c" +#line 20810 "Photo.c" { PhotoRow* _tmp8_ = NULL; #line 2712 "/home/jens/Source/shotwell/src/Photo.vala" _tmp8_ = self->row; #line 2712 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 20751 "Photo.c" +#line 20817 "Photo.c" } #line 2713 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 20755 "Photo.c" +#line 20821 "Photo.c" } __finally364: { @@ -20762,15 +20828,15 @@ gboolean photo_has_transformations (Photo* self) { _tmp9_ = self->row; #line 2712 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 20764 "Photo.c" +#line 20830 "Photo.c" } #line 2712 "/home/jens/Source/shotwell/src/Photo.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 2712 "/home/jens/Source/shotwell/src/Photo.vala" g_clear_error (&_inner_error_); #line 2712 "/home/jens/Source/shotwell/src/Photo.vala" - return FALSE; -#line 20772 "Photo.c" + return _tmp10_; +#line 20838 "Photo.c" } } @@ -20794,7 +20860,7 @@ gboolean photo_only_metadata_changed (Photo* self) { _tmp1_ = metadata; #line 2723 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp1_ != NULL) { -#line 20796 "Photo.c" +#line 20862 "Photo.c" PhotoMetadata* _tmp2_ = NULL; MetadataDateTime* _tmp3_ = NULL; #line 2724 "/home/jens/Source/shotwell/src/Photo.vala" @@ -20805,15 +20871,16 @@ gboolean photo_only_metadata_changed (Photo* self) { _metadata_date_time_unref0 (date_time); #line 2724 "/home/jens/Source/shotwell/src/Photo.vala" date_time = _tmp3_; -#line 20807 "Photo.c" +#line 20873 "Photo.c" } { PhotoRow* _tmp4_ = NULL; + gboolean _tmp21_ = FALSE; #line 2726 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = self->row; #line 2726 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_row); -#line 20815 "Photo.c" +#line 20882 "Photo.c" { gboolean _tmp5_ = FALSE; PhotoRow* _tmp6_ = NULL; @@ -20824,7 +20891,7 @@ gboolean photo_only_metadata_changed (Photo* self) { _tmp7_ = _tmp6_->transformations; #line 2727 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp7_ == NULL) { -#line 20826 "Photo.c" +#line 20893 "Photo.c" gboolean _tmp8_ = FALSE; PhotoRow* _tmp9_ = NULL; Orientation _tmp10_ = 0; @@ -20842,7 +20909,7 @@ gboolean photo_only_metadata_changed (Photo* self) { if (_tmp10_ != _tmp12_) { #line 2728 "/home/jens/Source/shotwell/src/Photo.vala" _tmp8_ = TRUE; -#line 20844 "Photo.c" +#line 20911 "Photo.c" } else { gboolean _tmp13_ = FALSE; MetadataDateTime* _tmp14_ = NULL; @@ -20850,7 +20917,7 @@ gboolean photo_only_metadata_changed (Photo* self) { _tmp14_ = date_time; #line 2729 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp14_ != NULL) { -#line 20852 "Photo.c" +#line 20919 "Photo.c" PhotoRow* _tmp15_ = NULL; time_t _tmp16_ = 0; MetadataDateTime* _tmp17_ = NULL; @@ -20865,34 +20932,34 @@ gboolean photo_only_metadata_changed (Photo* self) { _tmp18_ = metadata_date_time_get_timestamp (_tmp17_); #line 2729 "/home/jens/Source/shotwell/src/Photo.vala" _tmp13_ = _tmp16_ != _tmp18_; -#line 20867 "Photo.c" +#line 20934 "Photo.c" } else { #line 2729 "/home/jens/Source/shotwell/src/Photo.vala" _tmp13_ = FALSE; -#line 20871 "Photo.c" +#line 20938 "Photo.c" } #line 2729 "/home/jens/Source/shotwell/src/Photo.vala" _tmp8_ = _tmp13_; -#line 20875 "Photo.c" +#line 20942 "Photo.c" } #line 2728 "/home/jens/Source/shotwell/src/Photo.vala" _tmp5_ = _tmp8_; -#line 20879 "Photo.c" +#line 20946 "Photo.c" } else { #line 2727 "/home/jens/Source/shotwell/src/Photo.vala" _tmp5_ = FALSE; -#line 20883 "Photo.c" +#line 20950 "Photo.c" } #line 2727 "/home/jens/Source/shotwell/src/Photo.vala" result = _tmp5_; -#line 20887 "Photo.c" +#line 20954 "Photo.c" { PhotoRow* _tmp19_ = NULL; #line 2726 "/home/jens/Source/shotwell/src/Photo.vala" _tmp19_ = self->row; #line 2726 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 20894 "Photo.c" +#line 20961 "Photo.c" } #line 2727 "/home/jens/Source/shotwell/src/Photo.vala" _media_metadata_unref0 (metadata); @@ -20900,7 +20967,7 @@ gboolean photo_only_metadata_changed (Photo* self) { _metadata_date_time_unref0 (date_time); #line 2727 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 20902 "Photo.c" +#line 20969 "Photo.c" } __finally365: { @@ -20909,7 +20976,7 @@ gboolean photo_only_metadata_changed (Photo* self) { _tmp20_ = self->row; #line 2726 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 20911 "Photo.c" +#line 20978 "Photo.c" } #line 2726 "/home/jens/Source/shotwell/src/Photo.vala" _media_metadata_unref0 (metadata); @@ -20920,14 +20987,14 @@ gboolean photo_only_metadata_changed (Photo* self) { #line 2726 "/home/jens/Source/shotwell/src/Photo.vala" g_clear_error (&_inner_error_); #line 2726 "/home/jens/Source/shotwell/src/Photo.vala" - return FALSE; -#line 20923 "Photo.c" + return _tmp21_; +#line 20990 "Photo.c" } #line 2719 "/home/jens/Source/shotwell/src/Photo.vala" _media_metadata_unref0 (metadata); #line 2719 "/home/jens/Source/shotwell/src/Photo.vala" _metadata_date_time_unref0 (date_time); -#line 20929 "Photo.c" +#line 20996 "Photo.c" } @@ -20957,7 +21024,7 @@ gboolean photo_has_alterations (Photo* self) { _tmp1_ = metadata; #line 2739 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp1_ != NULL) { -#line 20959 "Photo.c" +#line 21026 "Photo.c" PhotoMetadata* _tmp2_ = NULL; MetadataDateTime* _tmp3_ = NULL; PhotoMetadata* _tmp4_ = NULL; @@ -20988,20 +21055,20 @@ gboolean photo_has_alterations (Photo* self) { _g_free0 (comment); #line 2742 "/home/jens/Source/shotwell/src/Photo.vala" comment = _tmp7_; -#line 20990 "Photo.c" +#line 21057 "Photo.c" } #line 2746 "/home/jens/Source/shotwell/src/Photo.vala" _tmp8_ = date_time; #line 2746 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp8_ == NULL) { -#line 20996 "Photo.c" +#line 21063 "Photo.c" { PhotoRow* _tmp9_ = NULL; #line 2748 "/home/jens/Source/shotwell/src/Photo.vala" _tmp9_ = self->row; #line 2748 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_row); -#line 21003 "Photo.c" +#line 21070 "Photo.c" { BackingPhotoRow* _tmp10_ = NULL; time_t _tmp11_ = 0; @@ -21019,14 +21086,14 @@ gboolean photo_has_alterations (Photo* self) { if (_tmp11_ != _tmp13_) { #line 2752 "/home/jens/Source/shotwell/src/Photo.vala" result = TRUE; -#line 21021 "Photo.c" +#line 21088 "Photo.c" { PhotoRow* _tmp14_ = NULL; #line 2748 "/home/jens/Source/shotwell/src/Photo.vala" _tmp14_ = self->row; #line 2748 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 21028 "Photo.c" +#line 21095 "Photo.c" } #line 2752 "/home/jens/Source/shotwell/src/Photo.vala" _media_metadata_unref0 (metadata); @@ -21038,7 +21105,7 @@ gboolean photo_has_alterations (Photo* self) { _metadata_date_time_unref0 (date_time); #line 2752 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 21040 "Photo.c" +#line 21107 "Photo.c" } } __finally366: @@ -21048,10 +21115,12 @@ gboolean photo_has_alterations (Photo* self) { _tmp15_ = self->row; #line 2748 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 21050 "Photo.c" +#line 21117 "Photo.c" } #line 2748 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { +#line 21121 "Photo.c" + gboolean _tmp16_ = FALSE; #line 2748 "/home/jens/Source/shotwell/src/Photo.vala" _media_metadata_unref0 (metadata); #line 2748 "/home/jens/Source/shotwell/src/Photo.vala" @@ -21065,140 +21134,141 @@ gboolean photo_has_alterations (Photo* self) { #line 2748 "/home/jens/Source/shotwell/src/Photo.vala" g_clear_error (&_inner_error_); #line 2748 "/home/jens/Source/shotwell/src/Photo.vala" - return FALSE; -#line 21068 "Photo.c" + return _tmp16_; +#line 21137 "Photo.c" } } } { - PhotoRow* _tmp16_ = NULL; + PhotoRow* _tmp17_ = NULL; + gboolean _tmp42_ = FALSE; #line 2757 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp16_ = self->row; + _tmp17_ = self->row; #line 2757 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_row); -#line 21078 "Photo.c" +#line 21148 "Photo.c" { - gboolean _tmp17_ = FALSE; gboolean _tmp18_ = FALSE; gboolean _tmp19_ = FALSE; gboolean _tmp20_ = FALSE; - PhotoRow* _tmp21_ = NULL; - GeeHashMap* _tmp22_ = NULL; + gboolean _tmp21_ = FALSE; + PhotoRow* _tmp22_ = NULL; + GeeHashMap* _tmp23_ = NULL; #line 2758 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp21_ = self->row; + _tmp22_ = self->row; #line 2758 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp22_ = _tmp21_->transformations; + _tmp23_ = _tmp22_->transformations; #line 2758 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp22_ != NULL) { + if (_tmp23_ != NULL) { #line 2758 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp20_ = TRUE; -#line 21094 "Photo.c" + _tmp21_ = TRUE; +#line 21164 "Photo.c" } else { - PhotoRow* _tmp23_ = NULL; - Orientation _tmp24_ = 0; - BackingPhotoRow* _tmp25_ = NULL; - Orientation _tmp26_ = 0; + PhotoRow* _tmp24_ = NULL; + Orientation _tmp25_ = 0; + BackingPhotoRow* _tmp26_ = NULL; + Orientation _tmp27_ = 0; #line 2759 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp23_ = self->row; + _tmp24_ = self->row; #line 2759 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp24_ = _tmp23_->orientation; + _tmp25_ = _tmp24_->orientation; #line 2759 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp25_ = self->backing_photo_row; + _tmp26_ = self->backing_photo_row; #line 2759 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp26_ = _tmp25_->original_orientation; + _tmp27_ = _tmp26_->original_orientation; #line 2759 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp20_ = _tmp24_ != _tmp26_; -#line 21110 "Photo.c" + _tmp21_ = _tmp25_ != _tmp27_; +#line 21180 "Photo.c" } #line 2758 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp20_) { + if (_tmp21_) { #line 2758 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp19_ = TRUE; -#line 21116 "Photo.c" + _tmp20_ = TRUE; +#line 21186 "Photo.c" } else { - gboolean _tmp27_ = FALSE; - MetadataDateTime* _tmp28_ = NULL; + gboolean _tmp28_ = FALSE; + MetadataDateTime* _tmp29_ = NULL; #line 2760 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp28_ = date_time; + _tmp29_ = date_time; #line 2760 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp28_ != NULL) { -#line 21124 "Photo.c" - PhotoRow* _tmp29_ = NULL; - time_t _tmp30_ = 0; - MetadataDateTime* _tmp31_ = NULL; - time_t _tmp32_ = 0; + if (_tmp29_ != NULL) { +#line 21194 "Photo.c" + PhotoRow* _tmp30_ = NULL; + time_t _tmp31_ = 0; + MetadataDateTime* _tmp32_ = NULL; + time_t _tmp33_ = 0; #line 2760 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp29_ = self->row; + _tmp30_ = self->row; #line 2760 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp30_ = _tmp29_->exposure_time; + _tmp31_ = _tmp30_->exposure_time; #line 2760 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp31_ = date_time; + _tmp32_ = date_time; #line 2760 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp32_ = metadata_date_time_get_timestamp (_tmp31_); + _tmp33_ = metadata_date_time_get_timestamp (_tmp32_); #line 2760 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp27_ = _tmp30_ != _tmp32_; -#line 21139 "Photo.c" + _tmp28_ = _tmp31_ != _tmp33_; +#line 21209 "Photo.c" } else { #line 2760 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp27_ = FALSE; -#line 21143 "Photo.c" + _tmp28_ = FALSE; +#line 21213 "Photo.c" } #line 2760 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp19_ = _tmp27_; -#line 21147 "Photo.c" + _tmp20_ = _tmp28_; +#line 21217 "Photo.c" } #line 2758 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp19_) { + if (_tmp20_) { #line 2758 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp18_ = TRUE; -#line 21153 "Photo.c" + _tmp19_ = TRUE; +#line 21223 "Photo.c" } else { - gchar* _tmp33_ = NULL; gchar* _tmp34_ = NULL; - const gchar* _tmp35_ = NULL; + gchar* _tmp35_ = NULL; + const gchar* _tmp36_ = NULL; #line 2761 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp33_ = media_source_get_comment (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource)); + _tmp34_ = media_source_get_comment (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource)); #line 2761 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp34_ = _tmp33_; + _tmp35_ = _tmp34_; #line 2761 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp35_ = comment; + _tmp36_ = comment; #line 2761 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp18_ = g_strcmp0 (_tmp34_, _tmp35_) != 0; + _tmp19_ = g_strcmp0 (_tmp35_, _tmp36_) != 0; #line 2761 "/home/jens/Source/shotwell/src/Photo.vala" - _g_free0 (_tmp34_); -#line 21168 "Photo.c" + _g_free0 (_tmp35_); +#line 21238 "Photo.c" } #line 2758 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp18_) { + if (_tmp19_) { #line 2758 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp17_ = TRUE; -#line 21174 "Photo.c" + _tmp18_ = TRUE; +#line 21244 "Photo.c" } else { - gchar* _tmp36_ = NULL; gchar* _tmp37_ = NULL; - const gchar* _tmp38_ = NULL; + gchar* _tmp38_ = NULL; + const gchar* _tmp39_ = NULL; #line 2762 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp36_ = media_source_get_title (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource)); + _tmp37_ = media_source_get_title (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource)); #line 2762 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp37_ = _tmp36_; + _tmp38_ = _tmp37_; #line 2762 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp38_ = title; + _tmp39_ = title; #line 2762 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp17_ = g_strcmp0 (_tmp37_, _tmp38_) != 0; + _tmp18_ = g_strcmp0 (_tmp38_, _tmp39_) != 0; #line 2762 "/home/jens/Source/shotwell/src/Photo.vala" - _g_free0 (_tmp37_); -#line 21189 "Photo.c" + _g_free0 (_tmp38_); +#line 21259 "Photo.c" } #line 2758 "/home/jens/Source/shotwell/src/Photo.vala" - result = _tmp17_; -#line 21193 "Photo.c" + result = _tmp18_; +#line 21263 "Photo.c" { - PhotoRow* _tmp39_ = NULL; + PhotoRow* _tmp40_ = NULL; #line 2757 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp39_ = self->row; + _tmp40_ = self->row; #line 2757 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 21200 "Photo.c" +#line 21270 "Photo.c" } #line 2758 "/home/jens/Source/shotwell/src/Photo.vala" _media_metadata_unref0 (metadata); @@ -21210,16 +21280,16 @@ gboolean photo_has_alterations (Photo* self) { _metadata_date_time_unref0 (date_time); #line 2758 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 21212 "Photo.c" +#line 21282 "Photo.c" } __finally367: { - PhotoRow* _tmp40_ = NULL; + PhotoRow* _tmp41_ = NULL; #line 2757 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp40_ = self->row; + _tmp41_ = self->row; #line 2757 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 21221 "Photo.c" +#line 21291 "Photo.c" } #line 2757 "/home/jens/Source/shotwell/src/Photo.vala" _media_metadata_unref0 (metadata); @@ -21234,8 +21304,8 @@ gboolean photo_has_alterations (Photo* self) { #line 2757 "/home/jens/Source/shotwell/src/Photo.vala" g_clear_error (&_inner_error_); #line 2757 "/home/jens/Source/shotwell/src/Photo.vala" - return FALSE; -#line 21237 "Photo.c" + return _tmp42_; +#line 21307 "Photo.c" } #line 2733 "/home/jens/Source/shotwell/src/Photo.vala" _media_metadata_unref0 (metadata); @@ -21245,7 +21315,7 @@ gboolean photo_has_alterations (Photo* self) { _g_free0 (title); #line 2733 "/home/jens/Source/shotwell/src/Photo.vala" _metadata_date_time_unref0 (date_time); -#line 21247 "Photo.c" +#line 21317 "Photo.c" } @@ -21254,14 +21324,14 @@ PhotoTransformationState* photo_save_transformation_state (Photo* self) { GError * _inner_error_ = NULL; #line 2767 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_PHOTO (self), NULL); -#line 21256 "Photo.c" +#line 21326 "Photo.c" { PhotoRow* _tmp0_ = NULL; #line 2768 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = self->row; #line 2768 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_row); -#line 21263 "Photo.c" +#line 21333 "Photo.c" { PixelTransformer* _tmp1_ = NULL; PixelTransformer* _tmp2_ = NULL; @@ -21276,7 +21346,7 @@ PhotoTransformationState* photo_save_transformation_state (Photo* self) { _tmp2_ = self->priv->transformer; #line 2771 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp2_ != NULL) { -#line 21278 "Photo.c" +#line 21348 "Photo.c" PixelTransformer* _tmp3_ = NULL; PixelTransformer* _tmp4_ = NULL; #line 2771 "/home/jens/Source/shotwell/src/Photo.vala" @@ -21287,19 +21357,19 @@ PhotoTransformationState* photo_save_transformation_state (Photo* self) { _pixel_transformer_unref0 (_tmp1_); #line 2771 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = _tmp4_; -#line 21289 "Photo.c" +#line 21359 "Photo.c" } else { #line 2771 "/home/jens/Source/shotwell/src/Photo.vala" _pixel_transformer_unref0 (_tmp1_); #line 2771 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = NULL; -#line 21295 "Photo.c" +#line 21365 "Photo.c" } #line 2772 "/home/jens/Source/shotwell/src/Photo.vala" _tmp6_ = self->priv->adjustments; #line 2772 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp6_ != NULL) { -#line 21301 "Photo.c" +#line 21371 "Photo.c" PixelTransformationBundle* _tmp7_ = NULL; PixelTransformationBundle* _tmp8_ = NULL; #line 2772 "/home/jens/Source/shotwell/src/Photo.vala" @@ -21310,13 +21380,13 @@ PhotoTransformationState* photo_save_transformation_state (Photo* self) { _pixel_transformation_bundle_unref0 (_tmp5_); #line 2772 "/home/jens/Source/shotwell/src/Photo.vala" _tmp5_ = _tmp8_; -#line 21312 "Photo.c" +#line 21382 "Photo.c" } else { #line 2772 "/home/jens/Source/shotwell/src/Photo.vala" _pixel_transformation_bundle_unref0 (_tmp5_); #line 2772 "/home/jens/Source/shotwell/src/Photo.vala" _tmp5_ = NULL; -#line 21318 "Photo.c" +#line 21388 "Photo.c" } #line 2769 "/home/jens/Source/shotwell/src/Photo.vala" _tmp9_ = self->row; @@ -21334,18 +21404,18 @@ PhotoTransformationState* photo_save_transformation_state (Photo* self) { _pixel_transformation_bundle_unref0 (_tmp5_); #line 2769 "/home/jens/Source/shotwell/src/Photo.vala" _pixel_transformer_unref0 (_tmp1_); -#line 21336 "Photo.c" +#line 21406 "Photo.c" { PhotoRow* _tmp14_ = NULL; #line 2768 "/home/jens/Source/shotwell/src/Photo.vala" _tmp14_ = self->row; #line 2768 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 21343 "Photo.c" +#line 21413 "Photo.c" } #line 2769 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 21347 "Photo.c" +#line 21417 "Photo.c" } __finally368: { @@ -21354,7 +21424,7 @@ PhotoTransformationState* photo_save_transformation_state (Photo* self) { _tmp15_ = self->row; #line 2768 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 21356 "Photo.c" +#line 21426 "Photo.c" } #line 2768 "/home/jens/Source/shotwell/src/Photo.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); @@ -21362,7 +21432,7 @@ PhotoTransformationState* photo_save_transformation_state (Photo* self) { g_clear_error (&_inner_error_); #line 2768 "/home/jens/Source/shotwell/src/Photo.vala" return NULL; -#line 21364 "Photo.c" +#line 21434 "Photo.c" } } @@ -21370,14 +21440,14 @@ PhotoTransformationState* photo_save_transformation_state (Photo* self) { static gpointer _pixel_transformer_ref0 (gpointer self) { #line 2793 "/home/jens/Source/shotwell/src/Photo.vala" return self ? pixel_transformer_ref (self) : NULL; -#line 21372 "Photo.c" +#line 21442 "Photo.c" } static gpointer _pixel_transformation_bundle_ref0 (gpointer self) { #line 2794 "/home/jens/Source/shotwell/src/Photo.vala" return self ? pixel_transformation_bundle_ref (self) : NULL; -#line 21379 "Photo.c" +#line 21449 "Photo.c" } @@ -21400,7 +21470,7 @@ gboolean photo_load_transformation_state (Photo* self, PhotoTransformationState* PhotoPhotoTransformationStateImpl* _tmp9_ = NULL; PixelTransformationBundle* _tmp10_ = NULL; gboolean committed = FALSE; - gboolean _tmp30_ = FALSE; + gboolean _tmp31_ = FALSE; GError * _inner_error_ = NULL; #line 2776 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_PHOTO (self), FALSE); @@ -21422,7 +21492,7 @@ gboolean photo_load_transformation_state (Photo* self, PhotoTransformationState* _g_object_unref0 (state_impl); #line 2779 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 21424 "Photo.c" +#line 21494 "Photo.c" } #line 2781 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = state_impl; @@ -21448,14 +21518,14 @@ gboolean photo_load_transformation_state (Photo* self, PhotoTransformationState* _tmp10_ = photo_photo_transformation_state_impl_get_color_adjustments (_tmp9_); #line 2784 "/home/jens/Source/shotwell/src/Photo.vala" saved_adjustments = _tmp10_; -#line 21450 "Photo.c" +#line 21520 "Photo.c" { PhotoRow* _tmp11_ = NULL; #line 2787 "/home/jens/Source/shotwell/src/Photo.vala" _tmp11_ = self->row; #line 2787 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_row); -#line 21457 "Photo.c" +#line 21527 "Photo.c" { PhotoTable* _tmp12_ = NULL; PhotoTable* _tmp13_ = NULL; @@ -21487,7 +21557,7 @@ gboolean photo_load_transformation_state (Photo* self, PhotoTransformationState* _tmp19_ = committed; #line 2790 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp19_) { -#line 21489 "Photo.c" +#line 21559 "Photo.c" PhotoRow* _tmp20_ = NULL; Orientation _tmp21_ = 0; PhotoRow* _tmp22_ = NULL; @@ -21529,7 +21599,7 @@ gboolean photo_load_transformation_state (Photo* self, PhotoTransformationState* _pixel_transformation_bundle_unref0 (self->priv->adjustments); #line 2794 "/home/jens/Source/shotwell/src/Photo.vala" self->priv->adjustments = _tmp28_; -#line 21531 "Photo.c" +#line 21601 "Photo.c" } } __finally369: @@ -21539,10 +21609,12 @@ gboolean photo_load_transformation_state (Photo* self, PhotoTransformationState* _tmp29_ = self->row; #line 2787 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 21541 "Photo.c" +#line 21611 "Photo.c" } #line 2787 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { +#line 21615 "Photo.c" + gboolean _tmp30_ = FALSE; #line 2787 "/home/jens/Source/shotwell/src/Photo.vala" _pixel_transformation_bundle_unref0 (saved_adjustments); #line 2787 "/home/jens/Source/shotwell/src/Photo.vala" @@ -21556,26 +21628,26 @@ gboolean photo_load_transformation_state (Photo* self, PhotoTransformationState* #line 2787 "/home/jens/Source/shotwell/src/Photo.vala" g_clear_error (&_inner_error_); #line 2787 "/home/jens/Source/shotwell/src/Photo.vala" - return FALSE; -#line 21559 "Photo.c" + return _tmp30_; +#line 21631 "Photo.c" } } #line 2798 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp30_ = committed; + _tmp31_ = committed; #line 2798 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp30_) { -#line 21566 "Photo.c" - Alteration* _tmp31_ = NULL; + if (_tmp31_) { +#line 21638 "Photo.c" Alteration* _tmp32_ = NULL; + Alteration* _tmp33_ = NULL; #line 2799 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp31_ = alteration_new ("image", "transformation-state"); + _tmp32_ = alteration_new ("image", "transformation-state"); #line 2799 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp32_ = _tmp31_; + _tmp33_ = _tmp32_; #line 2799 "/home/jens/Source/shotwell/src/Photo.vala" - data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp32_); + data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp33_); #line 2799 "/home/jens/Source/shotwell/src/Photo.vala" - _alteration_unref0 (_tmp32_); -#line 21577 "Photo.c" + _alteration_unref0 (_tmp33_); +#line 21649 "Photo.c" } #line 2801 "/home/jens/Source/shotwell/src/Photo.vala" result = committed; @@ -21589,7 +21661,7 @@ gboolean photo_load_transformation_state (Photo* self, PhotoTransformationState* _g_object_unref0 (state_impl); #line 2801 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 21591 "Photo.c" +#line 21663 "Photo.c" } @@ -21598,7 +21670,7 @@ void photo_remove_all_transformations (Photo* self) { g_return_if_fail (IS_PHOTO (self)); #line 2805 "/home/jens/Source/shotwell/src/Photo.vala" photo_internal_remove_all_transformations (self, TRUE); -#line 21600 "Photo.c" +#line 21672 "Photo.c" } @@ -21611,14 +21683,14 @@ static void photo_internal_remove_all_transformations (Photo* self, gboolean not g_return_if_fail (IS_PHOTO (self)); #line 2809 "/home/jens/Source/shotwell/src/Photo.vala" is_altered = FALSE; -#line 21613 "Photo.c" +#line 21685 "Photo.c" { PhotoRow* _tmp0_ = NULL; #line 2810 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = self->row; #line 2810 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_row); -#line 21620 "Photo.c" +#line 21692 "Photo.c" { PhotoTable* _tmp1_ = NULL; PhotoTable* _tmp2_ = NULL; @@ -21668,7 +21740,7 @@ static void photo_internal_remove_all_transformations (Photo* self, gboolean not _tmp10_ = _tmp9_->original_orientation; #line 2817 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp8_ != _tmp10_) { -#line 21670 "Photo.c" +#line 21742 "Photo.c" PhotoTable* _tmp11_ = NULL; PhotoTable* _tmp12_ = NULL; PhotoRow* _tmp13_ = NULL; @@ -21704,7 +21776,7 @@ static void photo_internal_remove_all_transformations (Photo* self, gboolean not _tmp17_->orientation = _tmp19_; #line 2821 "/home/jens/Source/shotwell/src/Photo.vala" is_altered = TRUE; -#line 21706 "Photo.c" +#line 21778 "Photo.c" } } __finally370: @@ -21714,7 +21786,7 @@ static void photo_internal_remove_all_transformations (Photo* self, gboolean not _tmp20_ = self->row; #line 2810 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 21716 "Photo.c" +#line 21788 "Photo.c" } #line 2810 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { @@ -21724,28 +21796,28 @@ static void photo_internal_remove_all_transformations (Photo* self, gboolean not g_clear_error (&_inner_error_); #line 2810 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 21726 "Photo.c" +#line 21798 "Photo.c" } } #line 2825 "/home/jens/Source/shotwell/src/Photo.vala" _tmp22_ = is_altered; #line 2825 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp22_) { -#line 21733 "Photo.c" +#line 21805 "Photo.c" gboolean _tmp23_ = FALSE; #line 2825 "/home/jens/Source/shotwell/src/Photo.vala" _tmp23_ = notify; #line 2825 "/home/jens/Source/shotwell/src/Photo.vala" _tmp21_ = _tmp23_; -#line 21739 "Photo.c" +#line 21811 "Photo.c" } else { #line 2825 "/home/jens/Source/shotwell/src/Photo.vala" _tmp21_ = FALSE; -#line 21743 "Photo.c" +#line 21815 "Photo.c" } #line 2825 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp21_) { -#line 21747 "Photo.c" +#line 21819 "Photo.c" Alteration* _tmp24_ = NULL; Alteration* _tmp25_ = NULL; #line 2826 "/home/jens/Source/shotwell/src/Photo.vala" @@ -21756,7 +21828,7 @@ static void photo_internal_remove_all_transformations (Photo* self, gboolean not data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp25_); #line 2826 "/home/jens/Source/shotwell/src/Photo.vala" _alteration_unref0 (_tmp25_); -#line 21758 "Photo.c" +#line 21830 "Photo.c" } } @@ -21766,14 +21838,14 @@ Orientation photo_get_original_orientation (Photo* self) { GError * _inner_error_ = NULL; #line 2829 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_PHOTO (self), 0); -#line 21768 "Photo.c" +#line 21840 "Photo.c" { PhotoRow* _tmp0_ = NULL; #line 2830 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = self->row; #line 2830 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_row); -#line 21775 "Photo.c" +#line 21847 "Photo.c" { BackingPhotoRow* _tmp1_ = NULL; Orientation _tmp2_ = 0; @@ -21783,18 +21855,18 @@ Orientation photo_get_original_orientation (Photo* self) { _tmp2_ = _tmp1_->original_orientation; #line 2831 "/home/jens/Source/shotwell/src/Photo.vala" result = _tmp2_; -#line 21785 "Photo.c" +#line 21857 "Photo.c" { PhotoRow* _tmp3_ = NULL; #line 2830 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = self->row; #line 2830 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 21792 "Photo.c" +#line 21864 "Photo.c" } #line 2831 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 21796 "Photo.c" +#line 21868 "Photo.c" } __finally371: { @@ -21803,7 +21875,7 @@ Orientation photo_get_original_orientation (Photo* self) { _tmp4_ = self->row; #line 2830 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 21805 "Photo.c" +#line 21877 "Photo.c" } #line 2830 "/home/jens/Source/shotwell/src/Photo.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); @@ -21811,7 +21883,7 @@ Orientation photo_get_original_orientation (Photo* self) { g_clear_error (&_inner_error_); #line 2830 "/home/jens/Source/shotwell/src/Photo.vala" return 0; -#line 21813 "Photo.c" +#line 21885 "Photo.c" } } @@ -21821,14 +21893,14 @@ Orientation photo_get_orientation (Photo* self) { GError * _inner_error_ = NULL; #line 2835 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_PHOTO (self), 0); -#line 21823 "Photo.c" +#line 21895 "Photo.c" { PhotoRow* _tmp0_ = NULL; #line 2836 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = self->row; #line 2836 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_row); -#line 21830 "Photo.c" +#line 21902 "Photo.c" { PhotoRow* _tmp1_ = NULL; Orientation _tmp2_ = 0; @@ -21838,18 +21910,18 @@ Orientation photo_get_orientation (Photo* self) { _tmp2_ = _tmp1_->orientation; #line 2837 "/home/jens/Source/shotwell/src/Photo.vala" result = _tmp2_; -#line 21840 "Photo.c" +#line 21912 "Photo.c" { PhotoRow* _tmp3_ = NULL; #line 2836 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = self->row; #line 2836 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 21847 "Photo.c" +#line 21919 "Photo.c" } #line 2837 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 21851 "Photo.c" +#line 21923 "Photo.c" } __finally372: { @@ -21858,7 +21930,7 @@ Orientation photo_get_orientation (Photo* self) { _tmp4_ = self->row; #line 2836 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 21860 "Photo.c" +#line 21932 "Photo.c" } #line 2836 "/home/jens/Source/shotwell/src/Photo.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); @@ -21866,7 +21938,7 @@ Orientation photo_get_orientation (Photo* self) { g_clear_error (&_inner_error_); #line 2836 "/home/jens/Source/shotwell/src/Photo.vala" return 0; -#line 21868 "Photo.c" +#line 21940 "Photo.c" } } @@ -21874,20 +21946,20 @@ Orientation photo_get_orientation (Photo* self) { gboolean photo_set_orientation (Photo* self, Orientation orientation) { gboolean result = FALSE; gboolean committed = FALSE; - gboolean _tmp14_ = FALSE; + gboolean _tmp15_ = FALSE; GError * _inner_error_ = NULL; #line 2841 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_PHOTO (self), FALSE); #line 2842 "/home/jens/Source/shotwell/src/Photo.vala" committed = FALSE; -#line 21882 "Photo.c" +#line 21954 "Photo.c" { PhotoRow* _tmp0_ = NULL; #line 2843 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = self->row; #line 2843 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_row); -#line 21889 "Photo.c" +#line 21961 "Photo.c" { PhotoRow* _tmp1_ = NULL; Orientation _tmp2_ = 0; @@ -21900,7 +21972,7 @@ gboolean photo_set_orientation (Photo* self, Orientation orientation) { _tmp3_ = orientation; #line 2844 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp2_ != _tmp3_) { -#line 21902 "Photo.c" +#line 21974 "Photo.c" PhotoTable* _tmp4_ = NULL; PhotoTable* _tmp5_ = NULL; PhotoRow* _tmp6_ = NULL; @@ -21928,7 +22000,7 @@ gboolean photo_set_orientation (Photo* self, Orientation orientation) { _tmp10_ = committed; #line 2846 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp10_) { -#line 21930 "Photo.c" +#line 22002 "Photo.c" PhotoRow* _tmp11_ = NULL; Orientation _tmp12_ = 0; #line 2847 "/home/jens/Source/shotwell/src/Photo.vala" @@ -21937,7 +22009,7 @@ gboolean photo_set_orientation (Photo* self, Orientation orientation) { _tmp12_ = orientation; #line 2847 "/home/jens/Source/shotwell/src/Photo.vala" _tmp11_->orientation = _tmp12_; -#line 21939 "Photo.c" +#line 22011 "Photo.c" } } } @@ -21948,41 +22020,43 @@ gboolean photo_set_orientation (Photo* self, Orientation orientation) { _tmp13_ = self->row; #line 2843 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 21950 "Photo.c" +#line 22022 "Photo.c" } #line 2843 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { +#line 22026 "Photo.c" + gboolean _tmp14_ = FALSE; #line 2843 "/home/jens/Source/shotwell/src/Photo.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 2843 "/home/jens/Source/shotwell/src/Photo.vala" g_clear_error (&_inner_error_); #line 2843 "/home/jens/Source/shotwell/src/Photo.vala" - return FALSE; -#line 21960 "Photo.c" + return _tmp14_; +#line 22034 "Photo.c" } } #line 2851 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp14_ = committed; + _tmp15_ = committed; #line 2851 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp14_) { -#line 21967 "Photo.c" - Alteration* _tmp15_ = NULL; + if (_tmp15_) { +#line 22041 "Photo.c" Alteration* _tmp16_ = NULL; + Alteration* _tmp17_ = NULL; #line 2852 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp15_ = alteration_new ("image", "orientation"); + _tmp16_ = alteration_new ("image", "orientation"); #line 2852 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp16_ = _tmp15_; + _tmp17_ = _tmp16_; #line 2852 "/home/jens/Source/shotwell/src/Photo.vala" - data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp16_); + data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp17_); #line 2852 "/home/jens/Source/shotwell/src/Photo.vala" - _alteration_unref0 (_tmp16_); -#line 21978 "Photo.c" + _alteration_unref0 (_tmp17_); +#line 22052 "Photo.c" } #line 2854 "/home/jens/Source/shotwell/src/Photo.vala" result = committed; #line 2854 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 21984 "Photo.c" +#line 22058 "Photo.c" } @@ -21997,7 +22071,7 @@ gboolean photo_check_can_rotate (Photo* self) { result = _tmp0_; #line 2858 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 21999 "Photo.c" +#line 22073 "Photo.c" } @@ -22009,7 +22083,7 @@ static void photo_real_rotate (Photo* self, Rotation rotation) { _tmp0_ = self->row; #line 2862 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_row); -#line 22011 "Photo.c" +#line 22085 "Photo.c" { Orientation _tmp1_ = 0; Rotation _tmp2_ = 0; @@ -22022,7 +22096,7 @@ static void photo_real_rotate (Photo* self, Rotation rotation) { _tmp3_ = orientation_perform (_tmp1_, _tmp2_); #line 2863 "/home/jens/Source/shotwell/src/Photo.vala" photo_set_orientation (self, _tmp3_); -#line 22024 "Photo.c" +#line 22098 "Photo.c" } __finally374: { @@ -22031,7 +22105,7 @@ static void photo_real_rotate (Photo* self, Rotation rotation) { _tmp4_ = self->row; #line 2862 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 22033 "Photo.c" +#line 22107 "Photo.c" } #line 2862 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { @@ -22041,7 +22115,7 @@ static void photo_real_rotate (Photo* self, Rotation rotation) { g_clear_error (&_inner_error_); #line 2862 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 22043 "Photo.c" +#line 22117 "Photo.c" } } } @@ -22052,7 +22126,7 @@ void photo_rotate (Photo* self, Rotation rotation) { g_return_if_fail (IS_PHOTO (self)); #line 2861 "/home/jens/Source/shotwell/src/Photo.vala" PHOTO_GET_CLASS (self)->rotate (self, rotation); -#line 22054 "Photo.c" +#line 22128 "Photo.c" } @@ -22063,14 +22137,15 @@ static gboolean photo_has_transformation (Photo* self, const gchar* name) { g_return_val_if_fail (IS_PHOTO (self), FALSE); #line 2867 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (name != NULL, FALSE); -#line 22065 "Photo.c" +#line 22139 "Photo.c" { PhotoRow* _tmp0_ = NULL; + gboolean _tmp10_ = FALSE; #line 2868 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = self->row; #line 2868 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_row); -#line 22072 "Photo.c" +#line 22147 "Photo.c" { gboolean _tmp1_ = FALSE; PhotoRow* _tmp2_ = NULL; @@ -22081,7 +22156,7 @@ static gboolean photo_has_transformation (Photo* self, const gchar* name) { _tmp3_ = _tmp2_->transformations; #line 2869 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp3_ != NULL) { -#line 22083 "Photo.c" +#line 22158 "Photo.c" PhotoRow* _tmp4_ = NULL; GeeHashMap* _tmp5_ = NULL; const gchar* _tmp6_ = NULL; @@ -22096,26 +22171,26 @@ static gboolean photo_has_transformation (Photo* self, const gchar* name) { _tmp7_ = gee_abstract_map_has_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp6_); #line 2869 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = _tmp7_; -#line 22098 "Photo.c" +#line 22173 "Photo.c" } else { #line 2869 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = FALSE; -#line 22102 "Photo.c" +#line 22177 "Photo.c" } #line 2869 "/home/jens/Source/shotwell/src/Photo.vala" result = _tmp1_; -#line 22106 "Photo.c" +#line 22181 "Photo.c" { PhotoRow* _tmp8_ = NULL; #line 2868 "/home/jens/Source/shotwell/src/Photo.vala" _tmp8_ = self->row; #line 2868 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 22113 "Photo.c" +#line 22188 "Photo.c" } #line 2869 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 22117 "Photo.c" +#line 22192 "Photo.c" } __finally375: { @@ -22124,15 +22199,15 @@ static gboolean photo_has_transformation (Photo* self, const gchar* name) { _tmp9_ = self->row; #line 2868 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 22126 "Photo.c" +#line 22201 "Photo.c" } #line 2868 "/home/jens/Source/shotwell/src/Photo.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 2868 "/home/jens/Source/shotwell/src/Photo.vala" g_clear_error (&_inner_error_); #line 2868 "/home/jens/Source/shotwell/src/Photo.vala" - return FALSE; -#line 22134 "Photo.c" + return _tmp10_; +#line 22209 "Photo.c" } } @@ -22147,14 +22222,14 @@ static KeyValueMap* photo_get_transformation (Photo* self, const gchar* name) { g_return_val_if_fail (name != NULL, NULL); #line 2877 "/home/jens/Source/shotwell/src/Photo.vala" map = NULL; -#line 22149 "Photo.c" +#line 22224 "Photo.c" { PhotoRow* _tmp0_ = NULL; #line 2878 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = self->row; #line 2878 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_row); -#line 22156 "Photo.c" +#line 22231 "Photo.c" { PhotoRow* _tmp1_ = NULL; GeeHashMap* _tmp2_ = NULL; @@ -22164,7 +22239,7 @@ static KeyValueMap* photo_get_transformation (Photo* self, const gchar* name) { _tmp2_ = _tmp1_->transformations; #line 2879 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp2_ != NULL) { -#line 22166 "Photo.c" +#line 22241 "Photo.c" PhotoRow* _tmp3_ = NULL; GeeHashMap* _tmp4_ = NULL; const gchar* _tmp5_ = NULL; @@ -22186,7 +22261,7 @@ static KeyValueMap* photo_get_transformation (Photo* self, const gchar* name) { _tmp7_ = map; #line 2881 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp7_ != NULL) { -#line 22188 "Photo.c" +#line 22263 "Photo.c" KeyValueMap* _tmp8_ = NULL; KeyValueMap* _tmp9_ = NULL; #line 2882 "/home/jens/Source/shotwell/src/Photo.vala" @@ -22197,7 +22272,7 @@ static KeyValueMap* photo_get_transformation (Photo* self, const gchar* name) { _key_value_map_unref0 (map); #line 2882 "/home/jens/Source/shotwell/src/Photo.vala" map = _tmp9_; -#line 22199 "Photo.c" +#line 22274 "Photo.c" } } } @@ -22208,7 +22283,7 @@ static KeyValueMap* photo_get_transformation (Photo* self, const gchar* name) { _tmp10_ = self->row; #line 2878 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 22210 "Photo.c" +#line 22285 "Photo.c" } #line 2878 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { @@ -22220,14 +22295,14 @@ static KeyValueMap* photo_get_transformation (Photo* self, const gchar* name) { g_clear_error (&_inner_error_); #line 2878 "/home/jens/Source/shotwell/src/Photo.vala" return NULL; -#line 22222 "Photo.c" +#line 22297 "Photo.c" } } #line 2886 "/home/jens/Source/shotwell/src/Photo.vala" result = map; #line 2886 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 22229 "Photo.c" +#line 22304 "Photo.c" } @@ -22238,14 +22313,15 @@ static gboolean photo_set_transformation (Photo* self, KeyValueMap* trans) { g_return_val_if_fail (IS_PHOTO (self), FALSE); #line 2889 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_KEY_VALUE_MAP (trans), FALSE); -#line 22240 "Photo.c" +#line 22315 "Photo.c" { PhotoRow* _tmp0_ = NULL; + gboolean _tmp20_ = FALSE; #line 2890 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = self->row; #line 2890 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_row); -#line 22247 "Photo.c" +#line 22323 "Photo.c" { PhotoRow* _tmp1_ = NULL; GeeHashMap* _tmp2_ = NULL; @@ -22268,18 +22344,18 @@ static gboolean photo_set_transformation (Photo* self, KeyValueMap* trans) { _tmp2_ = _tmp1_->transformations; #line 2891 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp2_ == NULL) { -#line 22270 "Photo.c" +#line 22346 "Photo.c" PhotoRow* _tmp3_ = NULL; GeeHashMap* _tmp4_ = NULL; #line 2892 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = self->row; #line 2892 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp4_ = gee_hash_map_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, g_free, TYPE_KEY_VALUE_MAP, (GBoxedCopyFunc) key_value_map_ref, key_value_map_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); + _tmp4_ = gee_hash_map_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, TYPE_KEY_VALUE_MAP, (GBoxedCopyFunc) key_value_map_ref, (GDestroyNotify) key_value_map_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); #line 2892 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_tmp3_->transformations); #line 2892 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_->transformations = _tmp4_; -#line 22281 "Photo.c" +#line 22357 "Photo.c" } #line 2894 "/home/jens/Source/shotwell/src/Photo.vala" _tmp5_ = self->row; @@ -22315,18 +22391,18 @@ static gboolean photo_set_transformation (Photo* self, KeyValueMap* trans) { _database_table_unref0 (_tmp12_); #line 2896 "/home/jens/Source/shotwell/src/Photo.vala" result = _tmp17_; -#line 22317 "Photo.c" +#line 22393 "Photo.c" { PhotoRow* _tmp18_ = NULL; #line 2890 "/home/jens/Source/shotwell/src/Photo.vala" _tmp18_ = self->row; #line 2890 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 22324 "Photo.c" +#line 22400 "Photo.c" } #line 2896 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 22328 "Photo.c" +#line 22404 "Photo.c" } __finally377: { @@ -22335,15 +22411,15 @@ static gboolean photo_set_transformation (Photo* self, KeyValueMap* trans) { _tmp19_ = self->row; #line 2890 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 22337 "Photo.c" +#line 22413 "Photo.c" } #line 2890 "/home/jens/Source/shotwell/src/Photo.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 2890 "/home/jens/Source/shotwell/src/Photo.vala" g_clear_error (&_inner_error_); #line 2890 "/home/jens/Source/shotwell/src/Photo.vala" - return FALSE; -#line 22345 "Photo.c" + return _tmp20_; +#line 22421 "Photo.c" } } @@ -22352,21 +22428,21 @@ static gboolean photo_remove_transformation (Photo* self, const gchar* name) { gboolean result = FALSE; gboolean altered_cache = FALSE; gboolean altered_persistent = FALSE; - gboolean _tmp19_ = FALSE; gboolean _tmp20_ = FALSE; + gboolean _tmp21_ = FALSE; GError * _inner_error_ = NULL; #line 2900 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_PHOTO (self), FALSE); #line 2900 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (name != NULL, FALSE); -#line 22361 "Photo.c" +#line 22437 "Photo.c" { PhotoRow* _tmp0_ = NULL; #line 2902 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = self->row; #line 2902 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_row); -#line 22368 "Photo.c" +#line 22444 "Photo.c" { PhotoRow* _tmp1_ = NULL; GeeHashMap* _tmp2_ = NULL; @@ -22382,7 +22458,7 @@ static gboolean photo_remove_transformation (Photo* self, const gchar* name) { _tmp2_ = _tmp1_->transformations; #line 2903 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp2_ != NULL) { -#line 22384 "Photo.c" +#line 22460 "Photo.c" PhotoRow* _tmp3_ = NULL; GeeHashMap* _tmp4_ = NULL; const gchar* _tmp5_ = NULL; @@ -22406,12 +22482,12 @@ static gboolean photo_remove_transformation (Photo* self, const gchar* name) { #line 2905 "/home/jens/Source/shotwell/src/Photo.vala" _tmp8_ = _tmp7_->transformations; #line 2905 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp9_ = gee_abstract_map_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, GEE_TYPE_MAP, GeeMap)); + _tmp9_ = gee_abstract_map_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap)); #line 2905 "/home/jens/Source/shotwell/src/Photo.vala" _tmp10_ = _tmp9_; #line 2905 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp10_ == 0) { -#line 22413 "Photo.c" +#line 22489 "Photo.c" PhotoRow* _tmp11_ = NULL; #line 2906 "/home/jens/Source/shotwell/src/Photo.vala" _tmp11_ = self->row; @@ -22419,12 +22495,12 @@ static gboolean photo_remove_transformation (Photo* self, const gchar* name) { _g_object_unref0 (_tmp11_->transformations); #line 2906 "/home/jens/Source/shotwell/src/Photo.vala" _tmp11_->transformations = NULL; -#line 22421 "Photo.c" +#line 22497 "Photo.c" } } else { #line 2908 "/home/jens/Source/shotwell/src/Photo.vala" altered_cache = FALSE; -#line 22426 "Photo.c" +#line 22502 "Photo.c" } #line 2911 "/home/jens/Source/shotwell/src/Photo.vala" _tmp12_ = photo_table_get_instance (); @@ -22442,7 +22518,7 @@ static gboolean photo_remove_transformation (Photo* self, const gchar* name) { altered_persistent = _tmp17_; #line 2911 "/home/jens/Source/shotwell/src/Photo.vala" _database_table_unref0 (_tmp13_); -#line 22444 "Photo.c" +#line 22520 "Photo.c" } __finally378: { @@ -22451,36 +22527,38 @@ static gboolean photo_remove_transformation (Photo* self, const gchar* name) { _tmp18_ = self->row; #line 2902 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 22453 "Photo.c" +#line 22529 "Photo.c" } #line 2902 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { +#line 22533 "Photo.c" + gboolean _tmp19_ = FALSE; #line 2902 "/home/jens/Source/shotwell/src/Photo.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 2902 "/home/jens/Source/shotwell/src/Photo.vala" g_clear_error (&_inner_error_); #line 2902 "/home/jens/Source/shotwell/src/Photo.vala" - return FALSE; -#line 22463 "Photo.c" + return _tmp19_; +#line 22541 "Photo.c" } } #line 2915 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp20_ = altered_cache; + _tmp21_ = altered_cache; #line 2915 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp20_) { + if (_tmp21_) { #line 2915 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp19_ = TRUE; -#line 22472 "Photo.c" + _tmp20_ = TRUE; +#line 22550 "Photo.c" } else { #line 2915 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp19_ = altered_persistent; -#line 22476 "Photo.c" + _tmp20_ = altered_persistent; +#line 22554 "Photo.c" } #line 2915 "/home/jens/Source/shotwell/src/Photo.vala" - result = _tmp19_; + result = _tmp20_; #line 2915 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 22482 "Photo.c" +#line 22560 "Photo.c" } @@ -22495,7 +22573,7 @@ gboolean photo_has_crop (Photo* self) { result = _tmp0_; #line 2919 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 22497 "Photo.c" +#line 22575 "Photo.c" } @@ -22545,11 +22623,11 @@ gboolean photo_get_raw_crop (Photo* self, Box* crop) { if (crop) { #line 2928 "/home/jens/Source/shotwell/src/Photo.vala" *crop = _vala_crop; -#line 22547 "Photo.c" +#line 22625 "Photo.c" } #line 2928 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 22551 "Photo.c" +#line 22629 "Photo.c" } #line 2930 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = map; @@ -22581,40 +22659,40 @@ gboolean photo_get_raw_crop (Photo* self, Box* crop) { if (_tmp13_ == -1) { #line 2935 "/home/jens/Source/shotwell/src/Photo.vala" _tmp12_ = TRUE; -#line 22583 "Photo.c" +#line 22661 "Photo.c" } else { gint _tmp14_ = 0; #line 2935 "/home/jens/Source/shotwell/src/Photo.vala" _tmp14_ = top; #line 2935 "/home/jens/Source/shotwell/src/Photo.vala" _tmp12_ = _tmp14_ == -1; -#line 22590 "Photo.c" +#line 22668 "Photo.c" } #line 2935 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp12_) { #line 2935 "/home/jens/Source/shotwell/src/Photo.vala" _tmp11_ = TRUE; -#line 22596 "Photo.c" +#line 22674 "Photo.c" } else { gint _tmp15_ = 0; #line 2935 "/home/jens/Source/shotwell/src/Photo.vala" _tmp15_ = right; #line 2935 "/home/jens/Source/shotwell/src/Photo.vala" _tmp11_ = _tmp15_ == -1; -#line 22603 "Photo.c" +#line 22681 "Photo.c" } #line 2935 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp11_) { #line 2935 "/home/jens/Source/shotwell/src/Photo.vala" _tmp10_ = TRUE; -#line 22609 "Photo.c" +#line 22687 "Photo.c" } else { gint _tmp16_ = 0; #line 2935 "/home/jens/Source/shotwell/src/Photo.vala" _tmp16_ = bottom; #line 2935 "/home/jens/Source/shotwell/src/Photo.vala" _tmp10_ = _tmp16_ == -1; -#line 22616 "Photo.c" +#line 22694 "Photo.c" } #line 2935 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp10_) { @@ -22626,11 +22704,11 @@ gboolean photo_get_raw_crop (Photo* self, Box* crop) { if (crop) { #line 2936 "/home/jens/Source/shotwell/src/Photo.vala" *crop = _vala_crop; -#line 22628 "Photo.c" +#line 22706 "Photo.c" } #line 2936 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 22632 "Photo.c" +#line 22710 "Photo.c" } #line 2938 "/home/jens/Source/shotwell/src/Photo.vala" _tmp17_ = left; @@ -22650,11 +22728,11 @@ gboolean photo_get_raw_crop (Photo* self, Box* crop) { if (crop) { #line 2940 "/home/jens/Source/shotwell/src/Photo.vala" *crop = _vala_crop; -#line 22652 "Photo.c" +#line 22730 "Photo.c" } #line 2940 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 22656 "Photo.c" +#line 22734 "Photo.c" } @@ -22721,7 +22799,7 @@ static void photo_set_raw_crop (Photo* self, Box* crop) { _tmp14_ = photo_set_transformation (self, _tmp13_); #line 2951 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp14_) { -#line 22723 "Photo.c" +#line 22801 "Photo.c" Alteration* _tmp15_ = NULL; Alteration* _tmp16_ = NULL; #line 2952 "/home/jens/Source/shotwell/src/Photo.vala" @@ -22732,11 +22810,11 @@ static void photo_set_raw_crop (Photo* self, Box* crop) { data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp16_); #line 2952 "/home/jens/Source/shotwell/src/Photo.vala" _alteration_unref0 (_tmp16_); -#line 22734 "Photo.c" +#line 22812 "Photo.c" } #line 2944 "/home/jens/Source/shotwell/src/Photo.vala" _key_value_map_unref0 (map); -#line 22738 "Photo.c" +#line 22816 "Photo.c" } @@ -22768,11 +22846,11 @@ static gboolean photo_get_raw_straighten (Photo* self, gdouble* angle) { if (angle) { #line 2960 "/home/jens/Source/shotwell/src/Photo.vala" *angle = _vala_angle; -#line 22770 "Photo.c" +#line 22848 "Photo.c" } #line 2960 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 22774 "Photo.c" +#line 22852 "Photo.c" } #line 2963 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = map; @@ -22788,11 +22866,11 @@ static gboolean photo_get_raw_straighten (Photo* self, gdouble* angle) { if (angle) { #line 2965 "/home/jens/Source/shotwell/src/Photo.vala" *angle = _vala_angle; -#line 22790 "Photo.c" +#line 22868 "Photo.c" } #line 2965 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 22794 "Photo.c" +#line 22872 "Photo.c" } @@ -22821,7 +22899,7 @@ static void photo_set_raw_straighten (Photo* self, gdouble theta) { _tmp4_ = photo_set_transformation (self, _tmp3_); #line 2972 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp4_) { -#line 22823 "Photo.c" +#line 22901 "Photo.c" Alteration* _tmp5_ = NULL; Alteration* _tmp6_ = NULL; #line 2973 "/home/jens/Source/shotwell/src/Photo.vala" @@ -22832,11 +22910,11 @@ static void photo_set_raw_straighten (Photo* self, gdouble theta) { data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp6_); #line 2973 "/home/jens/Source/shotwell/src/Photo.vala" _alteration_unref0 (_tmp6_); -#line 22834 "Photo.c" +#line 22912 "Photo.c" } #line 2968 "/home/jens/Source/shotwell/src/Photo.vala" _key_value_map_unref0 (map); -#line 22838 "Photo.c" +#line 22916 "Photo.c" } @@ -22868,7 +22946,7 @@ static EditingToolsRedeyeInstance* photo_get_raw_redeye_instances (Photo* self, _tmp1_ = map; #line 2980 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp1_ == NULL) { -#line 22870 "Photo.c" +#line 22948 "Photo.c" EditingToolsRedeyeInstance* _tmp2_ = NULL; EditingToolsRedeyeInstance* _tmp3_ = NULL; gint _tmp3__length1 = 0; @@ -22882,7 +22960,7 @@ static EditingToolsRedeyeInstance* photo_get_raw_redeye_instances (Photo* self, if (result_length1) { #line 2981 "/home/jens/Source/shotwell/src/Photo.vala" *result_length1 = _tmp3__length1; -#line 22884 "Photo.c" +#line 22962 "Photo.c" } #line 2981 "/home/jens/Source/shotwell/src/Photo.vala" result = _tmp3_; @@ -22890,7 +22968,7 @@ static EditingToolsRedeyeInstance* photo_get_raw_redeye_instances (Photo* self, _key_value_map_unref0 (map); #line 2981 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 22892 "Photo.c" +#line 22970 "Photo.c" } #line 2983 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = map; @@ -22920,19 +22998,19 @@ static EditingToolsRedeyeInstance* photo_get_raw_redeye_instances (Photo* self, default_point.x = -1; #line 2990 "/home/jens/Source/shotwell/src/Photo.vala" default_point.y = -1; -#line 22922 "Photo.c" +#line 23000 "Photo.c" { gint i = 0; #line 2992 "/home/jens/Source/shotwell/src/Photo.vala" i = 0; -#line 22927 "Photo.c" +#line 23005 "Photo.c" { gboolean _tmp10_ = FALSE; #line 2992 "/home/jens/Source/shotwell/src/Photo.vala" _tmp10_ = TRUE; #line 2992 "/home/jens/Source/shotwell/src/Photo.vala" while (TRUE) { -#line 22934 "Photo.c" +#line 23012 "Photo.c" gint _tmp12_ = 0; gint _tmp13_ = 0; gchar* center_key = NULL; @@ -22977,13 +23055,13 @@ static EditingToolsRedeyeInstance* photo_get_raw_redeye_instances (Photo* self, gint _tmp46_ = 0; #line 2992 "/home/jens/Source/shotwell/src/Photo.vala" if (!_tmp10_) { -#line 22979 "Photo.c" +#line 23057 "Photo.c" gint _tmp11_ = 0; #line 2992 "/home/jens/Source/shotwell/src/Photo.vala" _tmp11_ = i; #line 2992 "/home/jens/Source/shotwell/src/Photo.vala" i = _tmp11_ + 1; -#line 22985 "Photo.c" +#line 23063 "Photo.c" } #line 2992 "/home/jens/Source/shotwell/src/Photo.vala" _tmp10_ = FALSE; @@ -22995,7 +23073,7 @@ static EditingToolsRedeyeInstance* photo_get_raw_redeye_instances (Photo* self, if (!(_tmp12_ < _tmp13_)) { #line 2992 "/home/jens/Source/shotwell/src/Photo.vala" break; -#line 22997 "Photo.c" +#line 23075 "Photo.c" } #line 2993 "/home/jens/Source/shotwell/src/Photo.vala" _tmp14_ = i; @@ -23091,7 +23169,7 @@ static EditingToolsRedeyeInstance* photo_get_raw_redeye_instances (Photo* self, _g_free0 (radius_key); #line 2992 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (center_key); -#line 23093 "Photo.c" +#line 23171 "Photo.c" } } } @@ -23103,7 +23181,7 @@ static EditingToolsRedeyeInstance* photo_get_raw_redeye_instances (Photo* self, if (result_length1) { #line 3004 "/home/jens/Source/shotwell/src/Photo.vala" *result_length1 = _tmp47__length1; -#line 23105 "Photo.c" +#line 23183 "Photo.c" } #line 3004 "/home/jens/Source/shotwell/src/Photo.vala" result = _tmp47_; @@ -23111,7 +23189,7 @@ static EditingToolsRedeyeInstance* photo_get_raw_redeye_instances (Photo* self, _key_value_map_unref0 (map); #line 3004 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 23113 "Photo.c" +#line 23191 "Photo.c" } @@ -23126,7 +23204,7 @@ gboolean photo_has_redeye_transformations (Photo* self) { result = _tmp0_; #line 3008 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 23128 "Photo.c" +#line 23206 "Photo.c" } @@ -23169,7 +23247,7 @@ void photo_add_redeye_instance (Photo* self, EditingToolsRedeyeInstance* redeye) _tmp1_ = map; #line 3014 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp1_ == NULL) { -#line 23171 "Photo.c" +#line 23249 "Photo.c" KeyValueMap* _tmp2_ = NULL; KeyValueMap* _tmp3_ = NULL; #line 3015 "/home/jens/Source/shotwell/src/Photo.vala" @@ -23182,7 +23260,7 @@ void photo_add_redeye_instance (Photo* self, EditingToolsRedeyeInstance* redeye) _tmp3_ = map; #line 3016 "/home/jens/Source/shotwell/src/Photo.vala" key_value_map_set_int (_tmp3_, "num_points", 0); -#line 23184 "Photo.c" +#line 23262 "Photo.c" } #line 3019 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = map; @@ -23242,7 +23320,7 @@ void photo_add_redeye_instance (Photo* self, EditingToolsRedeyeInstance* redeye) _tmp23_ = photo_set_transformation (self, _tmp22_); #line 3032 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp23_) { -#line 23244 "Photo.c" +#line 23322 "Photo.c" Alteration* _tmp24_ = NULL; Alteration* _tmp25_ = NULL; #line 3033 "/home/jens/Source/shotwell/src/Photo.vala" @@ -23253,7 +23331,7 @@ void photo_add_redeye_instance (Photo* self, EditingToolsRedeyeInstance* redeye) data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp25_); #line 3033 "/home/jens/Source/shotwell/src/Photo.vala" _alteration_unref0 (_tmp25_); -#line 23255 "Photo.c" +#line 23333 "Photo.c" } #line 3012 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (center_key); @@ -23261,7 +23339,7 @@ void photo_add_redeye_instance (Photo* self, EditingToolsRedeyeInstance* redeye) _g_free0 (radius_key); #line 3012 "/home/jens/Source/shotwell/src/Photo.vala" _key_value_map_unref0 (map); -#line 23263 "Photo.c" +#line 23341 "Photo.c" } @@ -23274,14 +23352,15 @@ static gboolean photo_calculate_pixbuf_dimensions (Photo* self, Scaling* scaling g_return_val_if_fail (IS_PHOTO (self), FALSE); #line 3047 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (scaling != NULL, FALSE); -#line 23276 "Photo.c" +#line 23354 "Photo.c" { PhotoRow* _tmp0_ = NULL; + gboolean _tmp8_ = FALSE; #line 3049 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = self->row; #line 3049 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_row); -#line 23283 "Photo.c" +#line 23362 "Photo.c" { Scaling _tmp1_ = {0}; PhotoException _tmp2_ = 0; @@ -23300,30 +23379,30 @@ static gboolean photo_calculate_pixbuf_dimensions (Photo* self, Scaling* scaling _vala_scaled_to_viewport = _tmp4_; #line 3051 "/home/jens/Source/shotwell/src/Photo.vala" result = _tmp5_; -#line 23302 "Photo.c" +#line 23381 "Photo.c" { PhotoRow* _tmp6_ = NULL; #line 3049 "/home/jens/Source/shotwell/src/Photo.vala" _tmp6_ = self->row; #line 3049 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 23309 "Photo.c" +#line 23388 "Photo.c" } #line 3051 "/home/jens/Source/shotwell/src/Photo.vala" if (scaled_image) { #line 3051 "/home/jens/Source/shotwell/src/Photo.vala" *scaled_image = _vala_scaled_image; -#line 23315 "Photo.c" +#line 23394 "Photo.c" } #line 3051 "/home/jens/Source/shotwell/src/Photo.vala" if (scaled_to_viewport) { #line 3051 "/home/jens/Source/shotwell/src/Photo.vala" *scaled_to_viewport = _vala_scaled_to_viewport; -#line 23321 "Photo.c" +#line 23400 "Photo.c" } #line 3051 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 23325 "Photo.c" +#line 23404 "Photo.c" } __finally379: { @@ -23332,27 +23411,27 @@ static gboolean photo_calculate_pixbuf_dimensions (Photo* self, Scaling* scaling _tmp7_ = self->row; #line 3049 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 23334 "Photo.c" +#line 23413 "Photo.c" } #line 3049 "/home/jens/Source/shotwell/src/Photo.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 3049 "/home/jens/Source/shotwell/src/Photo.vala" g_clear_error (&_inner_error_); #line 3049 "/home/jens/Source/shotwell/src/Photo.vala" - return FALSE; -#line 23342 "Photo.c" + return _tmp8_; +#line 23421 "Photo.c" } #line 3047 "/home/jens/Source/shotwell/src/Photo.vala" if (scaled_image) { #line 3047 "/home/jens/Source/shotwell/src/Photo.vala" *scaled_image = _vala_scaled_image; -#line 23348 "Photo.c" +#line 23427 "Photo.c" } #line 3047 "/home/jens/Source/shotwell/src/Photo.vala" if (scaled_to_viewport) { #line 3047 "/home/jens/Source/shotwell/src/Photo.vala" *scaled_to_viewport = _vala_scaled_to_viewport; -#line 23354 "Photo.c" +#line 23433 "Photo.c" } } @@ -23388,7 +23467,7 @@ static gboolean photo_locked_calculate_pixbuf_dimensions (Photo* self, Scaling* _tmp1_ = scaling_is_unscaled (scaling); #line 3061 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp1_) { -#line 23390 "Photo.c" +#line 23469 "Photo.c" Dimensions _tmp2_ = {0}; Dimensions _tmp3_ = {0}; #line 3062 "/home/jens/Source/shotwell/src/Photo.vala" @@ -23405,17 +23484,17 @@ static gboolean photo_locked_calculate_pixbuf_dimensions (Photo* self, Scaling* if (scaled_image) { #line 3065 "/home/jens/Source/shotwell/src/Photo.vala" *scaled_image = _vala_scaled_image; -#line 23407 "Photo.c" +#line 23486 "Photo.c" } #line 3065 "/home/jens/Source/shotwell/src/Photo.vala" if (scaled_to_viewport) { #line 3065 "/home/jens/Source/shotwell/src/Photo.vala" *scaled_to_viewport = _vala_scaled_to_viewport; -#line 23413 "Photo.c" +#line 23492 "Photo.c" } #line 3065 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 23417 "Photo.c" +#line 23496 "Photo.c" } #line 3068 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = photo_get_orientation (self); @@ -23431,7 +23510,7 @@ static gboolean photo_locked_calculate_pixbuf_dimensions (Photo* self, Scaling* _tmp6_ = photo_exception_allows (_tmp5_, PHOTO_EXCEPTION_CROP); #line 3076 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp6_) { -#line 23433 "Photo.c" +#line 23512 "Photo.c" Box crop = {0}; Box _tmp7_ = {0}; gboolean _tmp8_ = FALSE; @@ -23441,7 +23520,7 @@ static gboolean photo_locked_calculate_pixbuf_dimensions (Photo* self, Scaling* crop = _tmp7_; #line 3078 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp8_) { -#line 23443 "Photo.c" +#line 23522 "Photo.c" Dimensions rotated_raw = {0}; Dimensions _tmp9_ = {0}; PhotoException _tmp10_ = 0; @@ -23469,7 +23548,7 @@ static gboolean photo_locked_calculate_pixbuf_dimensions (Photo* self, Scaling* _tmp11_ = photo_exception_allows (_tmp10_, PHOTO_EXCEPTION_ORIENTATION); #line 3082 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp11_) { -#line 23471 "Photo.c" +#line 23550 "Photo.c" Orientation _tmp12_ = 0; Dimensions _tmp13_ = {0}; Box _tmp14_ = {0}; @@ -23495,7 +23574,7 @@ static gboolean photo_locked_calculate_pixbuf_dimensions (Photo* self, Scaling* orientation_rotate_dimensions (_tmp16_, &_tmp17_, &_tmp18_); #line 3084 "/home/jens/Source/shotwell/src/Photo.vala" rotated_raw = _tmp18_; -#line 23497 "Photo.c" +#line 23576 "Photo.c" } #line 3088 "/home/jens/Source/shotwell/src/Photo.vala" box_get_dimensions (&crop, &_tmp19_); @@ -23515,7 +23594,7 @@ static gboolean photo_locked_calculate_pixbuf_dimensions (Photo* self, Scaling* _tmp25_ = box_get_width (&scaled_crop); #line 3094 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp24_ <= _tmp25_) { -#line 23517 "Photo.c" +#line 23596 "Photo.c" gint _tmp26_ = 0; gint _tmp27_ = 0; #line 3095 "/home/jens/Source/shotwell/src/Photo.vala" @@ -23524,15 +23603,15 @@ static gboolean photo_locked_calculate_pixbuf_dimensions (Photo* self, Scaling* _tmp27_ = box_get_height (&scaled_crop); #line 3095 "/home/jens/Source/shotwell/src/Photo.vala" _tmp23_ = _tmp26_ <= _tmp27_; -#line 23526 "Photo.c" +#line 23605 "Photo.c" } else { #line 3094 "/home/jens/Source/shotwell/src/Photo.vala" _tmp23_ = FALSE; -#line 23530 "Photo.c" +#line 23609 "Photo.c" } #line 3094 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp23_) { -#line 23534 "Photo.c" +#line 23613 "Photo.c" Dimensions _tmp28_ = {0}; Dimensions _tmp29_ = {0}; #line 3096 "/home/jens/Source/shotwell/src/Photo.vala" @@ -23549,17 +23628,17 @@ static gboolean photo_locked_calculate_pixbuf_dimensions (Photo* self, Scaling* if (scaled_image) { #line 3099 "/home/jens/Source/shotwell/src/Photo.vala" *scaled_image = _vala_scaled_image; -#line 23551 "Photo.c" +#line 23630 "Photo.c" } #line 3099 "/home/jens/Source/shotwell/src/Photo.vala" if (scaled_to_viewport) { #line 3099 "/home/jens/Source/shotwell/src/Photo.vala" *scaled_to_viewport = _vala_scaled_to_viewport; -#line 23557 "Photo.c" +#line 23636 "Photo.c" } #line 3099 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 23561 "Photo.c" +#line 23640 "Photo.c" } #line 3104 "/home/jens/Source/shotwell/src/Photo.vala" box_get_dimensions (&crop, &_tmp30_); @@ -23575,7 +23654,7 @@ static gboolean photo_locked_calculate_pixbuf_dimensions (Photo* self, Scaling* _tmp34_ = photo_exception_allows (_tmp33_, PHOTO_EXCEPTION_ORIENTATION); #line 3108 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp34_) { -#line 23577 "Photo.c" +#line 23656 "Photo.c" Orientation _tmp35_ = 0; Dimensions _tmp36_ = {0}; Dimensions _tmp37_ = {0}; @@ -23587,7 +23666,7 @@ static gboolean photo_locked_calculate_pixbuf_dimensions (Photo* self, Scaling* orientation_derotate_dimensions (_tmp35_, &_tmp36_, &_tmp37_); #line 3109 "/home/jens/Source/shotwell/src/Photo.vala" _vala_scaled_image = _tmp37_; -#line 23589 "Photo.c" +#line 23668 "Photo.c" } } } @@ -23595,7 +23674,7 @@ static gboolean photo_locked_calculate_pixbuf_dimensions (Photo* self, Scaling* _tmp38_ = dimensions_has_area (&_vala_scaled_image); #line 3114 "/home/jens/Source/shotwell/src/Photo.vala" if (!_tmp38_) { -#line 23597 "Photo.c" +#line 23676 "Photo.c" Dimensions rotated_raw = {0}; Dimensions _tmp39_ = {0}; PhotoException _tmp40_ = 0; @@ -23615,7 +23694,7 @@ static gboolean photo_locked_calculate_pixbuf_dimensions (Photo* self, Scaling* _tmp41_ = photo_exception_allows (_tmp40_, PHOTO_EXCEPTION_ORIENTATION); #line 3117 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp41_) { -#line 23617 "Photo.c" +#line 23696 "Photo.c" Orientation _tmp42_ = 0; Dimensions _tmp43_ = {0}; Dimensions _tmp44_ = {0}; @@ -23627,7 +23706,7 @@ static gboolean photo_locked_calculate_pixbuf_dimensions (Photo* self, Scaling* orientation_rotate_dimensions (_tmp42_, &_tmp43_, &_tmp44_); #line 3118 "/home/jens/Source/shotwell/src/Photo.vala" rotated_raw = _tmp44_; -#line 23629 "Photo.c" +#line 23708 "Photo.c" } #line 3120 "/home/jens/Source/shotwell/src/Photo.vala" _tmp45_ = rotated_raw; @@ -23645,7 +23724,7 @@ static gboolean photo_locked_calculate_pixbuf_dimensions (Photo* self, Scaling* _tmp49_ = photo_exception_allows (_tmp48_, PHOTO_EXCEPTION_ORIENTATION); #line 3124 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp49_) { -#line 23647 "Photo.c" +#line 23726 "Photo.c" Orientation _tmp50_ = 0; Dimensions _tmp51_ = {0}; Dimensions _tmp52_ = {0}; @@ -23657,7 +23736,7 @@ static gboolean photo_locked_calculate_pixbuf_dimensions (Photo* self, Scaling* orientation_derotate_dimensions (_tmp50_, &_tmp51_, &_tmp52_); #line 3125 "/home/jens/Source/shotwell/src/Photo.vala" _vala_scaled_image = _tmp52_; -#line 23659 "Photo.c" +#line 23738 "Photo.c" } } #line 3129 "/home/jens/Source/shotwell/src/Photo.vala" @@ -23670,7 +23749,7 @@ static gboolean photo_locked_calculate_pixbuf_dimensions (Photo* self, Scaling* _tmp57_ = _tmp56_.width; #line 3129 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp55_ >= _tmp57_) { -#line 23672 "Photo.c" +#line 23751 "Photo.c" Dimensions _tmp58_ = {0}; gint _tmp59_ = 0; Dimensions _tmp60_ = {0}; @@ -23685,15 +23764,15 @@ static gboolean photo_locked_calculate_pixbuf_dimensions (Photo* self, Scaling* _tmp61_ = _tmp60_.height; #line 3129 "/home/jens/Source/shotwell/src/Photo.vala" _tmp53_ = _tmp59_ >= _tmp61_; -#line 23687 "Photo.c" +#line 23766 "Photo.c" } else { #line 3129 "/home/jens/Source/shotwell/src/Photo.vala" _tmp53_ = FALSE; -#line 23691 "Photo.c" +#line 23770 "Photo.c" } #line 3129 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp53_) { -#line 23695 "Photo.c" +#line 23774 "Photo.c" Dimensions _tmp62_ = {0}; #line 3130 "/home/jens/Source/shotwell/src/Photo.vala" _tmp62_ = raw; @@ -23705,17 +23784,17 @@ static gboolean photo_locked_calculate_pixbuf_dimensions (Photo* self, Scaling* if (scaled_image) { #line 3132 "/home/jens/Source/shotwell/src/Photo.vala" *scaled_image = _vala_scaled_image; -#line 23707 "Photo.c" +#line 23786 "Photo.c" } #line 3132 "/home/jens/Source/shotwell/src/Photo.vala" if (scaled_to_viewport) { #line 3132 "/home/jens/Source/shotwell/src/Photo.vala" *scaled_to_viewport = _vala_scaled_to_viewport; -#line 23713 "Photo.c" +#line 23792 "Photo.c" } #line 3132 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 23717 "Photo.c" +#line 23796 "Photo.c" } #line 3135 "/home/jens/Source/shotwell/src/Photo.vala" _tmp63_ = dimensions_has_area (&_vala_scaled_image); @@ -23731,17 +23810,17 @@ static gboolean photo_locked_calculate_pixbuf_dimensions (Photo* self, Scaling* if (scaled_image) { #line 3138 "/home/jens/Source/shotwell/src/Photo.vala" *scaled_image = _vala_scaled_image; -#line 23733 "Photo.c" +#line 23812 "Photo.c" } #line 3138 "/home/jens/Source/shotwell/src/Photo.vala" if (scaled_to_viewport) { #line 3138 "/home/jens/Source/shotwell/src/Photo.vala" *scaled_to_viewport = _vala_scaled_to_viewport; -#line 23739 "Photo.c" +#line 23818 "Photo.c" } #line 3138 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 23743 "Photo.c" +#line 23822 "Photo.c" } @@ -23783,7 +23862,7 @@ static GdkPixbuf* photo_load_raw_pixbuf (Photo* self, Scaling* scaling, PhotoExc _tmp2_ = scaling_is_unscaled (scaling); #line 3150 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp2_) { -#line 23785 "Photo.c" +#line 23864 "Photo.c" GdkPixbuf* _tmp3_ = NULL; PhotoFileReader* _tmp4_ = NULL; GdkPixbuf* _tmp5_ = NULL; @@ -23802,7 +23881,7 @@ static GdkPixbuf* photo_load_raw_pixbuf (Photo* self, Scaling* scaling, PhotoExc _photo_file_adapter_unref0 (loader); #line 3155 "/home/jens/Source/shotwell/src/Photo.vala" return NULL; -#line 23804 "Photo.c" +#line 23883 "Photo.c" } #line 3155 "/home/jens/Source/shotwell/src/Photo.vala" _tmp6_ = _tmp3_; @@ -23816,7 +23895,7 @@ static GdkPixbuf* photo_load_raw_pixbuf (Photo* self, Scaling* scaling, PhotoExc _photo_file_adapter_unref0 (loader); #line 3155 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 23818 "Photo.c" +#line 23897 "Photo.c" } #line 3160 "/home/jens/Source/shotwell/src/Photo.vala" _tmp7_ = *scaling; @@ -23834,7 +23913,7 @@ static GdkPixbuf* photo_load_raw_pixbuf (Photo* self, Scaling* scaling, PhotoExc _tmp12_ = is_scaled; #line 3162 "/home/jens/Source/shotwell/src/Photo.vala" if (!_tmp12_) { -#line 23836 "Photo.c" +#line 23915 "Photo.c" GdkPixbuf* _tmp13_ = NULL; PhotoFileReader* _tmp14_ = NULL; GdkPixbuf* _tmp15_ = NULL; @@ -23853,7 +23932,7 @@ static GdkPixbuf* photo_load_raw_pixbuf (Photo* self, Scaling* scaling, PhotoExc _photo_file_adapter_unref0 (loader); #line 3167 "/home/jens/Source/shotwell/src/Photo.vala" return NULL; -#line 23855 "Photo.c" +#line 23934 "Photo.c" } #line 3167 "/home/jens/Source/shotwell/src/Photo.vala" _tmp16_ = _tmp13_; @@ -23867,7 +23946,7 @@ static GdkPixbuf* photo_load_raw_pixbuf (Photo* self, Scaling* scaling, PhotoExc _photo_file_adapter_unref0 (loader); #line 3167 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 23869 "Photo.c" +#line 23948 "Photo.c" } #line 3170 "/home/jens/Source/shotwell/src/Photo.vala" _tmp17_ = loader; @@ -23887,7 +23966,7 @@ static GdkPixbuf* photo_load_raw_pixbuf (Photo* self, Scaling* scaling, PhotoExc _photo_file_adapter_unref0 (loader); #line 3170 "/home/jens/Source/shotwell/src/Photo.vala" return NULL; -#line 23889 "Photo.c" +#line 23968 "Photo.c" } #line 3178 "/home/jens/Source/shotwell/src/Photo.vala" _tmp21_ = pixbuf; @@ -23903,7 +23982,7 @@ static GdkPixbuf* photo_load_raw_pixbuf (Photo* self, Scaling* scaling, PhotoExc _photo_file_adapter_unref0 (loader); #line 3180 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 23905 "Photo.c" +#line 23984 "Photo.c" } @@ -23933,7 +24012,7 @@ GdkPixbuf* photo_get_master_pixbuf (Photo* self, Scaling* scaling, gboolean rota g_propagate_error (error, _inner_error_); #line 3186 "/home/jens/Source/shotwell/src/Photo.vala" return NULL; -#line 23935 "Photo.c" +#line 24014 "Photo.c" } #line 3186 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = _tmp0_; @@ -23945,7 +24024,7 @@ GdkPixbuf* photo_get_master_pixbuf (Photo* self, Scaling* scaling, gboolean rota _g_object_unref0 (_tmp0_); #line 3186 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 23947 "Photo.c" +#line 24026 "Photo.c" } @@ -23975,7 +24054,7 @@ GdkPixbuf* photo_get_unmodified_pixbuf (Photo* self, Scaling* scaling, gboolean g_propagate_error (error, _inner_error_); #line 3191 "/home/jens/Source/shotwell/src/Photo.vala" return NULL; -#line 23977 "Photo.c" +#line 24056 "Photo.c" } #line 3191 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = _tmp0_; @@ -23987,7 +24066,7 @@ GdkPixbuf* photo_get_unmodified_pixbuf (Photo* self, Scaling* scaling, gboolean _g_object_unref0 (_tmp0_); #line 3191 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 23989 "Photo.c" +#line 24068 "Photo.c" } @@ -24006,14 +24085,14 @@ static GdkPixbuf* photo_get_untransformed_pixbuf (Photo* self, Scaling* scaling, g_return_val_if_fail (IS_PHOTO (self), NULL); #line 3195 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (scaling != NULL, NULL); -#line 24008 "Photo.c" +#line 24087 "Photo.c" { PhotoRow* _tmp0_ = NULL; #line 3209 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = self->row; #line 3209 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_row); -#line 24015 "Photo.c" +#line 24094 "Photo.c" { Scaling _tmp1_ = {0}; Dimensions _tmp2_ = {0}; @@ -24031,7 +24110,7 @@ static GdkPixbuf* photo_get_untransformed_pixbuf (Photo* self, Scaling* scaling, _tmp4_ = photo_get_original_orientation (self); #line 3212 "/home/jens/Source/shotwell/src/Photo.vala" original_orientation = _tmp4_; -#line 24033 "Photo.c" +#line 24112 "Photo.c" } __finally380: { @@ -24040,7 +24119,7 @@ static GdkPixbuf* photo_get_untransformed_pixbuf (Photo* self, Scaling* scaling, _tmp5_ = self->row; #line 3209 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 24042 "Photo.c" +#line 24121 "Photo.c" } #line 3209 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { @@ -24048,7 +24127,7 @@ static GdkPixbuf* photo_get_untransformed_pixbuf (Photo* self, Scaling* scaling, g_propagate_error (error, _inner_error_); #line 3209 "/home/jens/Source/shotwell/src/Photo.vala" return NULL; -#line 24050 "Photo.c" +#line 24129 "Photo.c" } } #line 3216 "/home/jens/Source/shotwell/src/Photo.vala" @@ -24065,13 +24144,13 @@ static GdkPixbuf* photo_get_untransformed_pixbuf (Photo* self, Scaling* scaling, g_propagate_error (error, _inner_error_); #line 3216 "/home/jens/Source/shotwell/src/Photo.vala" return NULL; -#line 24067 "Photo.c" +#line 24146 "Photo.c" } #line 3222 "/home/jens/Source/shotwell/src/Photo.vala" _tmp9_ = rotate; #line 3222 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp9_) { -#line 24073 "Photo.c" +#line 24152 "Photo.c" GdkPixbuf* _tmp10_ = NULL; GdkPixbuf* _tmp11_ = NULL; #line 3223 "/home/jens/Source/shotwell/src/Photo.vala" @@ -24082,13 +24161,13 @@ static GdkPixbuf* photo_get_untransformed_pixbuf (Photo* self, Scaling* scaling, _g_object_unref0 (pixbuf); #line 3223 "/home/jens/Source/shotwell/src/Photo.vala" pixbuf = _tmp11_; -#line 24084 "Photo.c" +#line 24163 "Photo.c" } #line 3232 "/home/jens/Source/shotwell/src/Photo.vala" result = pixbuf; #line 3232 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 24090 "Photo.c" +#line 24169 "Photo.c" } @@ -24116,7 +24195,7 @@ static GdkPixbuf* photo_real_get_pixbuf (PhotoSource* base, Scaling* scaling, GE g_propagate_error (error, _inner_error_); #line 3236 "/home/jens/Source/shotwell/src/Photo.vala" return NULL; -#line 24118 "Photo.c" +#line 24197 "Photo.c" } #line 3236 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = _tmp0_; @@ -24128,7 +24207,7 @@ static GdkPixbuf* photo_real_get_pixbuf (PhotoSource* base, Scaling* scaling, GE _g_object_unref0 (_tmp0_); #line 3236 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 24130 "Photo.c" +#line 24209 "Photo.c" } @@ -24150,7 +24229,7 @@ static GdkPixbuf* photo_real_get_pixbuf (PhotoSource* base, Scaling* scaling, GE static gpointer _photo_cached_pixbuf_ref0 (gpointer self) { #line 3271 "/home/jens/Source/shotwell/src/Photo.vala" return self ? photo_cached_pixbuf_ref (self) : NULL; -#line 24152 "Photo.c" +#line 24231 "Photo.c" } @@ -24159,7 +24238,7 @@ static gboolean _photo_trim_source_pixbuf_cache_gsource_func (gpointer self) { result = photo_trim_source_pixbuf_cache (); #line 3323 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 24161 "Photo.c" +#line 24240 "Photo.c" } @@ -24168,14 +24247,14 @@ static GdkPixbuf* photo_run_source_pixbuf_cache (Photo* locate, gboolean keep, G GError * _inner_error_ = NULL; #line 3254 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail ((locate == NULL) || IS_PHOTO (locate), NULL); -#line 24170 "Photo.c" +#line 24249 "Photo.c" { GeeLinkedList* _tmp0_ = NULL; #line 3255 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = photo_source_pixbuf_cache; #line 3255 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&__lock_photo_source_pixbuf_cache); -#line 24177 "Photo.c" +#line 24256 "Photo.c" { PhotoCachedPixbuf* found = NULL; gdouble min_elapsed = 0.0; @@ -24209,7 +24288,7 @@ static GdkPixbuf* photo_run_source_pixbuf_cache (Photo* locate, gboolean keep, G iter = _tmp2_; #line 3263 "/home/jens/Source/shotwell/src/Photo.vala" while (TRUE) { -#line 24211 "Photo.c" +#line 24290 "Photo.c" GeeIterator* _tmp3_ = NULL; gboolean _tmp4_ = FALSE; PhotoCachedPixbuf* cached_pixbuf = NULL; @@ -24230,7 +24309,7 @@ static GdkPixbuf* photo_run_source_pixbuf_cache (Photo* locate, gboolean keep, G if (!_tmp4_) { #line 3263 "/home/jens/Source/shotwell/src/Photo.vala" break; -#line 24232 "Photo.c" +#line 24311 "Photo.c" } #line 3264 "/home/jens/Source/shotwell/src/Photo.vala" _tmp5_ = iter; @@ -24252,7 +24331,7 @@ static GdkPixbuf* photo_run_source_pixbuf_cache (Photo* locate, gboolean keep, G _tmp12_ = locate; #line 3268 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp12_ != NULL) { -#line 24254 "Photo.c" +#line 24333 "Photo.c" PhotoCachedPixbuf* _tmp13_ = NULL; Photo* _tmp14_ = NULL; Photo* _tmp15_ = NULL; @@ -24267,15 +24346,15 @@ static GdkPixbuf* photo_run_source_pixbuf_cache (Photo* locate, gboolean keep, G _tmp16_ = data_source_equals (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, TYPE_DATA_SOURCE, DataSource), G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, TYPE_DATA_SOURCE, DataSource)); #line 3268 "/home/jens/Source/shotwell/src/Photo.vala" _tmp11_ = _tmp16_; -#line 24269 "Photo.c" +#line 24348 "Photo.c" } else { #line 3268 "/home/jens/Source/shotwell/src/Photo.vala" _tmp11_ = FALSE; -#line 24273 "Photo.c" +#line 24352 "Photo.c" } #line 3268 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp11_) { -#line 24277 "Photo.c" +#line 24356 "Photo.c" GeeIterator* _tmp17_ = NULL; PhotoCachedPixbuf* _tmp18_ = NULL; PhotoCachedPixbuf* _tmp19_ = NULL; @@ -24296,33 +24375,33 @@ static GdkPixbuf* photo_run_source_pixbuf_cache (Photo* locate, gboolean keep, G _tmp20_ = count; #line 3274 "/home/jens/Source/shotwell/src/Photo.vala" count = _tmp20_ + 1; -#line 24298 "Photo.c" +#line 24377 "Photo.c" } else { gdouble _tmp21_ = 0.0; #line 3275 "/home/jens/Source/shotwell/src/Photo.vala" _tmp21_ = elapsed; #line 3275 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp21_ >= ((gdouble) PHOTO_SOURCE_PIXBUF_TIME_TO_LIVE_SEC)) { -#line 24305 "Photo.c" +#line 24384 "Photo.c" GeeIterator* _tmp22_ = NULL; #line 3276 "/home/jens/Source/shotwell/src/Photo.vala" _tmp22_ = iter; #line 3276 "/home/jens/Source/shotwell/src/Photo.vala" gee_iterator_remove (_tmp22_); -#line 24311 "Photo.c" +#line 24390 "Photo.c" } else { gint _tmp23_ = 0; #line 3277 "/home/jens/Source/shotwell/src/Photo.vala" _tmp23_ = count; #line 3277 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp23_ >= PHOTO_SOURCE_PIXBUF_MAX_LRU_COUNT) { -#line 24318 "Photo.c" +#line 24397 "Photo.c" GeeIterator* _tmp24_ = NULL; #line 3278 "/home/jens/Source/shotwell/src/Photo.vala" _tmp24_ = iter; #line 3278 "/home/jens/Source/shotwell/src/Photo.vala" gee_iterator_remove (_tmp24_); -#line 24324 "Photo.c" +#line 24403 "Photo.c" } else { gdouble _tmp25_ = 0.0; gdouble _tmp26_ = 0.0; @@ -24340,47 +24419,47 @@ static GdkPixbuf* photo_run_source_pixbuf_cache (Photo* locate, gboolean keep, G _tmp28_ = count; #line 3283 "/home/jens/Source/shotwell/src/Photo.vala" count = _tmp28_ + 1; -#line 24342 "Photo.c" +#line 24421 "Photo.c" } } } #line 3263 "/home/jens/Source/shotwell/src/Photo.vala" _photo_cached_pixbuf_unref0 (cached_pixbuf); -#line 24348 "Photo.c" +#line 24427 "Photo.c" } #line 3288 "/home/jens/Source/shotwell/src/Photo.vala" _tmp31_ = found; #line 3288 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp31_ == NULL) { -#line 24354 "Photo.c" +#line 24433 "Photo.c" Photo* _tmp32_ = NULL; #line 3288 "/home/jens/Source/shotwell/src/Photo.vala" _tmp32_ = locate; #line 3288 "/home/jens/Source/shotwell/src/Photo.vala" _tmp30_ = _tmp32_ != NULL; -#line 24360 "Photo.c" +#line 24439 "Photo.c" } else { #line 3288 "/home/jens/Source/shotwell/src/Photo.vala" _tmp30_ = FALSE; -#line 24364 "Photo.c" +#line 24443 "Photo.c" } #line 3288 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp30_) { -#line 24368 "Photo.c" +#line 24447 "Photo.c" gboolean _tmp33_ = FALSE; #line 3288 "/home/jens/Source/shotwell/src/Photo.vala" _tmp33_ = keep; #line 3288 "/home/jens/Source/shotwell/src/Photo.vala" _tmp29_ = _tmp33_; -#line 24374 "Photo.c" +#line 24453 "Photo.c" } else { #line 3288 "/home/jens/Source/shotwell/src/Photo.vala" _tmp29_ = FALSE; -#line 24378 "Photo.c" +#line 24457 "Photo.c" } #line 3288 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp29_) { -#line 24382 "Photo.c" +#line 24461 "Photo.c" GdkPixbuf* _tmp34_ = NULL; Photo* _tmp35_ = NULL; Scaling _tmp36_ = {0}; @@ -24401,7 +24480,7 @@ static GdkPixbuf* photo_run_source_pixbuf_cache (Photo* locate, gboolean keep, G _g_object_unref0 (iter); #line 3290 "/home/jens/Source/shotwell/src/Photo.vala" _photo_cached_pixbuf_unref0 (found); -#line 24403 "Photo.c" +#line 24482 "Photo.c" goto __finally381; } #line 3289 "/home/jens/Source/shotwell/src/Photo.vala" @@ -24414,14 +24493,14 @@ static GdkPixbuf* photo_run_source_pixbuf_cache (Photo* locate, gboolean keep, G found = _tmp39_; #line 3288 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_tmp34_); -#line 24416 "Photo.c" +#line 24495 "Photo.c" } else { PhotoCachedPixbuf* _tmp40_ = NULL; #line 3291 "/home/jens/Source/shotwell/src/Photo.vala" _tmp40_ = found; #line 3291 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp40_ != NULL) { -#line 24423 "Photo.c" +#line 24502 "Photo.c" PhotoCachedPixbuf* _tmp41_ = NULL; GTimer* _tmp42_ = NULL; #line 3293 "/home/jens/Source/shotwell/src/Photo.vala" @@ -24430,28 +24509,28 @@ static GdkPixbuf* photo_run_source_pixbuf_cache (Photo* locate, gboolean keep, G _tmp42_ = _tmp41_->last_touched; #line 3293 "/home/jens/Source/shotwell/src/Photo.vala" g_timer_start (_tmp42_); -#line 24432 "Photo.c" +#line 24511 "Photo.c" } } #line 3297 "/home/jens/Source/shotwell/src/Photo.vala" _tmp44_ = found; #line 3297 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp44_ != NULL) { -#line 24439 "Photo.c" +#line 24518 "Photo.c" gboolean _tmp45_ = FALSE; #line 3297 "/home/jens/Source/shotwell/src/Photo.vala" _tmp45_ = keep; #line 3297 "/home/jens/Source/shotwell/src/Photo.vala" _tmp43_ = _tmp45_; -#line 24445 "Photo.c" +#line 24524 "Photo.c" } else { #line 3297 "/home/jens/Source/shotwell/src/Photo.vala" _tmp43_ = FALSE; -#line 24449 "Photo.c" +#line 24528 "Photo.c" } #line 3297 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp43_) { -#line 24453 "Photo.c" +#line 24532 "Photo.c" GeeLinkedList* _tmp46_ = NULL; PhotoCachedPixbuf* _tmp47_ = NULL; PhotoCachedPixbuf* _tmp48_ = NULL; @@ -24479,7 +24558,7 @@ static GdkPixbuf* photo_run_source_pixbuf_cache (Photo* locate, gboolean keep, G min_elapsed = _tmp52_; #line 3307 "/home/jens/Source/shotwell/src/Photo.vala" while (TRUE) { -#line 24481 "Photo.c" +#line 24560 "Photo.c" GeeLinkedList* _tmp53_ = NULL; gint _tmp54_ = 0; gint _tmp55_ = 0; @@ -24489,14 +24568,14 @@ static GdkPixbuf* photo_run_source_pixbuf_cache (Photo* locate, gboolean keep, G #line 3307 "/home/jens/Source/shotwell/src/Photo.vala" _tmp53_ = photo_source_pixbuf_cache; #line 3307 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp54_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp53_, GEE_TYPE_COLLECTION, GeeCollection)); + _tmp54_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp53_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); #line 3307 "/home/jens/Source/shotwell/src/Photo.vala" _tmp55_ = _tmp54_; #line 3307 "/home/jens/Source/shotwell/src/Photo.vala" if (!(_tmp55_ > PHOTO_SOURCE_PIXBUF_MAX_LRU_COUNT)) { #line 3307 "/home/jens/Source/shotwell/src/Photo.vala" break; -#line 24498 "Photo.c" +#line 24577 "Photo.c" } #line 3308 "/home/jens/Source/shotwell/src/Photo.vala" _tmp56_ = photo_source_pixbuf_cache; @@ -24506,14 +24585,14 @@ static GdkPixbuf* photo_run_source_pixbuf_cache (Photo* locate, gboolean keep, G _tmp58_ = (PhotoCachedPixbuf*) _tmp57_; #line 3308 "/home/jens/Source/shotwell/src/Photo.vala" _photo_cached_pixbuf_unref0 (_tmp58_); -#line 24508 "Photo.c" +#line 24587 "Photo.c" } } #line 3312 "/home/jens/Source/shotwell/src/Photo.vala" _tmp59_ = photo_discard_source_id; #line 3312 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp59_ != ((guint) 0)) { -#line 24515 "Photo.c" +#line 24594 "Photo.c" guint _tmp60_ = 0U; #line 3313 "/home/jens/Source/shotwell/src/Photo.vala" _tmp60_ = photo_discard_source_id; @@ -24521,17 +24600,17 @@ static GdkPixbuf* photo_run_source_pixbuf_cache (Photo* locate, gboolean keep, G g_source_remove (_tmp60_); #line 3314 "/home/jens/Source/shotwell/src/Photo.vala" photo_discard_source_id = (guint) 0; -#line 24523 "Photo.c" +#line 24602 "Photo.c" } #line 3318 "/home/jens/Source/shotwell/src/Photo.vala" _tmp61_ = photo_source_pixbuf_cache; #line 3318 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp62_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp61_, GEE_TYPE_COLLECTION, GeeCollection)); + _tmp62_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp61_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); #line 3318 "/home/jens/Source/shotwell/src/Photo.vala" _tmp63_ = _tmp62_; #line 3318 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp63_ > PHOTO_SOURCE_PIXBUF_MIN_LRU_COUNT) { -#line 24533 "Photo.c" +#line 24612 "Photo.c" gdouble _tmp64_ = 0.0; guint retry_sec = 0U; gdouble _tmp65_ = 0.0; @@ -24554,13 +24633,13 @@ static GdkPixbuf* photo_run_source_pixbuf_cache (Photo* locate, gboolean keep, G _tmp68_ = g_timeout_add_seconds_full (G_PRIORITY_LOW, _tmp67_, _photo_trim_source_pixbuf_cache_gsource_func, NULL, NULL); #line 3323 "/home/jens/Source/shotwell/src/Photo.vala" photo_discard_source_id = _tmp68_; -#line 24556 "Photo.c" +#line 24635 "Photo.c" } #line 3326 "/home/jens/Source/shotwell/src/Photo.vala" _tmp70_ = found; #line 3326 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp70_ != NULL) { -#line 24562 "Photo.c" +#line 24641 "Photo.c" PhotoCachedPixbuf* _tmp71_ = NULL; GdkPixbuf* _tmp72_ = NULL; #line 3326 "/home/jens/Source/shotwell/src/Photo.vala" @@ -24569,11 +24648,11 @@ static GdkPixbuf* photo_run_source_pixbuf_cache (Photo* locate, gboolean keep, G _tmp72_ = _tmp71_->pixbuf; #line 3326 "/home/jens/Source/shotwell/src/Photo.vala" _tmp69_ = _tmp72_; -#line 24571 "Photo.c" +#line 24650 "Photo.c" } else { #line 3326 "/home/jens/Source/shotwell/src/Photo.vala" _tmp69_ = NULL; -#line 24575 "Photo.c" +#line 24654 "Photo.c" } #line 3326 "/home/jens/Source/shotwell/src/Photo.vala" _tmp73_ = _g_object_ref0 (_tmp69_); @@ -24583,18 +24662,18 @@ static GdkPixbuf* photo_run_source_pixbuf_cache (Photo* locate, gboolean keep, G _g_object_unref0 (iter); #line 3326 "/home/jens/Source/shotwell/src/Photo.vala" _photo_cached_pixbuf_unref0 (found); -#line 24585 "Photo.c" +#line 24664 "Photo.c" { GeeLinkedList* _tmp74_ = NULL; #line 3255 "/home/jens/Source/shotwell/src/Photo.vala" _tmp74_ = photo_source_pixbuf_cache; #line 3255 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&__lock_photo_source_pixbuf_cache); -#line 24592 "Photo.c" +#line 24671 "Photo.c" } #line 3326 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 24596 "Photo.c" +#line 24675 "Photo.c" } __finally381: { @@ -24603,13 +24682,13 @@ static GdkPixbuf* photo_run_source_pixbuf_cache (Photo* locate, gboolean keep, G _tmp75_ = photo_source_pixbuf_cache; #line 3255 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&__lock_photo_source_pixbuf_cache); -#line 24605 "Photo.c" +#line 24684 "Photo.c" } #line 3255 "/home/jens/Source/shotwell/src/Photo.vala" g_propagate_error (error, _inner_error_); #line 3255 "/home/jens/Source/shotwell/src/Photo.vala" return NULL; -#line 24611 "Photo.c" +#line 24690 "Photo.c" } } @@ -24628,7 +24707,7 @@ static gboolean photo_trim_source_pixbuf_cache (void) { _g_object_unref0 (_tmp1_); #line 3332 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 24630 "Photo.c" +#line 24709 "Photo.c" goto __catch382_g_error; } } @@ -24642,24 +24721,26 @@ static gboolean photo_trim_source_pixbuf_cache (void) { _inner_error_ = NULL; #line 3331 "/home/jens/Source/shotwell/src/Photo.vala" _g_error_free0 (err); -#line 24644 "Photo.c" +#line 24723 "Photo.c" } __finally382: #line 3331 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { +#line 24728 "Photo.c" + gboolean _tmp2_ = FALSE; #line 3331 "/home/jens/Source/shotwell/src/Photo.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 3331 "/home/jens/Source/shotwell/src/Photo.vala" g_clear_error (&_inner_error_); #line 3331 "/home/jens/Source/shotwell/src/Photo.vala" - return FALSE; -#line 24655 "Photo.c" + return _tmp2_; +#line 24736 "Photo.c" } #line 3336 "/home/jens/Source/shotwell/src/Photo.vala" result = FALSE; #line 3336 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 24661 "Photo.c" +#line 24742 "Photo.c" } @@ -24689,7 +24770,7 @@ GdkPixbuf* photo_get_prefetched_copy (Photo* self, GError** error) { g_propagate_error (error, _inner_error_); #line 3345 "/home/jens/Source/shotwell/src/Photo.vala" return NULL; -#line 24691 "Photo.c" +#line 24772 "Photo.c" } #line 3345 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = _tmp0_; @@ -24709,7 +24790,7 @@ GdkPixbuf* photo_get_prefetched_copy (Photo* self, GError** error) { _g_object_unref0 (_tmp0_); #line 3345 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 24711 "Photo.c" +#line 24792 "Photo.c" } @@ -24720,7 +24801,7 @@ void photo_discard_prefetched (Photo* self) { GError * _inner_error_ = NULL; #line 3351 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (IS_PHOTO (self)); -#line 24722 "Photo.c" +#line 24803 "Photo.c" { GdkPixbuf* _tmp0_ = NULL; GdkPixbuf* _tmp1_ = NULL; @@ -24732,7 +24813,7 @@ void photo_discard_prefetched (Photo* self) { _g_object_unref0 (_tmp1_); #line 3353 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 24734 "Photo.c" +#line 24815 "Photo.c" goto __catch383_g_error; } } @@ -24746,7 +24827,7 @@ void photo_discard_prefetched (Photo* self) { _inner_error_ = NULL; #line 3352 "/home/jens/Source/shotwell/src/Photo.vala" _g_error_free0 (err); -#line 24748 "Photo.c" +#line 24829 "Photo.c" } __finally383: #line 3352 "/home/jens/Source/shotwell/src/Photo.vala" @@ -24757,7 +24838,7 @@ void photo_discard_prefetched (Photo* self) { g_clear_error (&_inner_error_); #line 3352 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 24759 "Photo.c" +#line 24840 "Photo.c" } } @@ -24819,21 +24900,21 @@ GdkPixbuf* photo_get_pixbuf_with_options (Photo* self, Scaling* scaling, PhotoEx _tmp4_ = _tmp3_; #line 3382 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp4_) { -#line 24821 "Photo.c" +#line 24902 "Photo.c" PhotoFileFormat _tmp5_ = 0; #line 3383 "/home/jens/Source/shotwell/src/Photo.vala" _tmp5_ = photo_get_master_file_format (self); #line 3383 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = _tmp5_ == PHOTO_FILE_FORMAT_RAW; -#line 24827 "Photo.c" +#line 24908 "Photo.c" } else { #line 3382 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = FALSE; -#line 24831 "Photo.c" +#line 24912 "Photo.c" } #line 3382 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp2_) { -#line 24835 "Photo.c" +#line 24916 "Photo.c" gboolean _tmp6_ = FALSE; gboolean _tmp7_ = FALSE; BackingFetchMode _tmp8_ = 0; @@ -24843,39 +24924,39 @@ GdkPixbuf* photo_get_pixbuf_with_options (Photo* self, Scaling* scaling, PhotoEx if (_tmp8_ == BACKING_FETCH_MODE_BASELINE) { #line 3384 "/home/jens/Source/shotwell/src/Photo.vala" _tmp7_ = TRUE; -#line 24845 "Photo.c" +#line 24926 "Photo.c" } else { BackingFetchMode _tmp9_ = 0; #line 3384 "/home/jens/Source/shotwell/src/Photo.vala" _tmp9_ = fetch_mode; #line 3384 "/home/jens/Source/shotwell/src/Photo.vala" _tmp7_ = _tmp9_ == BACKING_FETCH_MODE_UNMODIFIED; -#line 24852 "Photo.c" +#line 24933 "Photo.c" } #line 3384 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp7_) { #line 3384 "/home/jens/Source/shotwell/src/Photo.vala" _tmp6_ = TRUE; -#line 24858 "Photo.c" +#line 24939 "Photo.c" } else { BackingFetchMode _tmp10_ = 0; #line 3385 "/home/jens/Source/shotwell/src/Photo.vala" _tmp10_ = fetch_mode; #line 3385 "/home/jens/Source/shotwell/src/Photo.vala" _tmp6_ = _tmp10_ == BACKING_FETCH_MODE_SOURCE; -#line 24865 "Photo.c" +#line 24946 "Photo.c" } #line 3384 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = _tmp6_; -#line 24869 "Photo.c" +#line 24950 "Photo.c" } else { #line 3382 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = FALSE; -#line 24873 "Photo.c" +#line 24954 "Photo.c" } #line 3382 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp1_) { -#line 24877 "Photo.c" +#line 24958 "Photo.c" RawDeveloper _tmp11_ = 0; gboolean _tmp12_ = FALSE; #line 3386 "/home/jens/Source/shotwell/src/Photo.vala" @@ -24884,21 +24965,21 @@ GdkPixbuf* photo_get_pixbuf_with_options (Photo* self, Scaling* scaling, PhotoEx _tmp12_ = photo_is_raw_developer_complete (self, _tmp11_); #line 3386 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = !_tmp12_; -#line 24886 "Photo.c" +#line 24967 "Photo.c" } else { #line 3382 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = FALSE; -#line 24890 "Photo.c" +#line 24971 "Photo.c" } #line 3382 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp0_) { -#line 24894 "Photo.c" +#line 24975 "Photo.c" RawDeveloper _tmp13_ = 0; #line 3387 "/home/jens/Source/shotwell/src/Photo.vala" _tmp13_ = photo_get_raw_developer (self); #line 3387 "/home/jens/Source/shotwell/src/Photo.vala" photo_set_raw_developer (self, _tmp13_); -#line 24900 "Photo.c" +#line 24981 "Photo.c" } #line 3392 "/home/jens/Source/shotwell/src/Photo.vala" dimensions_init (&original, 0, 0); @@ -24912,14 +24993,14 @@ GdkPixbuf* photo_get_pixbuf_with_options (Photo* self, Scaling* scaling, PhotoEx _redeye_instances_size_ = redeye_instances_length1; #line 3397 "/home/jens/Source/shotwell/src/Photo.vala" transformer = NULL; -#line 24914 "Photo.c" +#line 24995 "Photo.c" { PhotoRow* _tmp14_ = NULL; #line 3400 "/home/jens/Source/shotwell/src/Photo.vala" _tmp14_ = self->row; #line 3400 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_row); -#line 24921 "Photo.c" +#line 25002 "Photo.c" { Dimensions _tmp15_ = {0}; PhotoException _tmp16_ = 0; @@ -24987,7 +25068,7 @@ GdkPixbuf* photo_get_pixbuf_with_options (Photo* self, Scaling* scaling, PhotoEx _tmp29_ = photo_has_color_adjustments (self); #line 3413 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp29_) { -#line 24989 "Photo.c" +#line 25070 "Photo.c" PixelTransformer* _tmp30_ = NULL; #line 3414 "/home/jens/Source/shotwell/src/Photo.vala" _tmp30_ = photo_get_pixel_transformer (self); @@ -24995,13 +25076,13 @@ GdkPixbuf* photo_get_pixbuf_with_options (Photo* self, Scaling* scaling, PhotoEx _pixel_transformer_unref0 (transformer); #line 3414 "/home/jens/Source/shotwell/src/Photo.vala" transformer = _tmp30_; -#line 24997 "Photo.c" +#line 25078 "Photo.c" } #line 3416 "/home/jens/Source/shotwell/src/Photo.vala" _tmp31_ = photo_get_orientation (self); #line 3416 "/home/jens/Source/shotwell/src/Photo.vala" orientation = _tmp31_; -#line 25003 "Photo.c" +#line 25084 "Photo.c" } __finally384: { @@ -25010,7 +25091,7 @@ GdkPixbuf* photo_get_pixbuf_with_options (Photo* self, Scaling* scaling, PhotoEx _tmp32_ = self->row; #line 3400 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 25012 "Photo.c" +#line 25093 "Photo.c" } #line 3400 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { @@ -25022,7 +25103,7 @@ GdkPixbuf* photo_get_pixbuf_with_options (Photo* self, Scaling* scaling, PhotoEx redeye_instances = (g_free (redeye_instances), NULL); #line 3400 "/home/jens/Source/shotwell/src/Photo.vala" return NULL; -#line 25024 "Photo.c" +#line 25105 "Photo.c" } } #line 3423 "/home/jens/Source/shotwell/src/Photo.vala" @@ -25039,7 +25120,7 @@ GdkPixbuf* photo_get_pixbuf_with_options (Photo* self, Scaling* scaling, PhotoEx redeye_instances = (g_free (redeye_instances), NULL); #line 3423 "/home/jens/Source/shotwell/src/Photo.vala" return NULL; -#line 25041 "Photo.c" +#line 25122 "Photo.c" } #line 3430 "/home/jens/Source/shotwell/src/Photo.vala" _tmp34_ = exceptions; @@ -25047,14 +25128,14 @@ GdkPixbuf* photo_get_pixbuf_with_options (Photo* self, Scaling* scaling, PhotoEx _tmp35_ = photo_exception_allows (_tmp34_, PHOTO_EXCEPTION_REDEYE); #line 3430 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp35_) { -#line 25049 "Photo.c" +#line 25130 "Photo.c" EditingToolsRedeyeInstance* _tmp36_ = NULL; gint _tmp36__length1 = 0; #line 3435 "/home/jens/Source/shotwell/src/Photo.vala" _tmp36_ = redeye_instances; #line 3435 "/home/jens/Source/shotwell/src/Photo.vala" _tmp36__length1 = redeye_instances_length1; -#line 25056 "Photo.c" +#line 25137 "Photo.c" { EditingToolsRedeyeInstance* instance_collection = NULL; gint instance_collection_length1 = 0; @@ -25066,11 +25147,11 @@ GdkPixbuf* photo_get_pixbuf_with_options (Photo* self, Scaling* scaling, PhotoEx instance_collection_length1 = _tmp36__length1; #line 3435 "/home/jens/Source/shotwell/src/Photo.vala" for (instance_it = 0; instance_it < _tmp36__length1; instance_it = instance_it + 1) { -#line 25068 "Photo.c" +#line 25149 "Photo.c" EditingToolsRedeyeInstance instance = {0}; #line 3435 "/home/jens/Source/shotwell/src/Photo.vala" instance = instance_collection[instance_it]; -#line 25072 "Photo.c" +#line 25153 "Photo.c" { GdkPixbuf* _tmp37_ = NULL; EditingToolsRedeyeInstance _tmp38_ = {0}; @@ -25085,7 +25166,7 @@ GdkPixbuf* photo_get_pixbuf_with_options (Photo* self, Scaling* scaling, PhotoEx _g_object_unref0 (pixbuf); #line 3436 "/home/jens/Source/shotwell/src/Photo.vala" pixbuf = _tmp39_; -#line 25087 "Photo.c" +#line 25168 "Photo.c" } } } @@ -25096,13 +25177,13 @@ GdkPixbuf* photo_get_pixbuf_with_options (Photo* self, Scaling* scaling, PhotoEx _tmp41_ = photo_exception_allows (_tmp40_, PHOTO_EXCEPTION_STRAIGHTEN); #line 3444 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp41_) { -#line 25098 "Photo.c" +#line 25179 "Photo.c" gboolean _tmp42_ = FALSE; #line 3448 "/home/jens/Source/shotwell/src/Photo.vala" _tmp42_ = is_straightened; #line 3448 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp42_) { -#line 25104 "Photo.c" +#line 25185 "Photo.c" GdkPixbuf* _tmp43_ = NULL; gdouble _tmp44_ = 0.0; GdkPixbuf* _tmp45_ = NULL; @@ -25116,7 +25197,7 @@ GdkPixbuf* photo_get_pixbuf_with_options (Photo* self, Scaling* scaling, PhotoEx _g_object_unref0 (pixbuf); #line 3449 "/home/jens/Source/shotwell/src/Photo.vala" pixbuf = _tmp45_; -#line 25118 "Photo.c" +#line 25199 "Photo.c" } } #line 3458 "/home/jens/Source/shotwell/src/Photo.vala" @@ -25125,13 +25206,13 @@ GdkPixbuf* photo_get_pixbuf_with_options (Photo* self, Scaling* scaling, PhotoEx _tmp47_ = photo_exception_allows (_tmp46_, PHOTO_EXCEPTION_CROP); #line 3458 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp47_) { -#line 25127 "Photo.c" +#line 25208 "Photo.c" gboolean _tmp48_ = FALSE; #line 3462 "/home/jens/Source/shotwell/src/Photo.vala" _tmp48_ = is_cropped; #line 3462 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp48_) { -#line 25133 "Photo.c" +#line 25214 "Photo.c" Box _tmp49_ = {0}; gint _tmp50_ = 0; GdkPixbuf* _tmp51_ = NULL; @@ -25252,7 +25333,7 @@ GdkPixbuf* photo_get_pixbuf_with_options (Photo* self, Scaling* scaling, PhotoEx _g_object_unref0 (pixbuf); #line 3473 "/home/jens/Source/shotwell/src/Photo.vala" pixbuf = _tmp84_; -#line 25254 "Photo.c" +#line 25335 "Photo.c" } } #line 3483 "/home/jens/Source/shotwell/src/Photo.vala" @@ -25261,7 +25342,7 @@ GdkPixbuf* photo_get_pixbuf_with_options (Photo* self, Scaling* scaling, PhotoEx _tmp86_ = photo_exception_allows (_tmp85_, PHOTO_EXCEPTION_ORIENTATION); #line 3483 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp86_) { -#line 25263 "Photo.c" +#line 25344 "Photo.c" GdkPixbuf* _tmp87_ = NULL; GdkPixbuf* _tmp88_ = NULL; #line 3487 "/home/jens/Source/shotwell/src/Photo.vala" @@ -25272,13 +25353,13 @@ GdkPixbuf* photo_get_pixbuf_with_options (Photo* self, Scaling* scaling, PhotoEx _g_object_unref0 (pixbuf); #line 3487 "/home/jens/Source/shotwell/src/Photo.vala" pixbuf = _tmp88_; -#line 25274 "Photo.c" +#line 25355 "Photo.c" } #line 3494 "/home/jens/Source/shotwell/src/Photo.vala" _tmp89_ = is_scaled; #line 3494 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp89_) { -#line 25280 "Photo.c" +#line 25361 "Photo.c" GdkPixbuf* _tmp90_ = NULL; Dimensions _tmp91_ = {0}; gint _tmp92_ = 0; @@ -25301,7 +25382,7 @@ GdkPixbuf* photo_get_pixbuf_with_options (Photo* self, Scaling* scaling, PhotoEx _g_object_unref0 (pixbuf); #line 3498 "/home/jens/Source/shotwell/src/Photo.vala" pixbuf = _tmp95_; -#line 25303 "Photo.c" +#line 25384 "Photo.c" } #line 3506 "/home/jens/Source/shotwell/src/Photo.vala" _tmp96_ = exceptions; @@ -25309,13 +25390,13 @@ GdkPixbuf* photo_get_pixbuf_with_options (Photo* self, Scaling* scaling, PhotoEx _tmp97_ = photo_exception_allows (_tmp96_, PHOTO_EXCEPTION_ADJUST); #line 3506 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp97_) { -#line 25311 "Photo.c" +#line 25392 "Photo.c" PixelTransformer* _tmp98_ = NULL; #line 3510 "/home/jens/Source/shotwell/src/Photo.vala" _tmp98_ = transformer; #line 3510 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp98_ != NULL) { -#line 25317 "Photo.c" +#line 25398 "Photo.c" PixelTransformer* _tmp99_ = NULL; GdkPixbuf* _tmp100_ = NULL; #line 3511 "/home/jens/Source/shotwell/src/Photo.vala" @@ -25324,28 +25405,28 @@ GdkPixbuf* photo_get_pixbuf_with_options (Photo* self, Scaling* scaling, PhotoEx _tmp100_ = pixbuf; #line 3511 "/home/jens/Source/shotwell/src/Photo.vala" pixel_transformer_transform_pixbuf (_tmp99_, _tmp100_, NULL); -#line 25326 "Photo.c" +#line 25407 "Photo.c" } } #line 3520 "/home/jens/Source/shotwell/src/Photo.vala" _tmp102_ = is_scaled; #line 3520 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp102_) { -#line 25333 "Photo.c" +#line 25414 "Photo.c" gboolean _tmp103_ = FALSE; #line 3520 "/home/jens/Source/shotwell/src/Photo.vala" _tmp103_ = is_straightened; #line 3520 "/home/jens/Source/shotwell/src/Photo.vala" _tmp101_ = !_tmp103_; -#line 25339 "Photo.c" +#line 25420 "Photo.c" } else { #line 3520 "/home/jens/Source/shotwell/src/Photo.vala" _tmp101_ = FALSE; -#line 25343 "Photo.c" +#line 25424 "Photo.c" } #line 3520 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp101_) { -#line 25347 "Photo.c" +#line 25428 "Photo.c" GdkPixbuf* _tmp104_ = NULL; Dimensions _tmp105_ = {0}; gboolean _tmp106_ = FALSE; @@ -25357,7 +25438,7 @@ GdkPixbuf* photo_get_pixbuf_with_options (Photo* self, Scaling* scaling, PhotoEx _tmp106_ = dimensions_approx_equals (&scaled_to_viewport, &_tmp105_, PHOTO_SCALING_FUDGE); #line 3521 "/home/jens/Source/shotwell/src/Photo.vala" _vala_assert (_tmp106_, "scaled_to_viewport.approx_equals(Dimensions.for_pixbuf(pixbuf), SCALING_FUDGE)"); -#line 25359 "Photo.c" +#line 25440 "Photo.c" } #line 3529 "/home/jens/Source/shotwell/src/Photo.vala" result = pixbuf; @@ -25367,16 +25448,17 @@ GdkPixbuf* photo_get_pixbuf_with_options (Photo* self, Scaling* scaling, PhotoEx redeye_instances = (g_free (redeye_instances), NULL); #line 3529 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 25369 "Photo.c" +#line 25450 "Photo.c" } static gboolean photo_real_has_user_generated_metadata (Photo* self) { + gboolean _tmp0_ = FALSE; #line 3537 "/home/jens/Source/shotwell/src/Photo.vala" g_critical ("Type `%s' does not implement abstract method `photo_has_user_generated_metadata'", g_type_name (G_TYPE_FROM_INSTANCE (self))); #line 3537 "/home/jens/Source/shotwell/src/Photo.vala" - return FALSE; -#line 25378 "Photo.c" + return _tmp0_; +#line 25460 "Photo.c" } @@ -25385,7 +25467,7 @@ gboolean photo_has_user_generated_metadata (Photo* self) { g_return_val_if_fail (IS_PHOTO (self), FALSE); #line 3537 "/home/jens/Source/shotwell/src/Photo.vala" return PHOTO_GET_CLASS (self)->has_user_generated_metadata (self); -#line 25387 "Photo.c" +#line 25469 "Photo.c" } @@ -25394,7 +25476,7 @@ static void photo_real_set_user_metadata_for_export (Photo* self, PhotoMetadata* g_critical ("Type `%s' does not implement abstract method `photo_set_user_metadata_for_export'", g_type_name (G_TYPE_FROM_INSTANCE (self))); #line 3541 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 25396 "Photo.c" +#line 25478 "Photo.c" } @@ -25403,7 +25485,7 @@ void photo_set_user_metadata_for_export (Photo* self, PhotoMetadata* metadata) { g_return_if_fail (IS_PHOTO (self)); #line 3541 "/home/jens/Source/shotwell/src/Photo.vala" PHOTO_GET_CLASS (self)->set_user_metadata_for_export (self, metadata); -#line 25405 "Photo.c" +#line 25487 "Photo.c" } @@ -25416,7 +25498,7 @@ gchar* photo_get_export_basename (Photo* self, PhotoFileFormat* file_format) { _tmp0_ = file_format; #line 3549 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp0_ != NULL) { -#line 25418 "Photo.c" +#line 25500 "Photo.c" PhotoFileFormat* _tmp1_ = NULL; PhotoFileFormatProperties* _tmp2_ = NULL; PhotoFileFormatProperties* _tmp3_ = NULL; @@ -25454,7 +25536,7 @@ gchar* photo_get_export_basename (Photo* self, PhotoFileFormat* file_format) { result = _tmp9_; #line 3550 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 25456 "Photo.c" +#line 25538 "Photo.c" } else { PhotoFileFormat _tmp10_ = 0; gboolean _tmp11_ = FALSE; @@ -25464,7 +25546,7 @@ gchar* photo_get_export_basename (Photo* self, PhotoFileFormat* file_format) { _tmp11_ = photo_file_format_can_write (_tmp10_); #line 3552 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp11_) { -#line 25466 "Photo.c" +#line 25548 "Photo.c" PhotoFileFormat _tmp12_ = 0; PhotoFileFormatProperties* _tmp13_ = NULL; PhotoFileFormatProperties* _tmp14_ = NULL; @@ -25502,7 +25584,7 @@ gchar* photo_get_export_basename (Photo* self, PhotoFileFormat* file_format) { result = _tmp20_; #line 3553 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 25504 "Photo.c" +#line 25586 "Photo.c" } else { PhotoFileFormat _tmp21_ = 0; PhotoFileFormatProperties* _tmp22_ = NULL; @@ -25541,7 +25623,7 @@ gchar* photo_get_export_basename (Photo* self, PhotoFileFormat* file_format) { result = _tmp29_; #line 3556 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 25543 "Photo.c" +#line 25625 "Photo.c" } } } @@ -25551,49 +25633,49 @@ static gboolean photo_export_fullsized_backing (Photo* self, GFile* file, gboole gboolean result = FALSE; PhotoFileReader* export_reader = NULL; gboolean is_master = FALSE; - PhotoFileReader* _tmp29_ = NULL; - PhotoFileFormatProperties* format_properties = NULL; PhotoFileReader* _tmp30_ = NULL; - PhotoFileFormat _tmp31_ = 0; - PhotoFileFormatProperties* _tmp32_ = NULL; - GFile* dest_file = NULL; + PhotoFileFormatProperties* format_properties = NULL; + PhotoFileReader* _tmp31_ = NULL; + PhotoFileFormat _tmp32_ = 0; PhotoFileFormatProperties* _tmp33_ = NULL; - GFile* _tmp34_ = NULL; + GFile* dest_file = NULL; + PhotoFileFormatProperties* _tmp34_ = NULL; GFile* _tmp35_ = NULL; + GFile* _tmp36_ = NULL; PhotoFileMetadataWriter* writer = NULL; - PhotoFileReader* _tmp36_ = NULL; - PhotoFileFormat _tmp37_ = 0; - GFile* _tmp38_ = NULL; - gchar* _tmp39_ = NULL; + PhotoFileReader* _tmp37_ = NULL; + PhotoFileFormat _tmp38_ = 0; + GFile* _tmp39_ = NULL; gchar* _tmp40_ = NULL; - PhotoFileMetadataWriter* _tmp41_ = NULL; + gchar* _tmp41_ = NULL; PhotoFileMetadataWriter* _tmp42_ = NULL; - gchar* _tmp43_ = NULL; - gchar* _tmp44_ = NULL; - PhotoFileMetadataWriter* _tmp45_ = NULL; + PhotoFileMetadataWriter* _tmp43_ = NULL; + gchar* _tmp45_ = NULL; gchar* _tmp46_ = NULL; - gchar* _tmp47_ = NULL; - PhotoFileReader* _tmp48_ = NULL; - GFile* _tmp49_ = NULL; - GFile* _tmp50_ = NULL; + PhotoFileMetadataWriter* _tmp47_ = NULL; + gchar* _tmp48_ = NULL; + gchar* _tmp49_ = NULL; + PhotoFileReader* _tmp50_ = NULL; GFile* _tmp51_ = NULL; - gboolean _tmp52_ = FALSE; - gboolean _tmp53_ = FALSE; - gboolean _tmp54_ = FALSE; + GFile* _tmp52_ = NULL; + GFile* _tmp53_ = NULL; gboolean _tmp55_ = FALSE; gboolean _tmp56_ = FALSE; gboolean _tmp57_ = FALSE; + gboolean _tmp58_ = FALSE; + gboolean _tmp59_ = FALSE; + gboolean _tmp60_ = FALSE; PhotoMetadata* metadata = NULL; - PhotoFileReader* _tmp65_ = NULL; - PhotoMetadata* _tmp66_ = NULL; - PhotoMetadata* _tmp67_ = NULL; - PhotoFileMetadataWriter* _tmp71_ = NULL; - gchar* _tmp72_ = NULL; - gchar* _tmp73_ = NULL; - time_t _tmp74_ = 0; - gboolean _tmp80_ = FALSE; - PhotoFileMetadataWriter* _tmp97_ = NULL; - PhotoMetadata* _tmp98_ = NULL; + PhotoFileReader* _tmp68_ = NULL; + PhotoMetadata* _tmp69_ = NULL; + PhotoMetadata* _tmp71_ = NULL; + PhotoFileMetadataWriter* _tmp75_ = NULL; + gchar* _tmp76_ = NULL; + gchar* _tmp77_ = NULL; + time_t _tmp78_ = 0; + gboolean _tmp84_ = FALSE; + PhotoFileMetadataWriter* _tmp101_ = NULL; + PhotoMetadata* _tmp102_ = NULL; GError * _inner_error_ = NULL; #line 3562 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_PHOTO (self), FALSE); @@ -25603,14 +25685,14 @@ static gboolean photo_export_fullsized_backing (Photo* self, GFile* file, gboole export_reader = NULL; #line 3566 "/home/jens/Source/shotwell/src/Photo.vala" is_master = TRUE; -#line 25605 "Photo.c" +#line 25687 "Photo.c" { PhotoBackingReaders* _tmp0_ = NULL; #line 3567 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = self->priv->readers; #line 3567 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_readers); -#line 25612 "Photo.c" +#line 25694 "Photo.c" { gboolean _tmp1_ = FALSE; PhotoBackingReaders* _tmp2_ = NULL; @@ -25621,7 +25703,7 @@ static gboolean photo_export_fullsized_backing (Photo* self, GFile* file, gboole _tmp3_ = _tmp2_->editable; #line 3568 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp3_ != NULL) { -#line 25623 "Photo.c" +#line 25705 "Photo.c" PhotoBackingReaders* _tmp4_ = NULL; PhotoFileReader* _tmp5_ = NULL; PhotoFileFormat _tmp6_ = 0; @@ -25636,15 +25718,15 @@ static gboolean photo_export_fullsized_backing (Photo* self, GFile* file, gboole _tmp7_ = photo_file_format_can_write_metadata (_tmp6_); #line 3568 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = _tmp7_; -#line 25638 "Photo.c" +#line 25720 "Photo.c" } else { #line 3568 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = FALSE; -#line 25642 "Photo.c" +#line 25724 "Photo.c" } #line 3568 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp1_) { -#line 25646 "Photo.c" +#line 25728 "Photo.c" PhotoBackingReaders* _tmp8_ = NULL; PhotoFileReader* _tmp9_ = NULL; PhotoFileReader* _tmp10_ = NULL; @@ -25660,7 +25742,7 @@ static gboolean photo_export_fullsized_backing (Photo* self, GFile* file, gboole export_reader = _tmp10_; #line 3570 "/home/jens/Source/shotwell/src/Photo.vala" is_master = FALSE; -#line 25662 "Photo.c" +#line 25744 "Photo.c" } else { gboolean _tmp11_ = FALSE; PhotoBackingReaders* _tmp12_ = NULL; @@ -25671,7 +25753,7 @@ static gboolean photo_export_fullsized_backing (Photo* self, GFile* file, gboole _tmp13_ = _tmp12_->developer; #line 3571 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp13_ != NULL) { -#line 25673 "Photo.c" +#line 25755 "Photo.c" PhotoBackingReaders* _tmp14_ = NULL; PhotoFileReader* _tmp15_ = NULL; PhotoFileFormat _tmp16_ = 0; @@ -25686,15 +25768,15 @@ static gboolean photo_export_fullsized_backing (Photo* self, GFile* file, gboole _tmp17_ = photo_file_format_can_write_metadata (_tmp16_); #line 3571 "/home/jens/Source/shotwell/src/Photo.vala" _tmp11_ = _tmp17_; -#line 25688 "Photo.c" +#line 25770 "Photo.c" } else { #line 3571 "/home/jens/Source/shotwell/src/Photo.vala" _tmp11_ = FALSE; -#line 25692 "Photo.c" +#line 25774 "Photo.c" } #line 3571 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp11_) { -#line 25696 "Photo.c" +#line 25778 "Photo.c" PhotoBackingReaders* _tmp18_ = NULL; PhotoFileReader* _tmp19_ = NULL; PhotoFileReader* _tmp20_ = NULL; @@ -25710,7 +25792,7 @@ static gboolean photo_export_fullsized_backing (Photo* self, GFile* file, gboole export_reader = _tmp20_; #line 3573 "/home/jens/Source/shotwell/src/Photo.vala" is_master = FALSE; -#line 25712 "Photo.c" +#line 25794 "Photo.c" } else { PhotoBackingReaders* _tmp21_ = NULL; PhotoFileReader* _tmp22_ = NULL; @@ -25726,7 +25808,7 @@ static gboolean photo_export_fullsized_backing (Photo* self, GFile* file, gboole _tmp24_ = photo_file_format_can_write_metadata (_tmp23_); #line 3574 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp24_) { -#line 25728 "Photo.c" +#line 25810 "Photo.c" PhotoBackingReaders* _tmp25_ = NULL; PhotoFileReader* _tmp26_ = NULL; PhotoFileReader* _tmp27_ = NULL; @@ -25740,7 +25822,7 @@ static gboolean photo_export_fullsized_backing (Photo* self, GFile* file, gboole _photo_file_adapter_unref0 (export_reader); #line 3575 "/home/jens/Source/shotwell/src/Photo.vala" export_reader = _tmp27_; -#line 25742 "Photo.c" +#line 25824 "Photo.c" } } } @@ -25752,67 +25834,71 @@ static gboolean photo_export_fullsized_backing (Photo* self, GFile* file, gboole _tmp28_ = self->priv->readers; #line 3567 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_readers); -#line 25754 "Photo.c" +#line 25836 "Photo.c" } #line 3567 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { +#line 25840 "Photo.c" + gboolean _tmp29_ = FALSE; #line 3567 "/home/jens/Source/shotwell/src/Photo.vala" g_propagate_error (error, _inner_error_); #line 3567 "/home/jens/Source/shotwell/src/Photo.vala" _photo_file_adapter_unref0 (export_reader); #line 3567 "/home/jens/Source/shotwell/src/Photo.vala" - return FALSE; -#line 25764 "Photo.c" + return _tmp29_; +#line 25848 "Photo.c" } } #line 3579 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp29_ = export_reader; + _tmp30_ = export_reader; #line 3579 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp29_ == NULL) { + if (_tmp30_ == NULL) { #line 3580 "/home/jens/Source/shotwell/src/Photo.vala" result = FALSE; #line 3580 "/home/jens/Source/shotwell/src/Photo.vala" _photo_file_adapter_unref0 (export_reader); #line 3580 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 25777 "Photo.c" +#line 25861 "Photo.c" } #line 3582 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp30_ = export_reader; + _tmp31_ = export_reader; #line 3582 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp31_ = photo_file_adapter_get_file_format (G_TYPE_CHECK_INSTANCE_CAST (_tmp30_, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter)); + _tmp32_ = photo_file_adapter_get_file_format (G_TYPE_CHECK_INSTANCE_CAST (_tmp31_, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter)); #line 3582 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp32_ = photo_file_format_get_properties (_tmp31_); + _tmp33_ = photo_file_format_get_properties (_tmp32_); #line 3582 "/home/jens/Source/shotwell/src/Photo.vala" - format_properties = _tmp32_; + format_properties = _tmp33_; #line 3585 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp33_ = format_properties; + _tmp34_ = format_properties; #line 3585 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp34_ = file; + _tmp35_ = file; #line 3585 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp35_ = photo_file_format_properties_convert_file_extension (_tmp33_, _tmp34_); + _tmp36_ = photo_file_format_properties_convert_file_extension (_tmp34_, _tmp35_); #line 3585 "/home/jens/Source/shotwell/src/Photo.vala" - dest_file = _tmp35_; + dest_file = _tmp36_; #line 3588 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp36_ = export_reader; + _tmp37_ = export_reader; #line 3588 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp37_ = photo_file_adapter_get_file_format (G_TYPE_CHECK_INSTANCE_CAST (_tmp36_, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter)); + _tmp38_ = photo_file_adapter_get_file_format (G_TYPE_CHECK_INSTANCE_CAST (_tmp37_, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter)); #line 3588 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp38_ = dest_file; + _tmp39_ = dest_file; #line 3588 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp39_ = g_file_get_path (_tmp38_); + _tmp40_ = g_file_get_path (_tmp39_); #line 3588 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp40_ = _tmp39_; + _tmp41_ = _tmp40_; #line 3588 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp41_ = photo_file_format_create_metadata_writer (_tmp37_, _tmp40_, &_inner_error_); + _tmp42_ = photo_file_format_create_metadata_writer (_tmp38_, _tmp41_, &_inner_error_); #line 3588 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp42_ = _tmp41_; + _tmp43_ = _tmp42_; #line 3588 "/home/jens/Source/shotwell/src/Photo.vala" - _g_free0 (_tmp40_); + _g_free0 (_tmp41_); #line 3588 "/home/jens/Source/shotwell/src/Photo.vala" - writer = _tmp42_; + writer = _tmp43_; #line 3588 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { +#line 25899 "Photo.c" + gboolean _tmp44_ = FALSE; #line 3588 "/home/jens/Source/shotwell/src/Photo.vala" g_propagate_error (error, _inner_error_); #line 3588 "/home/jens/Source/shotwell/src/Photo.vala" @@ -25822,39 +25908,41 @@ static gboolean photo_export_fullsized_backing (Photo* self, GFile* file, gboole #line 3588 "/home/jens/Source/shotwell/src/Photo.vala" _photo_file_adapter_unref0 (export_reader); #line 3588 "/home/jens/Source/shotwell/src/Photo.vala" - return FALSE; -#line 25825 "Photo.c" + return _tmp44_; +#line 25911 "Photo.c" } #line 3591 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp43_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject)); + _tmp45_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject)); #line 3591 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp44_ = _tmp43_; + _tmp46_ = _tmp45_; #line 3591 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp45_ = writer; + _tmp47_ = writer; #line 3591 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp46_ = photo_file_adapter_get_filepath (G_TYPE_CHECK_INSTANCE_CAST (_tmp45_, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter)); + _tmp48_ = photo_file_adapter_get_filepath (G_TYPE_CHECK_INSTANCE_CAST (_tmp47_, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter)); #line 3591 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp47_ = _tmp46_; + _tmp49_ = _tmp48_; #line 3591 "/home/jens/Source/shotwell/src/Photo.vala" - g_debug ("Photo.vala:3591: Exporting full-sized copy of %s to %s", _tmp44_, _tmp47_); + g_debug ("Photo.vala:3591: Exporting full-sized copy of %s to %s", _tmp46_, _tmp49_); #line 3591 "/home/jens/Source/shotwell/src/Photo.vala" - _g_free0 (_tmp47_); + _g_free0 (_tmp49_); #line 3591 "/home/jens/Source/shotwell/src/Photo.vala" - _g_free0 (_tmp44_); + _g_free0 (_tmp46_); #line 3593 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp48_ = export_reader; + _tmp50_ = export_reader; #line 3593 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp49_ = photo_file_adapter_get_file (G_TYPE_CHECK_INSTANCE_CAST (_tmp48_, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter)); + _tmp51_ = photo_file_adapter_get_file (G_TYPE_CHECK_INSTANCE_CAST (_tmp50_, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter)); #line 3593 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp50_ = _tmp49_; + _tmp52_ = _tmp51_; #line 3593 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp51_ = dest_file; + _tmp53_ = dest_file; #line 3593 "/home/jens/Source/shotwell/src/Photo.vala" - g_file_copy (_tmp50_, _tmp51_, G_FILE_COPY_OVERWRITE | G_FILE_COPY_TARGET_DEFAULT_PERMS, NULL, NULL, NULL, &_inner_error_); + g_file_copy (_tmp52_, _tmp53_, G_FILE_COPY_OVERWRITE | G_FILE_COPY_TARGET_DEFAULT_PERMS, NULL, NULL, NULL, &_inner_error_); #line 3593 "/home/jens/Source/shotwell/src/Photo.vala" - _g_object_unref0 (_tmp50_); + _g_object_unref0 (_tmp52_); #line 3593 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { +#line 25943 "Photo.c" + gboolean _tmp54_ = FALSE; #line 3593 "/home/jens/Source/shotwell/src/Photo.vala" g_propagate_error (error, _inner_error_); #line 3593 "/home/jens/Source/shotwell/src/Photo.vala" @@ -25866,93 +25954,93 @@ static gboolean photo_export_fullsized_backing (Photo* self, GFile* file, gboole #line 3593 "/home/jens/Source/shotwell/src/Photo.vala" _photo_file_adapter_unref0 (export_reader); #line 3593 "/home/jens/Source/shotwell/src/Photo.vala" - return FALSE; -#line 25869 "Photo.c" + return _tmp54_; +#line 25957 "Photo.c" } #line 3598 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp57_ = photo_has_alterations (self); + _tmp60_ = photo_has_alterations (self); #line 3598 "/home/jens/Source/shotwell/src/Photo.vala" - if (!_tmp57_) { -#line 25875 "Photo.c" - gboolean _tmp58_ = FALSE; + if (!_tmp60_) { +#line 25963 "Photo.c" + gboolean _tmp61_ = FALSE; #line 3598 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp58_ = is_master; + _tmp61_ = is_master; #line 3598 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp56_ = _tmp58_; -#line 25881 "Photo.c" + _tmp59_ = _tmp61_; +#line 25969 "Photo.c" } else { #line 3598 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp56_ = FALSE; -#line 25885 "Photo.c" + _tmp59_ = FALSE; +#line 25973 "Photo.c" } #line 3598 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp56_) { -#line 25889 "Photo.c" - gboolean _tmp59_ = FALSE; + if (_tmp59_) { +#line 25977 "Photo.c" + gboolean _tmp62_ = FALSE; #line 3598 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp59_ = photo_has_user_generated_metadata (self); + _tmp62_ = photo_has_user_generated_metadata (self); #line 3598 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp55_ = !_tmp59_; -#line 25895 "Photo.c" + _tmp58_ = !_tmp62_; +#line 25983 "Photo.c" } else { #line 3598 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp55_ = FALSE; -#line 25899 "Photo.c" + _tmp58_ = FALSE; +#line 25987 "Photo.c" } #line 3598 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp55_) { -#line 25903 "Photo.c" - gchar* _tmp60_ = NULL; - gchar* _tmp61_ = NULL; + if (_tmp58_) { +#line 25991 "Photo.c" + gchar* _tmp63_ = NULL; + gchar* _tmp64_ = NULL; #line 3599 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp60_ = media_source_get_title (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource)); + _tmp63_ = media_source_get_title (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource)); #line 3599 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp61_ = _tmp60_; + _tmp64_ = _tmp63_; #line 3599 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp54_ = _tmp61_ == NULL; + _tmp57_ = _tmp64_ == NULL; #line 3599 "/home/jens/Source/shotwell/src/Photo.vala" - _g_free0 (_tmp61_); -#line 25914 "Photo.c" + _g_free0 (_tmp64_); +#line 26002 "Photo.c" } else { #line 3598 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp54_ = FALSE; -#line 25918 "Photo.c" + _tmp57_ = FALSE; +#line 26006 "Photo.c" } #line 3598 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp54_) { -#line 25922 "Photo.c" - gchar* _tmp62_ = NULL; - gchar* _tmp63_ = NULL; + if (_tmp57_) { +#line 26010 "Photo.c" + gchar* _tmp65_ = NULL; + gchar* _tmp66_ = NULL; #line 3599 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp62_ = media_source_get_comment (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource)); + _tmp65_ = media_source_get_comment (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource)); #line 3599 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp63_ = _tmp62_; + _tmp66_ = _tmp65_; #line 3599 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp53_ = _tmp63_ == NULL; + _tmp56_ = _tmp66_ == NULL; #line 3599 "/home/jens/Source/shotwell/src/Photo.vala" - _g_free0 (_tmp63_); -#line 25933 "Photo.c" + _g_free0 (_tmp66_); +#line 26021 "Photo.c" } else { #line 3598 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp53_ = FALSE; -#line 25937 "Photo.c" + _tmp56_ = FALSE; +#line 26025 "Photo.c" } #line 3598 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp53_) { -#line 25941 "Photo.c" - gboolean _tmp64_ = FALSE; + if (_tmp56_) { +#line 26029 "Photo.c" + gboolean _tmp67_ = FALSE; #line 3599 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp64_ = export_metadata; + _tmp67_ = export_metadata; #line 3599 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp52_ = _tmp64_; -#line 25947 "Photo.c" + _tmp55_ = _tmp67_; +#line 26035 "Photo.c" } else { #line 3598 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp52_ = FALSE; -#line 25951 "Photo.c" + _tmp55_ = FALSE; +#line 26039 "Photo.c" } #line 3598 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp52_) { + if (_tmp55_) { #line 3600 "/home/jens/Source/shotwell/src/Photo.vala" result = TRUE; #line 3600 "/home/jens/Source/shotwell/src/Photo.vala" @@ -25965,16 +26053,18 @@ static gboolean photo_export_fullsized_backing (Photo* self, GFile* file, gboole _photo_file_adapter_unref0 (export_reader); #line 3600 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 25967 "Photo.c" +#line 26055 "Photo.c" } #line 3603 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp65_ = export_reader; + _tmp68_ = export_reader; #line 3603 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp66_ = photo_file_reader_read_metadata (_tmp65_, &_inner_error_); + _tmp69_ = photo_file_reader_read_metadata (_tmp68_, &_inner_error_); #line 3603 "/home/jens/Source/shotwell/src/Photo.vala" - metadata = _tmp66_; + metadata = _tmp69_; #line 3603 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { +#line 26065 "Photo.c" + gboolean _tmp70_ = FALSE; #line 3603 "/home/jens/Source/shotwell/src/Photo.vala" g_propagate_error (error, _inner_error_); #line 3603 "/home/jens/Source/shotwell/src/Photo.vala" @@ -25986,159 +26076,161 @@ static gboolean photo_export_fullsized_backing (Photo* self, GFile* file, gboole #line 3603 "/home/jens/Source/shotwell/src/Photo.vala" _photo_file_adapter_unref0 (export_reader); #line 3603 "/home/jens/Source/shotwell/src/Photo.vala" - return FALSE; -#line 25989 "Photo.c" + return _tmp70_; +#line 26079 "Photo.c" } #line 3604 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp67_ = metadata; + _tmp71_ = metadata; #line 3604 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp67_ == NULL) { -#line 25995 "Photo.c" - PhotoFileReader* _tmp68_ = NULL; - PhotoFileFormat _tmp69_ = 0; - PhotoMetadata* _tmp70_ = NULL; + if (_tmp71_ == NULL) { +#line 26085 "Photo.c" + PhotoFileReader* _tmp72_ = NULL; + PhotoFileFormat _tmp73_ = 0; + PhotoMetadata* _tmp74_ = NULL; #line 3605 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp68_ = export_reader; + _tmp72_ = export_reader; #line 3605 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp69_ = photo_file_adapter_get_file_format (G_TYPE_CHECK_INSTANCE_CAST (_tmp68_, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter)); + _tmp73_ = photo_file_adapter_get_file_format (G_TYPE_CHECK_INSTANCE_CAST (_tmp72_, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter)); #line 3605 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp70_ = photo_file_format_create_metadata (_tmp69_); + _tmp74_ = photo_file_format_create_metadata (_tmp73_); #line 3605 "/home/jens/Source/shotwell/src/Photo.vala" _media_metadata_unref0 (metadata); #line 3605 "/home/jens/Source/shotwell/src/Photo.vala" - metadata = _tmp70_; -#line 26009 "Photo.c" + metadata = _tmp74_; +#line 26099 "Photo.c" } #line 3607 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp71_ = writer; + _tmp75_ = writer; #line 3607 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp72_ = photo_file_adapter_get_filepath (G_TYPE_CHECK_INSTANCE_CAST (_tmp71_, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter)); + _tmp76_ = photo_file_adapter_get_filepath (G_TYPE_CHECK_INSTANCE_CAST (_tmp75_, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter)); #line 3607 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp73_ = _tmp72_; + _tmp77_ = _tmp76_; #line 3607 "/home/jens/Source/shotwell/src/Photo.vala" - g_debug ("Photo.vala:3607: Updating metadata of %s", _tmp73_); + g_debug ("Photo.vala:3607: Updating metadata of %s", _tmp77_); #line 3607 "/home/jens/Source/shotwell/src/Photo.vala" - _g_free0 (_tmp73_); + _g_free0 (_tmp77_); #line 3609 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp74_ = media_source_get_exposure_time (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource)); + _tmp78_ = media_source_get_exposure_time (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource)); #line 3609 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp74_ != ((time_t) 0)) { -#line 26025 "Photo.c" - PhotoMetadata* _tmp75_ = NULL; - time_t _tmp76_ = 0; - MetadataDateTime* _tmp77_ = NULL; - MetadataDateTime* _tmp78_ = NULL; + if (_tmp78_ != ((time_t) 0)) { +#line 26115 "Photo.c" + PhotoMetadata* _tmp79_ = NULL; + time_t _tmp80_ = 0; + MetadataDateTime* _tmp81_ = NULL; + MetadataDateTime* _tmp82_ = NULL; #line 3610 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp75_ = metadata; + _tmp79_ = metadata; #line 3610 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp76_ = media_source_get_exposure_time (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource)); + _tmp80_ = media_source_get_exposure_time (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource)); #line 3610 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp77_ = metadata_date_time_new (_tmp76_); + _tmp81_ = metadata_date_time_new (_tmp80_); #line 3610 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp78_ = _tmp77_; + _tmp82_ = _tmp81_; #line 3610 "/home/jens/Source/shotwell/src/Photo.vala" - photo_metadata_set_exposure_date_time (_tmp75_, _tmp78_, PHOTO_METADATA_SET_OPTION_ALL_DOMAINS); + photo_metadata_set_exposure_date_time (_tmp79_, _tmp82_, PHOTO_METADATA_SET_OPTION_ALL_DOMAINS); #line 3610 "/home/jens/Source/shotwell/src/Photo.vala" - _metadata_date_time_unref0 (_tmp78_); -#line 26042 "Photo.c" + _metadata_date_time_unref0 (_tmp82_); +#line 26132 "Photo.c" } else { - PhotoMetadata* _tmp79_ = NULL; + PhotoMetadata* _tmp83_ = NULL; #line 3612 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp79_ = metadata; + _tmp83_ = metadata; #line 3612 "/home/jens/Source/shotwell/src/Photo.vala" - photo_metadata_set_exposure_date_time (_tmp79_, NULL, PHOTO_METADATA_SET_OPTION_ALL_DOMAINS); -#line 26049 "Photo.c" + photo_metadata_set_exposure_date_time (_tmp83_, NULL, PHOTO_METADATA_SET_OPTION_ALL_DOMAINS); +#line 26139 "Photo.c" } #line 3614 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp80_ = export_metadata; + _tmp84_ = export_metadata; #line 3614 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp80_) { -#line 26055 "Photo.c" - PhotoMetadata* _tmp81_ = NULL; - gchar* _tmp82_ = NULL; - gchar* _tmp83_ = NULL; - PhotoMetadata* _tmp84_ = NULL; - gchar* _tmp85_ = NULL; + if (_tmp84_) { +#line 26145 "Photo.c" + PhotoMetadata* _tmp85_ = NULL; gchar* _tmp86_ = NULL; - PhotoMetadata* _tmp87_ = NULL; - Dimensions _tmp88_ = {0}; - PhotoMetadata* _tmp89_ = NULL; - Orientation _tmp90_ = 0; + gchar* _tmp87_ = NULL; + PhotoMetadata* _tmp88_ = NULL; + gchar* _tmp89_ = NULL; + gchar* _tmp90_ = NULL; PhotoMetadata* _tmp91_ = NULL; - Orientation _tmp92_ = 0; - Orientation _tmp93_ = 0; + Dimensions _tmp92_ = {0}; + PhotoMetadata* _tmp93_ = NULL; + Orientation _tmp94_ = 0; PhotoMetadata* _tmp95_ = NULL; + Orientation _tmp96_ = 0; + Orientation _tmp97_ = 0; + PhotoMetadata* _tmp99_ = NULL; #line 3616 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp81_ = metadata; + _tmp85_ = metadata; #line 3616 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp82_ = media_source_get_title (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource)); + _tmp86_ = media_source_get_title (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource)); #line 3616 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp83_ = _tmp82_; + _tmp87_ = _tmp86_; #line 3616 "/home/jens/Source/shotwell/src/Photo.vala" - photo_metadata_set_title (_tmp81_, _tmp83_, PHOTO_METADATA_SET_OPTION_ALL_DOMAINS); + photo_metadata_set_title (_tmp85_, _tmp87_, PHOTO_METADATA_SET_OPTION_ALL_DOMAINS); #line 3616 "/home/jens/Source/shotwell/src/Photo.vala" - _g_free0 (_tmp83_); + _g_free0 (_tmp87_); #line 3617 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp84_ = metadata; + _tmp88_ = metadata; #line 3617 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp85_ = media_source_get_comment (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource)); + _tmp89_ = media_source_get_comment (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource)); #line 3617 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp86_ = _tmp85_; + _tmp90_ = _tmp89_; #line 3617 "/home/jens/Source/shotwell/src/Photo.vala" - photo_metadata_set_comment (_tmp84_, _tmp86_, PHOTO_METADATA_SET_OPTION_ALL_DOMAINS); + photo_metadata_set_comment (_tmp88_, _tmp90_, PHOTO_METADATA_SET_OPTION_ALL_DOMAINS); #line 3617 "/home/jens/Source/shotwell/src/Photo.vala" - _g_free0 (_tmp86_); + _g_free0 (_tmp90_); #line 3618 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp87_ = metadata; + _tmp91_ = metadata; #line 3618 "/home/jens/Source/shotwell/src/Photo.vala" - media_source_get_dimensions (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource), PHOTO_EXCEPTION_NONE, &_tmp88_); + media_source_get_dimensions (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource), PHOTO_EXCEPTION_NONE, &_tmp92_); #line 3618 "/home/jens/Source/shotwell/src/Photo.vala" - photo_metadata_set_pixel_dimensions (_tmp87_, &_tmp88_, PHOTO_METADATA_SET_OPTION_ALL_DOMAINS); + photo_metadata_set_pixel_dimensions (_tmp91_, &_tmp92_, PHOTO_METADATA_SET_OPTION_ALL_DOMAINS); #line 3619 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp89_ = metadata; + _tmp93_ = metadata; #line 3619 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp90_ = photo_get_orientation (self); + _tmp94_ = photo_get_orientation (self); #line 3619 "/home/jens/Source/shotwell/src/Photo.vala" - photo_metadata_set_orientation (_tmp89_, _tmp90_); + photo_metadata_set_orientation (_tmp93_, _tmp94_); #line 3620 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp91_ = metadata; + _tmp95_ = metadata; #line 3620 "/home/jens/Source/shotwell/src/Photo.vala" - photo_metadata_set_software (_tmp91_, RESOURCES_APP_TITLE, RESOURCES_APP_VERSION); + photo_metadata_set_software (_tmp95_, RESOURCES_APP_TITLE, RESOURCES_APP_VERSION); #line 3622 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp92_ = photo_get_orientation (self); + _tmp96_ = photo_get_orientation (self); #line 3622 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp93_ = photo_get_original_orientation (self); + _tmp97_ = photo_get_original_orientation (self); #line 3622 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp92_ != _tmp93_) { -#line 26112 "Photo.c" - PhotoMetadata* _tmp94_ = NULL; + if (_tmp96_ != _tmp97_) { +#line 26202 "Photo.c" + PhotoMetadata* _tmp98_ = NULL; #line 3623 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp94_ = metadata; + _tmp98_ = metadata; #line 3623 "/home/jens/Source/shotwell/src/Photo.vala" - photo_metadata_remove_exif_thumbnail (_tmp94_); -#line 26118 "Photo.c" + photo_metadata_remove_exif_thumbnail (_tmp98_); +#line 26208 "Photo.c" } #line 3625 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp95_ = metadata; + _tmp99_ = metadata; #line 3625 "/home/jens/Source/shotwell/src/Photo.vala" - photo_set_user_metadata_for_export (self, _tmp95_); -#line 26124 "Photo.c" + photo_set_user_metadata_for_export (self, _tmp99_); +#line 26214 "Photo.c" } else { - PhotoMetadata* _tmp96_ = NULL; + PhotoMetadata* _tmp100_ = NULL; #line 3629 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp96_ = metadata; + _tmp100_ = metadata; #line 3629 "/home/jens/Source/shotwell/src/Photo.vala" - photo_metadata_clear (_tmp96_); -#line 26131 "Photo.c" + photo_metadata_clear (_tmp100_); +#line 26221 "Photo.c" } #line 3631 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp97_ = writer; + _tmp101_ = writer; #line 3631 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp98_ = metadata; + _tmp102_ = metadata; #line 3631 "/home/jens/Source/shotwell/src/Photo.vala" - photo_file_metadata_writer_write_metadata (_tmp97_, _tmp98_, &_inner_error_); + photo_file_metadata_writer_write_metadata (_tmp101_, _tmp102_, &_inner_error_); #line 3631 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { +#line 26231 "Photo.c" + gboolean _tmp103_ = FALSE; #line 3631 "/home/jens/Source/shotwell/src/Photo.vala" g_propagate_error (error, _inner_error_); #line 3631 "/home/jens/Source/shotwell/src/Photo.vala" @@ -26152,8 +26244,8 @@ static gboolean photo_export_fullsized_backing (Photo* self, GFile* file, gboole #line 3631 "/home/jens/Source/shotwell/src/Photo.vala" _photo_file_adapter_unref0 (export_reader); #line 3631 "/home/jens/Source/shotwell/src/Photo.vala" - return FALSE; -#line 26155 "Photo.c" + return _tmp103_; +#line 26247 "Photo.c" } #line 3633 "/home/jens/Source/shotwell/src/Photo.vala" result = TRUE; @@ -26169,7 +26261,7 @@ static gboolean photo_export_fullsized_backing (Photo* self, GFile* file, gboole _photo_file_adapter_unref0 (export_reader); #line 3633 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 26171 "Photo.c" +#line 26263 "Photo.c" } @@ -26189,33 +26281,33 @@ gboolean photo_is_export_required (Photo* self, Scaling* scaling, PhotoFileForma if (!_tmp3_) { #line 3640 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = TRUE; -#line 26191 "Photo.c" +#line 26283 "Photo.c" } else { gboolean _tmp4_ = FALSE; #line 3640 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = photo_has_alterations (self); #line 3640 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = _tmp4_; -#line 26198 "Photo.c" +#line 26290 "Photo.c" } #line 3640 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp2_) { #line 3640 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = TRUE; -#line 26204 "Photo.c" +#line 26296 "Photo.c" } else { gboolean _tmp5_ = FALSE; #line 3640 "/home/jens/Source/shotwell/src/Photo.vala" _tmp5_ = photo_has_user_generated_metadata (self); #line 3640 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = _tmp5_; -#line 26211 "Photo.c" +#line 26303 "Photo.c" } #line 3640 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp1_) { #line 3640 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = TRUE; -#line 26217 "Photo.c" +#line 26309 "Photo.c" } else { PhotoFileFormat _tmp6_ = 0; PhotoFileFormat _tmp7_ = 0; @@ -26225,13 +26317,13 @@ gboolean photo_is_export_required (Photo* self, Scaling* scaling, PhotoFileForma _tmp7_ = photo_get_file_format (self); #line 3641 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = _tmp6_ != _tmp7_; -#line 26227 "Photo.c" +#line 26319 "Photo.c" } #line 3640 "/home/jens/Source/shotwell/src/Photo.vala" result = _tmp0_; #line 3640 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 26233 "Photo.c" +#line 26325 "Photo.c" } @@ -26293,7 +26385,7 @@ void photo_export (Photo* self, GFile* dest_file, Scaling* scaling, JpegQuality _tmp0_ = direct_copy_unmodified; #line 3649 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp0_) { -#line 26295 "Photo.c" +#line 26387 "Photo.c" GFile* _tmp1_ = NULL; GFile* _tmp2_ = NULL; GFile* _tmp3_ = NULL; @@ -26313,17 +26405,17 @@ void photo_export (Photo* self, GFile* dest_file, Scaling* scaling, JpegQuality g_propagate_error (error, _inner_error_); #line 3650 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 26315 "Photo.c" +#line 26407 "Photo.c" } #line 3652 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 26319 "Photo.c" +#line 26411 "Photo.c" } #line 3659 "/home/jens/Source/shotwell/src/Photo.vala" _tmp7_ = scaling_is_unscaled (scaling); #line 3659 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp7_) { -#line 26325 "Photo.c" +#line 26417 "Photo.c" gboolean _tmp8_ = FALSE; gboolean _tmp9_ = FALSE; #line 3659 "/home/jens/Source/shotwell/src/Photo.vala" @@ -26332,26 +26424,26 @@ void photo_export (Photo* self, GFile* dest_file, Scaling* scaling, JpegQuality if (!_tmp9_) { #line 3659 "/home/jens/Source/shotwell/src/Photo.vala" _tmp8_ = TRUE; -#line 26334 "Photo.c" +#line 26426 "Photo.c" } else { gboolean _tmp10_ = FALSE; #line 3659 "/home/jens/Source/shotwell/src/Photo.vala" _tmp10_ = photo_only_metadata_changed (self); #line 3659 "/home/jens/Source/shotwell/src/Photo.vala" _tmp8_ = _tmp10_; -#line 26341 "Photo.c" +#line 26433 "Photo.c" } #line 3659 "/home/jens/Source/shotwell/src/Photo.vala" _tmp6_ = _tmp8_; -#line 26345 "Photo.c" +#line 26437 "Photo.c" } else { #line 3659 "/home/jens/Source/shotwell/src/Photo.vala" _tmp6_ = FALSE; -#line 26349 "Photo.c" +#line 26441 "Photo.c" } #line 3659 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp6_) { -#line 26353 "Photo.c" +#line 26445 "Photo.c" PhotoFileFormat _tmp11_ = 0; PhotoFileFormat _tmp12_ = 0; #line 3660 "/home/jens/Source/shotwell/src/Photo.vala" @@ -26360,29 +26452,29 @@ void photo_export (Photo* self, GFile* dest_file, Scaling* scaling, JpegQuality _tmp12_ = photo_get_file_format (self); #line 3660 "/home/jens/Source/shotwell/src/Photo.vala" _tmp5_ = _tmp11_ == _tmp12_; -#line 26362 "Photo.c" +#line 26454 "Photo.c" } else { #line 3659 "/home/jens/Source/shotwell/src/Photo.vala" _tmp5_ = FALSE; -#line 26366 "Photo.c" +#line 26458 "Photo.c" } #line 3659 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp5_) { -#line 26370 "Photo.c" +#line 26462 "Photo.c" PhotoFileFormat _tmp13_ = 0; #line 3660 "/home/jens/Source/shotwell/src/Photo.vala" _tmp13_ = photo_get_file_format (self); #line 3660 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = _tmp13_ == PHOTO_FILE_FORMAT_JFIF; -#line 26376 "Photo.c" +#line 26468 "Photo.c" } else { #line 3659 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = FALSE; -#line 26380 "Photo.c" +#line 26472 "Photo.c" } #line 3659 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp4_) { -#line 26384 "Photo.c" +#line 26476 "Photo.c" gboolean _tmp14_ = FALSE; GFile* _tmp15_ = NULL; gboolean _tmp16_ = FALSE; @@ -26401,13 +26493,13 @@ void photo_export (Photo* self, GFile* dest_file, Scaling* scaling, JpegQuality g_propagate_error (error, _inner_error_); #line 3661 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 26403 "Photo.c" +#line 26495 "Photo.c" } #line 3661 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp14_) { #line 3662 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 26409 "Photo.c" +#line 26501 "Photo.c" } } #line 3668 "/home/jens/Source/shotwell/src/Photo.vala" @@ -26418,7 +26510,7 @@ void photo_export (Photo* self, GFile* dest_file, Scaling* scaling, JpegQuality _tmp19_ = metadata; #line 3669 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp19_ == NULL) { -#line 26420 "Photo.c" +#line 26512 "Photo.c" PhotoFileFormat _tmp20_ = 0; PhotoMetadata* _tmp21_ = NULL; #line 3670 "/home/jens/Source/shotwell/src/Photo.vala" @@ -26429,7 +26521,7 @@ void photo_export (Photo* self, GFile* dest_file, Scaling* scaling, JpegQuality _media_metadata_unref0 (metadata); #line 3670 "/home/jens/Source/shotwell/src/Photo.vala" metadata = _tmp21_; -#line 26431 "Photo.c" +#line 26523 "Photo.c" } #line 3672 "/home/jens/Source/shotwell/src/Photo.vala" _tmp22_ = export_format; @@ -26437,13 +26529,13 @@ void photo_export (Photo* self, GFile* dest_file, Scaling* scaling, JpegQuality _tmp23_ = photo_file_format_can_write (_tmp22_); #line 3672 "/home/jens/Source/shotwell/src/Photo.vala" if (!_tmp23_) { -#line 26439 "Photo.c" +#line 26531 "Photo.c" PhotoFileFormat _tmp24_ = 0; #line 3673 "/home/jens/Source/shotwell/src/Photo.vala" _tmp24_ = photo_file_format_get_system_default_format (); #line 3673 "/home/jens/Source/shotwell/src/Photo.vala" export_format = _tmp24_; -#line 26445 "Photo.c" +#line 26537 "Photo.c" } #line 3675 "/home/jens/Source/shotwell/src/Photo.vala" _tmp25_ = export_format; @@ -26469,7 +26561,7 @@ void photo_export (Photo* self, GFile* dest_file, Scaling* scaling, JpegQuality _media_metadata_unref0 (metadata); #line 3675 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 26471 "Photo.c" +#line 26563 "Photo.c" } #line 3677 "/home/jens/Source/shotwell/src/Photo.vala" _tmp31_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject)); @@ -26498,18 +26590,18 @@ void photo_export (Photo* self, GFile* dest_file, Scaling* scaling, JpegQuality if (_tmp39_ == PHOTO_FILE_FORMAT_JFIF) { #line 3684 "/home/jens/Source/shotwell/src/Photo.vala" _tmp38_ = TRUE; -#line 26499 "Photo.c" +#line 26591 "Photo.c" } else { PhotoFileFormat _tmp40_ = 0; #line 3685 "/home/jens/Source/shotwell/src/Photo.vala" _tmp40_ = photo_get_file_format (self); #line 3685 "/home/jens/Source/shotwell/src/Photo.vala" _tmp38_ = _tmp40_ == PHOTO_FILE_FORMAT_RAW; -#line 26506 "Photo.c" +#line 26598 "Photo.c" } #line 3684 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp38_) { -#line 26510 "Photo.c" +#line 26602 "Photo.c" GdkPixbuf* _tmp41_ = NULL; Scaling _tmp42_ = {0}; GdkPixbuf* _tmp43_ = NULL; @@ -26532,7 +26624,7 @@ void photo_export (Photo* self, GFile* dest_file, Scaling* scaling, JpegQuality _media_metadata_unref0 (metadata); #line 3686 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 26533 "Photo.c" +#line 26625 "Photo.c" } #line 3686 "/home/jens/Source/shotwell/src/Photo.vala" _tmp44_ = _tmp41_; @@ -26544,7 +26636,7 @@ void photo_export (Photo* self, GFile* dest_file, Scaling* scaling, JpegQuality pixbuf = _tmp44_; #line 3684 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_tmp41_); -#line 26545 "Photo.c" +#line 26637 "Photo.c" } else { GdkPixbuf* _tmp45_ = NULL; Scaling _tmp46_ = {0}; @@ -26568,7 +26660,7 @@ void photo_export (Photo* self, GFile* dest_file, Scaling* scaling, JpegQuality _media_metadata_unref0 (metadata); #line 3690 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 26569 "Photo.c" +#line 26661 "Photo.c" } #line 3690 "/home/jens/Source/shotwell/src/Photo.vala" _tmp48_ = _tmp45_; @@ -26580,7 +26672,7 @@ void photo_export (Photo* self, GFile* dest_file, Scaling* scaling, JpegQuality pixbuf = _tmp48_; #line 3684 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_tmp45_); -#line 26581 "Photo.c" +#line 26673 "Photo.c" } #line 3694 "/home/jens/Source/shotwell/src/Photo.vala" _tmp49_ = writer; @@ -26602,7 +26694,7 @@ void photo_export (Photo* self, GFile* dest_file, Scaling* scaling, JpegQuality _media_metadata_unref0 (metadata); #line 3694 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 26603 "Photo.c" +#line 26695 "Photo.c" } #line 3696 "/home/jens/Source/shotwell/src/Photo.vala" _tmp52_ = writer; @@ -26618,7 +26710,7 @@ void photo_export (Photo* self, GFile* dest_file, Scaling* scaling, JpegQuality _tmp55_ = export_metadata; #line 3699 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp55_) { -#line 26619 "Photo.c" +#line 26711 "Photo.c" PhotoMetadata* _tmp56_ = NULL; gchar* _tmp57_ = NULL; gchar* _tmp58_ = NULL; @@ -26659,7 +26751,7 @@ void photo_export (Photo* self, GFile* dest_file, Scaling* scaling, JpegQuality _tmp63_ = media_source_get_exposure_time (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource)); #line 3705 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp63_ != ((time_t) 0)) { -#line 26660 "Photo.c" +#line 26752 "Photo.c" PhotoMetadata* _tmp64_ = NULL; time_t _tmp65_ = 0; MetadataDateTime* _tmp66_ = NULL; @@ -26676,14 +26768,14 @@ void photo_export (Photo* self, GFile* dest_file, Scaling* scaling, JpegQuality photo_metadata_set_exposure_date_time (_tmp64_, _tmp67_, PHOTO_METADATA_SET_OPTION_ALL_DOMAINS); #line 3706 "/home/jens/Source/shotwell/src/Photo.vala" _metadata_date_time_unref0 (_tmp67_); -#line 26677 "Photo.c" +#line 26769 "Photo.c" } else { PhotoMetadata* _tmp68_ = NULL; #line 3708 "/home/jens/Source/shotwell/src/Photo.vala" _tmp68_ = metadata; #line 3708 "/home/jens/Source/shotwell/src/Photo.vala" photo_metadata_set_exposure_date_time (_tmp68_, NULL, PHOTO_METADATA_SET_OPTION_ALL_DOMAINS); -#line 26684 "Photo.c" +#line 26776 "Photo.c" } #line 3710 "/home/jens/Source/shotwell/src/Photo.vala" _tmp69_ = metadata; @@ -26701,13 +26793,13 @@ void photo_export (Photo* self, GFile* dest_file, Scaling* scaling, JpegQuality _tmp72_ = photo_has_user_generated_metadata (self); #line 3714 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp72_) { -#line 26702 "Photo.c" +#line 26794 "Photo.c" PhotoMetadata* _tmp73_ = NULL; #line 3715 "/home/jens/Source/shotwell/src/Photo.vala" _tmp73_ = metadata; #line 3715 "/home/jens/Source/shotwell/src/Photo.vala" photo_set_user_metadata_for_export (self, _tmp73_); -#line 26708 "Photo.c" +#line 26800 "Photo.c" } } else { PhotoMetadata* _tmp74_ = NULL; @@ -26715,7 +26807,7 @@ void photo_export (Photo* self, GFile* dest_file, Scaling* scaling, JpegQuality _tmp74_ = metadata; #line 3719 "/home/jens/Source/shotwell/src/Photo.vala" photo_metadata_clear (_tmp74_); -#line 26716 "Photo.c" +#line 26808 "Photo.c" } #line 3726 "/home/jens/Source/shotwell/src/Photo.vala" _tmp76_ = photo_get_file_format (self); @@ -26723,18 +26815,18 @@ void photo_export (Photo* self, GFile* dest_file, Scaling* scaling, JpegQuality if (_tmp76_ == PHOTO_FILE_FORMAT_JFIF) { #line 3726 "/home/jens/Source/shotwell/src/Photo.vala" _tmp75_ = TRUE; -#line 26724 "Photo.c" +#line 26816 "Photo.c" } else { PhotoFileFormat _tmp77_ = 0; #line 3727 "/home/jens/Source/shotwell/src/Photo.vala" _tmp77_ = photo_get_file_format (self); #line 3727 "/home/jens/Source/shotwell/src/Photo.vala" _tmp75_ = _tmp77_ == PHOTO_FILE_FORMAT_RAW; -#line 26731 "Photo.c" +#line 26823 "Photo.c" } #line 3726 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp75_) { -#line 26735 "Photo.c" +#line 26827 "Photo.c" PhotoMetadata* _tmp78_ = NULL; Dimensions _tmp79_ = {0}; PhotoMetadata* _tmp80_ = NULL; @@ -26751,7 +26843,7 @@ void photo_export (Photo* self, GFile* dest_file, Scaling* scaling, JpegQuality _tmp81_ = photo_get_orientation (self); #line 3729 "/home/jens/Source/shotwell/src/Photo.vala" photo_metadata_set_orientation (_tmp80_, _tmp81_); -#line 26752 "Photo.c" +#line 26844 "Photo.c" } else { PhotoMetadata* _tmp82_ = NULL; GdkPixbuf* _tmp83_ = NULL; @@ -26769,7 +26861,7 @@ void photo_export (Photo* self, GFile* dest_file, Scaling* scaling, JpegQuality _tmp85_ = metadata; #line 3733 "/home/jens/Source/shotwell/src/Photo.vala" photo_metadata_set_orientation (_tmp85_, ORIENTATION_TOP_LEFT); -#line 26770 "Photo.c" +#line 26862 "Photo.c" } #line 3736 "/home/jens/Source/shotwell/src/Photo.vala" _tmp87_ = export_format; @@ -26799,7 +26891,7 @@ void photo_export (Photo* self, GFile* dest_file, Scaling* scaling, JpegQuality _media_metadata_unref0 (metadata); #line 3736 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 26800 "Photo.c" +#line 26892 "Photo.c" } #line 3736 "/home/jens/Source/shotwell/src/Photo.vala" _tmp93_ = _tmp86_; @@ -26827,7 +26919,7 @@ void photo_export (Photo* self, GFile* dest_file, Scaling* scaling, JpegQuality _media_metadata_unref0 (metadata); #line 3736 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 26828 "Photo.c" +#line 26920 "Photo.c" } #line 3647 "/home/jens/Source/shotwell/src/Photo.vala" _photo_file_adapter_unref0 (_tmp86_); @@ -26837,7 +26929,7 @@ void photo_export (Photo* self, GFile* dest_file, Scaling* scaling, JpegQuality _photo_file_adapter_unref0 (writer); #line 3647 "/home/jens/Source/shotwell/src/Photo.vala" _media_metadata_unref0 (metadata); -#line 26838 "Photo.c" +#line 26930 "Photo.c" } @@ -26871,14 +26963,14 @@ static GFile* photo_generate_new_editable_file (Photo* self, PhotoFileFormat* fi GError * _inner_error_ = NULL; #line 3739 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_PHOTO (self), NULL); -#line 26872 "Photo.c" +#line 26964 "Photo.c" { PhotoRow* _tmp0_ = NULL; #line 3741 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = self->row; #line 3741 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_row); -#line 26879 "Photo.c" +#line 26971 "Photo.c" { PhotoFileFormat _tmp1_ = 0; GFile* _tmp2_ = NULL; @@ -26892,7 +26984,7 @@ static GFile* photo_generate_new_editable_file (Photo* self, PhotoFileFormat* fi _g_object_unref0 (backing); #line 3743 "/home/jens/Source/shotwell/src/Photo.vala" backing = _tmp2_; -#line 26893 "Photo.c" +#line 26985 "Photo.c" } __finally386: { @@ -26901,7 +26993,7 @@ static GFile* photo_generate_new_editable_file (Photo* self, PhotoFileFormat* fi _tmp3_ = self->row; #line 3741 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 26902 "Photo.c" +#line 26994 "Photo.c" } #line 3741 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { @@ -26911,7 +27003,7 @@ static GFile* photo_generate_new_editable_file (Photo* self, PhotoFileFormat* fi _g_object_unref0 (backing); #line 3741 "/home/jens/Source/shotwell/src/Photo.vala" return NULL; -#line 26912 "Photo.c" +#line 27004 "Photo.c" } } #line 3746 "/home/jens/Source/shotwell/src/Photo.vala" @@ -26920,13 +27012,13 @@ static GFile* photo_generate_new_editable_file (Photo* self, PhotoFileFormat* fi _tmp5_ = photo_file_format_can_write (_tmp4_); #line 3746 "/home/jens/Source/shotwell/src/Photo.vala" if (!_tmp5_) { -#line 26921 "Photo.c" +#line 27013 "Photo.c" PhotoFileFormat _tmp6_ = 0; #line 3747 "/home/jens/Source/shotwell/src/Photo.vala" _tmp6_ = photo_file_format_get_system_default_format (); #line 3747 "/home/jens/Source/shotwell/src/Photo.vala" _vala_file_format = _tmp6_; -#line 26927 "Photo.c" +#line 27019 "Photo.c" } #line 3750 "/home/jens/Source/shotwell/src/Photo.vala" _tmp7_ = g_file_get_basename (backing); @@ -26950,7 +27042,7 @@ static GFile* photo_generate_new_editable_file (Photo* self, PhotoFileFormat* fi if (_tmp12_ == NULL) { #line 3752 "/home/jens/Source/shotwell/src/Photo.vala" _tmp11_ = TRUE; -#line 26951 "Photo.c" +#line 27043 "Photo.c" } else { PhotoFileFormat _tmp13_ = 0; PhotoFileFormatProperties* _tmp14_ = NULL; @@ -26971,11 +27063,11 @@ static GFile* photo_generate_new_editable_file (Photo* self, PhotoFileFormat* fi _tmp11_ = !_tmp17_; #line 3752 "/home/jens/Source/shotwell/src/Photo.vala" _photo_file_format_properties_unref0 (_tmp15_); -#line 26972 "Photo.c" +#line 27064 "Photo.c" } #line 3752 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp11_) { -#line 26976 "Photo.c" +#line 27068 "Photo.c" PhotoFileFormat _tmp18_ = 0; PhotoFileFormatProperties* _tmp19_ = NULL; PhotoFileFormatProperties* _tmp20_ = NULL; @@ -26994,7 +27086,7 @@ static GFile* photo_generate_new_editable_file (Photo* self, PhotoFileFormat* fi ext = _tmp21_; #line 3753 "/home/jens/Source/shotwell/src/Photo.vala" _photo_file_format_properties_unref0 (_tmp20_); -#line 26995 "Photo.c" +#line 27087 "Photo.c" } #line 3755 "/home/jens/Source/shotwell/src/Photo.vala" _tmp22_ = name; @@ -27034,7 +27126,7 @@ static GFile* photo_generate_new_editable_file (Photo* self, PhotoFileFormat* fi _g_object_unref0 (backing); #line 3758 "/home/jens/Source/shotwell/src/Photo.vala" return NULL; -#line 27035 "Photo.c" +#line 27127 "Photo.c" } #line 3758 "/home/jens/Source/shotwell/src/Photo.vala" _tmp32_ = _tmp26_; @@ -27056,18 +27148,18 @@ static GFile* photo_generate_new_editable_file (Photo* self, PhotoFileFormat* fi if (file_format) { #line 3758 "/home/jens/Source/shotwell/src/Photo.vala" *file_format = _vala_file_format; -#line 27057 "Photo.c" +#line 27149 "Photo.c" } #line 3758 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 27061 "Photo.c" +#line 27153 "Photo.c" } static void _g_object_unref0_ (gpointer var) { #line 3780 "/home/jens/Source/shotwell/src/Photo.vala" (var == NULL) ? NULL : (var = (g_object_unref (var), NULL)); -#line 27068 "Photo.c" +#line 27160 "Photo.c" } @@ -27076,7 +27168,7 @@ static void _g_list_free__g_object_unref0_ (GList* self) { g_list_foreach (self, (GFunc) _g_object_unref0_, NULL); #line 3780 "/home/jens/Source/shotwell/src/Photo.vala" g_list_free (self); -#line 27077 "Photo.c" +#line 27169 "Photo.c" } @@ -27090,29 +27182,29 @@ static gboolean photo_launch_editor (GFile* file, PhotoFileFormat file_format, G gboolean _tmp10_ = FALSE; GAppInfo* app = NULL; GList* files = NULL; - GFile* _tmp15_ = NULL; GFile* _tmp16_ = NULL; - GAppInfo* _tmp17_ = NULL; + GFile* _tmp17_ = NULL; + GAppInfo* _tmp18_ = NULL; gchar** argv = NULL; - gchar** _tmp22_ = NULL; + gchar** _tmp24_ = NULL; gint argv_length1 = 0; gint _argv_size_ = 0; - gchar** _tmp23_ = NULL; - gint _tmp23__length1 = 0; - const gchar* _tmp24_ = NULL; - gchar* _tmp25_ = NULL; - gchar* _tmp26_ = NULL; - gchar** _tmp27_ = NULL; - gint _tmp27__length1 = 0; - GFile* _tmp28_ = NULL; - gchar* _tmp29_ = NULL; - gchar* _tmp30_ = NULL; + gchar** _tmp25_ = NULL; + gint _tmp25__length1 = 0; + const gchar* _tmp26_ = NULL; + gchar* _tmp27_ = NULL; + gchar* _tmp28_ = NULL; + gchar** _tmp29_ = NULL; + gint _tmp29__length1 = 0; + GFile* _tmp30_ = NULL; + gchar* _tmp31_ = NULL; + gchar* _tmp32_ = NULL; GPid child_pid = 0; - gboolean _tmp31_ = FALSE; - gchar** _tmp32_ = NULL; - gint _tmp32__length1 = 0; - GPid _tmp33_ = 0; - gboolean _tmp34_ = FALSE; + gboolean _tmp33_ = FALSE; + gchar** _tmp34_ = NULL; + gint _tmp34__length1 = 0; + GPid _tmp35_ = 0; + gboolean _tmp36_ = FALSE; GError * _inner_error_ = NULL; #line 3761 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (G_IS_FILE (file), FALSE); @@ -27120,7 +27212,7 @@ static gboolean photo_launch_editor (GFile* file, PhotoFileFormat file_format, G _tmp1_ = file_format; #line 3762 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp1_ == PHOTO_FILE_FORMAT_RAW) { -#line 27121 "Photo.c" +#line 27213 "Photo.c" ConfigFacade* _tmp2_ = NULL; ConfigFacade* _tmp3_ = NULL; gchar* _tmp4_ = NULL; @@ -27136,7 +27228,7 @@ static gboolean photo_launch_editor (GFile* file, PhotoFileFormat file_format, G _tmp0_ = _tmp4_; #line 3762 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_tmp3_); -#line 27137 "Photo.c" +#line 27229 "Photo.c" } else { ConfigFacade* _tmp5_ = NULL; ConfigFacade* _tmp6_ = NULL; @@ -27153,7 +27245,7 @@ static gboolean photo_launch_editor (GFile* file, PhotoFileFormat file_format, G _tmp0_ = _tmp7_; #line 3763 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_tmp6_); -#line 27154 "Photo.c" +#line 27246 "Photo.c" } #line 3762 "/home/jens/Source/shotwell/src/Photo.vala" _tmp8_ = g_strdup (_tmp0_); @@ -27173,7 +27265,7 @@ static gboolean photo_launch_editor (GFile* file, PhotoFileFormat file_format, G _g_free0 (_tmp0_); #line 3766 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 27174 "Photo.c" +#line 27266 "Photo.c" } { GAppInfo* _tmp11_ = NULL; @@ -27188,7 +27280,7 @@ static gboolean photo_launch_editor (GFile* file, PhotoFileFormat file_format, G _tmp11_ = _tmp13_; #line 3770 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 27189 "Photo.c" +#line 27281 "Photo.c" goto __catch387_g_error; } #line 3770 "/home/jens/Source/shotwell/src/Photo.vala" @@ -27201,7 +27293,7 @@ static gboolean photo_launch_editor (GFile* file, PhotoFileFormat file_format, G app = _tmp14_; #line 3769 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_tmp11_); -#line 27202 "Photo.c" +#line 27294 "Photo.c" } goto __finally387; __catch387_g_error: @@ -27217,11 +27309,13 @@ static gboolean photo_launch_editor (GFile* file, PhotoFileFormat file_format, G app = NULL; #line 3769 "/home/jens/Source/shotwell/src/Photo.vala" _g_error_free0 (er); -#line 27218 "Photo.c" +#line 27310 "Photo.c" } __finally387: #line 3769 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { +#line 27315 "Photo.c" + gboolean _tmp15_ = FALSE; #line 3769 "/home/jens/Source/shotwell/src/Photo.vala" g_propagate_error (error, _inner_error_); #line 3769 "/home/jens/Source/shotwell/src/Photo.vala" @@ -27231,36 +27325,38 @@ static gboolean photo_launch_editor (GFile* file, PhotoFileFormat file_format, G #line 3769 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (_tmp0_); #line 3769 "/home/jens/Source/shotwell/src/Photo.vala" - return FALSE; -#line 27233 "Photo.c" + return _tmp15_; +#line 27327 "Photo.c" } #line 3776 "/home/jens/Source/shotwell/src/Photo.vala" files = NULL; #line 3777 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp15_ = file; + _tmp16_ = file; #line 3777 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp16_ = _g_object_ref0 (_tmp15_); + _tmp17_ = _g_object_ref0 (_tmp16_); #line 3777 "/home/jens/Source/shotwell/src/Photo.vala" - files = g_list_insert (files, _tmp16_, -1); + files = g_list_insert (files, _tmp17_, -1); #line 3779 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp17_ = app; + _tmp18_ = app; #line 3779 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp17_ != NULL) { -#line 27247 "Photo.c" - gboolean _tmp18_ = FALSE; - GAppInfo* _tmp19_ = NULL; - GList* _tmp20_ = NULL; - gboolean _tmp21_ = FALSE; + if (_tmp18_ != NULL) { +#line 27341 "Photo.c" + gboolean _tmp19_ = FALSE; + GAppInfo* _tmp20_ = NULL; + GList* _tmp21_ = NULL; + gboolean _tmp22_ = FALSE; #line 3780 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp19_ = app; + _tmp20_ = app; #line 3780 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp20_ = files; + _tmp21_ = files; #line 3780 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp21_ = g_app_info_launch (_tmp19_, _tmp20_, NULL, &_inner_error_); + _tmp22_ = g_app_info_launch (_tmp20_, _tmp21_, NULL, &_inner_error_); #line 3780 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp18_ = _tmp21_; + _tmp19_ = _tmp22_; #line 3780 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { +#line 27356 "Photo.c" + gboolean _tmp23_ = FALSE; #line 3780 "/home/jens/Source/shotwell/src/Photo.vala" g_propagate_error (error, _inner_error_); #line 3780 "/home/jens/Source/shotwell/src/Photo.vala" @@ -27272,11 +27368,11 @@ static gboolean photo_launch_editor (GFile* file, PhotoFileFormat file_format, G #line 3780 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (_tmp0_); #line 3780 "/home/jens/Source/shotwell/src/Photo.vala" - return FALSE; -#line 27274 "Photo.c" + return _tmp23_; +#line 27370 "Photo.c" } #line 3780 "/home/jens/Source/shotwell/src/Photo.vala" - result = _tmp18_; + result = _tmp19_; #line 3780 "/home/jens/Source/shotwell/src/Photo.vala" __g_list_free__g_object_unref0_0 (files); #line 3780 "/home/jens/Source/shotwell/src/Photo.vala" @@ -27287,56 +27383,58 @@ static gboolean photo_launch_editor (GFile* file, PhotoFileFormat file_format, G _g_free0 (_tmp0_); #line 3780 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 27288 "Photo.c" +#line 27384 "Photo.c" } #line 3782 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp22_ = g_new0 (gchar*, 2 + 1); + _tmp24_ = g_new0 (gchar*, 2 + 1); #line 3782 "/home/jens/Source/shotwell/src/Photo.vala" - argv = _tmp22_; + argv = _tmp24_; #line 3782 "/home/jens/Source/shotwell/src/Photo.vala" argv_length1 = 2; #line 3782 "/home/jens/Source/shotwell/src/Photo.vala" _argv_size_ = argv_length1; #line 3783 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp23_ = argv; + _tmp25_ = argv; #line 3783 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp23__length1 = argv_length1; + _tmp25__length1 = argv_length1; #line 3783 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp24_ = commandline; + _tmp26_ = commandline; #line 3783 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp25_ = g_strdup (_tmp24_); + _tmp27_ = g_strdup (_tmp26_); #line 3783 "/home/jens/Source/shotwell/src/Photo.vala" - _g_free0 (_tmp23_[0]); + _g_free0 (_tmp25_[0]); #line 3783 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp23_[0] = _tmp25_; + _tmp25_[0] = _tmp27_; #line 3783 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp26_ = _tmp23_[0]; + _tmp28_ = _tmp25_[0]; #line 3784 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp27_ = argv; + _tmp29_ = argv; #line 3784 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp27__length1 = argv_length1; + _tmp29__length1 = argv_length1; #line 3784 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp28_ = file; + _tmp30_ = file; #line 3784 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp29_ = g_file_get_path (_tmp28_); + _tmp31_ = g_file_get_path (_tmp30_); #line 3784 "/home/jens/Source/shotwell/src/Photo.vala" - _g_free0 (_tmp27_[1]); + _g_free0 (_tmp29_[1]); #line 3784 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp27_[1] = _tmp29_; + _tmp29_[1] = _tmp31_; #line 3784 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp30_ = _tmp27_[1]; + _tmp32_ = _tmp29_[1]; #line 3788 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp32_ = argv; + _tmp34_ = argv; #line 3788 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp32__length1 = argv_length1; + _tmp34__length1 = argv_length1; #line 3788 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp34_ = g_spawn_async ("/", _tmp32_, NULL, G_SPAWN_SEARCH_PATH, NULL, NULL, &_tmp33_, &_inner_error_); + _tmp36_ = g_spawn_async ("/", _tmp34_, NULL, G_SPAWN_SEARCH_PATH, NULL, NULL, &_tmp35_, &_inner_error_); #line 3788 "/home/jens/Source/shotwell/src/Photo.vala" - child_pid = _tmp33_; + child_pid = _tmp35_; #line 3788 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp31_ = _tmp34_; + _tmp33_ = _tmp36_; #line 3788 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { +#line 27434 "Photo.c" + gboolean _tmp37_ = FALSE; #line 3788 "/home/jens/Source/shotwell/src/Photo.vala" g_propagate_error (error, _inner_error_); #line 3788 "/home/jens/Source/shotwell/src/Photo.vala" @@ -27350,11 +27448,11 @@ static gboolean photo_launch_editor (GFile* file, PhotoFileFormat file_format, G #line 3788 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (_tmp0_); #line 3788 "/home/jens/Source/shotwell/src/Photo.vala" - return FALSE; -#line 27352 "Photo.c" + return _tmp37_; +#line 27450 "Photo.c" } #line 3788 "/home/jens/Source/shotwell/src/Photo.vala" - result = _tmp31_; + result = _tmp33_; #line 3788 "/home/jens/Source/shotwell/src/Photo.vala" argv = (_vala_array_free (argv, argv_length1, (GDestroyNotify) g_free), NULL); #line 3788 "/home/jens/Source/shotwell/src/Photo.vala" @@ -27367,7 +27465,7 @@ static gboolean photo_launch_editor (GFile* file, PhotoFileFormat file_format, G _g_free0 (_tmp0_); #line 3788 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 27368 "Photo.c" +#line 27466 "Photo.c" } @@ -27394,7 +27492,7 @@ void photo_open_with_raw_external_editor (Photo* self, GError** error) { g_propagate_error (error, _inner_error_); #line 3799 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 27395 "Photo.c" +#line 27493 "Photo.c" } } @@ -27419,14 +27517,14 @@ void photo_open_with_external_editor (Photo* self, GError** error) { current_editable_file = NULL; #line 3805 "/home/jens/Source/shotwell/src/Photo.vala" create_editable_file = NULL; -#line 27420 "Photo.c" +#line 27518 "Photo.c" { PhotoBackingReaders* _tmp0_ = NULL; #line 3807 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = self->priv->readers; #line 3807 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_readers); -#line 27427 "Photo.c" +#line 27525 "Photo.c" { PhotoBackingReaders* _tmp1_ = NULL; PhotoFileReader* _tmp2_ = NULL; @@ -27437,7 +27535,7 @@ void photo_open_with_external_editor (Photo* self, GError** error) { _tmp2_ = _tmp1_->editable; #line 3808 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp2_ != NULL) { -#line 27438 "Photo.c" +#line 27536 "Photo.c" PhotoBackingReaders* _tmp3_ = NULL; PhotoFileReader* _tmp4_ = NULL; GFile* _tmp5_ = NULL; @@ -27451,13 +27549,13 @@ void photo_open_with_external_editor (Photo* self, GError** error) { _g_object_unref0 (current_editable_file); #line 3809 "/home/jens/Source/shotwell/src/Photo.vala" current_editable_file = _tmp5_; -#line 27452 "Photo.c" +#line 27550 "Photo.c" } #line 3811 "/home/jens/Source/shotwell/src/Photo.vala" _tmp6_ = current_editable_file; #line 3811 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp6_ == NULL) { -#line 27458 "Photo.c" +#line 27556 "Photo.c" GFile* _tmp7_ = NULL; PhotoFileFormat _tmp8_ = 0; GFile* _tmp9_ = NULL; @@ -27470,7 +27568,7 @@ void photo_open_with_external_editor (Photo* self, GError** error) { _tmp7_ = _tmp9_; #line 3812 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 27471 "Photo.c" +#line 27569 "Photo.c" goto __finally388; } #line 3812 "/home/jens/Source/shotwell/src/Photo.vala" @@ -27483,7 +27581,7 @@ void photo_open_with_external_editor (Photo* self, GError** error) { create_editable_file = _tmp10_; #line 3811 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_tmp7_); -#line 27484 "Photo.c" +#line 27582 "Photo.c" } else { PhotoBackingReaders* _tmp11_ = NULL; PhotoFileReader* _tmp12_ = NULL; @@ -27496,7 +27594,7 @@ void photo_open_with_external_editor (Photo* self, GError** error) { _tmp13_ = photo_file_adapter_get_file_format (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter)); #line 3814 "/home/jens/Source/shotwell/src/Photo.vala" editable_file_format = _tmp13_; -#line 27497 "Photo.c" +#line 27595 "Photo.c" } } __finally388: @@ -27506,7 +27604,7 @@ void photo_open_with_external_editor (Photo* self, GError** error) { _tmp14_ = self->priv->readers; #line 3807 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_readers); -#line 27507 "Photo.c" +#line 27605 "Photo.c" } #line 3807 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { @@ -27518,28 +27616,28 @@ void photo_open_with_external_editor (Photo* self, GError** error) { _g_object_unref0 (current_editable_file); #line 3807 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 27519 "Photo.c" +#line 27617 "Photo.c" } } #line 3819 "/home/jens/Source/shotwell/src/Photo.vala" _tmp17_ = create_editable_file; #line 3819 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp17_ == NULL) { -#line 27526 "Photo.c" +#line 27624 "Photo.c" GFile* _tmp18_ = NULL; #line 3819 "/home/jens/Source/shotwell/src/Photo.vala" _tmp18_ = current_editable_file; #line 3819 "/home/jens/Source/shotwell/src/Photo.vala" _tmp16_ = _tmp18_ != NULL; -#line 27532 "Photo.c" +#line 27630 "Photo.c" } else { #line 3819 "/home/jens/Source/shotwell/src/Photo.vala" _tmp16_ = FALSE; -#line 27536 "Photo.c" +#line 27634 "Photo.c" } #line 3819 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp16_) { -#line 27540 "Photo.c" +#line 27638 "Photo.c" gboolean _tmp19_ = FALSE; GFile* _tmp20_ = NULL; gboolean _tmp21_ = FALSE; @@ -27551,26 +27649,26 @@ void photo_open_with_external_editor (Photo* self, GError** error) { if (!_tmp21_) { #line 3820 "/home/jens/Source/shotwell/src/Photo.vala" _tmp19_ = TRUE; -#line 27552 "Photo.c" +#line 27650 "Photo.c" } else { gboolean _tmp22_ = FALSE; #line 3820 "/home/jens/Source/shotwell/src/Photo.vala" _tmp22_ = photo_has_transformations (self); #line 3820 "/home/jens/Source/shotwell/src/Photo.vala" _tmp19_ = _tmp22_; -#line 27559 "Photo.c" +#line 27657 "Photo.c" } #line 3820 "/home/jens/Source/shotwell/src/Photo.vala" _tmp15_ = _tmp19_; -#line 27563 "Photo.c" +#line 27661 "Photo.c" } else { #line 3819 "/home/jens/Source/shotwell/src/Photo.vala" _tmp15_ = FALSE; -#line 27567 "Photo.c" +#line 27665 "Photo.c" } #line 3819 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp15_) { -#line 27571 "Photo.c" +#line 27669 "Photo.c" GFile* _tmp23_ = NULL; GFile* _tmp24_ = NULL; #line 3821 "/home/jens/Source/shotwell/src/Photo.vala" @@ -27581,13 +27679,13 @@ void photo_open_with_external_editor (Photo* self, GError** error) { _g_object_unref0 (create_editable_file); #line 3821 "/home/jens/Source/shotwell/src/Photo.vala" create_editable_file = _tmp24_; -#line 27582 "Photo.c" +#line 27680 "Photo.c" } #line 3824 "/home/jens/Source/shotwell/src/Photo.vala" _tmp26_ = create_editable_file; #line 3824 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp26_ != NULL) { -#line 27588 "Photo.c" +#line 27686 "Photo.c" PhotoFileFormat _tmp27_ = 0; gboolean _tmp28_ = FALSE; #line 3824 "/home/jens/Source/shotwell/src/Photo.vala" @@ -27596,22 +27694,22 @@ void photo_open_with_external_editor (Photo* self, GError** error) { _tmp28_ = photo_file_format_can_write (_tmp27_); #line 3824 "/home/jens/Source/shotwell/src/Photo.vala" _tmp25_ = _tmp28_; -#line 27597 "Photo.c" +#line 27695 "Photo.c" } else { #line 3824 "/home/jens/Source/shotwell/src/Photo.vala" _tmp25_ = FALSE; -#line 27601 "Photo.c" +#line 27699 "Photo.c" } #line 3824 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp25_) { -#line 27605 "Photo.c" +#line 27703 "Photo.c" PhotoFileFormat _tmp40_ = 0; GFile* _tmp41_ = NULL; GFile* _tmp42_ = NULL; GFile* _tmp43_ = NULL; #line 3825 "/home/jens/Source/shotwell/src/Photo.vala" photo_halt_monitoring_editable (self); -#line 27612 "Photo.c" +#line 27710 "Photo.c" { GFile* _tmp29_ = NULL; Scaling _tmp30_ = {0}; @@ -27626,7 +27724,7 @@ void photo_open_with_external_editor (Photo* self, GError** error) { photo_export (self, _tmp29_, &_tmp30_, JPEG_QUALITY_MAXIMUM, _tmp31_, FALSE, TRUE, &_inner_error_); #line 3828 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 27627 "Photo.c" +#line 27725 "Photo.c" goto __catch389_g_error; } } @@ -27640,7 +27738,7 @@ void photo_open_with_external_editor (Photo* self, GError** error) { err = _inner_error_; #line 3827 "/home/jens/Source/shotwell/src/Photo.vala" _inner_error_ = NULL; -#line 27641 "Photo.c" +#line 27739 "Photo.c" { GFile* _tmp32_ = NULL; #line 3833 "/home/jens/Source/shotwell/src/Photo.vala" @@ -27649,7 +27747,7 @@ void photo_open_with_external_editor (Photo* self, GError** error) { g_file_delete (_tmp32_, NULL, &_inner_error_); #line 3833 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 27650 "Photo.c" +#line 27748 "Photo.c" goto __catch390_g_error; } } @@ -27683,7 +27781,7 @@ void photo_open_with_external_editor (Photo* self, GError** error) { _g_free0 (_tmp35_); #line 3832 "/home/jens/Source/shotwell/src/Photo.vala" _g_error_free0 (delete_err); -#line 27683 "Photo.c" +#line 27781 "Photo.c" } __finally390: #line 3832 "/home/jens/Source/shotwell/src/Photo.vala" @@ -27702,7 +27800,7 @@ void photo_open_with_external_editor (Photo* self, GError** error) { g_clear_error (&_inner_error_); #line 3832 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 27702 "Photo.c" +#line 27800 "Photo.c" } #line 3840 "/home/jens/Source/shotwell/src/Photo.vala" _tmp38_ = err; @@ -27712,7 +27810,7 @@ void photo_open_with_external_editor (Photo* self, GError** error) { _inner_error_ = _tmp39_; #line 3840 "/home/jens/Source/shotwell/src/Photo.vala" _g_error_free0 (err); -#line 27712 "Photo.c" +#line 27810 "Photo.c" goto __finally389; } __finally389: @@ -27726,7 +27824,7 @@ void photo_open_with_external_editor (Photo* self, GError** error) { _g_object_unref0 (current_editable_file); #line 3827 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 27726 "Photo.c" +#line 27824 "Photo.c" } #line 3844 "/home/jens/Source/shotwell/src/Photo.vala" _tmp40_ = editable_file_format; @@ -27744,7 +27842,7 @@ void photo_open_with_external_editor (Photo* self, GError** error) { _g_object_unref0 (current_editable_file); #line 3844 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 27744 "Photo.c" +#line 27842 "Photo.c" } #line 3846 "/home/jens/Source/shotwell/src/Photo.vala" _tmp42_ = create_editable_file; @@ -27754,7 +27852,7 @@ void photo_open_with_external_editor (Photo* self, GError** error) { _g_object_unref0 (current_editable_file); #line 3846 "/home/jens/Source/shotwell/src/Photo.vala" current_editable_file = _tmp43_; -#line 27754 "Photo.c" +#line 27852 "Photo.c" } #line 3849 "/home/jens/Source/shotwell/src/Photo.vala" _tmp44_ = current_editable_file; @@ -27764,7 +27862,7 @@ void photo_open_with_external_editor (Photo* self, GError** error) { _tmp45_ = self->priv->editable_monitor; #line 3852 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp45_ == NULL) { -#line 27764 "Photo.c" +#line 27862 "Photo.c" GFile* _tmp46_ = NULL; #line 3853 "/home/jens/Source/shotwell/src/Photo.vala" _tmp46_ = current_editable_file; @@ -27780,7 +27878,7 @@ void photo_open_with_external_editor (Photo* self, GError** error) { _g_object_unref0 (current_editable_file); #line 3853 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 27780 "Photo.c" +#line 27878 "Photo.c" } } #line 3855 "/home/jens/Source/shotwell/src/Photo.vala" @@ -27799,13 +27897,13 @@ void photo_open_with_external_editor (Photo* self, GError** error) { _g_object_unref0 (current_editable_file); #line 3855 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 27799 "Photo.c" +#line 27897 "Photo.c" } #line 3803 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (create_editable_file); #line 3803 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (current_editable_file); -#line 27805 "Photo.c" +#line 27903 "Photo.c" } @@ -27817,14 +27915,14 @@ void photo_revert_to_master (Photo* self, gboolean notify) { _tmp0_ = notify; #line 3859 "/home/jens/Source/shotwell/src/Photo.vala" photo_detach_editable (self, TRUE, TRUE, _tmp0_); -#line 27817 "Photo.c" +#line 27915 "Photo.c" } static void _photo_on_editable_file_changed_g_file_monitor_changed (GFileMonitor* _sender, GFile* file, GFile* other_file, GFileMonitorEvent event_type, gpointer self) { #line 3869 "/home/jens/Source/shotwell/src/Photo.vala" photo_on_editable_file_changed ((Photo*) self, file, other_file, event_type); -#line 27824 "Photo.c" +#line 27922 "Photo.c" } @@ -27858,7 +27956,7 @@ static void photo_start_monitoring_editable (Photo* self, GFile* file, GError** g_propagate_error (error, _inner_error_); #line 3868 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 27858 "Photo.c" +#line 27956 "Photo.c" } #line 3868 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = _tmp1_; @@ -27874,7 +27972,7 @@ static void photo_start_monitoring_editable (Photo* self, GFile* file, GError** g_signal_connect_object (_tmp5_, "changed", (GCallback) _photo_on_editable_file_changed_g_file_monitor_changed, self, 0); #line 3862 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_tmp1_); -#line 27874 "Photo.c" +#line 27972 "Photo.c" } @@ -27894,7 +27992,7 @@ static void photo_halt_monitoring_editable (Photo* self) { if (_tmp0_ == NULL) { #line 3874 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 27894 "Photo.c" +#line 27992 "Photo.c" } #line 3877 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = photo_get_editable_file (self); @@ -27904,13 +28002,13 @@ static void photo_halt_monitoring_editable (Photo* self) { _tmp2_ = file; #line 3878 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp2_ != NULL) { -#line 27904 "Photo.c" +#line 28002 "Photo.c" GFile* _tmp3_ = NULL; #line 3879 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = file; #line 3879 "/home/jens/Source/shotwell/src/Photo.vala" library_monitor_unblacklist_file (_tmp3_); -#line 27910 "Photo.c" +#line 28008 "Photo.c" } #line 3881 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = self->priv->editable_monitor; @@ -27928,7 +28026,7 @@ static void photo_halt_monitoring_editable (Photo* self) { self->priv->editable_monitor = NULL; #line 3872 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (file); -#line 27928 "Photo.c" +#line 28026 "Photo.c" } @@ -27970,7 +28068,7 @@ static void photo_attach_editable (Photo* self, PhotoFileFormat file_format, GFi g_propagate_error (error, _inner_error_); #line 3892 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 27970 "Photo.c" +#line 28068 "Photo.c" } } @@ -27987,7 +28085,7 @@ static void photo_update_editable_attributes (Photo* self, GError** error) { g_propagate_error (error, _inner_error_); #line 3896 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 27987 "Photo.c" +#line 28085 "Photo.c" } } @@ -28004,7 +28102,7 @@ void photo_reimport_editable (Photo* self, GError** error) { g_propagate_error (error, _inner_error_); #line 3900 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 28004 "Photo.c" +#line 28102 "Photo.c" } } @@ -28016,13 +28114,13 @@ static void _vala_array_add103 (gchar*** array, int* length, int* size, gchar* v *size = (*size) ? (2 * (*size)) : 4; #line 4007 "/home/jens/Source/shotwell/src/Photo.vala" *array = g_renew (gchar*, *array, (*size) + 1); -#line 28016 "Photo.c" +#line 28114 "Photo.c" } #line 4007 "/home/jens/Source/shotwell/src/Photo.vala" (*array)[(*length)++] = value; #line 4007 "/home/jens/Source/shotwell/src/Photo.vala" (*array)[*length] = NULL; -#line 28022 "Photo.c" +#line 28120 "Photo.c" } @@ -28033,13 +28131,13 @@ static void _vala_array_add104 (gchar*** array, int* length, int* size, gchar* v *size = (*size) ? (2 * (*size)) : 4; #line 4008 "/home/jens/Source/shotwell/src/Photo.vala" *array = g_renew (gchar*, *array, (*size) + 1); -#line 28033 "Photo.c" +#line 28131 "Photo.c" } #line 4008 "/home/jens/Source/shotwell/src/Photo.vala" (*array)[(*length)++] = value; #line 4008 "/home/jens/Source/shotwell/src/Photo.vala" (*array)[*length] = NULL; -#line 28039 "Photo.c" +#line 28137 "Photo.c" } @@ -28050,13 +28148,13 @@ static void _vala_array_add105 (gchar*** array, int* length, int* size, gchar* v *size = (*size) ? (2 * (*size)) : 4; #line 4011 "/home/jens/Source/shotwell/src/Photo.vala" *array = g_renew (gchar*, *array, (*size) + 1); -#line 28050 "Photo.c" +#line 28148 "Photo.c" } #line 4011 "/home/jens/Source/shotwell/src/Photo.vala" (*array)[(*length)++] = value; #line 4011 "/home/jens/Source/shotwell/src/Photo.vala" (*array)[*length] = NULL; -#line 28056 "Photo.c" +#line 28154 "Photo.c" } @@ -28067,13 +28165,13 @@ static void _vala_array_add106 (gchar*** array, int* length, int* size, gchar* v *size = (*size) ? (2 * (*size)) : 4; #line 4015 "/home/jens/Source/shotwell/src/Photo.vala" *array = g_renew (gchar*, *array, (*size) + 1); -#line 28067 "Photo.c" +#line 28165 "Photo.c" } #line 4015 "/home/jens/Source/shotwell/src/Photo.vala" (*array)[(*length)++] = value; #line 4015 "/home/jens/Source/shotwell/src/Photo.vala" (*array)[*length] = NULL; -#line 28073 "Photo.c" +#line 28171 "Photo.c" } @@ -28084,13 +28182,13 @@ static void _vala_array_add107 (gchar*** array, int* length, int* size, gchar* v *size = (*size) ? (2 * (*size)) : 4; #line 4016 "/home/jens/Source/shotwell/src/Photo.vala" *array = g_renew (gchar*, *array, (*size) + 1); -#line 28084 "Photo.c" +#line 28182 "Photo.c" } #line 4016 "/home/jens/Source/shotwell/src/Photo.vala" (*array)[(*length)++] = value; #line 4016 "/home/jens/Source/shotwell/src/Photo.vala" (*array)[*length] = NULL; -#line 28090 "Photo.c" +#line 28188 "Photo.c" } @@ -28101,13 +28199,13 @@ static void _vala_array_add108 (gchar*** array, int* length, int* size, gchar* v *size = (*size) ? (2 * (*size)) : 4; #line 4019 "/home/jens/Source/shotwell/src/Photo.vala" *array = g_renew (gchar*, *array, (*size) + 1); -#line 28101 "Photo.c" +#line 28199 "Photo.c" } #line 4019 "/home/jens/Source/shotwell/src/Photo.vala" (*array)[(*length)++] = value; #line 4019 "/home/jens/Source/shotwell/src/Photo.vala" (*array)[*length] = NULL; -#line 28107 "Photo.c" +#line 28205 "Photo.c" } @@ -28158,30 +28256,30 @@ static void photo_update_editable (Photo* self, gboolean only_attributes, PhotoF _tmp2_ = only_attributes; #line 3907 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp2_) { -#line 28158 "Photo.c" +#line 28256 "Photo.c" PhotoFileReader* _tmp3_ = NULL; #line 3907 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = new_reader; #line 3907 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = _tmp3_ == NULL; -#line 28164 "Photo.c" +#line 28262 "Photo.c" } else { #line 3907 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = FALSE; -#line 28168 "Photo.c" +#line 28266 "Photo.c" } #line 3907 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp1_) { #line 3907 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = TRUE; -#line 28174 "Photo.c" +#line 28272 "Photo.c" } else { gboolean _tmp4_ = FALSE; #line 3907 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = only_attributes; #line 3907 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = !_tmp4_; -#line 28181 "Photo.c" +#line 28279 "Photo.c" } #line 3907 "/home/jens/Source/shotwell/src/Photo.vala" _vala_assert (_tmp0_, "(only_attributes && new_reader == null) || (!only_attributes)"); @@ -28195,13 +28293,13 @@ static void photo_update_editable (Photo* self, gboolean only_attributes, PhotoF _tmp6_ = _tmp7_; #line 3911 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp6_ == NULL) { -#line 28195 "Photo.c" +#line 28293 "Photo.c" PhotoFileReader* _tmp8_ = NULL; #line 3911 "/home/jens/Source/shotwell/src/Photo.vala" _tmp8_ = old_reader; #line 3911 "/home/jens/Source/shotwell/src/Photo.vala" _tmp6_ = _tmp8_; -#line 28201 "Photo.c" +#line 28299 "Photo.c" } #line 3911 "/home/jens/Source/shotwell/src/Photo.vala" _tmp9_ = _photo_file_adapter_ref0 (_tmp6_); @@ -28219,7 +28317,7 @@ static void photo_update_editable (Photo* self, gboolean only_attributes, PhotoF _photo_file_adapter_unref0 (old_reader); #line 3915 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 28219 "Photo.c" +#line 28317 "Photo.c" } #line 3918 "/home/jens/Source/shotwell/src/Photo.vala" timestamp_changed = FALSE; @@ -28261,19 +28359,19 @@ static void photo_update_editable (Photo* self, gboolean only_attributes, PhotoF _photo_file_adapter_unref0 (old_reader); #line 3926 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 28261 "Photo.c" +#line 28359 "Photo.c" } #line 3930 "/home/jens/Source/shotwell/src/Photo.vala" _tmp17_ = backing_photo_id_is_invalid (&editable_id); #line 3930 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp17_) { -#line 28267 "Photo.c" +#line 28365 "Photo.c" BackingPhotoRow* _tmp18_ = NULL; #line 3932 "/home/jens/Source/shotwell/src/Photo.vala" _tmp18_ = backing; #line 3932 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp18_ != NULL) { -#line 28273 "Photo.c" +#line 28371 "Photo.c" BackingPhotoTable* _tmp19_ = NULL; BackingPhotoTable* _tmp20_ = NULL; BackingPhotoRow* _tmp21_ = NULL; @@ -28303,7 +28401,7 @@ static void photo_update_editable (Photo* self, gboolean only_attributes, PhotoF _photo_file_adapter_unref0 (old_reader); #line 3933 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 28303 "Photo.c" +#line 28401 "Photo.c" } { PhotoRow* _tmp22_ = NULL; @@ -28311,7 +28409,7 @@ static void photo_update_editable (Photo* self, gboolean only_attributes, PhotoF _tmp22_ = self->row; #line 3934 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_row); -#line 28311 "Photo.c" +#line 28409 "Photo.c" { PhotoTable* _tmp23_ = NULL; PhotoTable* _tmp24_ = NULL; @@ -28344,7 +28442,7 @@ static void photo_update_editable (Photo* self, gboolean only_attributes, PhotoF _database_table_unref0 (_tmp24_); #line 3938 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 28344 "Photo.c" +#line 28442 "Photo.c" goto __finally391; } #line 3939 "/home/jens/Source/shotwell/src/Photo.vala" @@ -28369,7 +28467,7 @@ static void photo_update_editable (Photo* self, gboolean only_attributes, PhotoF _tmp33_ = _tmp32_->original_orientation; #line 3941 "/home/jens/Source/shotwell/src/Photo.vala" photo_set_orientation (self, _tmp33_); -#line 28369 "Photo.c" +#line 28467 "Photo.c" } __finally391: { @@ -28378,7 +28476,7 @@ static void photo_update_editable (Photo* self, gboolean only_attributes, PhotoF _tmp34_ = self->row; #line 3934 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 28378 "Photo.c" +#line 28476 "Photo.c" } #line 3934 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { @@ -28396,19 +28494,19 @@ static void photo_update_editable (Photo* self, gboolean only_attributes, PhotoF _photo_file_adapter_unref0 (old_reader); #line 3934 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 28396 "Photo.c" +#line 28494 "Photo.c" } } } #line 3944 "/home/jens/Source/shotwell/src/Photo.vala" is_new_editable = TRUE; -#line 28402 "Photo.c" +#line 28500 "Photo.c" } #line 3947 "/home/jens/Source/shotwell/src/Photo.vala" _tmp35_ = only_attributes; #line 3947 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp35_) { -#line 28408 "Photo.c" +#line 28506 "Photo.c" gboolean _tmp36_ = FALSE; GFileInfo* info = NULL; GTimeVal timestamp = {0}; @@ -28425,7 +28523,7 @@ static void photo_update_editable (Photo* self, gboolean only_attributes, PhotoF _tmp36_ = backing_photo_id_is_valid (&editable_id); #line 3949 "/home/jens/Source/shotwell/src/Photo.vala" _vala_assert (_tmp36_, "editable_id.is_valid()"); -#line 28425 "Photo.c" +#line 28523 "Photo.c" { GFileInfo* _tmp37_ = NULL; GFile* _tmp38_ = NULL; @@ -28439,7 +28537,7 @@ static void photo_update_editable (Photo* self, gboolean only_attributes, PhotoF _tmp37_ = _tmp39_; #line 3953 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 28439 "Photo.c" +#line 28537 "Photo.c" goto __catch392_g_error; } #line 3953 "/home/jens/Source/shotwell/src/Photo.vala" @@ -28452,7 +28550,7 @@ static void photo_update_editable (Photo* self, gboolean only_attributes, PhotoF info = _tmp40_; #line 3952 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_tmp37_); -#line 28452 "Photo.c" +#line 28550 "Photo.c" } goto __finally392; __catch392_g_error: @@ -28496,7 +28594,7 @@ static void photo_update_editable (Photo* self, gboolean only_attributes, PhotoF _photo_file_adapter_unref0 (old_reader); #line 3958 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 28496 "Photo.c" +#line 28594 "Photo.c" } __finally392: #line 3952 "/home/jens/Source/shotwell/src/Photo.vala" @@ -28517,7 +28615,7 @@ static void photo_update_editable (Photo* self, gboolean only_attributes, PhotoF _photo_file_adapter_unref0 (old_reader); #line 3952 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 28517 "Photo.c" +#line 28615 "Photo.c" } #line 3961 "/home/jens/Source/shotwell/src/Photo.vala" _tmp45_ = info; @@ -28561,7 +28659,7 @@ static void photo_update_editable (Photo* self, gboolean only_attributes, PhotoF _photo_file_adapter_unref0 (old_reader); #line 3963 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 28561 "Photo.c" +#line 28659 "Photo.c" } { PhotoRow* _tmp54_ = NULL; @@ -28569,7 +28667,7 @@ static void photo_update_editable (Photo* self, gboolean only_attributes, PhotoF _tmp54_ = self->row; #line 3965 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_row); -#line 28569 "Photo.c" +#line 28667 "Photo.c" { BackingPhotoRow* _tmp55_ = NULL; time_t _tmp56_ = 0; @@ -28621,7 +28719,7 @@ static void photo_update_editable (Photo* self, gboolean only_attributes, PhotoF _tmp68_ = g_file_info_get_size (_tmp67_); #line 3970 "/home/jens/Source/shotwell/src/Photo.vala" _tmp66_->filesize = _tmp68_; -#line 28621 "Photo.c" +#line 28719 "Photo.c" } __finally393: { @@ -28630,7 +28728,7 @@ static void photo_update_editable (Photo* self, gboolean only_attributes, PhotoF _tmp69_ = self->row; #line 3965 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 28630 "Photo.c" +#line 28728 "Photo.c" } #line 3965 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { @@ -28650,12 +28748,12 @@ static void photo_update_editable (Photo* self, gboolean only_attributes, PhotoF _photo_file_adapter_unref0 (old_reader); #line 3965 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 28650 "Photo.c" +#line 28748 "Photo.c" } } #line 3947 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (info); -#line 28655 "Photo.c" +#line 28753 "Photo.c" } else { gboolean _tmp70_ = FALSE; gboolean _tmp71_ = FALSE; @@ -28663,21 +28761,21 @@ static void photo_update_editable (Photo* self, gboolean only_attributes, PhotoF _tmp71_ = backing_photo_id_is_valid (&editable_id); #line 3974 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp71_) { -#line 28663 "Photo.c" +#line 28761 "Photo.c" gboolean _tmp72_ = FALSE; #line 3974 "/home/jens/Source/shotwell/src/Photo.vala" _tmp72_ = is_new_editable; #line 3974 "/home/jens/Source/shotwell/src/Photo.vala" _tmp70_ = !_tmp72_; -#line 28669 "Photo.c" +#line 28767 "Photo.c" } else { #line 3974 "/home/jens/Source/shotwell/src/Photo.vala" _tmp70_ = FALSE; -#line 28673 "Photo.c" +#line 28771 "Photo.c" } #line 3974 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp70_) { -#line 28677 "Photo.c" +#line 28775 "Photo.c" BackingPhotoRow* _tmp73_ = NULL; BackingPhotoID _tmp74_ = {0}; BackingPhotoTable* _tmp75_ = NULL; @@ -28715,7 +28813,7 @@ static void photo_update_editable (Photo* self, gboolean only_attributes, PhotoF _photo_file_adapter_unref0 (old_reader); #line 3980 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 28715 "Photo.c" +#line 28813 "Photo.c" } { PhotoRow* _tmp78_ = NULL; @@ -28723,7 +28821,7 @@ static void photo_update_editable (Photo* self, gboolean only_attributes, PhotoF _tmp78_ = self->row; #line 3981 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_row); -#line 28723 "Photo.c" +#line 28821 "Photo.c" { BackingPhotoRow* _tmp79_ = NULL; time_t _tmp80_ = 0; @@ -28781,7 +28879,7 @@ static void photo_update_editable (Photo* self, gboolean only_attributes, PhotoF _tmp92_ = _tmp91_->original_orientation; #line 3987 "/home/jens/Source/shotwell/src/Photo.vala" photo_set_orientation (self, _tmp92_); -#line 28781 "Photo.c" +#line 28879 "Photo.c" } __finally394: { @@ -28790,7 +28888,7 @@ static void photo_update_editable (Photo* self, gboolean only_attributes, PhotoF _tmp93_ = self->row; #line 3981 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 28790 "Photo.c" +#line 28888 "Photo.c" } #line 3981 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { @@ -28808,7 +28906,7 @@ static void photo_update_editable (Photo* self, gboolean only_attributes, PhotoF _photo_file_adapter_unref0 (old_reader); #line 3981 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 28808 "Photo.c" +#line 28906 "Photo.c" } } } @@ -28817,14 +28915,14 @@ static void photo_update_editable (Photo* self, gboolean only_attributes, PhotoF _tmp94_ = new_reader; #line 3993 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp94_ != NULL) { -#line 28817 "Photo.c" +#line 28915 "Photo.c" { PhotoBackingReaders* _tmp95_ = NULL; #line 3994 "/home/jens/Source/shotwell/src/Photo.vala" _tmp95_ = self->priv->readers; #line 3994 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_readers); -#line 28824 "Photo.c" +#line 28922 "Photo.c" { PhotoBackingReaders* _tmp96_ = NULL; PhotoFileReader* _tmp97_ = NULL; @@ -28839,7 +28937,7 @@ static void photo_update_editable (Photo* self, gboolean only_attributes, PhotoF _photo_file_adapter_unref0 (_tmp96_->editable); #line 3995 "/home/jens/Source/shotwell/src/Photo.vala" _tmp96_->editable = _tmp98_; -#line 28839 "Photo.c" +#line 28937 "Photo.c" } __finally395: { @@ -28848,7 +28946,7 @@ static void photo_update_editable (Photo* self, gboolean only_attributes, PhotoF _tmp99_ = self->priv->readers; #line 3994 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_readers); -#line 28848 "Photo.c" +#line 28946 "Photo.c" } #line 3994 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { @@ -28866,7 +28964,7 @@ static void photo_update_editable (Photo* self, gboolean only_attributes, PhotoF _photo_file_adapter_unref0 (old_reader); #line 3994 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 28866 "Photo.c" +#line 28964 "Photo.c" } } } @@ -28874,7 +28972,7 @@ static void photo_update_editable (Photo* self, gboolean only_attributes, PhotoF _tmp101_ = only_attributes; #line 3999 "/home/jens/Source/shotwell/src/Photo.vala" if (!_tmp101_) { -#line 28874 "Photo.c" +#line 28972 "Photo.c" PhotoFileReader* _tmp102_ = NULL; PhotoFileReader* _tmp103_ = NULL; #line 3999 "/home/jens/Source/shotwell/src/Photo.vala" @@ -28883,15 +28981,15 @@ static void photo_update_editable (Photo* self, gboolean only_attributes, PhotoF _tmp103_ = old_reader; #line 3999 "/home/jens/Source/shotwell/src/Photo.vala" _tmp100_ = _tmp102_ != _tmp103_; -#line 28883 "Photo.c" +#line 28981 "Photo.c" } else { #line 3999 "/home/jens/Source/shotwell/src/Photo.vala" _tmp100_ = FALSE; -#line 28887 "Photo.c" +#line 28985 "Photo.c" } #line 3999 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp100_) { -#line 28891 "Photo.c" +#line 28989 "Photo.c" GFile* _tmp104_ = NULL; PhotoFileReader* _tmp105_ = NULL; GFile* _tmp108_ = NULL; @@ -28902,7 +29000,7 @@ static void photo_update_editable (Photo* self, gboolean only_attributes, PhotoF _tmp105_ = old_reader; #line 4001 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp105_ != NULL) { -#line 28902 "Photo.c" +#line 29000 "Photo.c" PhotoFileReader* _tmp106_ = NULL; GFile* _tmp107_ = NULL; #line 4001 "/home/jens/Source/shotwell/src/Photo.vala" @@ -28913,19 +29011,19 @@ static void photo_update_editable (Photo* self, gboolean only_attributes, PhotoF _g_object_unref0 (_tmp104_); #line 4001 "/home/jens/Source/shotwell/src/Photo.vala" _tmp104_ = _tmp107_; -#line 28913 "Photo.c" +#line 29011 "Photo.c" } else { #line 4001 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_tmp104_); #line 4001 "/home/jens/Source/shotwell/src/Photo.vala" _tmp104_ = NULL; -#line 28919 "Photo.c" +#line 29017 "Photo.c" } #line 4002 "/home/jens/Source/shotwell/src/Photo.vala" _tmp109_ = new_reader; #line 4002 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp109_ != NULL) { -#line 28925 "Photo.c" +#line 29023 "Photo.c" PhotoFileReader* _tmp110_ = NULL; GFile* _tmp111_ = NULL; #line 4002 "/home/jens/Source/shotwell/src/Photo.vala" @@ -28936,13 +29034,13 @@ static void photo_update_editable (Photo* self, gboolean only_attributes, PhotoF _g_object_unref0 (_tmp108_); #line 4002 "/home/jens/Source/shotwell/src/Photo.vala" _tmp108_ = _tmp111_; -#line 28936 "Photo.c" +#line 29034 "Photo.c" } else { #line 4002 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_tmp108_); #line 4002 "/home/jens/Source/shotwell/src/Photo.vala" _tmp108_ = NULL; -#line 28942 "Photo.c" +#line 29040 "Photo.c" } #line 4001 "/home/jens/Source/shotwell/src/Photo.vala" photo_notify_editable_replaced (self, _tmp104_, _tmp108_); @@ -28950,7 +29048,7 @@ static void photo_update_editable (Photo* self, gboolean only_attributes, PhotoF _g_object_unref0 (_tmp108_); #line 3999 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_tmp104_); -#line 28950 "Photo.c" +#line 29048 "Photo.c" } #line 4005 "/home/jens/Source/shotwell/src/Photo.vala" _tmp112_ = g_new0 (gchar*, 0 + 1); @@ -28964,7 +29062,7 @@ static void photo_update_editable (Photo* self, gboolean only_attributes, PhotoF _tmp113_ = timestamp_changed; #line 4006 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp113_) { -#line 28964 "Photo.c" +#line 29062 "Photo.c" gchar** _tmp114_ = NULL; gint _tmp114__length1 = 0; gchar* _tmp115_ = NULL; @@ -28992,7 +29090,7 @@ static void photo_update_editable (Photo* self, gboolean only_attributes, PhotoF _tmp118_ = photo_is_editable_source (self); #line 4010 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp118_) { -#line 28992 "Photo.c" +#line 29090 "Photo.c" gchar** _tmp119_ = NULL; gint _tmp119__length1 = 0; gchar* _tmp120_ = NULL; @@ -29004,7 +29102,7 @@ static void photo_update_editable (Photo* self, gboolean only_attributes, PhotoF _tmp120_ = g_strdup ("metadata:source-timestamp"); #line 4011 "/home/jens/Source/shotwell/src/Photo.vala" _vala_array_add105 (&alteration_list, &alteration_list_length1, &_alteration_list_size_, _tmp120_); -#line 29004 "Photo.c" +#line 29102 "Photo.c" } } #line 4014 "/home/jens/Source/shotwell/src/Photo.vala" @@ -29013,18 +29111,18 @@ static void photo_update_editable (Photo* self, gboolean only_attributes, PhotoF if (_tmp122_) { #line 4014 "/home/jens/Source/shotwell/src/Photo.vala" _tmp121_ = TRUE; -#line 29013 "Photo.c" +#line 29111 "Photo.c" } else { PhotoFileReader* _tmp123_ = NULL; #line 4014 "/home/jens/Source/shotwell/src/Photo.vala" _tmp123_ = new_reader; #line 4014 "/home/jens/Source/shotwell/src/Photo.vala" _tmp121_ = _tmp123_ != NULL; -#line 29020 "Photo.c" +#line 29118 "Photo.c" } #line 4014 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp121_) { -#line 29024 "Photo.c" +#line 29122 "Photo.c" gchar** _tmp124_ = NULL; gint _tmp124__length1 = 0; gchar* _tmp125_ = NULL; @@ -29052,7 +29150,7 @@ static void photo_update_editable (Photo* self, gboolean only_attributes, PhotoF _tmp128_ = photo_is_editable_source (self); #line 4018 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp128_) { -#line 29052 "Photo.c" +#line 29150 "Photo.c" gchar** _tmp129_ = NULL; gint _tmp129__length1 = 0; gchar* _tmp130_ = NULL; @@ -29064,7 +29162,7 @@ static void photo_update_editable (Photo* self, gboolean only_attributes, PhotoF _tmp130_ = g_strdup ("image:source"); #line 4019 "/home/jens/Source/shotwell/src/Photo.vala" _vala_array_add108 (&alteration_list, &alteration_list_length1, &_alteration_list_size_, _tmp130_); -#line 29064 "Photo.c" +#line 29162 "Photo.c" } } #line 4022 "/home/jens/Source/shotwell/src/Photo.vala" @@ -29073,7 +29171,7 @@ static void photo_update_editable (Photo* self, gboolean only_attributes, PhotoF _tmp131__length1 = alteration_list_length1; #line 4022 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp131__length1 > 0) { -#line 29073 "Photo.c" +#line 29171 "Photo.c" gchar** _tmp132_ = NULL; gint _tmp132__length1 = 0; Alteration* _tmp133_ = NULL; @@ -29090,7 +29188,7 @@ static void photo_update_editable (Photo* self, gboolean only_attributes, PhotoF data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp134_); #line 4023 "/home/jens/Source/shotwell/src/Photo.vala" _alteration_unref0 (_tmp134_); -#line 29090 "Photo.c" +#line 29188 "Photo.c" } #line 3905 "/home/jens/Source/shotwell/src/Photo.vala" alteration_list = (_vala_array_free (alteration_list, alteration_list_length1, (GDestroyNotify) g_free), NULL); @@ -29104,7 +29202,7 @@ static void photo_update_editable (Photo* self, gboolean only_attributes, PhotoF _photo_file_adapter_unref0 (reader); #line 3905 "/home/jens/Source/shotwell/src/Photo.vala" _photo_file_adapter_unref0 (old_reader); -#line 29104 "Photo.c" +#line 29202 "Photo.c" } @@ -29128,14 +29226,14 @@ static void photo_detach_editable (Photo* self, gboolean delete_editable, gboole has_editable = FALSE; #line 4030 "/home/jens/Source/shotwell/src/Photo.vala" editable_file = NULL; -#line 29128 "Photo.c" +#line 29226 "Photo.c" { PhotoBackingReaders* _tmp0_ = NULL; #line 4031 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = self->priv->readers; #line 4031 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_readers); -#line 29135 "Photo.c" +#line 29233 "Photo.c" { PhotoBackingReaders* _tmp1_ = NULL; PhotoFileReader* _tmp2_ = NULL; @@ -29145,7 +29243,7 @@ static void photo_detach_editable (Photo* self, gboolean delete_editable, gboole _tmp2_ = _tmp1_->editable; #line 4032 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp2_ != NULL) { -#line 29145 "Photo.c" +#line 29243 "Photo.c" PhotoBackingReaders* _tmp3_ = NULL; PhotoFileReader* _tmp4_ = NULL; GFile* _tmp5_ = NULL; @@ -29168,7 +29266,7 @@ static void photo_detach_editable (Photo* self, gboolean delete_editable, gboole _tmp6_->editable = NULL; #line 4035 "/home/jens/Source/shotwell/src/Photo.vala" has_editable = TRUE; -#line 29168 "Photo.c" +#line 29266 "Photo.c" } } __finally396: @@ -29178,7 +29276,7 @@ static void photo_detach_editable (Photo* self, gboolean delete_editable, gboole _tmp7_ = self->priv->readers; #line 4031 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_readers); -#line 29178 "Photo.c" +#line 29276 "Photo.c" } #line 4031 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { @@ -29190,18 +29288,18 @@ static void photo_detach_editable (Photo* self, gboolean delete_editable, gboole g_clear_error (&_inner_error_); #line 4031 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 29190 "Photo.c" +#line 29288 "Photo.c" } } #line 4039 "/home/jens/Source/shotwell/src/Photo.vala" _tmp8_ = has_editable; #line 4039 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp8_) { -#line 29197 "Photo.c" +#line 29295 "Photo.c" BackingPhotoID editable_id = {0}; #line 4040 "/home/jens/Source/shotwell/src/Photo.vala" backing_photo_id_init (&editable_id, BACKING_PHOTO_ID_INVALID); -#line 29201 "Photo.c" +#line 29299 "Photo.c" { { PhotoRow* _tmp9_ = NULL; @@ -29209,7 +29307,7 @@ static void photo_detach_editable (Photo* self, gboolean delete_editable, gboole _tmp9_ = self->row; #line 4042 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_row); -#line 29209 "Photo.c" +#line 29307 "Photo.c" { PhotoRow* _tmp10_ = NULL; BackingPhotoID _tmp11_ = {0}; @@ -29227,7 +29325,7 @@ static void photo_detach_editable (Photo* self, gboolean delete_editable, gboole _tmp12_ = backing_photo_id_is_valid (&editable_id); #line 4044 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp12_) { -#line 29227 "Photo.c" +#line 29325 "Photo.c" PhotoTable* _tmp13_ = NULL; PhotoTable* _tmp14_ = NULL; PhotoRow* _tmp15_ = NULL; @@ -29243,7 +29341,7 @@ static void photo_detach_editable (Photo* self, gboolean delete_editable, gboole _database_table_unref0 (_tmp14_); #line 4045 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 29243 "Photo.c" +#line 29341 "Photo.c" goto __finally398; } } @@ -29257,7 +29355,7 @@ static void photo_detach_editable (Photo* self, gboolean delete_editable, gboole _backing_photo_row_unref0 (self->backing_photo_row); #line 4046 "/home/jens/Source/shotwell/src/Photo.vala" self->backing_photo_row = _tmp18_; -#line 29257 "Photo.c" +#line 29355 "Photo.c" } __finally398: { @@ -29266,13 +29364,13 @@ static void photo_detach_editable (Photo* self, gboolean delete_editable, gboole _tmp19_ = self->row; #line 4042 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 29266 "Photo.c" +#line 29364 "Photo.c" } #line 4042 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 4042 "/home/jens/Source/shotwell/src/Photo.vala" if (_inner_error_->domain == DATABASE_ERROR) { -#line 29272 "Photo.c" +#line 29370 "Photo.c" goto __catch397_database_error; } #line 4042 "/home/jens/Source/shotwell/src/Photo.vala" @@ -29283,7 +29381,7 @@ static void photo_detach_editable (Photo* self, gboolean delete_editable, gboole g_clear_error (&_inner_error_); #line 4042 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 29283 "Photo.c" +#line 29381 "Photo.c" } } } @@ -29305,7 +29403,7 @@ static void photo_detach_editable (Photo* self, gboolean delete_editable, gboole g_warning ("Photo.vala:4049: Unable to remove editable from PhotoTable: %s", _tmp21_); #line 4041 "/home/jens/Source/shotwell/src/Photo.vala" _g_error_free0 (err); -#line 29305 "Photo.c" +#line 29403 "Photo.c" } __finally397: #line 4041 "/home/jens/Source/shotwell/src/Photo.vala" @@ -29318,7 +29416,7 @@ static void photo_detach_editable (Photo* self, gboolean delete_editable, gboole g_clear_error (&_inner_error_); #line 4041 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 29318 "Photo.c" +#line 29416 "Photo.c" } { gboolean _tmp22_ = FALSE; @@ -29326,7 +29424,7 @@ static void photo_detach_editable (Photo* self, gboolean delete_editable, gboole _tmp22_ = backing_photo_id_is_valid (&editable_id); #line 4053 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp22_) { -#line 29326 "Photo.c" +#line 29424 "Photo.c" BackingPhotoTable* _tmp23_ = NULL; BackingPhotoTable* _tmp24_ = NULL; BackingPhotoID _tmp25_ = {0}; @@ -29344,7 +29442,7 @@ static void photo_detach_editable (Photo* self, gboolean delete_editable, gboole if (G_UNLIKELY (_inner_error_ != NULL)) { #line 4054 "/home/jens/Source/shotwell/src/Photo.vala" if (_inner_error_->domain == DATABASE_ERROR) { -#line 29344 "Photo.c" +#line 29442 "Photo.c" goto __catch399_database_error; } #line 4054 "/home/jens/Source/shotwell/src/Photo.vala" @@ -29355,7 +29453,7 @@ static void photo_detach_editable (Photo* self, gboolean delete_editable, gboole g_clear_error (&_inner_error_); #line 4054 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 29355 "Photo.c" +#line 29453 "Photo.c" } } } @@ -29377,7 +29475,7 @@ static void photo_detach_editable (Photo* self, gboolean delete_editable, gboole g_warning ("Photo.vala:4056: Unable to remove editable from BackingPhotoTable: %s", _tmp27_); #line 4052 "/home/jens/Source/shotwell/src/Photo.vala" _g_error_free0 (err); -#line 29377 "Photo.c" +#line 29475 "Photo.c" } __finally399: #line 4052 "/home/jens/Source/shotwell/src/Photo.vala" @@ -29390,7 +29488,7 @@ static void photo_detach_editable (Photo* self, gboolean delete_editable, gboole g_clear_error (&_inner_error_); #line 4052 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 29390 "Photo.c" +#line 29488 "Photo.c" } } #line 4060 "/home/jens/Source/shotwell/src/Photo.vala" @@ -29399,13 +29497,13 @@ static void photo_detach_editable (Photo* self, gboolean delete_editable, gboole if (_tmp28_) { #line 4061 "/home/jens/Source/shotwell/src/Photo.vala" photo_internal_remove_all_transformations (self, FALSE); -#line 29399 "Photo.c" +#line 29497 "Photo.c" } #line 4063 "/home/jens/Source/shotwell/src/Photo.vala" _tmp29_ = has_editable; #line 4063 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp29_) { -#line 29405 "Photo.c" +#line 29503 "Photo.c" GFile* _tmp30_ = NULL; #line 4064 "/home/jens/Source/shotwell/src/Photo.vala" photo_notify_baseline_replaced (self); @@ -29413,27 +29511,27 @@ static void photo_detach_editable (Photo* self, gboolean delete_editable, gboole _tmp30_ = editable_file; #line 4065 "/home/jens/Source/shotwell/src/Photo.vala" photo_notify_editable_replaced (self, _tmp30_, NULL); -#line 29413 "Photo.c" +#line 29511 "Photo.c" } #line 4068 "/home/jens/Source/shotwell/src/Photo.vala" _tmp32_ = delete_editable; #line 4068 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp32_) { -#line 29419 "Photo.c" +#line 29517 "Photo.c" GFile* _tmp33_ = NULL; #line 4068 "/home/jens/Source/shotwell/src/Photo.vala" _tmp33_ = editable_file; #line 4068 "/home/jens/Source/shotwell/src/Photo.vala" _tmp31_ = _tmp33_ != NULL; -#line 29425 "Photo.c" +#line 29523 "Photo.c" } else { #line 4068 "/home/jens/Source/shotwell/src/Photo.vala" _tmp31_ = FALSE; -#line 29429 "Photo.c" +#line 29527 "Photo.c" } #line 4068 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp31_) { -#line 29433 "Photo.c" +#line 29531 "Photo.c" { GFile* _tmp34_ = NULL; #line 4070 "/home/jens/Source/shotwell/src/Photo.vala" @@ -29442,7 +29540,7 @@ static void photo_detach_editable (Photo* self, gboolean delete_editable, gboole g_file_trash (_tmp34_, NULL, &_inner_error_); #line 4070 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 29442 "Photo.c" +#line 29540 "Photo.c" goto __catch400_g_error; } } @@ -29483,7 +29581,7 @@ static void photo_detach_editable (Photo* self, gboolean delete_editable, gboole _g_free0 (_tmp37_); #line 4069 "/home/jens/Source/shotwell/src/Photo.vala" _g_error_free0 (err); -#line 29483 "Photo.c" +#line 29581 "Photo.c" } __finally400: #line 4069 "/home/jens/Source/shotwell/src/Photo.vala" @@ -29496,7 +29594,7 @@ static void photo_detach_editable (Photo* self, gboolean delete_editable, gboole g_clear_error (&_inner_error_); #line 4069 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 29496 "Photo.c" +#line 29594 "Photo.c" } } #line 4077 "/home/jens/Source/shotwell/src/Photo.vala" @@ -29505,32 +29603,32 @@ static void photo_detach_editable (Photo* self, gboolean delete_editable, gboole if (_tmp44_) { #line 4077 "/home/jens/Source/shotwell/src/Photo.vala" _tmp43_ = TRUE; -#line 29505 "Photo.c" +#line 29603 "Photo.c" } else { gboolean _tmp45_ = FALSE; #line 4077 "/home/jens/Source/shotwell/src/Photo.vala" _tmp45_ = remove_transformations; #line 4077 "/home/jens/Source/shotwell/src/Photo.vala" _tmp43_ = _tmp45_; -#line 29512 "Photo.c" +#line 29610 "Photo.c" } #line 4077 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp43_) { -#line 29516 "Photo.c" +#line 29614 "Photo.c" gboolean _tmp46_ = FALSE; #line 4077 "/home/jens/Source/shotwell/src/Photo.vala" _tmp46_ = notify; #line 4077 "/home/jens/Source/shotwell/src/Photo.vala" _tmp42_ = _tmp46_; -#line 29522 "Photo.c" +#line 29620 "Photo.c" } else { #line 4077 "/home/jens/Source/shotwell/src/Photo.vala" _tmp42_ = FALSE; -#line 29526 "Photo.c" +#line 29624 "Photo.c" } #line 4077 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp42_) { -#line 29530 "Photo.c" +#line 29628 "Photo.c" Alteration* _tmp47_ = NULL; Alteration* _tmp48_ = NULL; #line 4078 "/home/jens/Source/shotwell/src/Photo.vala" @@ -29541,32 +29639,32 @@ static void photo_detach_editable (Photo* self, gboolean delete_editable, gboole data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp48_); #line 4078 "/home/jens/Source/shotwell/src/Photo.vala" _alteration_unref0 (_tmp48_); -#line 29541 "Photo.c" +#line 29639 "Photo.c" } #line 4026 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (editable_file); -#line 29545 "Photo.c" +#line 29643 "Photo.c" } static void _photo_on_reimport_editable_one_shot_callback (gpointer self) { #line 4100 "/home/jens/Source/shotwell/src/Photo.vala" photo_on_reimport_editable ((Photo*) self); -#line 29552 "Photo.c" +#line 29650 "Photo.c" } static void _photo_on_update_editable_attributes_one_shot_callback (gpointer self) { #line 4109 "/home/jens/Source/shotwell/src/Photo.vala" photo_on_update_editable_attributes ((Photo*) self); -#line 29559 "Photo.c" +#line 29657 "Photo.c" } static void _photo_on_remove_editable_one_shot_callback (gpointer self) { #line 4118 "/home/jens/Source/shotwell/src/Photo.vala" photo_on_remove_editable ((Photo*) self); -#line 29566 "Photo.c" +#line 29664 "Photo.c" } @@ -29584,14 +29682,14 @@ static void photo_on_editable_file_changed (Photo* self, GFile* file, GFile* oth g_return_if_fail (G_IS_FILE (file)); #line 4081 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail ((other_file == NULL) || G_IS_FILE (other_file)); -#line 29584 "Photo.c" +#line 29682 "Photo.c" { PhotoBackingReaders* _tmp0_ = NULL; #line 4083 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = self->priv->readers; #line 4083 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_readers); -#line 29591 "Photo.c" +#line 29689 "Photo.c" { PhotoBackingReaders* _tmp1_ = NULL; PhotoFileReader* _tmp2_ = NULL; @@ -29626,18 +29724,18 @@ static void photo_on_editable_file_changed (Photo* self, GFile* file, GFile* oth _g_object_unref0 (_tmp7_); #line 4086 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp9_) { -#line 29626 "Photo.c" +#line 29724 "Photo.c" { PhotoBackingReaders* _tmp10_ = NULL; #line 4083 "/home/jens/Source/shotwell/src/Photo.vala" _tmp10_ = self->priv->readers; #line 4083 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_readers); -#line 29633 "Photo.c" +#line 29731 "Photo.c" } #line 4090 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 29637 "Photo.c" +#line 29735 "Photo.c" } } __finally401: @@ -29647,7 +29745,7 @@ static void photo_on_editable_file_changed (Photo* self, GFile* file, GFile* oth _tmp11_ = self->priv->readers; #line 4083 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_readers); -#line 29647 "Photo.c" +#line 29745 "Photo.c" } #line 4083 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { @@ -29657,7 +29755,7 @@ static void photo_on_editable_file_changed (Photo* self, GFile* file, GFile* oth g_clear_error (&_inner_error_); #line 4083 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 29657 "Photo.c" +#line 29755 "Photo.c" } } #line 4094 "/home/jens/Source/shotwell/src/Photo.vala" @@ -29682,7 +29780,7 @@ static void photo_on_editable_file_changed (Photo* self, GFile* file, GFile* oth case G_FILE_MONITOR_EVENT_CHANGED: #line 4096 "/home/jens/Source/shotwell/src/Photo.vala" case G_FILE_MONITOR_EVENT_CREATED: -#line 29682 "Photo.c" +#line 29780 "Photo.c" { OneShotScheduler* _tmp18_ = NULL; OneShotScheduler* _tmp20_ = NULL; @@ -29690,7 +29788,7 @@ static void photo_on_editable_file_changed (Photo* self, GFile* file, GFile* oth _tmp18_ = self->priv->reimport_editable_scheduler; #line 4099 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp18_ == NULL) { -#line 29690 "Photo.c" +#line 29788 "Photo.c" OneShotScheduler* _tmp19_ = NULL; #line 4100 "/home/jens/Source/shotwell/src/Photo.vala" _tmp19_ = one_shot_scheduler_new ("Photo.reimport_editable", _photo_on_reimport_editable_one_shot_callback, self); @@ -29698,7 +29796,7 @@ static void photo_on_editable_file_changed (Photo* self, GFile* file, GFile* oth _one_shot_scheduler_unref0 (self->priv->reimport_editable_scheduler); #line 4100 "/home/jens/Source/shotwell/src/Photo.vala" self->priv->reimport_editable_scheduler = _tmp19_; -#line 29698 "Photo.c" +#line 29796 "Photo.c" } #line 4104 "/home/jens/Source/shotwell/src/Photo.vala" _tmp20_ = self->priv->reimport_editable_scheduler; @@ -29706,11 +29804,11 @@ static void photo_on_editable_file_changed (Photo* self, GFile* file, GFile* oth one_shot_scheduler_after_timeout (_tmp20_, (guint) 1000, TRUE); #line 4105 "/home/jens/Source/shotwell/src/Photo.vala" break; -#line 29706 "Photo.c" +#line 29804 "Photo.c" } #line 4096 "/home/jens/Source/shotwell/src/Photo.vala" case G_FILE_MONITOR_EVENT_ATTRIBUTE_CHANGED: -#line 29710 "Photo.c" +#line 29808 "Photo.c" { OneShotScheduler* _tmp21_ = NULL; OneShotScheduler* _tmp23_ = NULL; @@ -29718,7 +29816,7 @@ static void photo_on_editable_file_changed (Photo* self, GFile* file, GFile* oth _tmp21_ = self->priv->update_editable_attributes_scheduler; #line 4108 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp21_ == NULL) { -#line 29718 "Photo.c" +#line 29816 "Photo.c" OneShotScheduler* _tmp22_ = NULL; #line 4109 "/home/jens/Source/shotwell/src/Photo.vala" _tmp22_ = one_shot_scheduler_new ("Photo.update_editable_attributes", _photo_on_update_editable_attributes_one_shot_callback, self); @@ -29726,7 +29824,7 @@ static void photo_on_editable_file_changed (Photo* self, GFile* file, GFile* oth _one_shot_scheduler_unref0 (self->priv->update_editable_attributes_scheduler); #line 4109 "/home/jens/Source/shotwell/src/Photo.vala" self->priv->update_editable_attributes_scheduler = _tmp22_; -#line 29726 "Photo.c" +#line 29824 "Photo.c" } #line 4113 "/home/jens/Source/shotwell/src/Photo.vala" _tmp23_ = self->priv->update_editable_attributes_scheduler; @@ -29734,11 +29832,11 @@ static void photo_on_editable_file_changed (Photo* self, GFile* file, GFile* oth one_shot_scheduler_after_timeout (_tmp23_, (guint) 1000, TRUE); #line 4114 "/home/jens/Source/shotwell/src/Photo.vala" break; -#line 29734 "Photo.c" +#line 29832 "Photo.c" } #line 4096 "/home/jens/Source/shotwell/src/Photo.vala" case G_FILE_MONITOR_EVENT_DELETED: -#line 29738 "Photo.c" +#line 29836 "Photo.c" { OneShotScheduler* _tmp24_ = NULL; OneShotScheduler* _tmp26_ = NULL; @@ -29746,7 +29844,7 @@ static void photo_on_editable_file_changed (Photo* self, GFile* file, GFile* oth _tmp24_ = self->priv->remove_editable_scheduler; #line 4117 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp24_ == NULL) { -#line 29746 "Photo.c" +#line 29844 "Photo.c" OneShotScheduler* _tmp25_ = NULL; #line 4118 "/home/jens/Source/shotwell/src/Photo.vala" _tmp25_ = one_shot_scheduler_new ("Photo.remove_editable", _photo_on_remove_editable_one_shot_callback, self); @@ -29754,7 +29852,7 @@ static void photo_on_editable_file_changed (Photo* self, GFile* file, GFile* oth _one_shot_scheduler_unref0 (self->priv->remove_editable_scheduler); #line 4118 "/home/jens/Source/shotwell/src/Photo.vala" self->priv->remove_editable_scheduler = _tmp25_; -#line 29754 "Photo.c" +#line 29852 "Photo.c" } #line 4122 "/home/jens/Source/shotwell/src/Photo.vala" _tmp26_ = self->priv->remove_editable_scheduler; @@ -29762,21 +29860,21 @@ static void photo_on_editable_file_changed (Photo* self, GFile* file, GFile* oth one_shot_scheduler_after_timeout (_tmp26_, (guint) 3000, TRUE); #line 4123 "/home/jens/Source/shotwell/src/Photo.vala" break; -#line 29762 "Photo.c" +#line 29860 "Photo.c" } default: #line 4096 "/home/jens/Source/shotwell/src/Photo.vala" case G_FILE_MONITOR_EVENT_CHANGES_DONE_HINT: -#line 29767 "Photo.c" +#line 29865 "Photo.c" { #line 4128 "/home/jens/Source/shotwell/src/Photo.vala" break; -#line 29771 "Photo.c" +#line 29869 "Photo.c" } } #line 4133 "/home/jens/Source/shotwell/src/Photo.vala" photo_discard_prefetched (self); -#line 29776 "Photo.c" +#line 29874 "Photo.c" } @@ -29796,13 +29894,13 @@ static void photo_on_reimport_editable (Photo* self) { g_debug ("Photo.vala:4140: Reimporting editable for %s", _tmp1_); #line 4140 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (_tmp1_); -#line 29796 "Photo.c" +#line 29894 "Photo.c" { #line 4142 "/home/jens/Source/shotwell/src/Photo.vala" photo_reimport_editable (self, &_inner_error_); #line 4142 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 29802 "Photo.c" +#line 29900 "Photo.c" goto __catch402_g_error; } } @@ -29833,7 +29931,7 @@ static void photo_on_reimport_editable (Photo* self) { _g_free0 (_tmp3_); #line 4141 "/home/jens/Source/shotwell/src/Photo.vala" _g_error_free0 (err); -#line 29832 "Photo.c" +#line 29930 "Photo.c" } __finally402: #line 4141 "/home/jens/Source/shotwell/src/Photo.vala" @@ -29844,7 +29942,7 @@ static void photo_on_reimport_editable (Photo* self) { g_clear_error (&_inner_error_); #line 4141 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 29843 "Photo.c" +#line 29941 "Photo.c" } } @@ -29863,13 +29961,13 @@ static void photo_on_update_editable_attributes (Photo* self) { g_debug ("Photo.vala:4150: Updating editable attributes for %s", _tmp1_); #line 4150 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (_tmp1_); -#line 29862 "Photo.c" +#line 29960 "Photo.c" { #line 4152 "/home/jens/Source/shotwell/src/Photo.vala" photo_update_editable_attributes (self, &_inner_error_); #line 4152 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 29868 "Photo.c" +#line 29966 "Photo.c" goto __catch403_g_error; } } @@ -29891,7 +29989,7 @@ static void photo_on_update_editable_attributes (Photo* self) { g_warning ("Photo.vala:4154: Unable to update editable attributes: %s", _tmp3_); #line 4151 "/home/jens/Source/shotwell/src/Photo.vala" _g_error_free0 (err); -#line 29890 "Photo.c" +#line 29988 "Photo.c" } __finally403: #line 4151 "/home/jens/Source/shotwell/src/Photo.vala" @@ -29902,7 +30000,7 @@ static void photo_on_update_editable_attributes (Photo* self) { g_clear_error (&_inner_error_); #line 4151 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 29901 "Photo.c" +#line 29999 "Photo.c" } } @@ -29932,7 +30030,7 @@ static void photo_on_remove_editable (Photo* self) { _photo_file_adapter_unref0 (reader); #line 4161 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 29931 "Photo.c" +#line 30029 "Photo.c" } #line 4163 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = reader; @@ -29946,7 +30044,7 @@ static void photo_on_remove_editable (Photo* self) { _tmp5_ = g_file_query_exists (_tmp4_, NULL); #line 4164 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp5_) { -#line 29945 "Photo.c" +#line 30043 "Photo.c" gchar* _tmp6_ = NULL; gchar* _tmp7_ = NULL; #line 4165 "/home/jens/Source/shotwell/src/Photo.vala" @@ -29963,7 +30061,7 @@ static void photo_on_remove_editable (Photo* self) { _photo_file_adapter_unref0 (reader); #line 4167 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 29962 "Photo.c" +#line 30060 "Photo.c" } #line 4170 "/home/jens/Source/shotwell/src/Photo.vala" _tmp8_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject)); @@ -29979,7 +30077,7 @@ static void photo_on_remove_editable (Photo* self) { _g_object_unref0 (file); #line 4158 "/home/jens/Source/shotwell/src/Photo.vala" _photo_file_adapter_unref0 (reader); -#line 29978 "Photo.c" +#line 30076 "Photo.c" } @@ -30008,7 +30106,7 @@ void photo_get_original_dimensions (Photo* self, Dimensions* result) { *result = _tmp3_; #line 4183 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 30007 "Photo.c" +#line 30105 "Photo.c" } @@ -30028,7 +30126,7 @@ void photo_get_master_dimensions (Photo* self, Dimensions* result) { *result = _tmp2_; #line 4188 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 30027 "Photo.c" +#line 30125 "Photo.c" } @@ -30060,11 +30158,11 @@ gboolean photo_get_crop (Photo* self, Box* crop, PhotoException exceptions) { if (crop) { #line 4197 "/home/jens/Source/shotwell/src/Photo.vala" *crop = _vala_crop; -#line 30059 "Photo.c" +#line 30157 "Photo.c" } #line 4197 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 30063 "Photo.c" +#line 30161 "Photo.c" } #line 4200 "/home/jens/Source/shotwell/src/Photo.vala" media_source_get_dimensions (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource), PHOTO_EXCEPTION_CROP | PHOTO_EXCEPTION_ORIENTATION, &_tmp2_); @@ -30080,7 +30178,7 @@ gboolean photo_get_crop (Photo* self, Box* crop, PhotoException exceptions) { _tmp5_ = photo_exception_allows (_tmp4_, PHOTO_EXCEPTION_ORIENTATION); #line 4203 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp5_) { -#line 30079 "Photo.c" +#line 30177 "Photo.c" Orientation _tmp6_ = 0; Dimensions _tmp7_ = {0}; Box _tmp8_ = {0}; @@ -30095,14 +30193,14 @@ gboolean photo_get_crop (Photo* self, Box* crop, PhotoException exceptions) { orientation_rotate_box (_tmp6_, &_tmp7_, &_tmp8_, &_tmp9_); #line 4204 "/home/jens/Source/shotwell/src/Photo.vala" _vala_crop = _tmp9_; -#line 30094 "Photo.c" +#line 30192 "Photo.c" } else { Box _tmp10_ = {0}; #line 4206 "/home/jens/Source/shotwell/src/Photo.vala" _tmp10_ = raw; #line 4206 "/home/jens/Source/shotwell/src/Photo.vala" _vala_crop = _tmp10_; -#line 30101 "Photo.c" +#line 30199 "Photo.c" } #line 4208 "/home/jens/Source/shotwell/src/Photo.vala" result = TRUE; @@ -30110,11 +30208,11 @@ gboolean photo_get_crop (Photo* self, Box* crop, PhotoException exceptions) { if (crop) { #line 4208 "/home/jens/Source/shotwell/src/Photo.vala" *crop = _vala_crop; -#line 30109 "Photo.c" +#line 30207 "Photo.c" } #line 4208 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 30113 "Photo.c" +#line 30211 "Photo.c" } @@ -30232,7 +30330,7 @@ void photo_set_crop (Photo* self, Box* crop) { _tmp29_ = derotated; #line 4224 "/home/jens/Source/shotwell/src/Photo.vala" photo_set_raw_crop (self, &_tmp29_); -#line 30231 "Photo.c" +#line 30329 "Photo.c" } @@ -30255,11 +30353,11 @@ gboolean photo_get_straighten (Photo* self, gdouble* theta) { if (theta) { #line 4229 "/home/jens/Source/shotwell/src/Photo.vala" *theta = _vala_theta; -#line 30254 "Photo.c" +#line 30352 "Photo.c" } #line 4229 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 30258 "Photo.c" +#line 30356 "Photo.c" } #line 4231 "/home/jens/Source/shotwell/src/Photo.vala" result = TRUE; @@ -30267,11 +30365,11 @@ gboolean photo_get_straighten (Photo* self, gdouble* theta) { if (theta) { #line 4231 "/home/jens/Source/shotwell/src/Photo.vala" *theta = _vala_theta; -#line 30266 "Photo.c" +#line 30364 "Photo.c" } #line 4231 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 30270 "Photo.c" +#line 30368 "Photo.c" } @@ -30283,7 +30381,7 @@ void photo_set_straighten (Photo* self, gdouble theta) { _tmp0_ = theta; #line 4235 "/home/jens/Source/shotwell/src/Photo.vala" photo_set_raw_straighten (self, _tmp0_); -#line 30282 "Photo.c" +#line 30380 "Photo.c" } @@ -30367,7 +30465,7 @@ static GdkPixbuf* photo_do_redeye (Photo* self, GdkPixbuf* pixbuf, EditingToolsR _x_insets_first_quadrant_size_ = x_insets_first_quadrant_length1; #line 4251 "/home/jens/Source/shotwell/src/Photo.vala" i = 0; -#line 30366 "Photo.c" +#line 30464 "Photo.c" { gdouble y = 0.0; gdouble _tmp5_ = 0.0; @@ -30375,14 +30473,14 @@ static GdkPixbuf* photo_do_redeye (Photo* self, GdkPixbuf* pixbuf, EditingToolsR _tmp5_ = r; #line 4252 "/home/jens/Source/shotwell/src/Photo.vala" y = _tmp5_; -#line 30374 "Photo.c" +#line 30472 "Photo.c" { gboolean _tmp6_ = FALSE; #line 4252 "/home/jens/Source/shotwell/src/Photo.vala" _tmp6_ = TRUE; #line 4252 "/home/jens/Source/shotwell/src/Photo.vala" while (TRUE) { -#line 30381 "Photo.c" +#line 30479 "Photo.c" gdouble _tmp8_ = 0.0; gdouble theta = 0.0; gdouble _tmp9_ = 0.0; @@ -30402,13 +30500,13 @@ static GdkPixbuf* photo_do_redeye (Photo* self, GdkPixbuf* pixbuf, EditingToolsR gint _tmp21_ = 0; #line 4252 "/home/jens/Source/shotwell/src/Photo.vala" if (!_tmp6_) { -#line 30401 "Photo.c" +#line 30499 "Photo.c" gdouble _tmp7_ = 0.0; #line 4252 "/home/jens/Source/shotwell/src/Photo.vala" _tmp7_ = y; #line 4252 "/home/jens/Source/shotwell/src/Photo.vala" y = _tmp7_ - 1.0; -#line 30407 "Photo.c" +#line 30505 "Photo.c" } #line 4252 "/home/jens/Source/shotwell/src/Photo.vala" _tmp6_ = FALSE; @@ -30418,7 +30516,7 @@ static GdkPixbuf* photo_do_redeye (Photo* self, GdkPixbuf* pixbuf, EditingToolsR if (!(_tmp8_ >= 0.0)) { #line 4252 "/home/jens/Source/shotwell/src/Photo.vala" break; -#line 30417 "Photo.c" +#line 30515 "Photo.c" } #line 4253 "/home/jens/Source/shotwell/src/Photo.vala" _tmp9_ = y; @@ -30456,7 +30554,7 @@ static GdkPixbuf* photo_do_redeye (Photo* self, GdkPixbuf* pixbuf, EditingToolsR _tmp21_ = i; #line 4257 "/home/jens/Source/shotwell/src/Photo.vala" i = _tmp21_ + 1; -#line 30455 "Photo.c" +#line 30553 "Photo.c" } } } @@ -30502,14 +30600,14 @@ static GdkPixbuf* photo_do_redeye (Photo* self, GdkPixbuf* pixbuf, EditingToolsR if (_tmp38_ < 0) { #line 4263 "/home/jens/Source/shotwell/src/Photo.vala" _tmp37_ = 0; -#line 30501 "Photo.c" +#line 30599 "Photo.c" } else { gint _tmp39_ = 0; #line 4263 "/home/jens/Source/shotwell/src/Photo.vala" _tmp39_ = ymin; #line 4263 "/home/jens/Source/shotwell/src/Photo.vala" _tmp37_ = _tmp39_; -#line 30508 "Photo.c" +#line 30606 "Photo.c" } #line 4263 "/home/jens/Source/shotwell/src/Photo.vala" ymin = _tmp37_; @@ -30531,7 +30629,7 @@ static GdkPixbuf* photo_do_redeye (Photo* self, GdkPixbuf* pixbuf, EditingToolsR _tmp47_ = _tmp46_; #line 4265 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp44_ > (_tmp47_ - 1)) { -#line 30530 "Photo.c" +#line 30628 "Photo.c" GdkPixbuf* _tmp48_ = NULL; gint _tmp49_ = 0; gint _tmp50_ = 0; @@ -30543,20 +30641,20 @@ static GdkPixbuf* photo_do_redeye (Photo* self, GdkPixbuf* pixbuf, EditingToolsR _tmp50_ = _tmp49_; #line 4265 "/home/jens/Source/shotwell/src/Photo.vala" _tmp43_ = _tmp50_ - 1; -#line 30542 "Photo.c" +#line 30640 "Photo.c" } else { gint _tmp51_ = 0; #line 4265 "/home/jens/Source/shotwell/src/Photo.vala" _tmp51_ = ymax; #line 4265 "/home/jens/Source/shotwell/src/Photo.vala" _tmp43_ = _tmp51_; -#line 30549 "Photo.c" +#line 30647 "Photo.c" } #line 4265 "/home/jens/Source/shotwell/src/Photo.vala" ymax = _tmp43_; #line 4269 "/home/jens/Source/shotwell/src/Photo.vala" inset_index = 0; -#line 30555 "Photo.c" +#line 30653 "Photo.c" { gint y_it = 0; gint _tmp52_ = 0; @@ -30564,14 +30662,14 @@ static GdkPixbuf* photo_do_redeye (Photo* self, GdkPixbuf* pixbuf, EditingToolsR _tmp52_ = ymin; #line 4270 "/home/jens/Source/shotwell/src/Photo.vala" y_it = _tmp52_; -#line 30563 "Photo.c" +#line 30661 "Photo.c" { gboolean _tmp53_ = FALSE; #line 4270 "/home/jens/Source/shotwell/src/Photo.vala" _tmp53_ = TRUE; #line 4270 "/home/jens/Source/shotwell/src/Photo.vala" while (TRUE) { -#line 30570 "Photo.c" +#line 30668 "Photo.c" gint _tmp55_ = 0; gint _tmp56_ = 0; gint xmin = 0; @@ -30596,13 +30694,13 @@ static GdkPixbuf* photo_do_redeye (Photo* self, GdkPixbuf* pixbuf, EditingToolsR gint _tmp87_ = 0; #line 4270 "/home/jens/Source/shotwell/src/Photo.vala" if (!_tmp53_) { -#line 30595 "Photo.c" +#line 30693 "Photo.c" gint _tmp54_ = 0; #line 4270 "/home/jens/Source/shotwell/src/Photo.vala" _tmp54_ = y_it; #line 4270 "/home/jens/Source/shotwell/src/Photo.vala" y_it = _tmp54_ + 1; -#line 30601 "Photo.c" +#line 30699 "Photo.c" } #line 4270 "/home/jens/Source/shotwell/src/Photo.vala" _tmp53_ = FALSE; @@ -30614,7 +30712,7 @@ static GdkPixbuf* photo_do_redeye (Photo* self, GdkPixbuf* pixbuf, EditingToolsR if (!(_tmp55_ <= _tmp56_)) { #line 4270 "/home/jens/Source/shotwell/src/Photo.vala" break; -#line 30613 "Photo.c" +#line 30711 "Photo.c" } #line 4271 "/home/jens/Source/shotwell/src/Photo.vala" _tmp57_ = x_bounds_min; @@ -30634,14 +30732,14 @@ static GdkPixbuf* photo_do_redeye (Photo* self, GdkPixbuf* pixbuf, EditingToolsR if (_tmp62_ < 0) { #line 4272 "/home/jens/Source/shotwell/src/Photo.vala" _tmp61_ = 0; -#line 30633 "Photo.c" +#line 30731 "Photo.c" } else { gint _tmp63_ = 0; #line 4272 "/home/jens/Source/shotwell/src/Photo.vala" _tmp63_ = xmin; #line 4272 "/home/jens/Source/shotwell/src/Photo.vala" _tmp61_ = _tmp63_; -#line 30640 "Photo.c" +#line 30738 "Photo.c" } #line 4272 "/home/jens/Source/shotwell/src/Photo.vala" xmin = _tmp61_; @@ -30667,7 +30765,7 @@ static GdkPixbuf* photo_do_redeye (Photo* self, GdkPixbuf* pixbuf, EditingToolsR _tmp72_ = _tmp71_; #line 4274 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp69_ > (_tmp72_ - 1)) { -#line 30666 "Photo.c" +#line 30764 "Photo.c" GdkPixbuf* _tmp73_ = NULL; gint _tmp74_ = 0; gint _tmp75_ = 0; @@ -30679,18 +30777,18 @@ static GdkPixbuf* photo_do_redeye (Photo* self, GdkPixbuf* pixbuf, EditingToolsR _tmp75_ = _tmp74_; #line 4274 "/home/jens/Source/shotwell/src/Photo.vala" _tmp68_ = _tmp75_ - 1; -#line 30678 "Photo.c" +#line 30776 "Photo.c" } else { gint _tmp76_ = 0; #line 4274 "/home/jens/Source/shotwell/src/Photo.vala" _tmp76_ = xmax; #line 4274 "/home/jens/Source/shotwell/src/Photo.vala" _tmp68_ = _tmp76_; -#line 30685 "Photo.c" +#line 30783 "Photo.c" } #line 4274 "/home/jens/Source/shotwell/src/Photo.vala" xmax = _tmp68_; -#line 30689 "Photo.c" +#line 30787 "Photo.c" { gint x_it = 0; gint _tmp77_ = 0; @@ -30698,14 +30796,14 @@ static GdkPixbuf* photo_do_redeye (Photo* self, GdkPixbuf* pixbuf, EditingToolsR _tmp77_ = xmin; #line 4276 "/home/jens/Source/shotwell/src/Photo.vala" x_it = _tmp77_; -#line 30697 "Photo.c" +#line 30795 "Photo.c" { gboolean _tmp78_ = FALSE; #line 4276 "/home/jens/Source/shotwell/src/Photo.vala" _tmp78_ = TRUE; #line 4276 "/home/jens/Source/shotwell/src/Photo.vala" while (TRUE) { -#line 30704 "Photo.c" +#line 30802 "Photo.c" gint _tmp80_ = 0; gint _tmp81_ = 0; GdkPixbuf* _tmp82_ = NULL; @@ -30715,13 +30813,13 @@ static GdkPixbuf* photo_do_redeye (Photo* self, GdkPixbuf* pixbuf, EditingToolsR GdkPixbuf* _tmp86_ = NULL; #line 4276 "/home/jens/Source/shotwell/src/Photo.vala" if (!_tmp78_) { -#line 30714 "Photo.c" +#line 30812 "Photo.c" gint _tmp79_ = 0; #line 4276 "/home/jens/Source/shotwell/src/Photo.vala" _tmp79_ = x_it; #line 4276 "/home/jens/Source/shotwell/src/Photo.vala" x_it = _tmp79_ + 1; -#line 30720 "Photo.c" +#line 30818 "Photo.c" } #line 4276 "/home/jens/Source/shotwell/src/Photo.vala" _tmp78_ = FALSE; @@ -30733,7 +30831,7 @@ static GdkPixbuf* photo_do_redeye (Photo* self, GdkPixbuf* pixbuf, EditingToolsR if (!(_tmp80_ <= _tmp81_)) { #line 4276 "/home/jens/Source/shotwell/src/Photo.vala" break; -#line 30732 "Photo.c" +#line 30830 "Photo.c" } #line 4277 "/home/jens/Source/shotwell/src/Photo.vala" _tmp82_ = pixbuf; @@ -30747,7 +30845,7 @@ static GdkPixbuf* photo_do_redeye (Photo* self, GdkPixbuf* pixbuf, EditingToolsR _tmp86_ = _tmp85_; #line 4277 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_tmp86_); -#line 30746 "Photo.c" +#line 30844 "Photo.c" } } } @@ -30755,7 +30853,7 @@ static GdkPixbuf* photo_do_redeye (Photo* self, GdkPixbuf* pixbuf, EditingToolsR _tmp87_ = inset_index; #line 4279 "/home/jens/Source/shotwell/src/Photo.vala" inset_index = _tmp87_ + 1; -#line 30754 "Photo.c" +#line 30852 "Photo.c" } } } @@ -30785,7 +30883,7 @@ static GdkPixbuf* photo_do_redeye (Photo* self, GdkPixbuf* pixbuf, EditingToolsR _tmp96__length1 = x_insets_first_quadrant_length1; #line 4286 "/home/jens/Source/shotwell/src/Photo.vala" inset_index = _tmp96__length1 - 1; -#line 30784 "Photo.c" +#line 30882 "Photo.c" { gint y_it = 0; gint _tmp97_ = 0; @@ -30793,14 +30891,14 @@ static GdkPixbuf* photo_do_redeye (Photo* self, GdkPixbuf* pixbuf, EditingToolsR _tmp97_ = ymin; #line 4287 "/home/jens/Source/shotwell/src/Photo.vala" y_it = _tmp97_; -#line 30792 "Photo.c" +#line 30890 "Photo.c" { gboolean _tmp98_ = FALSE; #line 4287 "/home/jens/Source/shotwell/src/Photo.vala" _tmp98_ = TRUE; #line 4287 "/home/jens/Source/shotwell/src/Photo.vala" while (TRUE) { -#line 30799 "Photo.c" +#line 30897 "Photo.c" gint _tmp100_ = 0; gint _tmp101_ = 0; gint xmin = 0; @@ -30825,13 +30923,13 @@ static GdkPixbuf* photo_do_redeye (Photo* self, GdkPixbuf* pixbuf, EditingToolsR gint _tmp132_ = 0; #line 4287 "/home/jens/Source/shotwell/src/Photo.vala" if (!_tmp98_) { -#line 30824 "Photo.c" +#line 30922 "Photo.c" gint _tmp99_ = 0; #line 4287 "/home/jens/Source/shotwell/src/Photo.vala" _tmp99_ = y_it; #line 4287 "/home/jens/Source/shotwell/src/Photo.vala" y_it = _tmp99_ + 1; -#line 30830 "Photo.c" +#line 30928 "Photo.c" } #line 4287 "/home/jens/Source/shotwell/src/Photo.vala" _tmp98_ = FALSE; @@ -30843,7 +30941,7 @@ static GdkPixbuf* photo_do_redeye (Photo* self, GdkPixbuf* pixbuf, EditingToolsR if (!(_tmp100_ <= _tmp101_)) { #line 4287 "/home/jens/Source/shotwell/src/Photo.vala" break; -#line 30842 "Photo.c" +#line 30940 "Photo.c" } #line 4288 "/home/jens/Source/shotwell/src/Photo.vala" _tmp102_ = x_bounds_min; @@ -30863,14 +30961,14 @@ static GdkPixbuf* photo_do_redeye (Photo* self, GdkPixbuf* pixbuf, EditingToolsR if (_tmp107_ < 0) { #line 4289 "/home/jens/Source/shotwell/src/Photo.vala" _tmp106_ = 0; -#line 30862 "Photo.c" +#line 30960 "Photo.c" } else { gint _tmp108_ = 0; #line 4289 "/home/jens/Source/shotwell/src/Photo.vala" _tmp108_ = xmin; #line 4289 "/home/jens/Source/shotwell/src/Photo.vala" _tmp106_ = _tmp108_; -#line 30869 "Photo.c" +#line 30967 "Photo.c" } #line 4289 "/home/jens/Source/shotwell/src/Photo.vala" xmin = _tmp106_; @@ -30896,7 +30994,7 @@ static GdkPixbuf* photo_do_redeye (Photo* self, GdkPixbuf* pixbuf, EditingToolsR _tmp117_ = _tmp116_; #line 4291 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp114_ > (_tmp117_ - 1)) { -#line 30895 "Photo.c" +#line 30993 "Photo.c" GdkPixbuf* _tmp118_ = NULL; gint _tmp119_ = 0; gint _tmp120_ = 0; @@ -30908,18 +31006,18 @@ static GdkPixbuf* photo_do_redeye (Photo* self, GdkPixbuf* pixbuf, EditingToolsR _tmp120_ = _tmp119_; #line 4291 "/home/jens/Source/shotwell/src/Photo.vala" _tmp113_ = _tmp120_ - 1; -#line 30907 "Photo.c" +#line 31005 "Photo.c" } else { gint _tmp121_ = 0; #line 4291 "/home/jens/Source/shotwell/src/Photo.vala" _tmp121_ = xmax; #line 4291 "/home/jens/Source/shotwell/src/Photo.vala" _tmp113_ = _tmp121_; -#line 30914 "Photo.c" +#line 31012 "Photo.c" } #line 4291 "/home/jens/Source/shotwell/src/Photo.vala" xmax = _tmp113_; -#line 30918 "Photo.c" +#line 31016 "Photo.c" { gint x_it = 0; gint _tmp122_ = 0; @@ -30927,14 +31025,14 @@ static GdkPixbuf* photo_do_redeye (Photo* self, GdkPixbuf* pixbuf, EditingToolsR _tmp122_ = xmin; #line 4293 "/home/jens/Source/shotwell/src/Photo.vala" x_it = _tmp122_; -#line 30926 "Photo.c" +#line 31024 "Photo.c" { gboolean _tmp123_ = FALSE; #line 4293 "/home/jens/Source/shotwell/src/Photo.vala" _tmp123_ = TRUE; #line 4293 "/home/jens/Source/shotwell/src/Photo.vala" while (TRUE) { -#line 30933 "Photo.c" +#line 31031 "Photo.c" gint _tmp125_ = 0; gint _tmp126_ = 0; GdkPixbuf* _tmp127_ = NULL; @@ -30944,13 +31042,13 @@ static GdkPixbuf* photo_do_redeye (Photo* self, GdkPixbuf* pixbuf, EditingToolsR GdkPixbuf* _tmp131_ = NULL; #line 4293 "/home/jens/Source/shotwell/src/Photo.vala" if (!_tmp123_) { -#line 30943 "Photo.c" +#line 31041 "Photo.c" gint _tmp124_ = 0; #line 4293 "/home/jens/Source/shotwell/src/Photo.vala" _tmp124_ = x_it; #line 4293 "/home/jens/Source/shotwell/src/Photo.vala" x_it = _tmp124_ + 1; -#line 30949 "Photo.c" +#line 31047 "Photo.c" } #line 4293 "/home/jens/Source/shotwell/src/Photo.vala" _tmp123_ = FALSE; @@ -30962,7 +31060,7 @@ static GdkPixbuf* photo_do_redeye (Photo* self, GdkPixbuf* pixbuf, EditingToolsR if (!(_tmp125_ <= _tmp126_)) { #line 4293 "/home/jens/Source/shotwell/src/Photo.vala" break; -#line 30961 "Photo.c" +#line 31059 "Photo.c" } #line 4294 "/home/jens/Source/shotwell/src/Photo.vala" _tmp127_ = pixbuf; @@ -30976,7 +31074,7 @@ static GdkPixbuf* photo_do_redeye (Photo* self, GdkPixbuf* pixbuf, EditingToolsR _tmp131_ = _tmp130_; #line 4294 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_tmp131_); -#line 30975 "Photo.c" +#line 31073 "Photo.c" } } } @@ -30984,7 +31082,7 @@ static GdkPixbuf* photo_do_redeye (Photo* self, GdkPixbuf* pixbuf, EditingToolsR _tmp132_ = inset_index; #line 4296 "/home/jens/Source/shotwell/src/Photo.vala" inset_index = _tmp132_ - 1; -#line 30983 "Photo.c" +#line 31081 "Photo.c" } } } @@ -30998,7 +31096,7 @@ static GdkPixbuf* photo_do_redeye (Photo* self, GdkPixbuf* pixbuf, EditingToolsR x_insets_first_quadrant = (g_free (x_insets_first_quadrant), NULL); #line 4299 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 30997 "Photo.c" +#line 31095 "Photo.c" } @@ -31039,21 +31137,21 @@ static GdkPixbuf* photo_red_reduce_pixel (Photo* self, GdkPixbuf* pixbuf, gint x _tmp9_ = x; #line 4310 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp9_ >= 0) { -#line 31038 "Photo.c" +#line 31136 "Photo.c" gint _tmp10_ = 0; #line 4310 "/home/jens/Source/shotwell/src/Photo.vala" _tmp10_ = y; #line 4310 "/home/jens/Source/shotwell/src/Photo.vala" _tmp8_ = _tmp10_ >= 0; -#line 31044 "Photo.c" +#line 31142 "Photo.c" } else { #line 4310 "/home/jens/Source/shotwell/src/Photo.vala" _tmp8_ = FALSE; -#line 31048 "Photo.c" +#line 31146 "Photo.c" } #line 4310 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp8_) { -#line 31052 "Photo.c" +#line 31150 "Photo.c" gint _tmp11_ = 0; GdkPixbuf* _tmp12_ = NULL; gint _tmp13_ = 0; @@ -31068,15 +31166,15 @@ static GdkPixbuf* photo_red_reduce_pixel (Photo* self, GdkPixbuf* pixbuf, gint x _tmp14_ = _tmp13_; #line 4310 "/home/jens/Source/shotwell/src/Photo.vala" _tmp7_ = _tmp11_ < _tmp14_; -#line 31067 "Photo.c" +#line 31165 "Photo.c" } else { #line 4310 "/home/jens/Source/shotwell/src/Photo.vala" _tmp7_ = FALSE; -#line 31071 "Photo.c" +#line 31169 "Photo.c" } #line 4310 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp7_) { -#line 31075 "Photo.c" +#line 31173 "Photo.c" gint _tmp15_ = 0; GdkPixbuf* _tmp16_ = NULL; gint _tmp17_ = 0; @@ -31091,15 +31189,15 @@ static GdkPixbuf* photo_red_reduce_pixel (Photo* self, GdkPixbuf* pixbuf, gint x _tmp18_ = _tmp17_; #line 4310 "/home/jens/Source/shotwell/src/Photo.vala" _tmp6_ = _tmp15_ < _tmp18_; -#line 31090 "Photo.c" +#line 31188 "Photo.c" } else { #line 4310 "/home/jens/Source/shotwell/src/Photo.vala" _tmp6_ = FALSE; -#line 31094 "Photo.c" +#line 31192 "Photo.c" } #line 4310 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp6_) { -#line 31098 "Photo.c" +#line 31196 "Photo.c" guchar* pixel_data = NULL; GdkPixbuf* _tmp19_ = NULL; guint8* _tmp20_ = NULL; @@ -31171,7 +31269,7 @@ static GdkPixbuf* photo_red_reduce_pixel (Photo* self, GdkPixbuf* pixbuf, gint x _tmp29_[_tmp30_] = _tmp31_; #line 4326 "/home/jens/Source/shotwell/src/Photo.vala" _tmp32_ = _tmp29_[_tmp30_]; -#line 31170 "Photo.c" +#line 31268 "Photo.c" } #line 4329 "/home/jens/Source/shotwell/src/Photo.vala" _tmp33_ = pixbuf; @@ -31181,7 +31279,7 @@ static GdkPixbuf* photo_red_reduce_pixel (Photo* self, GdkPixbuf* pixbuf, gint x result = _tmp34_; #line 4329 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 31180 "Photo.c" +#line 31278 "Photo.c" } @@ -31232,7 +31330,7 @@ void photo_unscaled_to_raw_point (Photo* self, GdkPoint* unscaled_point, GdkPoin crop_box = _tmp4_; #line 4342 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp5_) { -#line 31231 "Photo.c" +#line 31329 "Photo.c" Box _tmp6_ = {0}; gint _tmp7_ = 0; Box _tmp8_ = {0}; @@ -31249,7 +31347,7 @@ void photo_unscaled_to_raw_point (Photo* self, GdkPoint* unscaled_point, GdkPoin _tmp9_ = _tmp8_.top; #line 4344 "/home/jens/Source/shotwell/src/Photo.vala" unscaled_y_offset_raw = _tmp9_; -#line 31248 "Photo.c" +#line 31346 "Photo.c" } #line 4347 "/home/jens/Source/shotwell/src/Photo.vala" _tmp10_ = unscaled_orientation; @@ -31277,7 +31375,7 @@ void photo_unscaled_to_raw_point (Photo* self, GdkPoint* unscaled_point, GdkPoin *result = derotated_point; #line 4354 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 31276 "Photo.c" +#line 31374 "Photo.c" } @@ -31389,7 +31487,7 @@ void photo_unscaled_to_raw_rect (Photo* self, GdkRectangle* unscaled_rect, GdkRe _tmp21_ = _tmp20_.x; #line 4368 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp19_ > _tmp21_) { -#line 31388 "Photo.c" +#line 31486 "Photo.c" gint temp = 0; GdkPoint _tmp22_ = {0}; gint _tmp23_ = 0; @@ -31412,7 +31510,7 @@ void photo_unscaled_to_raw_rect (Photo* self, GdkRectangle* unscaled_rect, GdkRe _tmp26_ = temp; #line 4371 "/home/jens/Source/shotwell/src/Photo.vala" lower_right.x = _tmp26_; -#line 31411 "Photo.c" +#line 31509 "Photo.c" } #line 4373 "/home/jens/Source/shotwell/src/Photo.vala" _tmp27_ = upper_left; @@ -31424,7 +31522,7 @@ void photo_unscaled_to_raw_rect (Photo* self, GdkRectangle* unscaled_rect, GdkRe _tmp30_ = _tmp29_.y; #line 4373 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp28_ > _tmp30_) { -#line 31423 "Photo.c" +#line 31521 "Photo.c" gint temp = 0; GdkPoint _tmp31_ = {0}; gint _tmp32_ = 0; @@ -31447,7 +31545,7 @@ void photo_unscaled_to_raw_rect (Photo* self, GdkRectangle* unscaled_rect, GdkRe _tmp35_ = temp; #line 4376 "/home/jens/Source/shotwell/src/Photo.vala" lower_right.y = _tmp35_; -#line 31446 "Photo.c" +#line 31544 "Photo.c" } #line 4379 "/home/jens/Source/shotwell/src/Photo.vala" memset (&raw_rect, 0, sizeof (GdkRectangle)); @@ -31487,7 +31585,7 @@ void photo_unscaled_to_raw_rect (Photo* self, GdkRectangle* unscaled_rect, GdkRe *result = raw_rect; #line 4385 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 31486 "Photo.c" +#line 31584 "Photo.c" } @@ -31502,7 +31600,7 @@ PixelTransformationBundle* photo_get_enhance_transformations (Photo* self) { g_return_val_if_fail (IS_PHOTO (self), NULL); #line 4389 "/home/jens/Source/shotwell/src/Photo.vala" pixbuf = NULL; -#line 31501 "Photo.c" +#line 31599 "Photo.c" { GdkPixbuf* _tmp0_ = NULL; Scaling _tmp1_ = {0}; @@ -31516,7 +31614,7 @@ PixelTransformationBundle* photo_get_enhance_transformations (Photo* self) { _tmp0_ = _tmp2_; #line 4396 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 31515 "Photo.c" +#line 31613 "Photo.c" goto __catch404_g_error; } #line 4396 "/home/jens/Source/shotwell/src/Photo.vala" @@ -31529,7 +31627,7 @@ PixelTransformationBundle* photo_get_enhance_transformations (Photo* self) { pixbuf = _tmp3_; #line 4395 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_tmp0_); -#line 31528 "Photo.c" +#line 31626 "Photo.c" } goto __finally404; __catch404_g_error: @@ -31549,7 +31647,7 @@ PixelTransformationBundle* photo_get_enhance_transformations (Photo* self) { _g_object_unref0 (pixbuf); #line 4405 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 31548 "Photo.c" +#line 31646 "Photo.c" } __finally404: #line 4395 "/home/jens/Source/shotwell/src/Photo.vala" @@ -31562,7 +31660,7 @@ PixelTransformationBundle* photo_get_enhance_transformations (Photo* self) { g_clear_error (&_inner_error_); #line 4395 "/home/jens/Source/shotwell/src/Photo.vala" return NULL; -#line 31561 "Photo.c" +#line 31659 "Photo.c" } #line 4412 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = pixbuf; @@ -31576,7 +31674,7 @@ PixelTransformationBundle* photo_get_enhance_transformations (Photo* self) { _g_object_unref0 (pixbuf); #line 4420 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 31575 "Photo.c" +#line 31673 "Photo.c" } @@ -31602,7 +31700,7 @@ gboolean photo_enhance (Photo* self) { _pixel_transformation_bundle_unref0 (transformations); #line 4427 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 31601 "Photo.c" +#line 31699 "Photo.c" } { PhotoRow* _tmp2_ = NULL; @@ -31610,14 +31708,14 @@ gboolean photo_enhance (Photo* self) { _tmp2_ = self->row; #line 4432 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_row); -#line 31609 "Photo.c" +#line 31707 "Photo.c" { PixelTransformationBundle* _tmp3_ = NULL; #line 4433 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = transformations; #line 4433 "/home/jens/Source/shotwell/src/Photo.vala" photo_set_color_adjustments (self, _tmp3_); -#line 31616 "Photo.c" +#line 31714 "Photo.c" } __finally405: { @@ -31626,10 +31724,12 @@ gboolean photo_enhance (Photo* self) { _tmp4_ = self->row; #line 4432 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 31625 "Photo.c" +#line 31723 "Photo.c" } #line 4432 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { +#line 31727 "Photo.c" + gboolean _tmp5_ = FALSE; #line 4432 "/home/jens/Source/shotwell/src/Photo.vala" _pixel_transformation_bundle_unref0 (transformations); #line 4432 "/home/jens/Source/shotwell/src/Photo.vala" @@ -31637,8 +31737,8 @@ gboolean photo_enhance (Photo* self) { #line 4432 "/home/jens/Source/shotwell/src/Photo.vala" g_clear_error (&_inner_error_); #line 4432 "/home/jens/Source/shotwell/src/Photo.vala" - return FALSE; -#line 31637 "Photo.c" + return _tmp5_; +#line 31737 "Photo.c" } } #line 4440 "/home/jens/Source/shotwell/src/Photo.vala" @@ -31647,7 +31747,7 @@ gboolean photo_enhance (Photo* self) { _pixel_transformation_bundle_unref0 (transformations); #line 4440 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 31646 "Photo.c" +#line 31746 "Photo.c" } @@ -31660,7 +31760,7 @@ gboolean photo_get_develop_raw_photos_to_files (void) { result = _tmp0_; #line 349 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 31659 "Photo.c" +#line 31759 "Photo.c" } @@ -31670,7 +31770,7 @@ void photo_set_develop_raw_photos_to_files (gboolean value) { _tmp0_ = value; #line 349 "/home/jens/Source/shotwell/src/Photo.vala" photo__develop_raw_photos_to_files = _tmp0_; -#line 31669 "Photo.c" +#line 31769 "Photo.c" } @@ -31679,7 +31779,7 @@ static void photo_real_editable_replaced (Photo* self, GFile* old_file, GFile* n g_return_if_fail ((old_file == NULL) || G_IS_FILE (old_file)); #line 358 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail ((new_file == NULL) || G_IS_FILE (new_file)); -#line 31678 "Photo.c" +#line 31778 "Photo.c" } @@ -31698,19 +31798,19 @@ static void g_cclosure_user_marshal_VOID__OBJECT_OBJECT (GClosure * closure, GVa data1 = closure->data; #line 161 "/home/jens/Source/shotwell/src/Photo.vala" data2 = param_values->data[0].v_pointer; -#line 31697 "Photo.c" +#line 31797 "Photo.c" } else { #line 161 "/home/jens/Source/shotwell/src/Photo.vala" data1 = param_values->data[0].v_pointer; #line 161 "/home/jens/Source/shotwell/src/Photo.vala" data2 = closure->data; -#line 31703 "Photo.c" +#line 31803 "Photo.c" } #line 161 "/home/jens/Source/shotwell/src/Photo.vala" callback = (GMarshalFunc_VOID__OBJECT_OBJECT) (marshal_data ? marshal_data : cc->callback); #line 161 "/home/jens/Source/shotwell/src/Photo.vala" callback (data1, g_value_get_object (param_values + 1), g_value_get_object (param_values + 2), data2); -#line 31709 "Photo.c" +#line 31809 "Photo.c" } @@ -31725,7 +31825,7 @@ static void photo_real_baseline_replaced (Photo* self) { static void photo_real_master_reimported (Photo* self, PhotoMetadata* metadata) { #line 376 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail ((metadata == NULL) || IS_PHOTO_METADATA (metadata)); -#line 31724 "Photo.c" +#line 31824 "Photo.c" } @@ -31744,47 +31844,47 @@ static void g_cclosure_user_marshal_VOID__MEDIA_METADATA (GClosure * closure, GV data1 = closure->data; #line 161 "/home/jens/Source/shotwell/src/Photo.vala" data2 = param_values->data[0].v_pointer; -#line 31743 "Photo.c" +#line 31843 "Photo.c" } else { #line 161 "/home/jens/Source/shotwell/src/Photo.vala" data1 = param_values->data[0].v_pointer; #line 161 "/home/jens/Source/shotwell/src/Photo.vala" data2 = closure->data; -#line 31749 "Photo.c" +#line 31849 "Photo.c" } #line 161 "/home/jens/Source/shotwell/src/Photo.vala" callback = (GMarshalFunc_VOID__MEDIA_METADATA) (marshal_data ? marshal_data : cc->callback); #line 161 "/home/jens/Source/shotwell/src/Photo.vala" callback (data1, value_get_media_metadata (param_values + 1), data2); -#line 31755 "Photo.c" +#line 31855 "Photo.c" } static void photo_real_editable_reimported (Photo* self, PhotoMetadata* metadata) { #line 380 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail ((metadata == NULL) || IS_PHOTO_METADATA (metadata)); -#line 31762 "Photo.c" +#line 31862 "Photo.c" } static void photo_real_baseline_reimported (Photo* self, PhotoMetadata* metadata) { #line 387 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail ((metadata == NULL) || IS_PHOTO_METADATA (metadata)); -#line 31769 "Photo.c" +#line 31869 "Photo.c" } static void photo_real_source_reimported (Photo* self, PhotoMetadata* metadata) { #line 394 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail ((metadata == NULL) || IS_PHOTO_METADATA (metadata)); -#line 31776 "Photo.c" +#line 31876 "Photo.c" } static void _photo_photo_transformation_state_impl_on_photo_baseline_replaced_photo_baseline_replaced (Photo* _sender, gpointer self) { #line 257 "/home/jens/Source/shotwell/src/Photo.vala" photo_photo_transformation_state_impl_on_photo_baseline_replaced ((PhotoPhotoTransformationStateImpl*) self); -#line 31783 "Photo.c" +#line 31883 "Photo.c" } @@ -31852,14 +31952,14 @@ static PhotoPhotoTransformationStateImpl* photo_photo_transformation_state_impl_ g_signal_connect_object (_tmp9_, "baseline-replaced", (GCallback) _photo_photo_transformation_state_impl_on_photo_baseline_replaced_photo_baseline_replaced, self, 0); #line 244 "/home/jens/Source/shotwell/src/Photo.vala" return self; -#line 31851 "Photo.c" +#line 31951 "Photo.c" } static PhotoPhotoTransformationStateImpl* photo_photo_transformation_state_impl_new (Photo* photo, Orientation orientation, GeeHashMap* transformations, PixelTransformer* transformer, PixelTransformationBundle* adjustments) { #line 244 "/home/jens/Source/shotwell/src/Photo.vala" return photo_photo_transformation_state_impl_construct (PHOTO_TYPE_PHOTO_TRANSFORMATION_STATE_IMPL, photo, orientation, transformations, transformer, adjustments); -#line 31858 "Photo.c" +#line 31958 "Photo.c" } @@ -31874,7 +31974,7 @@ static Orientation photo_photo_transformation_state_impl_get_orientation (PhotoP result = _tmp0_; #line 261 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 31873 "Photo.c" +#line 31973 "Photo.c" } @@ -31892,7 +31992,7 @@ static GeeHashMap* photo_photo_transformation_state_impl_get_transformations (Ph result = _tmp1_; #line 265 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 31891 "Photo.c" +#line 31991 "Photo.c" } @@ -31906,7 +32006,7 @@ static PixelTransformer* photo_photo_transformation_state_impl_get_transformer ( _tmp1_ = self->priv->transformer; #line 269 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp1_ != NULL) { -#line 31905 "Photo.c" +#line 32005 "Photo.c" PixelTransformer* _tmp2_ = NULL; PixelTransformer* _tmp3_ = NULL; #line 269 "/home/jens/Source/shotwell/src/Photo.vala" @@ -31917,19 +32017,19 @@ static PixelTransformer* photo_photo_transformation_state_impl_get_transformer ( _pixel_transformer_unref0 (_tmp0_); #line 269 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = _tmp3_; -#line 31916 "Photo.c" +#line 32016 "Photo.c" } else { #line 269 "/home/jens/Source/shotwell/src/Photo.vala" _pixel_transformer_unref0 (_tmp0_); #line 269 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = NULL; -#line 31922 "Photo.c" +#line 32022 "Photo.c" } #line 269 "/home/jens/Source/shotwell/src/Photo.vala" result = _tmp0_; #line 269 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 31928 "Photo.c" +#line 32028 "Photo.c" } @@ -31943,7 +32043,7 @@ static PixelTransformationBundle* photo_photo_transformation_state_impl_get_colo _tmp1_ = self->priv->adjustments; #line 273 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp1_ != NULL) { -#line 31942 "Photo.c" +#line 32042 "Photo.c" PixelTransformationBundle* _tmp2_ = NULL; PixelTransformationBundle* _tmp3_ = NULL; #line 273 "/home/jens/Source/shotwell/src/Photo.vala" @@ -31954,19 +32054,19 @@ static PixelTransformationBundle* photo_photo_transformation_state_impl_get_colo _pixel_transformation_bundle_unref0 (_tmp0_); #line 273 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = _tmp3_; -#line 31953 "Photo.c" +#line 32053 "Photo.c" } else { #line 273 "/home/jens/Source/shotwell/src/Photo.vala" _pixel_transformation_bundle_unref0 (_tmp0_); #line 273 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = NULL; -#line 31959 "Photo.c" +#line 32059 "Photo.c" } #line 273 "/home/jens/Source/shotwell/src/Photo.vala" result = _tmp0_; #line 273 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 31965 "Photo.c" +#line 32065 "Photo.c" } @@ -31985,13 +32085,13 @@ static GeeHashMap* photo_photo_transformation_state_impl_copy_transformations (G result = NULL; #line 279 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 31984 "Photo.c" +#line 32084 "Photo.c" } #line 281 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp1_ = gee_hash_map_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, g_free, TYPE_KEY_VALUE_MAP, (GBoxedCopyFunc) key_value_map_ref, key_value_map_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); + _tmp1_ = gee_hash_map_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, TYPE_KEY_VALUE_MAP, (GBoxedCopyFunc) key_value_map_ref, (GDestroyNotify) key_value_map_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); #line 281 "/home/jens/Source/shotwell/src/Photo.vala" clone = _tmp1_; -#line 31990 "Photo.c" +#line 32090 "Photo.c" { GeeIterator* _object_it = NULL; GeeHashMap* _tmp2_ = NULL; @@ -32003,7 +32103,7 @@ static GeeHashMap* photo_photo_transformation_state_impl_copy_transformations (G #line 282 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = original; #line 282 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp3_ = gee_abstract_map_get_keys (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_MAP, GeeMap)); + _tmp3_ = gee_abstract_map_get_keys (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap)); #line 282 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = _tmp3_; #line 282 "/home/jens/Source/shotwell/src/Photo.vala" @@ -32018,7 +32118,7 @@ static GeeHashMap* photo_photo_transformation_state_impl_copy_transformations (G _object_it = _tmp7_; #line 282 "/home/jens/Source/shotwell/src/Photo.vala" while (TRUE) { -#line 32017 "Photo.c" +#line 32117 "Photo.c" GeeIterator* _tmp8_ = NULL; gboolean _tmp9_ = FALSE; gchar* object = NULL; @@ -32040,7 +32140,7 @@ static GeeHashMap* photo_photo_transformation_state_impl_copy_transformations (G if (!_tmp9_) { #line 282 "/home/jens/Source/shotwell/src/Photo.vala" break; -#line 32039 "Photo.c" +#line 32139 "Photo.c" } #line 282 "/home/jens/Source/shotwell/src/Photo.vala" _tmp10_ = _object_it; @@ -32072,17 +32172,17 @@ static GeeHashMap* photo_photo_transformation_state_impl_copy_transformations (G _key_value_map_unref0 (_tmp17_); #line 282 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (object); -#line 32071 "Photo.c" +#line 32171 "Photo.c" } #line 282 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_object_it); -#line 32075 "Photo.c" +#line 32175 "Photo.c" } #line 285 "/home/jens/Source/shotwell/src/Photo.vala" result = clone; #line 285 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 32081 "Photo.c" +#line 32181 "Photo.c" } @@ -32096,7 +32196,7 @@ static void photo_photo_transformation_state_impl_on_photo_baseline_replaced (Ph if (!_tmp0_) { #line 290 "/home/jens/Source/shotwell/src/Photo.vala" g_signal_emit_by_name (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO_TRANSFORMATION_STATE, PhotoTransformationState), "broken"); -#line 32095 "Photo.c" +#line 32195 "Photo.c" } } @@ -32108,14 +32208,14 @@ static void photo_photo_transformation_state_impl_class_init (PhotoPhotoTransfor g_type_class_add_private (klass, sizeof (PhotoPhotoTransformationStateImplPrivate)); #line 237 "/home/jens/Source/shotwell/src/Photo.vala" G_OBJECT_CLASS (klass)->finalize = photo_photo_transformation_state_impl_finalize; -#line 32107 "Photo.c" +#line 32207 "Photo.c" } static void photo_photo_transformation_state_impl_instance_init (PhotoPhotoTransformationStateImpl * self) { #line 237 "/home/jens/Source/shotwell/src/Photo.vala" self->priv = PHOTO_PHOTO_TRANSFORMATION_STATE_IMPL_GET_PRIVATE (self); -#line 32114 "Photo.c" +#line 32214 "Photo.c" } @@ -32141,7 +32241,7 @@ static void photo_photo_transformation_state_impl_finalize (GObject* obj) { _pixel_transformation_bundle_unref0 (self->priv->adjustments); #line 237 "/home/jens/Source/shotwell/src/Photo.vala" G_OBJECT_CLASS (photo_photo_transformation_state_impl_parent_class)->finalize (obj); -#line 32140 "Photo.c" +#line 32240 "Photo.c" } @@ -32163,21 +32263,21 @@ static PhotoBackingReaders* photo_backing_readers_construct (GType object_type) self = (PhotoBackingReaders*) g_type_create_instance (object_type); #line 294 "/home/jens/Source/shotwell/src/Photo.vala" return self; -#line 32162 "Photo.c" +#line 32262 "Photo.c" } static PhotoBackingReaders* photo_backing_readers_new (void) { #line 294 "/home/jens/Source/shotwell/src/Photo.vala" return photo_backing_readers_construct (PHOTO_TYPE_BACKING_READERS); -#line 32169 "Photo.c" +#line 32269 "Photo.c" } static void photo_value_backing_readers_init (GValue* value) { #line 294 "/home/jens/Source/shotwell/src/Photo.vala" value->data[0].v_pointer = NULL; -#line 32176 "Photo.c" +#line 32276 "Photo.c" } @@ -32186,7 +32286,7 @@ static void photo_value_backing_readers_free_value (GValue* value) { if (value->data[0].v_pointer) { #line 294 "/home/jens/Source/shotwell/src/Photo.vala" photo_backing_readers_unref (value->data[0].v_pointer); -#line 32185 "Photo.c" +#line 32285 "Photo.c" } } @@ -32196,11 +32296,11 @@ static void photo_value_backing_readers_copy_value (const GValue* src_value, GVa if (src_value->data[0].v_pointer) { #line 294 "/home/jens/Source/shotwell/src/Photo.vala" dest_value->data[0].v_pointer = photo_backing_readers_ref (src_value->data[0].v_pointer); -#line 32195 "Photo.c" +#line 32295 "Photo.c" } else { #line 294 "/home/jens/Source/shotwell/src/Photo.vala" dest_value->data[0].v_pointer = NULL; -#line 32199 "Photo.c" +#line 32299 "Photo.c" } } @@ -32208,37 +32308,37 @@ static void photo_value_backing_readers_copy_value (const GValue* src_value, GVa static gpointer photo_value_backing_readers_peek_pointer (const GValue* value) { #line 294 "/home/jens/Source/shotwell/src/Photo.vala" return value->data[0].v_pointer; -#line 32207 "Photo.c" +#line 32307 "Photo.c" } static gchar* photo_value_backing_readers_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { #line 294 "/home/jens/Source/shotwell/src/Photo.vala" if (collect_values[0].v_pointer) { -#line 32214 "Photo.c" +#line 32314 "Photo.c" PhotoBackingReaders* object; object = collect_values[0].v_pointer; #line 294 "/home/jens/Source/shotwell/src/Photo.vala" if (object->parent_instance.g_class == NULL) { #line 294 "/home/jens/Source/shotwell/src/Photo.vala" return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 32221 "Photo.c" +#line 32321 "Photo.c" } else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) { #line 294 "/home/jens/Source/shotwell/src/Photo.vala" return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 32225 "Photo.c" +#line 32325 "Photo.c" } #line 294 "/home/jens/Source/shotwell/src/Photo.vala" value->data[0].v_pointer = photo_backing_readers_ref (object); -#line 32229 "Photo.c" +#line 32329 "Photo.c" } else { #line 294 "/home/jens/Source/shotwell/src/Photo.vala" value->data[0].v_pointer = NULL; -#line 32233 "Photo.c" +#line 32333 "Photo.c" } #line 294 "/home/jens/Source/shotwell/src/Photo.vala" return NULL; -#line 32237 "Photo.c" +#line 32337 "Photo.c" } @@ -32249,25 +32349,25 @@ static gchar* photo_value_backing_readers_lcopy_value (const GValue* value, guin if (!object_p) { #line 294 "/home/jens/Source/shotwell/src/Photo.vala" return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value)); -#line 32248 "Photo.c" +#line 32348 "Photo.c" } #line 294 "/home/jens/Source/shotwell/src/Photo.vala" if (!value->data[0].v_pointer) { #line 294 "/home/jens/Source/shotwell/src/Photo.vala" *object_p = NULL; -#line 32254 "Photo.c" +#line 32354 "Photo.c" } else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) { #line 294 "/home/jens/Source/shotwell/src/Photo.vala" *object_p = value->data[0].v_pointer; -#line 32258 "Photo.c" +#line 32358 "Photo.c" } else { #line 294 "/home/jens/Source/shotwell/src/Photo.vala" *object_p = photo_backing_readers_ref (value->data[0].v_pointer); -#line 32262 "Photo.c" +#line 32362 "Photo.c" } #line 294 "/home/jens/Source/shotwell/src/Photo.vala" return NULL; -#line 32266 "Photo.c" +#line 32366 "Photo.c" } @@ -32281,7 +32381,7 @@ static GParamSpec* photo_param_spec_backing_readers (const gchar* name, const gc G_PARAM_SPEC (spec)->value_type = object_type; #line 294 "/home/jens/Source/shotwell/src/Photo.vala" return G_PARAM_SPEC (spec); -#line 32280 "Photo.c" +#line 32380 "Photo.c" } @@ -32290,7 +32390,7 @@ static gpointer photo_value_get_backing_readers (const GValue* value) { g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PHOTO_TYPE_BACKING_READERS), NULL); #line 294 "/home/jens/Source/shotwell/src/Photo.vala" return value->data[0].v_pointer; -#line 32289 "Photo.c" +#line 32389 "Photo.c" } @@ -32310,17 +32410,17 @@ static void photo_value_set_backing_readers (GValue* value, gpointer v_object) { value->data[0].v_pointer = v_object; #line 294 "/home/jens/Source/shotwell/src/Photo.vala" photo_backing_readers_ref (value->data[0].v_pointer); -#line 32309 "Photo.c" +#line 32409 "Photo.c" } else { #line 294 "/home/jens/Source/shotwell/src/Photo.vala" value->data[0].v_pointer = NULL; -#line 32313 "Photo.c" +#line 32413 "Photo.c" } #line 294 "/home/jens/Source/shotwell/src/Photo.vala" if (old) { #line 294 "/home/jens/Source/shotwell/src/Photo.vala" photo_backing_readers_unref (old); -#line 32319 "Photo.c" +#line 32419 "Photo.c" } } @@ -32339,17 +32439,17 @@ static void photo_value_take_backing_readers (GValue* value, gpointer v_object) g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value))); #line 294 "/home/jens/Source/shotwell/src/Photo.vala" value->data[0].v_pointer = v_object; -#line 32338 "Photo.c" +#line 32438 "Photo.c" } else { #line 294 "/home/jens/Source/shotwell/src/Photo.vala" value->data[0].v_pointer = NULL; -#line 32342 "Photo.c" +#line 32442 "Photo.c" } #line 294 "/home/jens/Source/shotwell/src/Photo.vala" if (old) { #line 294 "/home/jens/Source/shotwell/src/Photo.vala" photo_backing_readers_unref (old); -#line 32348 "Photo.c" +#line 32448 "Photo.c" } } @@ -32359,14 +32459,14 @@ static void photo_backing_readers_class_init (PhotoBackingReadersClass * klass) photo_backing_readers_parent_class = g_type_class_peek_parent (klass); #line 294 "/home/jens/Source/shotwell/src/Photo.vala" ((PhotoBackingReadersClass *) klass)->finalize = photo_backing_readers_finalize; -#line 32358 "Photo.c" +#line 32458 "Photo.c" } static void photo_backing_readers_instance_init (PhotoBackingReaders * self) { #line 294 "/home/jens/Source/shotwell/src/Photo.vala" self->ref_count = 1; -#line 32365 "Photo.c" +#line 32465 "Photo.c" } @@ -32382,7 +32482,7 @@ static void photo_backing_readers_finalize (PhotoBackingReaders* obj) { _photo_file_adapter_unref0 (self->developer); #line 297 "/home/jens/Source/shotwell/src/Photo.vala" _photo_file_adapter_unref0 (self->editable); -#line 32381 "Photo.c" +#line 32481 "Photo.c" } @@ -32407,7 +32507,7 @@ static gpointer photo_backing_readers_ref (gpointer instance) { g_atomic_int_inc (&self->ref_count); #line 294 "/home/jens/Source/shotwell/src/Photo.vala" return instance; -#line 32406 "Photo.c" +#line 32506 "Photo.c" } @@ -32420,7 +32520,7 @@ static void photo_backing_readers_unref (gpointer instance) { PHOTO_BACKING_READERS_GET_CLASS (self)->finalize (self); #line 294 "/home/jens/Source/shotwell/src/Photo.vala" g_type_free_instance ((GTypeInstance *) self); -#line 32419 "Photo.c" +#line 32519 "Photo.c" } } @@ -32455,21 +32555,21 @@ static PhotoCachedPixbuf* photo_cached_pixbuf_construct (GType object_type, Phot self->pixbuf = _tmp3_; #line 305 "/home/jens/Source/shotwell/src/Photo.vala" return self; -#line 32454 "Photo.c" +#line 32554 "Photo.c" } static PhotoCachedPixbuf* photo_cached_pixbuf_new (Photo* photo, GdkPixbuf* pixbuf) { #line 305 "/home/jens/Source/shotwell/src/Photo.vala" return photo_cached_pixbuf_construct (PHOTO_TYPE_CACHED_PIXBUF, photo, pixbuf); -#line 32461 "Photo.c" +#line 32561 "Photo.c" } static void photo_value_cached_pixbuf_init (GValue* value) { #line 300 "/home/jens/Source/shotwell/src/Photo.vala" value->data[0].v_pointer = NULL; -#line 32468 "Photo.c" +#line 32568 "Photo.c" } @@ -32478,7 +32578,7 @@ static void photo_value_cached_pixbuf_free_value (GValue* value) { if (value->data[0].v_pointer) { #line 300 "/home/jens/Source/shotwell/src/Photo.vala" photo_cached_pixbuf_unref (value->data[0].v_pointer); -#line 32477 "Photo.c" +#line 32577 "Photo.c" } } @@ -32488,11 +32588,11 @@ static void photo_value_cached_pixbuf_copy_value (const GValue* src_value, GValu if (src_value->data[0].v_pointer) { #line 300 "/home/jens/Source/shotwell/src/Photo.vala" dest_value->data[0].v_pointer = photo_cached_pixbuf_ref (src_value->data[0].v_pointer); -#line 32487 "Photo.c" +#line 32587 "Photo.c" } else { #line 300 "/home/jens/Source/shotwell/src/Photo.vala" dest_value->data[0].v_pointer = NULL; -#line 32491 "Photo.c" +#line 32591 "Photo.c" } } @@ -32500,37 +32600,37 @@ static void photo_value_cached_pixbuf_copy_value (const GValue* src_value, GValu static gpointer photo_value_cached_pixbuf_peek_pointer (const GValue* value) { #line 300 "/home/jens/Source/shotwell/src/Photo.vala" return value->data[0].v_pointer; -#line 32499 "Photo.c" +#line 32599 "Photo.c" } static gchar* photo_value_cached_pixbuf_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { #line 300 "/home/jens/Source/shotwell/src/Photo.vala" if (collect_values[0].v_pointer) { -#line 32506 "Photo.c" +#line 32606 "Photo.c" PhotoCachedPixbuf* object; object = collect_values[0].v_pointer; #line 300 "/home/jens/Source/shotwell/src/Photo.vala" if (object->parent_instance.g_class == NULL) { #line 300 "/home/jens/Source/shotwell/src/Photo.vala" return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 32513 "Photo.c" +#line 32613 "Photo.c" } else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) { #line 300 "/home/jens/Source/shotwell/src/Photo.vala" return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 32517 "Photo.c" +#line 32617 "Photo.c" } #line 300 "/home/jens/Source/shotwell/src/Photo.vala" value->data[0].v_pointer = photo_cached_pixbuf_ref (object); -#line 32521 "Photo.c" +#line 32621 "Photo.c" } else { #line 300 "/home/jens/Source/shotwell/src/Photo.vala" value->data[0].v_pointer = NULL; -#line 32525 "Photo.c" +#line 32625 "Photo.c" } #line 300 "/home/jens/Source/shotwell/src/Photo.vala" return NULL; -#line 32529 "Photo.c" +#line 32629 "Photo.c" } @@ -32541,25 +32641,25 @@ static gchar* photo_value_cached_pixbuf_lcopy_value (const GValue* value, guint if (!object_p) { #line 300 "/home/jens/Source/shotwell/src/Photo.vala" return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value)); -#line 32540 "Photo.c" +#line 32640 "Photo.c" } #line 300 "/home/jens/Source/shotwell/src/Photo.vala" if (!value->data[0].v_pointer) { #line 300 "/home/jens/Source/shotwell/src/Photo.vala" *object_p = NULL; -#line 32546 "Photo.c" +#line 32646 "Photo.c" } else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) { #line 300 "/home/jens/Source/shotwell/src/Photo.vala" *object_p = value->data[0].v_pointer; -#line 32550 "Photo.c" +#line 32650 "Photo.c" } else { #line 300 "/home/jens/Source/shotwell/src/Photo.vala" *object_p = photo_cached_pixbuf_ref (value->data[0].v_pointer); -#line 32554 "Photo.c" +#line 32654 "Photo.c" } #line 300 "/home/jens/Source/shotwell/src/Photo.vala" return NULL; -#line 32558 "Photo.c" +#line 32658 "Photo.c" } @@ -32573,7 +32673,7 @@ static GParamSpec* photo_param_spec_cached_pixbuf (const gchar* name, const gcha G_PARAM_SPEC (spec)->value_type = object_type; #line 300 "/home/jens/Source/shotwell/src/Photo.vala" return G_PARAM_SPEC (spec); -#line 32572 "Photo.c" +#line 32672 "Photo.c" } @@ -32582,7 +32682,7 @@ static gpointer photo_value_get_cached_pixbuf (const GValue* value) { g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PHOTO_TYPE_CACHED_PIXBUF), NULL); #line 300 "/home/jens/Source/shotwell/src/Photo.vala" return value->data[0].v_pointer; -#line 32581 "Photo.c" +#line 32681 "Photo.c" } @@ -32602,17 +32702,17 @@ static void photo_value_set_cached_pixbuf (GValue* value, gpointer v_object) { value->data[0].v_pointer = v_object; #line 300 "/home/jens/Source/shotwell/src/Photo.vala" photo_cached_pixbuf_ref (value->data[0].v_pointer); -#line 32601 "Photo.c" +#line 32701 "Photo.c" } else { #line 300 "/home/jens/Source/shotwell/src/Photo.vala" value->data[0].v_pointer = NULL; -#line 32605 "Photo.c" +#line 32705 "Photo.c" } #line 300 "/home/jens/Source/shotwell/src/Photo.vala" if (old) { #line 300 "/home/jens/Source/shotwell/src/Photo.vala" photo_cached_pixbuf_unref (old); -#line 32611 "Photo.c" +#line 32711 "Photo.c" } } @@ -32631,17 +32731,17 @@ static void photo_value_take_cached_pixbuf (GValue* value, gpointer v_object) { g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value))); #line 300 "/home/jens/Source/shotwell/src/Photo.vala" value->data[0].v_pointer = v_object; -#line 32630 "Photo.c" +#line 32730 "Photo.c" } else { #line 300 "/home/jens/Source/shotwell/src/Photo.vala" value->data[0].v_pointer = NULL; -#line 32634 "Photo.c" +#line 32734 "Photo.c" } #line 300 "/home/jens/Source/shotwell/src/Photo.vala" if (old) { #line 300 "/home/jens/Source/shotwell/src/Photo.vala" photo_cached_pixbuf_unref (old); -#line 32640 "Photo.c" +#line 32740 "Photo.c" } } @@ -32651,7 +32751,7 @@ static void photo_cached_pixbuf_class_init (PhotoCachedPixbufClass * klass) { photo_cached_pixbuf_parent_class = g_type_class_peek_parent (klass); #line 300 "/home/jens/Source/shotwell/src/Photo.vala" ((PhotoCachedPixbufClass *) klass)->finalize = photo_cached_pixbuf_finalize; -#line 32650 "Photo.c" +#line 32750 "Photo.c" } @@ -32663,7 +32763,7 @@ static void photo_cached_pixbuf_instance_init (PhotoCachedPixbuf * self) { self->last_touched = _tmp0_; #line 300 "/home/jens/Source/shotwell/src/Photo.vala" self->ref_count = 1; -#line 32662 "Photo.c" +#line 32762 "Photo.c" } @@ -32679,7 +32779,7 @@ static void photo_cached_pixbuf_finalize (PhotoCachedPixbuf* obj) { _g_object_unref0 (self->pixbuf); #line 303 "/home/jens/Source/shotwell/src/Photo.vala" _g_timer_destroy0 (self->last_touched); -#line 32678 "Photo.c" +#line 32778 "Photo.c" } @@ -32704,7 +32804,7 @@ static gpointer photo_cached_pixbuf_ref (gpointer instance) { g_atomic_int_inc (&self->ref_count); #line 300 "/home/jens/Source/shotwell/src/Photo.vala" return instance; -#line 32703 "Photo.c" +#line 32803 "Photo.c" } @@ -32717,7 +32817,7 @@ static void photo_cached_pixbuf_unref (gpointer instance) { PHOTO_CACHED_PIXBUF_GET_CLASS (self)->finalize (self); #line 300 "/home/jens/Source/shotwell/src/Photo.vala" g_type_free_instance ((GTypeInstance *) self); -#line 32716 "Photo.c" +#line 32816 "Photo.c" } } @@ -32728,14 +32828,14 @@ PhotoReimportMasterState* photo_reimport_master_state_construct (GType object_ty self = (PhotoReimportMasterState*) g_type_create_instance (object_type); #line 1350 "/home/jens/Source/shotwell/src/Photo.vala" return self; -#line 32727 "Photo.c" +#line 32827 "Photo.c" } static void photo_value_reimport_master_state_init (GValue* value) { #line 1350 "/home/jens/Source/shotwell/src/Photo.vala" value->data[0].v_pointer = NULL; -#line 32734 "Photo.c" +#line 32834 "Photo.c" } @@ -32744,7 +32844,7 @@ static void photo_value_reimport_master_state_free_value (GValue* value) { if (value->data[0].v_pointer) { #line 1350 "/home/jens/Source/shotwell/src/Photo.vala" photo_reimport_master_state_unref (value->data[0].v_pointer); -#line 32743 "Photo.c" +#line 32843 "Photo.c" } } @@ -32754,11 +32854,11 @@ static void photo_value_reimport_master_state_copy_value (const GValue* src_valu if (src_value->data[0].v_pointer) { #line 1350 "/home/jens/Source/shotwell/src/Photo.vala" dest_value->data[0].v_pointer = photo_reimport_master_state_ref (src_value->data[0].v_pointer); -#line 32753 "Photo.c" +#line 32853 "Photo.c" } else { #line 1350 "/home/jens/Source/shotwell/src/Photo.vala" dest_value->data[0].v_pointer = NULL; -#line 32757 "Photo.c" +#line 32857 "Photo.c" } } @@ -32766,37 +32866,37 @@ static void photo_value_reimport_master_state_copy_value (const GValue* src_valu static gpointer photo_value_reimport_master_state_peek_pointer (const GValue* value) { #line 1350 "/home/jens/Source/shotwell/src/Photo.vala" return value->data[0].v_pointer; -#line 32765 "Photo.c" +#line 32865 "Photo.c" } static gchar* photo_value_reimport_master_state_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { #line 1350 "/home/jens/Source/shotwell/src/Photo.vala" if (collect_values[0].v_pointer) { -#line 32772 "Photo.c" +#line 32872 "Photo.c" PhotoReimportMasterState* object; object = collect_values[0].v_pointer; #line 1350 "/home/jens/Source/shotwell/src/Photo.vala" if (object->parent_instance.g_class == NULL) { #line 1350 "/home/jens/Source/shotwell/src/Photo.vala" return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 32779 "Photo.c" +#line 32879 "Photo.c" } else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) { #line 1350 "/home/jens/Source/shotwell/src/Photo.vala" return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 32783 "Photo.c" +#line 32883 "Photo.c" } #line 1350 "/home/jens/Source/shotwell/src/Photo.vala" value->data[0].v_pointer = photo_reimport_master_state_ref (object); -#line 32787 "Photo.c" +#line 32887 "Photo.c" } else { #line 1350 "/home/jens/Source/shotwell/src/Photo.vala" value->data[0].v_pointer = NULL; -#line 32791 "Photo.c" +#line 32891 "Photo.c" } #line 1350 "/home/jens/Source/shotwell/src/Photo.vala" return NULL; -#line 32795 "Photo.c" +#line 32895 "Photo.c" } @@ -32807,25 +32907,25 @@ static gchar* photo_value_reimport_master_state_lcopy_value (const GValue* value if (!object_p) { #line 1350 "/home/jens/Source/shotwell/src/Photo.vala" return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value)); -#line 32806 "Photo.c" +#line 32906 "Photo.c" } #line 1350 "/home/jens/Source/shotwell/src/Photo.vala" if (!value->data[0].v_pointer) { #line 1350 "/home/jens/Source/shotwell/src/Photo.vala" *object_p = NULL; -#line 32812 "Photo.c" +#line 32912 "Photo.c" } else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) { #line 1350 "/home/jens/Source/shotwell/src/Photo.vala" *object_p = value->data[0].v_pointer; -#line 32816 "Photo.c" +#line 32916 "Photo.c" } else { #line 1350 "/home/jens/Source/shotwell/src/Photo.vala" *object_p = photo_reimport_master_state_ref (value->data[0].v_pointer); -#line 32820 "Photo.c" +#line 32920 "Photo.c" } #line 1350 "/home/jens/Source/shotwell/src/Photo.vala" return NULL; -#line 32824 "Photo.c" +#line 32924 "Photo.c" } @@ -32839,7 +32939,7 @@ GParamSpec* photo_param_spec_reimport_master_state (const gchar* name, const gch G_PARAM_SPEC (spec)->value_type = object_type; #line 1350 "/home/jens/Source/shotwell/src/Photo.vala" return G_PARAM_SPEC (spec); -#line 32838 "Photo.c" +#line 32938 "Photo.c" } @@ -32848,7 +32948,7 @@ gpointer photo_value_get_reimport_master_state (const GValue* value) { g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PHOTO_TYPE_REIMPORT_MASTER_STATE), NULL); #line 1350 "/home/jens/Source/shotwell/src/Photo.vala" return value->data[0].v_pointer; -#line 32847 "Photo.c" +#line 32947 "Photo.c" } @@ -32868,17 +32968,17 @@ void photo_value_set_reimport_master_state (GValue* value, gpointer v_object) { value->data[0].v_pointer = v_object; #line 1350 "/home/jens/Source/shotwell/src/Photo.vala" photo_reimport_master_state_ref (value->data[0].v_pointer); -#line 32867 "Photo.c" +#line 32967 "Photo.c" } else { #line 1350 "/home/jens/Source/shotwell/src/Photo.vala" value->data[0].v_pointer = NULL; -#line 32871 "Photo.c" +#line 32971 "Photo.c" } #line 1350 "/home/jens/Source/shotwell/src/Photo.vala" if (old) { #line 1350 "/home/jens/Source/shotwell/src/Photo.vala" photo_reimport_master_state_unref (old); -#line 32877 "Photo.c" +#line 32977 "Photo.c" } } @@ -32897,17 +32997,17 @@ void photo_value_take_reimport_master_state (GValue* value, gpointer v_object) { g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value))); #line 1350 "/home/jens/Source/shotwell/src/Photo.vala" value->data[0].v_pointer = v_object; -#line 32896 "Photo.c" +#line 32996 "Photo.c" } else { #line 1350 "/home/jens/Source/shotwell/src/Photo.vala" value->data[0].v_pointer = NULL; -#line 32900 "Photo.c" +#line 33000 "Photo.c" } #line 1350 "/home/jens/Source/shotwell/src/Photo.vala" if (old) { #line 1350 "/home/jens/Source/shotwell/src/Photo.vala" photo_reimport_master_state_unref (old); -#line 32906 "Photo.c" +#line 33006 "Photo.c" } } @@ -32917,14 +33017,14 @@ static void photo_reimport_master_state_class_init (PhotoReimportMasterStateClas photo_reimport_master_state_parent_class = g_type_class_peek_parent (klass); #line 1350 "/home/jens/Source/shotwell/src/Photo.vala" ((PhotoReimportMasterStateClass *) klass)->finalize = photo_reimport_master_state_finalize; -#line 32916 "Photo.c" +#line 33016 "Photo.c" } static void photo_reimport_master_state_instance_init (PhotoReimportMasterState * self) { #line 1350 "/home/jens/Source/shotwell/src/Photo.vala" self->ref_count = 1; -#line 32923 "Photo.c" +#line 33023 "Photo.c" } @@ -32934,7 +33034,7 @@ static void photo_reimport_master_state_finalize (PhotoReimportMasterState* obj) self = G_TYPE_CHECK_INSTANCE_CAST (obj, PHOTO_TYPE_REIMPORT_MASTER_STATE, PhotoReimportMasterState); #line 1350 "/home/jens/Source/shotwell/src/Photo.vala" g_signal_handlers_destroy (self); -#line 32933 "Photo.c" +#line 33033 "Photo.c" } @@ -32959,7 +33059,7 @@ gpointer photo_reimport_master_state_ref (gpointer instance) { g_atomic_int_inc (&self->ref_count); #line 1350 "/home/jens/Source/shotwell/src/Photo.vala" return instance; -#line 32958 "Photo.c" +#line 33058 "Photo.c" } @@ -32972,7 +33072,7 @@ void photo_reimport_master_state_unref (gpointer instance) { PHOTO_REIMPORT_MASTER_STATE_GET_CLASS (self)->finalize (self); #line 1350 "/home/jens/Source/shotwell/src/Photo.vala" g_type_free_instance ((GTypeInstance *) self); -#line 32971 "Photo.c" +#line 33071 "Photo.c" } } @@ -32984,17 +33084,17 @@ static gchar** _vala_array_dup28 (gchar** self, int length) { result = g_new0 (gchar*, length + 1); #line 1362 "/home/jens/Source/shotwell/src/Photo.vala" for (i = 0; i < length; i++) { -#line 32983 "Photo.c" +#line 33083 "Photo.c" gchar* _tmp0_ = NULL; #line 1362 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = g_strdup (self[i]); #line 1362 "/home/jens/Source/shotwell/src/Photo.vala" result[i] = _tmp0_; -#line 32989 "Photo.c" +#line 33089 "Photo.c" } #line 1362 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 32993 "Photo.c" +#line 33093 "Photo.c" } @@ -33048,14 +33148,14 @@ static PhotoReimportMasterStateImpl* photo_reimport_master_state_impl_construct self->_alterations_size_ = self->alterations_length1; #line 1359 "/home/jens/Source/shotwell/src/Photo.vala" return self; -#line 33047 "Photo.c" +#line 33147 "Photo.c" } static PhotoReimportMasterStateImpl* photo_reimport_master_state_impl_new (PhotoRow* row, PhotoMetadata* metadata, gchar** alterations, int alterations_length1) { #line 1359 "/home/jens/Source/shotwell/src/Photo.vala" return photo_reimport_master_state_impl_construct (PHOTO_TYPE_REIMPORT_MASTER_STATE_IMPL, row, metadata, alterations, alterations_length1); -#line 33054 "Photo.c" +#line 33154 "Photo.c" } @@ -33064,7 +33164,7 @@ static void photo_reimport_master_state_impl_class_init (PhotoReimportMasterStat photo_reimport_master_state_impl_parent_class = g_type_class_peek_parent (klass); #line 1353 "/home/jens/Source/shotwell/src/Photo.vala" ((PhotoReimportMasterStateClass *) klass)->finalize = photo_reimport_master_state_impl_finalize; -#line 33063 "Photo.c" +#line 33163 "Photo.c" } @@ -33076,7 +33176,7 @@ static void photo_reimport_master_state_impl_instance_init (PhotoReimportMasterS self->row = _tmp0_; #line 1357 "/home/jens/Source/shotwell/src/Photo.vala" self->metadata_only = FALSE; -#line 33075 "Photo.c" +#line 33175 "Photo.c" } @@ -33092,7 +33192,7 @@ static void photo_reimport_master_state_impl_finalize (PhotoReimportMasterState* self->alterations = (_vala_array_free (self->alterations, self->alterations_length1, (GDestroyNotify) g_free), NULL); #line 1353 "/home/jens/Source/shotwell/src/Photo.vala" PHOTO_REIMPORT_MASTER_STATE_CLASS (photo_reimport_master_state_impl_parent_class)->finalize (obj); -#line 33091 "Photo.c" +#line 33191 "Photo.c" } @@ -33114,14 +33214,14 @@ PhotoReimportEditableState* photo_reimport_editable_state_construct (GType objec self = (PhotoReimportEditableState*) g_type_create_instance (object_type); #line 1366 "/home/jens/Source/shotwell/src/Photo.vala" return self; -#line 33113 "Photo.c" +#line 33213 "Photo.c" } static void photo_value_reimport_editable_state_init (GValue* value) { #line 1366 "/home/jens/Source/shotwell/src/Photo.vala" value->data[0].v_pointer = NULL; -#line 33120 "Photo.c" +#line 33220 "Photo.c" } @@ -33130,7 +33230,7 @@ static void photo_value_reimport_editable_state_free_value (GValue* value) { if (value->data[0].v_pointer) { #line 1366 "/home/jens/Source/shotwell/src/Photo.vala" photo_reimport_editable_state_unref (value->data[0].v_pointer); -#line 33129 "Photo.c" +#line 33229 "Photo.c" } } @@ -33140,11 +33240,11 @@ static void photo_value_reimport_editable_state_copy_value (const GValue* src_va if (src_value->data[0].v_pointer) { #line 1366 "/home/jens/Source/shotwell/src/Photo.vala" dest_value->data[0].v_pointer = photo_reimport_editable_state_ref (src_value->data[0].v_pointer); -#line 33139 "Photo.c" +#line 33239 "Photo.c" } else { #line 1366 "/home/jens/Source/shotwell/src/Photo.vala" dest_value->data[0].v_pointer = NULL; -#line 33143 "Photo.c" +#line 33243 "Photo.c" } } @@ -33152,37 +33252,37 @@ static void photo_value_reimport_editable_state_copy_value (const GValue* src_va static gpointer photo_value_reimport_editable_state_peek_pointer (const GValue* value) { #line 1366 "/home/jens/Source/shotwell/src/Photo.vala" return value->data[0].v_pointer; -#line 33151 "Photo.c" +#line 33251 "Photo.c" } static gchar* photo_value_reimport_editable_state_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { #line 1366 "/home/jens/Source/shotwell/src/Photo.vala" if (collect_values[0].v_pointer) { -#line 33158 "Photo.c" +#line 33258 "Photo.c" PhotoReimportEditableState* object; object = collect_values[0].v_pointer; #line 1366 "/home/jens/Source/shotwell/src/Photo.vala" if (object->parent_instance.g_class == NULL) { #line 1366 "/home/jens/Source/shotwell/src/Photo.vala" return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 33165 "Photo.c" +#line 33265 "Photo.c" } else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) { #line 1366 "/home/jens/Source/shotwell/src/Photo.vala" return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 33169 "Photo.c" +#line 33269 "Photo.c" } #line 1366 "/home/jens/Source/shotwell/src/Photo.vala" value->data[0].v_pointer = photo_reimport_editable_state_ref (object); -#line 33173 "Photo.c" +#line 33273 "Photo.c" } else { #line 1366 "/home/jens/Source/shotwell/src/Photo.vala" value->data[0].v_pointer = NULL; -#line 33177 "Photo.c" +#line 33277 "Photo.c" } #line 1366 "/home/jens/Source/shotwell/src/Photo.vala" return NULL; -#line 33181 "Photo.c" +#line 33281 "Photo.c" } @@ -33193,25 +33293,25 @@ static gchar* photo_value_reimport_editable_state_lcopy_value (const GValue* val if (!object_p) { #line 1366 "/home/jens/Source/shotwell/src/Photo.vala" return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value)); -#line 33192 "Photo.c" +#line 33292 "Photo.c" } #line 1366 "/home/jens/Source/shotwell/src/Photo.vala" if (!value->data[0].v_pointer) { #line 1366 "/home/jens/Source/shotwell/src/Photo.vala" *object_p = NULL; -#line 33198 "Photo.c" +#line 33298 "Photo.c" } else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) { #line 1366 "/home/jens/Source/shotwell/src/Photo.vala" *object_p = value->data[0].v_pointer; -#line 33202 "Photo.c" +#line 33302 "Photo.c" } else { #line 1366 "/home/jens/Source/shotwell/src/Photo.vala" *object_p = photo_reimport_editable_state_ref (value->data[0].v_pointer); -#line 33206 "Photo.c" +#line 33306 "Photo.c" } #line 1366 "/home/jens/Source/shotwell/src/Photo.vala" return NULL; -#line 33210 "Photo.c" +#line 33310 "Photo.c" } @@ -33225,7 +33325,7 @@ GParamSpec* photo_param_spec_reimport_editable_state (const gchar* name, const g G_PARAM_SPEC (spec)->value_type = object_type; #line 1366 "/home/jens/Source/shotwell/src/Photo.vala" return G_PARAM_SPEC (spec); -#line 33224 "Photo.c" +#line 33324 "Photo.c" } @@ -33234,7 +33334,7 @@ gpointer photo_value_get_reimport_editable_state (const GValue* value) { g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PHOTO_TYPE_REIMPORT_EDITABLE_STATE), NULL); #line 1366 "/home/jens/Source/shotwell/src/Photo.vala" return value->data[0].v_pointer; -#line 33233 "Photo.c" +#line 33333 "Photo.c" } @@ -33254,17 +33354,17 @@ void photo_value_set_reimport_editable_state (GValue* value, gpointer v_object) value->data[0].v_pointer = v_object; #line 1366 "/home/jens/Source/shotwell/src/Photo.vala" photo_reimport_editable_state_ref (value->data[0].v_pointer); -#line 33253 "Photo.c" +#line 33353 "Photo.c" } else { #line 1366 "/home/jens/Source/shotwell/src/Photo.vala" value->data[0].v_pointer = NULL; -#line 33257 "Photo.c" +#line 33357 "Photo.c" } #line 1366 "/home/jens/Source/shotwell/src/Photo.vala" if (old) { #line 1366 "/home/jens/Source/shotwell/src/Photo.vala" photo_reimport_editable_state_unref (old); -#line 33263 "Photo.c" +#line 33363 "Photo.c" } } @@ -33283,17 +33383,17 @@ void photo_value_take_reimport_editable_state (GValue* value, gpointer v_object) g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value))); #line 1366 "/home/jens/Source/shotwell/src/Photo.vala" value->data[0].v_pointer = v_object; -#line 33282 "Photo.c" +#line 33382 "Photo.c" } else { #line 1366 "/home/jens/Source/shotwell/src/Photo.vala" value->data[0].v_pointer = NULL; -#line 33286 "Photo.c" +#line 33386 "Photo.c" } #line 1366 "/home/jens/Source/shotwell/src/Photo.vala" if (old) { #line 1366 "/home/jens/Source/shotwell/src/Photo.vala" photo_reimport_editable_state_unref (old); -#line 33292 "Photo.c" +#line 33392 "Photo.c" } } @@ -33303,14 +33403,14 @@ static void photo_reimport_editable_state_class_init (PhotoReimportEditableState photo_reimport_editable_state_parent_class = g_type_class_peek_parent (klass); #line 1366 "/home/jens/Source/shotwell/src/Photo.vala" ((PhotoReimportEditableStateClass *) klass)->finalize = photo_reimport_editable_state_finalize; -#line 33302 "Photo.c" +#line 33402 "Photo.c" } static void photo_reimport_editable_state_instance_init (PhotoReimportEditableState * self) { #line 1366 "/home/jens/Source/shotwell/src/Photo.vala" self->ref_count = 1; -#line 33309 "Photo.c" +#line 33409 "Photo.c" } @@ -33320,7 +33420,7 @@ static void photo_reimport_editable_state_finalize (PhotoReimportEditableState* self = G_TYPE_CHECK_INSTANCE_CAST (obj, PHOTO_TYPE_REIMPORT_EDITABLE_STATE, PhotoReimportEditableState); #line 1366 "/home/jens/Source/shotwell/src/Photo.vala" g_signal_handlers_destroy (self); -#line 33319 "Photo.c" +#line 33419 "Photo.c" } @@ -33345,7 +33445,7 @@ gpointer photo_reimport_editable_state_ref (gpointer instance) { g_atomic_int_inc (&self->ref_count); #line 1366 "/home/jens/Source/shotwell/src/Photo.vala" return instance; -#line 33344 "Photo.c" +#line 33444 "Photo.c" } @@ -33358,7 +33458,7 @@ void photo_reimport_editable_state_unref (gpointer instance) { PHOTO_REIMPORT_EDITABLE_STATE_GET_CLASS (self)->finalize (self); #line 1366 "/home/jens/Source/shotwell/src/Photo.vala" g_type_free_instance ((GTypeInstance *) self); -#line 33357 "Photo.c" +#line 33457 "Photo.c" } } @@ -33393,14 +33493,14 @@ static PhotoReimportEditableStateImpl* photo_reimport_editable_state_impl_constr self->metadata = _tmp3_; #line 1374 "/home/jens/Source/shotwell/src/Photo.vala" return self; -#line 33392 "Photo.c" +#line 33492 "Photo.c" } static PhotoReimportEditableStateImpl* photo_reimport_editable_state_impl_new (BackingPhotoRow* backing_state, PhotoMetadata* metadata) { #line 1374 "/home/jens/Source/shotwell/src/Photo.vala" return photo_reimport_editable_state_impl_construct (PHOTO_TYPE_REIMPORT_EDITABLE_STATE_IMPL, backing_state, metadata); -#line 33399 "Photo.c" +#line 33499 "Photo.c" } @@ -33409,7 +33509,7 @@ static void photo_reimport_editable_state_impl_class_init (PhotoReimportEditable photo_reimport_editable_state_impl_parent_class = g_type_class_peek_parent (klass); #line 1369 "/home/jens/Source/shotwell/src/Photo.vala" ((PhotoReimportEditableStateClass *) klass)->finalize = photo_reimport_editable_state_impl_finalize; -#line 33408 "Photo.c" +#line 33508 "Photo.c" } @@ -33421,7 +33521,7 @@ static void photo_reimport_editable_state_impl_instance_init (PhotoReimportEdita self->backing_state = _tmp0_; #line 1372 "/home/jens/Source/shotwell/src/Photo.vala" self->metadata_only = FALSE; -#line 33420 "Photo.c" +#line 33520 "Photo.c" } @@ -33435,7 +33535,7 @@ static void photo_reimport_editable_state_impl_finalize (PhotoReimportEditableSt _media_metadata_unref0 (self->metadata); #line 1369 "/home/jens/Source/shotwell/src/Photo.vala" PHOTO_REIMPORT_EDITABLE_STATE_CLASS (photo_reimport_editable_state_impl_parent_class)->finalize (obj); -#line 33434 "Photo.c" +#line 33534 "Photo.c" } @@ -33457,14 +33557,14 @@ PhotoReimportRawDevelopmentState* photo_reimport_raw_development_state_construct self = (PhotoReimportRawDevelopmentState*) g_type_create_instance (object_type); #line 1380 "/home/jens/Source/shotwell/src/Photo.vala" return self; -#line 33456 "Photo.c" +#line 33556 "Photo.c" } static void photo_value_reimport_raw_development_state_init (GValue* value) { #line 1380 "/home/jens/Source/shotwell/src/Photo.vala" value->data[0].v_pointer = NULL; -#line 33463 "Photo.c" +#line 33563 "Photo.c" } @@ -33473,7 +33573,7 @@ static void photo_value_reimport_raw_development_state_free_value (GValue* value if (value->data[0].v_pointer) { #line 1380 "/home/jens/Source/shotwell/src/Photo.vala" photo_reimport_raw_development_state_unref (value->data[0].v_pointer); -#line 33472 "Photo.c" +#line 33572 "Photo.c" } } @@ -33483,11 +33583,11 @@ static void photo_value_reimport_raw_development_state_copy_value (const GValue* if (src_value->data[0].v_pointer) { #line 1380 "/home/jens/Source/shotwell/src/Photo.vala" dest_value->data[0].v_pointer = photo_reimport_raw_development_state_ref (src_value->data[0].v_pointer); -#line 33482 "Photo.c" +#line 33582 "Photo.c" } else { #line 1380 "/home/jens/Source/shotwell/src/Photo.vala" dest_value->data[0].v_pointer = NULL; -#line 33486 "Photo.c" +#line 33586 "Photo.c" } } @@ -33495,37 +33595,37 @@ static void photo_value_reimport_raw_development_state_copy_value (const GValue* static gpointer photo_value_reimport_raw_development_state_peek_pointer (const GValue* value) { #line 1380 "/home/jens/Source/shotwell/src/Photo.vala" return value->data[0].v_pointer; -#line 33494 "Photo.c" +#line 33594 "Photo.c" } static gchar* photo_value_reimport_raw_development_state_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { #line 1380 "/home/jens/Source/shotwell/src/Photo.vala" if (collect_values[0].v_pointer) { -#line 33501 "Photo.c" +#line 33601 "Photo.c" PhotoReimportRawDevelopmentState* object; object = collect_values[0].v_pointer; #line 1380 "/home/jens/Source/shotwell/src/Photo.vala" if (object->parent_instance.g_class == NULL) { #line 1380 "/home/jens/Source/shotwell/src/Photo.vala" return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 33508 "Photo.c" +#line 33608 "Photo.c" } else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) { #line 1380 "/home/jens/Source/shotwell/src/Photo.vala" return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 33512 "Photo.c" +#line 33612 "Photo.c" } #line 1380 "/home/jens/Source/shotwell/src/Photo.vala" value->data[0].v_pointer = photo_reimport_raw_development_state_ref (object); -#line 33516 "Photo.c" +#line 33616 "Photo.c" } else { #line 1380 "/home/jens/Source/shotwell/src/Photo.vala" value->data[0].v_pointer = NULL; -#line 33520 "Photo.c" +#line 33620 "Photo.c" } #line 1380 "/home/jens/Source/shotwell/src/Photo.vala" return NULL; -#line 33524 "Photo.c" +#line 33624 "Photo.c" } @@ -33536,25 +33636,25 @@ static gchar* photo_value_reimport_raw_development_state_lcopy_value (const GVal if (!object_p) { #line 1380 "/home/jens/Source/shotwell/src/Photo.vala" return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value)); -#line 33535 "Photo.c" +#line 33635 "Photo.c" } #line 1380 "/home/jens/Source/shotwell/src/Photo.vala" if (!value->data[0].v_pointer) { #line 1380 "/home/jens/Source/shotwell/src/Photo.vala" *object_p = NULL; -#line 33541 "Photo.c" +#line 33641 "Photo.c" } else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) { #line 1380 "/home/jens/Source/shotwell/src/Photo.vala" *object_p = value->data[0].v_pointer; -#line 33545 "Photo.c" +#line 33645 "Photo.c" } else { #line 1380 "/home/jens/Source/shotwell/src/Photo.vala" *object_p = photo_reimport_raw_development_state_ref (value->data[0].v_pointer); -#line 33549 "Photo.c" +#line 33649 "Photo.c" } #line 1380 "/home/jens/Source/shotwell/src/Photo.vala" return NULL; -#line 33553 "Photo.c" +#line 33653 "Photo.c" } @@ -33568,7 +33668,7 @@ GParamSpec* photo_param_spec_reimport_raw_development_state (const gchar* name, G_PARAM_SPEC (spec)->value_type = object_type; #line 1380 "/home/jens/Source/shotwell/src/Photo.vala" return G_PARAM_SPEC (spec); -#line 33567 "Photo.c" +#line 33667 "Photo.c" } @@ -33577,7 +33677,7 @@ gpointer photo_value_get_reimport_raw_development_state (const GValue* value) { g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PHOTO_TYPE_REIMPORT_RAW_DEVELOPMENT_STATE), NULL); #line 1380 "/home/jens/Source/shotwell/src/Photo.vala" return value->data[0].v_pointer; -#line 33576 "Photo.c" +#line 33676 "Photo.c" } @@ -33597,17 +33697,17 @@ void photo_value_set_reimport_raw_development_state (GValue* value, gpointer v_o value->data[0].v_pointer = v_object; #line 1380 "/home/jens/Source/shotwell/src/Photo.vala" photo_reimport_raw_development_state_ref (value->data[0].v_pointer); -#line 33596 "Photo.c" +#line 33696 "Photo.c" } else { #line 1380 "/home/jens/Source/shotwell/src/Photo.vala" value->data[0].v_pointer = NULL; -#line 33600 "Photo.c" +#line 33700 "Photo.c" } #line 1380 "/home/jens/Source/shotwell/src/Photo.vala" if (old) { #line 1380 "/home/jens/Source/shotwell/src/Photo.vala" photo_reimport_raw_development_state_unref (old); -#line 33606 "Photo.c" +#line 33706 "Photo.c" } } @@ -33626,17 +33726,17 @@ void photo_value_take_reimport_raw_development_state (GValue* value, gpointer v_ g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value))); #line 1380 "/home/jens/Source/shotwell/src/Photo.vala" value->data[0].v_pointer = v_object; -#line 33625 "Photo.c" +#line 33725 "Photo.c" } else { #line 1380 "/home/jens/Source/shotwell/src/Photo.vala" value->data[0].v_pointer = NULL; -#line 33629 "Photo.c" +#line 33729 "Photo.c" } #line 1380 "/home/jens/Source/shotwell/src/Photo.vala" if (old) { #line 1380 "/home/jens/Source/shotwell/src/Photo.vala" photo_reimport_raw_development_state_unref (old); -#line 33635 "Photo.c" +#line 33735 "Photo.c" } } @@ -33646,14 +33746,14 @@ static void photo_reimport_raw_development_state_class_init (PhotoReimportRawDev photo_reimport_raw_development_state_parent_class = g_type_class_peek_parent (klass); #line 1380 "/home/jens/Source/shotwell/src/Photo.vala" ((PhotoReimportRawDevelopmentStateClass *) klass)->finalize = photo_reimport_raw_development_state_finalize; -#line 33645 "Photo.c" +#line 33745 "Photo.c" } static void photo_reimport_raw_development_state_instance_init (PhotoReimportRawDevelopmentState * self) { #line 1380 "/home/jens/Source/shotwell/src/Photo.vala" self->ref_count = 1; -#line 33652 "Photo.c" +#line 33752 "Photo.c" } @@ -33663,7 +33763,7 @@ static void photo_reimport_raw_development_state_finalize (PhotoReimportRawDevel self = G_TYPE_CHECK_INSTANCE_CAST (obj, PHOTO_TYPE_REIMPORT_RAW_DEVELOPMENT_STATE, PhotoReimportRawDevelopmentState); #line 1380 "/home/jens/Source/shotwell/src/Photo.vala" g_signal_handlers_destroy (self); -#line 33662 "Photo.c" +#line 33762 "Photo.c" } @@ -33688,7 +33788,7 @@ gpointer photo_reimport_raw_development_state_ref (gpointer instance) { g_atomic_int_inc (&self->ref_count); #line 1380 "/home/jens/Source/shotwell/src/Photo.vala" return instance; -#line 33687 "Photo.c" +#line 33787 "Photo.c" } @@ -33701,7 +33801,7 @@ void photo_reimport_raw_development_state_unref (gpointer instance) { PHOTO_REIMPORT_RAW_DEVELOPMENT_STATE_GET_CLASS (self)->finalize (self); #line 1380 "/home/jens/Source/shotwell/src/Photo.vala" g_type_free_instance ((GTypeInstance *) self); -#line 33700 "Photo.c" +#line 33800 "Photo.c" } } @@ -33712,14 +33812,14 @@ static PhotoReimportRawDevelopmentStateImpl* photo_reimport_raw_development_stat self = (PhotoReimportRawDevelopmentStateImpl*) photo_reimport_raw_development_state_construct (object_type); #line 1397 "/home/jens/Source/shotwell/src/Photo.vala" return self; -#line 33711 "Photo.c" +#line 33811 "Photo.c" } static PhotoReimportRawDevelopmentStateImpl* photo_reimport_raw_development_state_impl_new (void) { #line 1397 "/home/jens/Source/shotwell/src/Photo.vala" return photo_reimport_raw_development_state_impl_construct (PHOTO_TYPE_REIMPORT_RAW_DEVELOPMENT_STATE_IMPL); -#line 33718 "Photo.c" +#line 33818 "Photo.c" } @@ -33749,7 +33849,7 @@ static void photo_reimport_raw_development_state_impl_add (PhotoReimportRawDevel gee_collection_add (_tmp0_, _tmp4_); #line 1401 "/home/jens/Source/shotwell/src/Photo.vala" _photo_reimport_raw_development_state_impl_dev_to_reimport_unref0 (_tmp4_); -#line 33748 "Photo.c" +#line 33848 "Photo.c" } @@ -33770,7 +33870,7 @@ static gint photo_reimport_raw_development_state_impl_get_size (PhotoReimportRaw result = _tmp2_; #line 1405 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 33769 "Photo.c" +#line 33869 "Photo.c" } @@ -33804,21 +33904,21 @@ static PhotoReimportRawDevelopmentStateImplDevToReimport* photo_reimport_raw_dev self->metadata = _tmp3_; #line 1388 "/home/jens/Source/shotwell/src/Photo.vala" return self; -#line 33803 "Photo.c" +#line 33903 "Photo.c" } static PhotoReimportRawDevelopmentStateImplDevToReimport* photo_reimport_raw_development_state_impl_dev_to_reimport_new (BackingPhotoRow* backing, PhotoMetadata* metadata) { #line 1388 "/home/jens/Source/shotwell/src/Photo.vala" return photo_reimport_raw_development_state_impl_dev_to_reimport_construct (PHOTO_REIMPORT_RAW_DEVELOPMENT_STATE_IMPL_TYPE_DEV_TO_REIMPORT, backing, metadata); -#line 33810 "Photo.c" +#line 33910 "Photo.c" } static void photo_reimport_raw_development_state_impl_value_dev_to_reimport_init (GValue* value) { #line 1384 "/home/jens/Source/shotwell/src/Photo.vala" value->data[0].v_pointer = NULL; -#line 33817 "Photo.c" +#line 33917 "Photo.c" } @@ -33827,7 +33927,7 @@ static void photo_reimport_raw_development_state_impl_value_dev_to_reimport_free if (value->data[0].v_pointer) { #line 1384 "/home/jens/Source/shotwell/src/Photo.vala" photo_reimport_raw_development_state_impl_dev_to_reimport_unref (value->data[0].v_pointer); -#line 33826 "Photo.c" +#line 33926 "Photo.c" } } @@ -33837,11 +33937,11 @@ static void photo_reimport_raw_development_state_impl_value_dev_to_reimport_copy if (src_value->data[0].v_pointer) { #line 1384 "/home/jens/Source/shotwell/src/Photo.vala" dest_value->data[0].v_pointer = photo_reimport_raw_development_state_impl_dev_to_reimport_ref (src_value->data[0].v_pointer); -#line 33836 "Photo.c" +#line 33936 "Photo.c" } else { #line 1384 "/home/jens/Source/shotwell/src/Photo.vala" dest_value->data[0].v_pointer = NULL; -#line 33840 "Photo.c" +#line 33940 "Photo.c" } } @@ -33849,37 +33949,37 @@ static void photo_reimport_raw_development_state_impl_value_dev_to_reimport_copy static gpointer photo_reimport_raw_development_state_impl_value_dev_to_reimport_peek_pointer (const GValue* value) { #line 1384 "/home/jens/Source/shotwell/src/Photo.vala" return value->data[0].v_pointer; -#line 33848 "Photo.c" +#line 33948 "Photo.c" } static gchar* photo_reimport_raw_development_state_impl_value_dev_to_reimport_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { #line 1384 "/home/jens/Source/shotwell/src/Photo.vala" if (collect_values[0].v_pointer) { -#line 33855 "Photo.c" +#line 33955 "Photo.c" PhotoReimportRawDevelopmentStateImplDevToReimport* object; object = collect_values[0].v_pointer; #line 1384 "/home/jens/Source/shotwell/src/Photo.vala" if (object->parent_instance.g_class == NULL) { #line 1384 "/home/jens/Source/shotwell/src/Photo.vala" return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 33862 "Photo.c" +#line 33962 "Photo.c" } else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) { #line 1384 "/home/jens/Source/shotwell/src/Photo.vala" return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 33866 "Photo.c" +#line 33966 "Photo.c" } #line 1384 "/home/jens/Source/shotwell/src/Photo.vala" value->data[0].v_pointer = photo_reimport_raw_development_state_impl_dev_to_reimport_ref (object); -#line 33870 "Photo.c" +#line 33970 "Photo.c" } else { #line 1384 "/home/jens/Source/shotwell/src/Photo.vala" value->data[0].v_pointer = NULL; -#line 33874 "Photo.c" +#line 33974 "Photo.c" } #line 1384 "/home/jens/Source/shotwell/src/Photo.vala" return NULL; -#line 33878 "Photo.c" +#line 33978 "Photo.c" } @@ -33890,25 +33990,25 @@ static gchar* photo_reimport_raw_development_state_impl_value_dev_to_reimport_lc if (!object_p) { #line 1384 "/home/jens/Source/shotwell/src/Photo.vala" return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value)); -#line 33889 "Photo.c" +#line 33989 "Photo.c" } #line 1384 "/home/jens/Source/shotwell/src/Photo.vala" if (!value->data[0].v_pointer) { #line 1384 "/home/jens/Source/shotwell/src/Photo.vala" *object_p = NULL; -#line 33895 "Photo.c" +#line 33995 "Photo.c" } else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) { #line 1384 "/home/jens/Source/shotwell/src/Photo.vala" *object_p = value->data[0].v_pointer; -#line 33899 "Photo.c" +#line 33999 "Photo.c" } else { #line 1384 "/home/jens/Source/shotwell/src/Photo.vala" *object_p = photo_reimport_raw_development_state_impl_dev_to_reimport_ref (value->data[0].v_pointer); -#line 33903 "Photo.c" +#line 34003 "Photo.c" } #line 1384 "/home/jens/Source/shotwell/src/Photo.vala" return NULL; -#line 33907 "Photo.c" +#line 34007 "Photo.c" } @@ -33922,7 +34022,7 @@ static GParamSpec* photo_reimport_raw_development_state_impl_param_spec_dev_to_r G_PARAM_SPEC (spec)->value_type = object_type; #line 1384 "/home/jens/Source/shotwell/src/Photo.vala" return G_PARAM_SPEC (spec); -#line 33921 "Photo.c" +#line 34021 "Photo.c" } @@ -33931,7 +34031,7 @@ static gpointer photo_reimport_raw_development_state_impl_value_get_dev_to_reimp g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PHOTO_REIMPORT_RAW_DEVELOPMENT_STATE_IMPL_TYPE_DEV_TO_REIMPORT), NULL); #line 1384 "/home/jens/Source/shotwell/src/Photo.vala" return value->data[0].v_pointer; -#line 33930 "Photo.c" +#line 34030 "Photo.c" } @@ -33951,17 +34051,17 @@ static void photo_reimport_raw_development_state_impl_value_set_dev_to_reimport value->data[0].v_pointer = v_object; #line 1384 "/home/jens/Source/shotwell/src/Photo.vala" photo_reimport_raw_development_state_impl_dev_to_reimport_ref (value->data[0].v_pointer); -#line 33950 "Photo.c" +#line 34050 "Photo.c" } else { #line 1384 "/home/jens/Source/shotwell/src/Photo.vala" value->data[0].v_pointer = NULL; -#line 33954 "Photo.c" +#line 34054 "Photo.c" } #line 1384 "/home/jens/Source/shotwell/src/Photo.vala" if (old) { #line 1384 "/home/jens/Source/shotwell/src/Photo.vala" photo_reimport_raw_development_state_impl_dev_to_reimport_unref (old); -#line 33960 "Photo.c" +#line 34060 "Photo.c" } } @@ -33980,17 +34080,17 @@ static void photo_reimport_raw_development_state_impl_value_take_dev_to_reimport g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value))); #line 1384 "/home/jens/Source/shotwell/src/Photo.vala" value->data[0].v_pointer = v_object; -#line 33979 "Photo.c" +#line 34079 "Photo.c" } else { #line 1384 "/home/jens/Source/shotwell/src/Photo.vala" value->data[0].v_pointer = NULL; -#line 33983 "Photo.c" +#line 34083 "Photo.c" } #line 1384 "/home/jens/Source/shotwell/src/Photo.vala" if (old) { #line 1384 "/home/jens/Source/shotwell/src/Photo.vala" photo_reimport_raw_development_state_impl_dev_to_reimport_unref (old); -#line 33989 "Photo.c" +#line 34089 "Photo.c" } } @@ -34000,7 +34100,7 @@ static void photo_reimport_raw_development_state_impl_dev_to_reimport_class_init photo_reimport_raw_development_state_impl_dev_to_reimport_parent_class = g_type_class_peek_parent (klass); #line 1384 "/home/jens/Source/shotwell/src/Photo.vala" ((PhotoReimportRawDevelopmentStateImplDevToReimportClass *) klass)->finalize = photo_reimport_raw_development_state_impl_dev_to_reimport_finalize; -#line 33999 "Photo.c" +#line 34099 "Photo.c" } @@ -34012,7 +34112,7 @@ static void photo_reimport_raw_development_state_impl_dev_to_reimport_instance_i self->backing = _tmp0_; #line 1384 "/home/jens/Source/shotwell/src/Photo.vala" self->ref_count = 1; -#line 34011 "Photo.c" +#line 34111 "Photo.c" } @@ -34026,7 +34126,7 @@ static void photo_reimport_raw_development_state_impl_dev_to_reimport_finalize ( _backing_photo_row_unref0 (self->backing); #line 1386 "/home/jens/Source/shotwell/src/Photo.vala" _media_metadata_unref0 (self->metadata); -#line 34025 "Photo.c" +#line 34125 "Photo.c" } @@ -34051,7 +34151,7 @@ static gpointer photo_reimport_raw_development_state_impl_dev_to_reimport_ref (g g_atomic_int_inc (&self->ref_count); #line 1384 "/home/jens/Source/shotwell/src/Photo.vala" return instance; -#line 34050 "Photo.c" +#line 34150 "Photo.c" } @@ -34064,7 +34164,7 @@ static void photo_reimport_raw_development_state_impl_dev_to_reimport_unref (gpo PHOTO_REIMPORT_RAW_DEVELOPMENT_STATE_IMPL_DEV_TO_REIMPORT_GET_CLASS (self)->finalize (self); #line 1384 "/home/jens/Source/shotwell/src/Photo.vala" g_type_free_instance ((GTypeInstance *) self); -#line 34063 "Photo.c" +#line 34163 "Photo.c" } } @@ -34074,19 +34174,19 @@ static void photo_reimport_raw_development_state_impl_class_init (PhotoReimportR photo_reimport_raw_development_state_impl_parent_class = g_type_class_peek_parent (klass); #line 1383 "/home/jens/Source/shotwell/src/Photo.vala" ((PhotoReimportRawDevelopmentStateClass *) klass)->finalize = photo_reimport_raw_development_state_impl_finalize; -#line 34073 "Photo.c" +#line 34173 "Photo.c" } static void photo_reimport_raw_development_state_impl_instance_init (PhotoReimportRawDevelopmentStateImpl * self) { GeeArrayList* _tmp0_ = NULL; #line 1394 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp0_ = gee_array_list_new (PHOTO_REIMPORT_RAW_DEVELOPMENT_STATE_IMPL_TYPE_DEV_TO_REIMPORT, (GBoxedCopyFunc) photo_reimport_raw_development_state_impl_dev_to_reimport_ref, photo_reimport_raw_development_state_impl_dev_to_reimport_unref, NULL, NULL, NULL); + _tmp0_ = gee_array_list_new (PHOTO_REIMPORT_RAW_DEVELOPMENT_STATE_IMPL_TYPE_DEV_TO_REIMPORT, (GBoxedCopyFunc) photo_reimport_raw_development_state_impl_dev_to_reimport_ref, (GDestroyNotify) photo_reimport_raw_development_state_impl_dev_to_reimport_unref, NULL, NULL, NULL); #line 1394 "/home/jens/Source/shotwell/src/Photo.vala" self->list = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_COLLECTION, GeeCollection); #line 1395 "/home/jens/Source/shotwell/src/Photo.vala" self->metadata_only = FALSE; -#line 34085 "Photo.c" +#line 34185 "Photo.c" } @@ -34098,7 +34198,7 @@ static void photo_reimport_raw_development_state_impl_finalize (PhotoReimportRaw _g_object_unref0 (self->list); #line 1383 "/home/jens/Source/shotwell/src/Photo.vala" PHOTO_REIMPORT_RAW_DEVELOPMENT_STATE_CLASS (photo_reimport_raw_development_state_impl_parent_class)->finalize (obj); -#line 34097 "Photo.c" +#line 34197 "Photo.c" } @@ -34120,91 +34220,91 @@ static void photo_class_init (PhotoClass * klass) { #line 161 "/home/jens/Source/shotwell/src/Photo.vala" g_type_class_add_private (klass, sizeof (PhotoPrivate)); #line 161 "/home/jens/Source/shotwell/src/Photo.vala" - ((PhotoClass *) klass)->notify_editable_replaced = photo_real_notify_editable_replaced; + ((PhotoClass *) klass)->notify_editable_replaced = (void (*)(Photo*, GFile*, GFile*)) photo_real_notify_editable_replaced; #line 161 "/home/jens/Source/shotwell/src/Photo.vala" - ((PhotoClass *) klass)->notify_raw_development_modified = photo_real_notify_raw_development_modified; + ((PhotoClass *) klass)->notify_raw_development_modified = (void (*)(Photo*)) photo_real_notify_raw_development_modified; #line 161 "/home/jens/Source/shotwell/src/Photo.vala" - ((PhotoClass *) klass)->notify_baseline_replaced = photo_real_notify_baseline_replaced; + ((PhotoClass *) klass)->notify_baseline_replaced = (void (*)(Photo*)) photo_real_notify_baseline_replaced; #line 161 "/home/jens/Source/shotwell/src/Photo.vala" - ((PhotoClass *) klass)->notify_master_reimported = photo_real_notify_master_reimported; + ((PhotoClass *) klass)->notify_master_reimported = (void (*)(Photo*, PhotoMetadata*)) photo_real_notify_master_reimported; #line 161 "/home/jens/Source/shotwell/src/Photo.vala" - ((PhotoClass *) klass)->notify_editable_reimported = photo_real_notify_editable_reimported; + ((PhotoClass *) klass)->notify_editable_reimported = (void (*)(Photo*, PhotoMetadata*)) photo_real_notify_editable_reimported; #line 161 "/home/jens/Source/shotwell/src/Photo.vala" - ((PhotoClass *) klass)->notify_source_reimported = photo_real_notify_source_reimported; + ((PhotoClass *) klass)->notify_source_reimported = (void (*)(Photo*, PhotoMetadata*)) photo_real_notify_source_reimported; #line 161 "/home/jens/Source/shotwell/src/Photo.vala" - ((PhotoClass *) klass)->notify_baseline_reimported = photo_real_notify_baseline_reimported; + ((PhotoClass *) klass)->notify_baseline_reimported = (void (*)(Photo*, PhotoMetadata*)) photo_real_notify_baseline_reimported; #line 161 "/home/jens/Source/shotwell/src/Photo.vala" - ((DataSourceClass *) klass)->internal_delete_backing = photo_real_internal_delete_backing; + ((DataSourceClass *) klass)->internal_delete_backing = (gboolean (*)(DataSource*, GError**)) photo_real_internal_delete_backing; #line 161 "/home/jens/Source/shotwell/src/Photo.vala" - ((MediaSourceClass *) klass)->get_backing_files_state = photo_real_get_backing_files_state; + ((MediaSourceClass *) klass)->get_backing_files_state = (BackingFileState** (*)(MediaSource*, int*)) photo_real_get_backing_files_state; #line 161 "/home/jens/Source/shotwell/src/Photo.vala" - ((PhotoClass *) klass)->apply_user_metadata_for_reimport = photo_real_apply_user_metadata_for_reimport; + ((PhotoClass *) klass)->apply_user_metadata_for_reimport = (void (*)(Photo*, PhotoMetadata*)) photo_real_apply_user_metadata_for_reimport; #line 161 "/home/jens/Source/shotwell/src/Photo.vala" - ((DataSourceClass *) klass)->get_typename = photo_real_get_typename; + ((DataSourceClass *) klass)->get_typename = (gchar* (*)(DataSource*)) photo_real_get_typename; #line 161 "/home/jens/Source/shotwell/src/Photo.vala" - ((DataSourceClass *) klass)->get_instance_id = photo_real_get_instance_id; + ((DataSourceClass *) klass)->get_instance_id = (gint64 (*)(DataSource*)) photo_real_get_instance_id; #line 161 "/home/jens/Source/shotwell/src/Photo.vala" - ((DataSourceClass *) klass)->get_source_id = photo_real_get_source_id; + ((DataSourceClass *) klass)->get_source_id = (gchar* (*)(DataSource*)) photo_real_get_source_id; #line 161 "/home/jens/Source/shotwell/src/Photo.vala" - ((ThumbnailSourceClass *) klass)->get_preferred_thumbnail_format = photo_real_get_preferred_thumbnail_format; + ((ThumbnailSourceClass *) klass)->get_preferred_thumbnail_format = (PhotoFileFormat (*)(ThumbnailSource*)) photo_real_get_preferred_thumbnail_format; #line 161 "/home/jens/Source/shotwell/src/Photo.vala" - ((ThumbnailSourceClass *) klass)->create_thumbnail = photo_real_create_thumbnail; + ((ThumbnailSourceClass *) klass)->create_thumbnail = (GdkPixbuf* (*)(ThumbnailSource*, gint, GError**)) photo_real_create_thumbnail; #line 161 "/home/jens/Source/shotwell/src/Photo.vala" - ((MediaSourceClass *) klass)->get_file = photo_real_get_file; + ((MediaSourceClass *) klass)->get_file = (GFile* (*)(MediaSource*)) photo_real_get_file; #line 161 "/home/jens/Source/shotwell/src/Photo.vala" - ((MediaSourceClass *) klass)->get_master_file = photo_real_get_master_file; + ((MediaSourceClass *) klass)->get_master_file = (GFile* (*)(MediaSource*)) photo_real_get_master_file; #line 161 "/home/jens/Source/shotwell/src/Photo.vala" - ((MediaSourceClass *) klass)->get_timestamp = photo_real_get_timestamp; + ((MediaSourceClass *) klass)->get_timestamp = (time_t (*)(MediaSource*)) photo_real_get_timestamp; #line 161 "/home/jens/Source/shotwell/src/Photo.vala" - ((MediaSourceClass *) klass)->get_event_id = photo_real_get_event_id; + ((MediaSourceClass *) klass)->get_event_id = (void (*)(MediaSource*, EventID*)) photo_real_get_event_id; #line 161 "/home/jens/Source/shotwell/src/Photo.vala" - ((MediaSourceClass *) klass)->get_import_id = photo_real_get_import_id; + ((MediaSourceClass *) klass)->get_import_id = (void (*)(MediaSource*, ImportID*)) photo_real_get_import_id; #line 161 "/home/jens/Source/shotwell/src/Photo.vala" - ((MediaSourceClass *) klass)->get_master_md5 = photo_real_get_master_md5; + ((MediaSourceClass *) klass)->get_master_md5 = (gchar* (*)(MediaSource*)) photo_real_get_master_md5; #line 161 "/home/jens/Source/shotwell/src/Photo.vala" - ((MediaSourceClass *) klass)->get_rating = photo_real_get_rating; + ((MediaSourceClass *) klass)->get_rating = (Rating (*)(MediaSource*)) photo_real_get_rating; #line 161 "/home/jens/Source/shotwell/src/Photo.vala" - ((MediaSourceClass *) klass)->set_rating = photo_real_set_rating; + ((MediaSourceClass *) klass)->set_rating = (void (*)(MediaSource*, Rating)) photo_real_set_rating; #line 161 "/home/jens/Source/shotwell/src/Photo.vala" - ((MediaSourceClass *) klass)->increase_rating = photo_real_increase_rating; + ((MediaSourceClass *) klass)->increase_rating = (void (*)(MediaSource*)) photo_real_increase_rating; #line 161 "/home/jens/Source/shotwell/src/Photo.vala" - ((MediaSourceClass *) klass)->decrease_rating = photo_real_decrease_rating; + ((MediaSourceClass *) klass)->decrease_rating = (void (*)(MediaSource*)) photo_real_decrease_rating; #line 161 "/home/jens/Source/shotwell/src/Photo.vala" - ((DataSourceClass *) klass)->commit_backlinks = photo_real_commit_backlinks; + ((DataSourceClass *) klass)->commit_backlinks = (void (*)(DataSource*, SourceCollection*, const gchar*)) photo_real_commit_backlinks; #line 161 "/home/jens/Source/shotwell/src/Photo.vala" - ((MediaSourceClass *) klass)->set_event_id = photo_real_set_event_id; + ((MediaSourceClass *) klass)->set_event_id = (gboolean (*)(MediaSource*, EventID*)) photo_real_set_event_id; #line 161 "/home/jens/Source/shotwell/src/Photo.vala" - ((DataObjectClass *) klass)->to_string = photo_real_to_string; + ((DataObjectClass *) klass)->to_string = (gchar* (*)(DataObject*)) photo_real_to_string; #line 161 "/home/jens/Source/shotwell/src/Photo.vala" - ((DataSourceClass *) klass)->equals = photo_real_equals; + ((DataSourceClass *) klass)->equals = (gboolean (*)(DataSource*, DataSource*)) photo_real_equals; #line 161 "/home/jens/Source/shotwell/src/Photo.vala" - ((MediaSourceClass *) klass)->get_filesize = photo_real_get_filesize; + ((MediaSourceClass *) klass)->get_filesize = (guint64 (*)(MediaSource*)) photo_real_get_filesize; #line 161 "/home/jens/Source/shotwell/src/Photo.vala" - ((MediaSourceClass *) klass)->get_master_filesize = photo_real_get_master_filesize; + ((MediaSourceClass *) klass)->get_master_filesize = (guint64 (*)(MediaSource*)) photo_real_get_master_filesize; #line 161 "/home/jens/Source/shotwell/src/Photo.vala" - ((MediaSourceClass *) klass)->get_exposure_time = photo_real_get_exposure_time; + ((MediaSourceClass *) klass)->get_exposure_time = (time_t (*)(MediaSource*)) photo_real_get_exposure_time; #line 161 "/home/jens/Source/shotwell/src/Photo.vala" - ((MediaSourceClass *) klass)->get_basename = photo_real_get_basename; + ((MediaSourceClass *) klass)->get_basename = (gchar* (*)(MediaSource*)) photo_real_get_basename; #line 161 "/home/jens/Source/shotwell/src/Photo.vala" - ((MediaSourceClass *) klass)->get_title = photo_real_get_title; + ((MediaSourceClass *) klass)->get_title = (gchar* (*)(MediaSource*)) photo_real_get_title; #line 161 "/home/jens/Source/shotwell/src/Photo.vala" - ((MediaSourceClass *) klass)->get_comment = photo_real_get_comment; + ((MediaSourceClass *) klass)->get_comment = (gchar* (*)(MediaSource*)) photo_real_get_comment; #line 161 "/home/jens/Source/shotwell/src/Photo.vala" - ((MediaSourceClass *) klass)->set_title = photo_real_set_title; + ((MediaSourceClass *) klass)->set_title = (void (*)(MediaSource*, const gchar*)) photo_real_set_title; #line 161 "/home/jens/Source/shotwell/src/Photo.vala" - ((MediaSourceClass *) klass)->set_comment = photo_real_set_comment; + ((MediaSourceClass *) klass)->set_comment = (gboolean (*)(MediaSource*, const gchar*)) photo_real_set_comment; #line 161 "/home/jens/Source/shotwell/src/Photo.vala" - ((MediaSourceClass *) klass)->get_dimensions = photo_real_get_dimensions; + ((MediaSourceClass *) klass)->get_dimensions = (void (*)(MediaSource*, PhotoException, Dimensions*)) photo_real_get_dimensions; #line 161 "/home/jens/Source/shotwell/src/Photo.vala" - ((PhotoSourceClass *) klass)->get_metadata = photo_real_get_metadata; + ((PhotoSourceClass *) klass)->get_metadata = (PhotoMetadata* (*)(PhotoSource*)) photo_real_get_metadata; #line 161 "/home/jens/Source/shotwell/src/Photo.vala" - ((PhotoClass *) klass)->rotate = photo_real_rotate; + ((PhotoClass *) klass)->rotate = (void (*)(Photo*, Rotation)) photo_real_rotate; #line 161 "/home/jens/Source/shotwell/src/Photo.vala" - ((PhotoSourceClass *) klass)->get_pixbuf = photo_real_get_pixbuf; + ((PhotoSourceClass *) klass)->get_pixbuf = (GdkPixbuf* (*)(PhotoSource*, Scaling*, GError**)) photo_real_get_pixbuf; #line 161 "/home/jens/Source/shotwell/src/Photo.vala" - ((PhotoClass *) klass)->has_user_generated_metadata = photo_real_has_user_generated_metadata; + ((PhotoClass *) klass)->has_user_generated_metadata = (gboolean (*)(Photo*)) photo_real_has_user_generated_metadata; #line 161 "/home/jens/Source/shotwell/src/Photo.vala" - ((PhotoClass *) klass)->set_user_metadata_for_export = photo_real_set_user_metadata_for_export; + ((PhotoClass *) klass)->set_user_metadata_for_export = (void (*)(Photo*, PhotoMetadata*)) photo_real_set_user_metadata_for_export; #line 161 "/home/jens/Source/shotwell/src/Photo.vala" ((PhotoClass *) klass)->editable_replaced = photo_real_editable_replaced; #line 161 "/home/jens/Source/shotwell/src/Photo.vala" @@ -34241,7 +34341,7 @@ static void photo_class_init (PhotoClass * klass) { g_signal_new ("source_reimported", TYPE_PHOTO, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (PhotoClass, source_reimported), NULL, NULL, g_cclosure_user_marshal_VOID__MEDIA_METADATA, G_TYPE_NONE, 1, TYPE_PHOTO_METADATA); #line 326 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_init (&__lock_photo_source_pixbuf_cache); -#line 34240 "Photo.c" +#line 34340 "Photo.c" } @@ -34252,7 +34352,7 @@ static void photo_dateable_interface_init (DateableIface * iface) { iface->get_exposure_time = (time_t (*)(Dateable*)) photo_real_get_exposure_time; #line 161 "/home/jens/Source/shotwell/src/Photo.vala" iface->set_exposure_time = (void (*)(Dateable*, time_t)) photo_real_set_exposure_time; -#line 34251 "Photo.c" +#line 34351 "Photo.c" } @@ -34295,7 +34395,7 @@ static void photo_instance_init (Photo * self) { self->priv->developments = NULL; #line 353 "/home/jens/Source/shotwell/src/Photo.vala" self->backing_photo_row = NULL; -#line 34294 "Photo.c" +#line 34394 "Photo.c" } @@ -34335,7 +34435,7 @@ static void photo_finalize (GObject* obj) { _backing_photo_row_unref0 (self->backing_photo_row); #line 161 "/home/jens/Source/shotwell/src/Photo.vala" G_OBJECT_CLASS (photo_parent_class)->finalize (obj); -#line 34334 "Photo.c" +#line 34434 "Photo.c" } @@ -34358,13 +34458,13 @@ static void _vala_photo_get_property (GObject * object, guint property_id, GValu self = G_TYPE_CHECK_INSTANCE_CAST (object, TYPE_PHOTO, Photo); #line 161 "/home/jens/Source/shotwell/src/Photo.vala" switch (property_id) { -#line 34357 "Photo.c" +#line 34457 "Photo.c" default: #line 161 "/home/jens/Source/shotwell/src/Photo.vala" G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); #line 161 "/home/jens/Source/shotwell/src/Photo.vala" break; -#line 34363 "Photo.c" +#line 34463 "Photo.c" } } @@ -34374,13 +34474,13 @@ static void _vala_photo_set_property (GObject * object, guint property_id, const self = G_TYPE_CHECK_INSTANCE_CAST (object, TYPE_PHOTO, Photo); #line 161 "/home/jens/Source/shotwell/src/Photo.vala" switch (property_id) { -#line 34373 "Photo.c" +#line 34473 "Photo.c" default: #line 161 "/home/jens/Source/shotwell/src/Photo.vala" G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); #line 161 "/home/jens/Source/shotwell/src/Photo.vala" break; -#line 34379 "Photo.c" +#line 34479 "Photo.c" } } @@ -34402,7 +34502,7 @@ static guint _file_hash_gee_hash_data_func (gconstpointer v, gpointer self) { result = file_hash ((GFile*) v); #line 4464 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 34401 "Photo.c" +#line 34501 "Photo.c" } @@ -34411,7 +34511,7 @@ static gboolean _file_equal_gee_equal_data_func (gconstpointer a, gconstpointer result = file_equal ((GFile*) a, (GFile*) b); #line 4464 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 34410 "Photo.c" +#line 34510 "Photo.c" } @@ -34420,7 +34520,7 @@ static gint _int64_compare_gcompare_data_func (gconstpointer a, gconstpointer b, result = int64_compare ((gint64*) a, (gint64*) b); #line 4468 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 34419 "Photo.c" +#line 34519 "Photo.c" } @@ -34432,7 +34532,7 @@ static gint64* _int64_dup (gint64* self) { memcpy (dup, self, sizeof (gint64)); #line 4468 "/home/jens/Source/shotwell/src/Photo.vala" return dup; -#line 34431 "Photo.c" +#line 34531 "Photo.c" } @@ -34441,7 +34541,7 @@ static gboolean _int64_equal_gee_equal_data_func (gconstpointer a, gconstpointer result = int64_equal ((gint64*) a, (gint64*) b); #line 4470 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 34440 "Photo.c" +#line 34540 "Photo.c" } @@ -34450,21 +34550,21 @@ static gint64 _photo_get_photo_key_get_source_database_key (DataSource* source, result = photo_get_photo_key (source); #line 4490 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 34449 "Photo.c" +#line 34549 "Photo.c" } static void _library_photo_source_collection_on_trashcan_contents_altered_source_holding_tank_contents_altered (SourceHoldingTank* _sender, GeeCollection* added, GeeCollection* removed, gpointer self) { #line 4492 "/home/jens/Source/shotwell/src/Photo.vala" library_photo_source_collection_on_trashcan_contents_altered ((LibraryPhotoSourceCollection*) self, added, removed); -#line 34456 "Photo.c" +#line 34556 "Photo.c" } static void _library_photo_source_collection_on_offline_contents_altered_source_holding_tank_contents_altered (SourceHoldingTank* _sender, GeeCollection* added, GeeCollection* removed, gpointer self) { #line 4493 "/home/jens/Source/shotwell/src/Photo.vala" library_photo_source_collection_on_offline_contents_altered ((LibraryPhotoSourceCollection*) self, added, removed); -#line 34463 "Photo.c" +#line 34563 "Photo.c" } @@ -34494,14 +34594,14 @@ LibraryPhotoSourceCollection* library_photo_source_collection_construct (GType o _source_holding_tank_unref0 (_tmp3_); #line 4489 "/home/jens/Source/shotwell/src/Photo.vala" return self; -#line 34493 "Photo.c" +#line 34593 "Photo.c" } LibraryPhotoSourceCollection* library_photo_source_collection_new (void) { #line 4489 "/home/jens/Source/shotwell/src/Photo.vala" return library_photo_source_collection_construct (TYPE_LIBRARY_PHOTO_SOURCE_COLLECTION); -#line 34500 "Photo.c" +#line 34600 "Photo.c" } @@ -34510,7 +34610,7 @@ static gboolean _library_photo_source_collection_check_if_trashed_photo_source_h result = library_photo_source_collection_check_if_trashed_photo ((LibraryPhotoSourceCollection*) self, source, alteration); #line 4497 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 34509 "Photo.c" +#line 34609 "Photo.c" } @@ -34526,7 +34626,7 @@ static MediaSourceHoldingTank* library_photo_source_collection_real_create_trash result = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_MEDIA_SOURCE_HOLDING_TANK, MediaSourceHoldingTank); #line 4497 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 34525 "Photo.c" +#line 34625 "Photo.c" } @@ -34535,7 +34635,7 @@ static gboolean _library_photo_source_collection_check_if_offline_photo_source_h result = library_photo_source_collection_check_if_offline_photo ((LibraryPhotoSourceCollection*) self, source, alteration); #line 4501 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 34534 "Photo.c" +#line 34634 "Photo.c" } @@ -34551,7 +34651,7 @@ static MediaSourceHoldingTank* library_photo_source_collection_real_create_offli result = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_MEDIA_SOURCE_HOLDING_TANK, MediaSourceHoldingTank); #line 4501 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 34550 "Photo.c" +#line 34650 "Photo.c" } @@ -34577,7 +34677,7 @@ static MediaMonitor* library_photo_source_collection_real_create_media_monitor ( result = G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_MEDIA_MONITOR, MediaMonitor); #line 4505 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 34576 "Photo.c" +#line 34676 "Photo.c" } @@ -34595,7 +34695,7 @@ static gboolean library_photo_source_collection_real_holds_type_of_source (Sourc result = G_TYPE_CHECK_INSTANCE_TYPE (_tmp0_, TYPE_LIBRARY_PHOTO); #line 4509 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 34594 "Photo.c" +#line 34694 "Photo.c" } @@ -34611,7 +34711,7 @@ static gchar* library_photo_source_collection_real_get_typename (MediaSourceColl result = _tmp0_; #line 4513 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 34610 "Photo.c" +#line 34710 "Photo.c" } @@ -34632,21 +34732,21 @@ static gboolean library_photo_source_collection_real_is_file_recognized (MediaSo result = _tmp1_; #line 4517 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 34631 "Photo.c" +#line 34731 "Photo.c" } static void _library_photo_source_collection_on_editable_replaced_photo_editable_replaced (Photo* _sender, GFile* old_file, GFile* new_file, gpointer self) { #line 4529 "/home/jens/Source/shotwell/src/Photo.vala" library_photo_source_collection_on_editable_replaced ((LibraryPhotoSourceCollection*) self, _sender, old_file, new_file); -#line 34638 "Photo.c" +#line 34738 "Photo.c" } static void _library_photo_source_collection_on_raw_development_modified_photo_raw_development_modified (Photo* _sender, gpointer self) { #line 4535 "/home/jens/Source/shotwell/src/Photo.vala" library_photo_source_collection_on_raw_development_modified ((LibraryPhotoSourceCollection*) self, _sender); -#line 34645 "Photo.c" +#line 34745 "Photo.c" } @@ -34666,7 +34766,7 @@ static void library_photo_source_collection_real_notify_contents_altered (DataCo _tmp0_ = added; #line 4522 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp0_ != NULL) { -#line 34665 "Photo.c" +#line 34765 "Photo.c" { GeeIterator* _object_it = NULL; GeeIterable* _tmp1_ = NULL; @@ -34679,7 +34779,7 @@ static void library_photo_source_collection_real_notify_contents_altered (DataCo _object_it = _tmp2_; #line 4523 "/home/jens/Source/shotwell/src/Photo.vala" while (TRUE) { -#line 34678 "Photo.c" +#line 34778 "Photo.c" GeeIterator* _tmp3_ = NULL; gboolean _tmp4_ = FALSE; DataObject* object = NULL; @@ -34729,7 +34829,7 @@ static void library_photo_source_collection_real_notify_contents_altered (DataCo if (!_tmp4_) { #line 4523 "/home/jens/Source/shotwell/src/Photo.vala" break; -#line 34728 "Photo.c" +#line 34828 "Photo.c" } #line 4523 "/home/jens/Source/shotwell/src/Photo.vala" _tmp5_ = _object_it; @@ -34753,7 +34853,7 @@ static void library_photo_source_collection_real_notify_contents_altered (DataCo _tmp11_ = editable; #line 4527 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp11_ != NULL) { -#line 34752 "Photo.c" +#line 34852 "Photo.c" GeeHashMap* _tmp12_ = NULL; GFile* _tmp13_ = NULL; LibraryPhoto* _tmp14_ = NULL; @@ -34765,7 +34865,7 @@ static void library_photo_source_collection_real_notify_contents_altered (DataCo _tmp14_ = photo; #line 4528 "/home/jens/Source/shotwell/src/Photo.vala" gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp13_, _tmp14_); -#line 34764 "Photo.c" +#line 34864 "Photo.c" } #line 4529 "/home/jens/Source/shotwell/src/Photo.vala" _tmp15_ = photo; @@ -34781,7 +34881,7 @@ static void library_photo_source_collection_real_notify_contents_altered (DataCo _tmp18_ = raw_list; #line 4532 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp18_ != NULL) { -#line 34780 "Photo.c" +#line 34880 "Photo.c" { GeeIterator* _f_it = NULL; GeeCollection* _tmp19_ = NULL; @@ -34794,7 +34894,7 @@ static void library_photo_source_collection_real_notify_contents_altered (DataCo _f_it = _tmp20_; #line 4533 "/home/jens/Source/shotwell/src/Photo.vala" while (TRUE) { -#line 34793 "Photo.c" +#line 34893 "Photo.c" GeeIterator* _tmp21_ = NULL; gboolean _tmp22_ = FALSE; GFile* f = NULL; @@ -34811,7 +34911,7 @@ static void library_photo_source_collection_real_notify_contents_altered (DataCo if (!_tmp22_) { #line 4533 "/home/jens/Source/shotwell/src/Photo.vala" break; -#line 34810 "Photo.c" +#line 34910 "Photo.c" } #line 4533 "/home/jens/Source/shotwell/src/Photo.vala" _tmp23_ = _f_it; @@ -34829,11 +34929,11 @@ static void library_photo_source_collection_real_notify_contents_altered (DataCo gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp26_, _tmp27_); #line 4533 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (f); -#line 34828 "Photo.c" +#line 34928 "Photo.c" } #line 4533 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_f_it); -#line 34832 "Photo.c" +#line 34932 "Photo.c" } } #line 4535 "/home/jens/Source/shotwell/src/Photo.vala" @@ -34866,7 +34966,7 @@ static void library_photo_source_collection_real_notify_contents_altered (DataCo _backing_photo_row_unref0 (_tmp37_); #line 4538 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp38_) { -#line 34865 "Photo.c" +#line 34965 "Photo.c" LibraryPhoto* _tmp39_ = NULL; BackingPhotoRow* _tmp40_ = NULL; BackingPhotoRow* _tmp41_ = NULL; @@ -34883,11 +34983,11 @@ static void library_photo_source_collection_real_notify_contents_altered (DataCo _tmp34_ = _tmp42_; #line 4539 "/home/jens/Source/shotwell/src/Photo.vala" _backing_photo_row_unref0 (_tmp41_); -#line 34882 "Photo.c" +#line 34982 "Photo.c" } else { #line 4540 "/home/jens/Source/shotwell/src/Photo.vala" _tmp34_ = (gint64) -1; -#line 34886 "Photo.c" +#line 34986 "Photo.c" } #line 4538 "/home/jens/Source/shotwell/src/Photo.vala" editable_filesize = _tmp34_; @@ -34911,7 +35011,7 @@ static void library_photo_source_collection_real_notify_contents_altered (DataCo _tmp49_ = editable_filesize; #line 4543 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp49_ >= ((gint64) 0)) { -#line 34910 "Photo.c" +#line 35010 "Photo.c" GeeMultiMap* _tmp50_ = NULL; gint64 _tmp51_ = 0LL; LibraryPhoto* _tmp52_ = NULL; @@ -34934,7 +35034,7 @@ static void library_photo_source_collection_real_notify_contents_altered (DataCo _tmp55_ = editable_filesize; #line 4545 "/home/jens/Source/shotwell/src/Photo.vala" gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp53_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp54_, &_tmp55_); -#line 34933 "Photo.c" +#line 35033 "Photo.c" } #line 4548 "/home/jens/Source/shotwell/src/Photo.vala" _tmp56_ = photo; @@ -34946,7 +35046,7 @@ static void library_photo_source_collection_real_notify_contents_altered (DataCo _tmp58_ = raw_rows; #line 4549 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp58_ != NULL) { -#line 34945 "Photo.c" +#line 35045 "Photo.c" { GeeIterator* _row_it = NULL; GeeCollection* _tmp59_ = NULL; @@ -34959,7 +35059,7 @@ static void library_photo_source_collection_real_notify_contents_altered (DataCo _row_it = _tmp60_; #line 4550 "/home/jens/Source/shotwell/src/Photo.vala" while (TRUE) { -#line 34958 "Photo.c" +#line 35058 "Photo.c" GeeIterator* _tmp61_ = NULL; gboolean _tmp62_ = FALSE; BackingPhotoRow* row = NULL; @@ -34975,7 +35075,7 @@ static void library_photo_source_collection_real_notify_contents_altered (DataCo if (!_tmp62_) { #line 4550 "/home/jens/Source/shotwell/src/Photo.vala" break; -#line 34974 "Photo.c" +#line 35074 "Photo.c" } #line 4550 "/home/jens/Source/shotwell/src/Photo.vala" _tmp63_ = _row_it; @@ -34989,7 +35089,7 @@ static void library_photo_source_collection_real_notify_contents_altered (DataCo _tmp66_ = _tmp65_->filesize; #line 4551 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp66_ >= ((gint64) 0)) { -#line 34988 "Photo.c" +#line 35088 "Photo.c" GeeMultiMap* _tmp67_ = NULL; BackingPhotoRow* _tmp68_ = NULL; gint64 _tmp69_ = 0LL; @@ -35018,15 +35118,15 @@ static void library_photo_source_collection_real_notify_contents_altered (DataCo _tmp74_ = _tmp73_->filesize; #line 4553 "/home/jens/Source/shotwell/src/Photo.vala" gee_multi_map_set (_tmp71_, _tmp72_, &_tmp74_); -#line 35017 "Photo.c" +#line 35117 "Photo.c" } #line 4550 "/home/jens/Source/shotwell/src/Photo.vala" _backing_photo_row_unref0 (row); -#line 35021 "Photo.c" +#line 35121 "Photo.c" } #line 4550 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_row_it); -#line 35025 "Photo.c" +#line 35125 "Photo.c" } } #line 4523 "/home/jens/Source/shotwell/src/Photo.vala" @@ -35039,18 +35139,18 @@ static void library_photo_source_collection_real_notify_contents_altered (DataCo _g_object_unref0 (photo); #line 4523 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (object); -#line 35038 "Photo.c" +#line 35138 "Photo.c" } #line 4523 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_object_it); -#line 35042 "Photo.c" +#line 35142 "Photo.c" } } #line 4560 "/home/jens/Source/shotwell/src/Photo.vala" _tmp75_ = removed; #line 4560 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp75_ != NULL) { -#line 35049 "Photo.c" +#line 35149 "Photo.c" { GeeIterator* _object_it = NULL; GeeIterable* _tmp76_ = NULL; @@ -35063,7 +35163,7 @@ static void library_photo_source_collection_real_notify_contents_altered (DataCo _object_it = _tmp77_; #line 4561 "/home/jens/Source/shotwell/src/Photo.vala" while (TRUE) { -#line 35062 "Photo.c" +#line 35162 "Photo.c" GeeIterator* _tmp78_ = NULL; gboolean _tmp79_ = FALSE; DataObject* object = NULL; @@ -35114,7 +35214,7 @@ static void library_photo_source_collection_real_notify_contents_altered (DataCo if (!_tmp79_) { #line 4561 "/home/jens/Source/shotwell/src/Photo.vala" break; -#line 35113 "Photo.c" +#line 35213 "Photo.c" } #line 4561 "/home/jens/Source/shotwell/src/Photo.vala" _tmp80_ = _object_it; @@ -35138,7 +35238,7 @@ static void library_photo_source_collection_real_notify_contents_altered (DataCo _tmp86_ = editable; #line 4565 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp86_ != NULL) { -#line 35137 "Photo.c" +#line 35237 "Photo.c" gboolean is_removed = FALSE; GeeHashMap* _tmp87_ = NULL; LibraryPhoto* _tmp88_ = NULL; @@ -35167,7 +35267,7 @@ static void library_photo_source_collection_real_notify_contents_altered (DataCo _tmp93_ = is_removed; #line 4567 "/home/jens/Source/shotwell/src/Photo.vala" _vala_assert (_tmp93_, "is_removed"); -#line 35166 "Photo.c" +#line 35266 "Photo.c" } #line 4569 "/home/jens/Source/shotwell/src/Photo.vala" _tmp94_ = photo; @@ -35185,7 +35285,7 @@ static void library_photo_source_collection_real_notify_contents_altered (DataCo _tmp98_ = raw_list; #line 4572 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp98_ != NULL) { -#line 35184 "Photo.c" +#line 35284 "Photo.c" { GeeIterator* _f_it = NULL; GeeCollection* _tmp99_ = NULL; @@ -35198,7 +35298,7 @@ static void library_photo_source_collection_real_notify_contents_altered (DataCo _f_it = _tmp100_; #line 4573 "/home/jens/Source/shotwell/src/Photo.vala" while (TRUE) { -#line 35197 "Photo.c" +#line 35297 "Photo.c" GeeIterator* _tmp101_ = NULL; gboolean _tmp102_ = FALSE; GFile* f = NULL; @@ -35214,7 +35314,7 @@ static void library_photo_source_collection_real_notify_contents_altered (DataCo if (!_tmp102_) { #line 4573 "/home/jens/Source/shotwell/src/Photo.vala" break; -#line 35213 "Photo.c" +#line 35313 "Photo.c" } #line 4573 "/home/jens/Source/shotwell/src/Photo.vala" _tmp103_ = _f_it; @@ -35230,11 +35330,11 @@ static void library_photo_source_collection_real_notify_contents_altered (DataCo gee_abstract_map_unset (G_TYPE_CHECK_INSTANCE_CAST (_tmp105_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp106_, NULL); #line 4573 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (f); -#line 35229 "Photo.c" +#line 35329 "Photo.c" } #line 4573 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_f_it); -#line 35233 "Photo.c" +#line 35333 "Photo.c" } } #line 4575 "/home/jens/Source/shotwell/src/Photo.vala" @@ -35269,7 +35369,7 @@ static void library_photo_source_collection_real_notify_contents_altered (DataCo _backing_photo_row_unref0 (_tmp117_); #line 4578 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp118_) { -#line 35268 "Photo.c" +#line 35368 "Photo.c" LibraryPhoto* _tmp119_ = NULL; BackingPhotoRow* _tmp120_ = NULL; BackingPhotoRow* _tmp121_ = NULL; @@ -35286,11 +35386,11 @@ static void library_photo_source_collection_real_notify_contents_altered (DataCo _tmp114_ = _tmp122_; #line 4579 "/home/jens/Source/shotwell/src/Photo.vala" _backing_photo_row_unref0 (_tmp121_); -#line 35285 "Photo.c" +#line 35385 "Photo.c" } else { #line 4580 "/home/jens/Source/shotwell/src/Photo.vala" _tmp114_ = (gint64) -1; -#line 35289 "Photo.c" +#line 35389 "Photo.c" } #line 4578 "/home/jens/Source/shotwell/src/Photo.vala" editable_filesize = _tmp114_; @@ -35312,7 +35412,7 @@ static void library_photo_source_collection_real_notify_contents_altered (DataCo _tmp128_ = editable_filesize; #line 4583 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp128_ >= ((gint64) 0)) { -#line 35311 "Photo.c" +#line 35411 "Photo.c" GeeMultiMap* _tmp129_ = NULL; gint64 _tmp130_ = 0LL; LibraryPhoto* _tmp131_ = NULL; @@ -35332,7 +35432,7 @@ static void library_photo_source_collection_real_notify_contents_altered (DataCo _tmp133_ = photo; #line 4585 "/home/jens/Source/shotwell/src/Photo.vala" gee_abstract_map_unset (G_TYPE_CHECK_INSTANCE_CAST (_tmp132_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp133_, NULL); -#line 35331 "Photo.c" +#line 35431 "Photo.c" } #line 4588 "/home/jens/Source/shotwell/src/Photo.vala" _tmp134_ = photo; @@ -35344,7 +35444,7 @@ static void library_photo_source_collection_real_notify_contents_altered (DataCo _tmp136_ = raw_rows; #line 4589 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp136_ != NULL) { -#line 35343 "Photo.c" +#line 35443 "Photo.c" { GeeIterator* _row_it = NULL; GeeCollection* _tmp137_ = NULL; @@ -35357,7 +35457,7 @@ static void library_photo_source_collection_real_notify_contents_altered (DataCo _row_it = _tmp138_; #line 4590 "/home/jens/Source/shotwell/src/Photo.vala" while (TRUE) { -#line 35356 "Photo.c" +#line 35456 "Photo.c" GeeIterator* _tmp139_ = NULL; gboolean _tmp140_ = FALSE; BackingPhotoRow* row = NULL; @@ -35373,7 +35473,7 @@ static void library_photo_source_collection_real_notify_contents_altered (DataCo if (!_tmp140_) { #line 4590 "/home/jens/Source/shotwell/src/Photo.vala" break; -#line 35372 "Photo.c" +#line 35472 "Photo.c" } #line 4590 "/home/jens/Source/shotwell/src/Photo.vala" _tmp141_ = _row_it; @@ -35387,7 +35487,7 @@ static void library_photo_source_collection_real_notify_contents_altered (DataCo _tmp144_ = _tmp143_->filesize; #line 4591 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp144_ >= ((gint64) 0)) { -#line 35386 "Photo.c" +#line 35486 "Photo.c" GeeMultiMap* _tmp145_ = NULL; BackingPhotoRow* _tmp146_ = NULL; gint64 _tmp147_ = 0LL; @@ -35416,15 +35516,15 @@ static void library_photo_source_collection_real_notify_contents_altered (DataCo _tmp152_ = _tmp151_->filesize; #line 4593 "/home/jens/Source/shotwell/src/Photo.vala" gee_multi_map_remove (_tmp149_, _tmp150_, &_tmp152_); -#line 35415 "Photo.c" +#line 35515 "Photo.c" } #line 4590 "/home/jens/Source/shotwell/src/Photo.vala" _backing_photo_row_unref0 (row); -#line 35419 "Photo.c" +#line 35519 "Photo.c" } #line 4590 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_row_it); -#line 35423 "Photo.c" +#line 35523 "Photo.c" } } #line 4561 "/home/jens/Source/shotwell/src/Photo.vala" @@ -35437,11 +35537,11 @@ static void library_photo_source_collection_real_notify_contents_altered (DataCo _g_object_unref0 (photo); #line 4561 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (object); -#line 35436 "Photo.c" +#line 35536 "Photo.c" } #line 4561 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_object_it); -#line 35440 "Photo.c" +#line 35540 "Photo.c" } } #line 4600 "/home/jens/Source/shotwell/src/Photo.vala" @@ -35450,7 +35550,7 @@ static void library_photo_source_collection_real_notify_contents_altered (DataCo _tmp154_ = removed; #line 4600 "/home/jens/Source/shotwell/src/Photo.vala" DATA_COLLECTION_CLASS (library_photo_source_collection_parent_class)->notify_contents_altered (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection), TYPE_DATA_COLLECTION, DataCollection), _tmp153_, _tmp154_); -#line 35449 "Photo.c" +#line 35549 "Photo.c" } @@ -35469,7 +35569,7 @@ static void library_photo_source_collection_on_editable_replaced (LibraryPhotoSo _tmp0_ = old_file; #line 4604 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp0_ != NULL) { -#line 35468 "Photo.c" +#line 35568 "Photo.c" gboolean is_removed = FALSE; GeeHashMap* _tmp1_ = NULL; GFile* _tmp2_ = NULL; @@ -35487,13 +35587,13 @@ static void library_photo_source_collection_on_editable_replaced (LibraryPhotoSo _tmp4_ = is_removed; #line 4606 "/home/jens/Source/shotwell/src/Photo.vala" _vala_assert (_tmp4_, "is_removed"); -#line 35486 "Photo.c" +#line 35586 "Photo.c" } #line 4609 "/home/jens/Source/shotwell/src/Photo.vala" _tmp5_ = new_file; #line 4609 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp5_ != NULL) { -#line 35492 "Photo.c" +#line 35592 "Photo.c" GeeHashMap* _tmp6_ = NULL; GFile* _tmp7_ = NULL; Photo* _tmp8_ = NULL; @@ -35505,7 +35605,7 @@ static void library_photo_source_collection_on_editable_replaced (LibraryPhotoSo _tmp8_ = photo; #line 4610 "/home/jens/Source/shotwell/src/Photo.vala" gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp7_, G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_LIBRARY_PHOTO, LibraryPhoto)); -#line 35504 "Photo.c" +#line 35604 "Photo.c" } } @@ -35544,7 +35644,7 @@ static void library_photo_source_collection_on_raw_development_modified (Library _g_object_unref0 (photo); #line 4616 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 35543 "Photo.c" +#line 35643 "Photo.c" } #line 4619 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = self->priv->photo_to_raw_development_filesize; @@ -35554,7 +35654,7 @@ static void library_photo_source_collection_on_raw_development_modified (Library _tmp5_ = gee_multi_map_contains (_tmp3_, _tmp4_); #line 4619 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp5_) { -#line 35553 "Photo.c" +#line 35653 "Photo.c" GeeMultiMap* _tmp21_ = NULL; LibraryPhoto* _tmp22_ = NULL; { @@ -35583,7 +35683,7 @@ static void library_photo_source_collection_on_raw_development_modified (Library _s_it = _tmp11_; #line 4620 "/home/jens/Source/shotwell/src/Photo.vala" while (TRUE) { -#line 35582 "Photo.c" +#line 35682 "Photo.c" GeeIterator* _tmp12_ = NULL; gboolean _tmp13_ = FALSE; gint64 s = 0LL; @@ -35602,7 +35702,7 @@ static void library_photo_source_collection_on_raw_development_modified (Library if (!_tmp13_) { #line 4620 "/home/jens/Source/shotwell/src/Photo.vala" break; -#line 35601 "Photo.c" +#line 35701 "Photo.c" } #line 4620 "/home/jens/Source/shotwell/src/Photo.vala" _tmp14_ = _s_it; @@ -35624,11 +35724,11 @@ static void library_photo_source_collection_on_raw_development_modified (Library _tmp20_ = photo; #line 4621 "/home/jens/Source/shotwell/src/Photo.vala" gee_multi_map_remove (_tmp18_, &_tmp19_, _tmp20_); -#line 35623 "Photo.c" +#line 35723 "Photo.c" } #line 4620 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_s_it); -#line 35627 "Photo.c" +#line 35727 "Photo.c" } #line 4622 "/home/jens/Source/shotwell/src/Photo.vala" _tmp21_ = self->priv->photo_to_raw_development_filesize; @@ -35636,7 +35736,7 @@ static void library_photo_source_collection_on_raw_development_modified (Library _tmp22_ = photo; #line 4622 "/home/jens/Source/shotwell/src/Photo.vala" gee_multi_map_remove_all (_tmp21_, _tmp22_); -#line 35635 "Photo.c" +#line 35735 "Photo.c" } #line 4626 "/home/jens/Source/shotwell/src/Photo.vala" _tmp23_ = photo; @@ -35648,7 +35748,7 @@ static void library_photo_source_collection_on_raw_development_modified (Library _tmp25_ = raw_list; #line 4627 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp25_ != NULL) { -#line 35647 "Photo.c" +#line 35747 "Photo.c" { GeeIterator* _f_it = NULL; GeeCollection* _tmp26_ = NULL; @@ -35661,7 +35761,7 @@ static void library_photo_source_collection_on_raw_development_modified (Library _f_it = _tmp27_; #line 4628 "/home/jens/Source/shotwell/src/Photo.vala" while (TRUE) { -#line 35660 "Photo.c" +#line 35760 "Photo.c" GeeIterator* _tmp28_ = NULL; gboolean _tmp29_ = FALSE; GFile* f = NULL; @@ -35678,7 +35778,7 @@ static void library_photo_source_collection_on_raw_development_modified (Library if (!_tmp29_) { #line 4628 "/home/jens/Source/shotwell/src/Photo.vala" break; -#line 35677 "Photo.c" +#line 35777 "Photo.c" } #line 4628 "/home/jens/Source/shotwell/src/Photo.vala" _tmp30_ = _f_it; @@ -35696,11 +35796,11 @@ static void library_photo_source_collection_on_raw_development_modified (Library gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp32_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp33_, _tmp34_); #line 4628 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (f); -#line 35695 "Photo.c" +#line 35795 "Photo.c" } #line 4628 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_f_it); -#line 35699 "Photo.c" +#line 35799 "Photo.c" } } #line 4631 "/home/jens/Source/shotwell/src/Photo.vala" @@ -35713,7 +35813,7 @@ static void library_photo_source_collection_on_raw_development_modified (Library _tmp37_ = raw_rows; #line 4632 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp37_ != NULL) { -#line 35712 "Photo.c" +#line 35812 "Photo.c" { GeeIterator* _row_it = NULL; GeeCollection* _tmp38_ = NULL; @@ -35726,7 +35826,7 @@ static void library_photo_source_collection_on_raw_development_modified (Library _row_it = _tmp39_; #line 4633 "/home/jens/Source/shotwell/src/Photo.vala" while (TRUE) { -#line 35725 "Photo.c" +#line 35825 "Photo.c" GeeIterator* _tmp40_ = NULL; gboolean _tmp41_ = FALSE; BackingPhotoRow* row = NULL; @@ -35742,7 +35842,7 @@ static void library_photo_source_collection_on_raw_development_modified (Library if (!_tmp41_) { #line 4633 "/home/jens/Source/shotwell/src/Photo.vala" break; -#line 35741 "Photo.c" +#line 35841 "Photo.c" } #line 4633 "/home/jens/Source/shotwell/src/Photo.vala" _tmp42_ = _row_it; @@ -35756,7 +35856,7 @@ static void library_photo_source_collection_on_raw_development_modified (Library _tmp45_ = _tmp44_->filesize; #line 4634 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp45_ > ((gint64) 0)) { -#line 35755 "Photo.c" +#line 35855 "Photo.c" GeeMultiMap* _tmp46_ = NULL; BackingPhotoRow* _tmp47_ = NULL; gint64 _tmp48_ = 0LL; @@ -35785,15 +35885,15 @@ static void library_photo_source_collection_on_raw_development_modified (Library _tmp53_ = _tmp52_->filesize; #line 4636 "/home/jens/Source/shotwell/src/Photo.vala" gee_multi_map_set (_tmp50_, _tmp51_, &_tmp53_); -#line 35784 "Photo.c" +#line 35884 "Photo.c" } #line 4633 "/home/jens/Source/shotwell/src/Photo.vala" _backing_photo_row_unref0 (row); -#line 35788 "Photo.c" +#line 35888 "Photo.c" } #line 4633 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_row_it); -#line 35792 "Photo.c" +#line 35892 "Photo.c" } } #line 4613 "/home/jens/Source/shotwell/src/Photo.vala" @@ -35802,14 +35902,14 @@ static void library_photo_source_collection_on_raw_development_modified (Library _g_object_unref0 (raw_list); #line 4613 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (photo); -#line 35801 "Photo.c" +#line 35901 "Photo.c" } static gpointer __int64_dup0 (gpointer self) { #line 4652 "/home/jens/Source/shotwell/src/Photo.vala" return self ? _int64_dup (self) : NULL; -#line 35808 "Photo.c" +#line 35908 "Photo.c" } @@ -35820,7 +35920,7 @@ static void library_photo_source_collection_real_items_altered (DataCollection* self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO_SOURCE_COLLECTION, LibraryPhotoSourceCollection); #line 4642 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (GEE_IS_MAP (items)); -#line 35819 "Photo.c" +#line 35919 "Photo.c" { GeeIterator* _object_it = NULL; GeeMap* _tmp0_ = NULL; @@ -35847,7 +35947,7 @@ static void library_photo_source_collection_real_items_altered (DataCollection* _object_it = _tmp5_; #line 4643 "/home/jens/Source/shotwell/src/Photo.vala" while (TRUE) { -#line 35846 "Photo.c" +#line 35946 "Photo.c" GeeIterator* _tmp6_ = NULL; gboolean _tmp7_ = FALSE; DataObject* object = NULL; @@ -35871,7 +35971,7 @@ static void library_photo_source_collection_real_items_altered (DataCollection* if (!_tmp7_) { #line 4643 "/home/jens/Source/shotwell/src/Photo.vala" break; -#line 35870 "Photo.c" +#line 35970 "Photo.c" } #line 4643 "/home/jens/Source/shotwell/src/Photo.vala" _tmp8_ = _object_it; @@ -35901,7 +36001,7 @@ static void library_photo_source_collection_real_items_altered (DataCollection* if (_tmp17_) { #line 4648 "/home/jens/Source/shotwell/src/Photo.vala" _tmp15_ = TRUE; -#line 35900 "Photo.c" +#line 36000 "Photo.c" } else { Alteration* _tmp18_ = NULL; gboolean _tmp19_ = FALSE; @@ -35911,11 +36011,11 @@ static void library_photo_source_collection_real_items_altered (DataCollection* _tmp19_ = alteration_has_detail (_tmp18_, "image", "editable"); #line 4648 "/home/jens/Source/shotwell/src/Photo.vala" _tmp15_ = _tmp19_; -#line 35910 "Photo.c" +#line 36010 "Photo.c" } #line 4648 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp15_) { -#line 35914 "Photo.c" +#line 36014 "Photo.c" gint64 old_master_filesize = 0LL; GeeHashMap* _tmp20_ = NULL; LibraryPhoto* _tmp21_ = NULL; @@ -35974,7 +36074,7 @@ static void library_photo_source_collection_real_items_altered (DataCollection* _tmp28_ = gee_abstract_map_has_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp27_); #line 4650 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp28_) { -#line 35973 "Photo.c" +#line 36073 "Photo.c" GeeHashMap* _tmp29_ = NULL; LibraryPhoto* _tmp30_ = NULL; gpointer _tmp31_ = NULL; @@ -35988,7 +36088,7 @@ static void library_photo_source_collection_real_items_altered (DataCollection* _g_free0 (_tmp25_); #line 4651 "/home/jens/Source/shotwell/src/Photo.vala" _tmp25_ = (gint64*) _tmp31_; -#line 35987 "Photo.c" +#line 36087 "Photo.c" } else { gint64 _tmp32_ = 0LL; gint64* _tmp33_ = NULL; @@ -36000,7 +36100,7 @@ static void library_photo_source_collection_real_items_altered (DataCollection* _g_free0 (_tmp25_); #line 4652 "/home/jens/Source/shotwell/src/Photo.vala" _tmp25_ = _tmp33_; -#line 35999 "Photo.c" +#line 36099 "Photo.c" } #line 4650 "/home/jens/Source/shotwell/src/Photo.vala" old_editable_filesize = *_tmp25_; @@ -36022,7 +36122,7 @@ static void library_photo_source_collection_real_items_altered (DataCollection* _tmp39_ = old_editable_filesize; #line 4656 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp39_ >= ((gint64) 0)) { -#line 36021 "Photo.c" +#line 36121 "Photo.c" GeeHashMap* _tmp40_ = NULL; LibraryPhoto* _tmp41_ = NULL; GeeMultiMap* _tmp42_ = NULL; @@ -36042,7 +36142,7 @@ static void library_photo_source_collection_real_items_altered (DataCollection* _tmp44_ = photo; #line 4658 "/home/jens/Source/shotwell/src/Photo.vala" gee_multi_map_remove (_tmp42_, &_tmp43_, _tmp44_); -#line 36041 "Photo.c" +#line 36141 "Photo.c" } #line 4661 "/home/jens/Source/shotwell/src/Photo.vala" _tmp45_ = photo; @@ -36070,7 +36170,7 @@ static void library_photo_source_collection_real_items_altered (DataCollection* _backing_photo_row_unref0 (_tmp53_); #line 4662 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp54_) { -#line 36069 "Photo.c" +#line 36169 "Photo.c" LibraryPhoto* _tmp55_ = NULL; BackingPhotoRow* _tmp56_ = NULL; BackingPhotoRow* _tmp57_ = NULL; @@ -36087,11 +36187,11 @@ static void library_photo_source_collection_real_items_altered (DataCollection* _tmp50_ = _tmp58_; #line 4663 "/home/jens/Source/shotwell/src/Photo.vala" _backing_photo_row_unref0 (_tmp57_); -#line 36086 "Photo.c" +#line 36186 "Photo.c" } else { #line 4664 "/home/jens/Source/shotwell/src/Photo.vala" _tmp50_ = (gint64) -1; -#line 36090 "Photo.c" +#line 36190 "Photo.c" } #line 4662 "/home/jens/Source/shotwell/src/Photo.vala" editable_filesize = _tmp50_; @@ -36115,7 +36215,7 @@ static void library_photo_source_collection_real_items_altered (DataCollection* _tmp65_ = editable_filesize; #line 4667 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp65_ >= ((gint64) 0)) { -#line 36114 "Photo.c" +#line 36214 "Photo.c" GeeHashMap* _tmp66_ = NULL; LibraryPhoto* _tmp67_ = NULL; gint64 _tmp68_ = 0LL; @@ -36138,11 +36238,11 @@ static void library_photo_source_collection_real_items_altered (DataCollection* _tmp71_ = photo; #line 4669 "/home/jens/Source/shotwell/src/Photo.vala" gee_multi_map_set (_tmp69_, &_tmp70_, _tmp71_); -#line 36137 "Photo.c" +#line 36237 "Photo.c" } #line 4648 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (_tmp25_); -#line 36141 "Photo.c" +#line 36241 "Photo.c" } #line 4643 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (photo); @@ -36150,17 +36250,17 @@ static void library_photo_source_collection_real_items_altered (DataCollection* _alteration_unref0 (alteration); #line 4643 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (object); -#line 36149 "Photo.c" +#line 36249 "Photo.c" } #line 4643 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_object_it); -#line 36153 "Photo.c" +#line 36253 "Photo.c" } #line 4674 "/home/jens/Source/shotwell/src/Photo.vala" _tmp72_ = items; #line 4674 "/home/jens/Source/shotwell/src/Photo.vala" DATA_COLLECTION_CLASS (library_photo_source_collection_parent_class)->items_altered (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection), TYPE_DATA_COLLECTION, DataCollection), _tmp72_); -#line 36159 "Photo.c" +#line 36259 "Photo.c" } @@ -36174,10 +36274,10 @@ static void library_photo_source_collection_real_postprocess_imported_media (Med #line 4678 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (GEE_IS_COLLECTION (media_sources)); #line 4679 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp0_ = gee_hash_multi_map_new (TYPE_TAG, (GBoxedCopyFunc) g_object_ref, g_object_unref, TYPE_LIBRARY_PHOTO, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); + _tmp0_ = gee_hash_multi_map_new (TYPE_TAG, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, TYPE_LIBRARY_PHOTO, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); #line 4679 "/home/jens/Source/shotwell/src/Photo.vala" map = _tmp0_; -#line 36176 "Photo.c" +#line 36276 "Photo.c" { GeeIterator* _media_it = NULL; GeeCollection* _tmp1_ = NULL; @@ -36190,7 +36290,7 @@ static void library_photo_source_collection_real_postprocess_imported_media (Med _media_it = _tmp2_; #line 4680 "/home/jens/Source/shotwell/src/Photo.vala" while (TRUE) { -#line 36189 "Photo.c" +#line 36289 "Photo.c" GeeIterator* _tmp3_ = NULL; gboolean _tmp4_ = FALSE; MediaSource* media = NULL; @@ -36221,7 +36321,7 @@ static void library_photo_source_collection_real_postprocess_imported_media (Med if (!_tmp4_) { #line 4680 "/home/jens/Source/shotwell/src/Photo.vala" break; -#line 36220 "Photo.c" +#line 36320 "Photo.c" } #line 4680 "/home/jens/Source/shotwell/src/Photo.vala" _tmp5_ = _media_it; @@ -36253,7 +36353,7 @@ static void library_photo_source_collection_real_postprocess_imported_media (Med _tmp13_ = photo_metadata_has_hierarchical_keywords (_tmp12_); #line 4693 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp13_) { -#line 36252 "Photo.c" +#line 36352 "Photo.c" PhotoMetadata* _tmp14_ = NULL; GeeSet* _tmp15_ = NULL; GeeSet* _tmp16_ = NULL; @@ -36272,7 +36372,7 @@ static void library_photo_source_collection_real_postprocess_imported_media (Med htag_index = _tmp17_; #line 4694 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_tmp16_); -#line 36271 "Photo.c" +#line 36371 "Photo.c" } #line 4698 "/home/jens/Source/shotwell/src/Photo.vala" _tmp18_ = photo; @@ -36286,7 +36386,7 @@ static void library_photo_source_collection_real_postprocess_imported_media (Med _g_object_unref0 (_tmp20_); #line 4698 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp21_) { -#line 36285 "Photo.c" +#line 36385 "Photo.c" { GeeIterator* _keyword_it = NULL; LibraryPhoto* _tmp22_ = NULL; @@ -36310,7 +36410,7 @@ static void library_photo_source_collection_real_postprocess_imported_media (Med _keyword_it = _tmp26_; #line 4699 "/home/jens/Source/shotwell/src/Photo.vala" while (TRUE) { -#line 36309 "Photo.c" +#line 36409 "Photo.c" GeeIterator* _tmp27_ = NULL; gboolean _tmp28_ = FALSE; gchar* keyword = NULL; @@ -36333,7 +36433,7 @@ static void library_photo_source_collection_real_postprocess_imported_media (Med if (!_tmp28_) { #line 4699 "/home/jens/Source/shotwell/src/Photo.vala" break; -#line 36332 "Photo.c" +#line 36432 "Photo.c" } #line 4699 "/home/jens/Source/shotwell/src/Photo.vala" _tmp29_ = _keyword_it; @@ -36345,7 +36445,7 @@ static void library_photo_source_collection_real_postprocess_imported_media (Med _tmp32_ = htag_index; #line 4700 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp32_ != NULL) { -#line 36344 "Photo.c" +#line 36444 "Photo.c" HierarchicalTagIndex* _tmp33_ = NULL; const gchar* _tmp34_ = NULL; gboolean _tmp35_ = FALSE; @@ -36357,11 +36457,11 @@ static void library_photo_source_collection_real_postprocess_imported_media (Med _tmp35_ = hierarchical_tag_index_is_tag_in_index (_tmp33_, _tmp34_); #line 4700 "/home/jens/Source/shotwell/src/Photo.vala" _tmp31_ = _tmp35_; -#line 36356 "Photo.c" +#line 36456 "Photo.c" } else { #line 4700 "/home/jens/Source/shotwell/src/Photo.vala" _tmp31_ = FALSE; -#line 36360 "Photo.c" +#line 36460 "Photo.c" } #line 4700 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp31_) { @@ -36369,7 +36469,7 @@ static void library_photo_source_collection_real_postprocess_imported_media (Med _g_free0 (keyword); #line 4701 "/home/jens/Source/shotwell/src/Photo.vala" continue; -#line 36368 "Photo.c" +#line 36468 "Photo.c" } #line 4703 "/home/jens/Source/shotwell/src/Photo.vala" _tmp36_ = keyword; @@ -36385,7 +36485,7 @@ static void library_photo_source_collection_real_postprocess_imported_media (Med _tmp40_ = hierarchical_tag_index_is_tag_in_index (_tmp38_, _tmp39_); #line 4705 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp40_) { -#line 36384 "Photo.c" +#line 36484 "Photo.c" gchar* most_derived_path = NULL; HierarchicalTagIndex* _tmp41_ = NULL; const gchar* _tmp42_ = NULL; @@ -36425,13 +36525,13 @@ static void library_photo_source_collection_real_postprocess_imported_media (Med _g_free0 (keyword); #line 4708 "/home/jens/Source/shotwell/src/Photo.vala" continue; -#line 36424 "Photo.c" +#line 36524 "Photo.c" } #line 4711 "/home/jens/Source/shotwell/src/Photo.vala" _tmp49_ = name; #line 4711 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp49_ != NULL) { -#line 36430 "Photo.c" +#line 36530 "Photo.c" GeeHashMultiMap* _tmp50_ = NULL; const gchar* _tmp51_ = NULL; Tag* _tmp52_ = NULL; @@ -36451,17 +36551,17 @@ static void library_photo_source_collection_real_postprocess_imported_media (Med gee_multi_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp50_, GEE_TYPE_MULTI_MAP, GeeMultiMap), _tmp53_, _tmp54_); #line 4712 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_tmp53_); -#line 36450 "Photo.c" +#line 36550 "Photo.c" } #line 4699 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (name); #line 4699 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (keyword); -#line 36456 "Photo.c" +#line 36556 "Photo.c" } #line 4699 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_keyword_it); -#line 36460 "Photo.c" +#line 36560 "Photo.c" } } #line 4716 "/home/jens/Source/shotwell/src/Photo.vala" @@ -36470,7 +36570,7 @@ static void library_photo_source_collection_real_postprocess_imported_media (Med _tmp56_ = photo_metadata_has_hierarchical_keywords (_tmp55_); #line 4716 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp56_) { -#line 36469 "Photo.c" +#line 36569 "Photo.c" { GeeIterator* _path_it = NULL; HierarchicalTagIndex* _tmp57_ = NULL; @@ -36494,7 +36594,7 @@ static void library_photo_source_collection_real_postprocess_imported_media (Med _path_it = _tmp61_; #line 4717 "/home/jens/Source/shotwell/src/Photo.vala" while (TRUE) { -#line 36493 "Photo.c" +#line 36593 "Photo.c" GeeIterator* _tmp62_ = NULL; gboolean _tmp63_ = FALSE; gchar* path = NULL; @@ -36512,7 +36612,7 @@ static void library_photo_source_collection_real_postprocess_imported_media (Med if (!_tmp63_) { #line 4717 "/home/jens/Source/shotwell/src/Photo.vala" break; -#line 36511 "Photo.c" +#line 36611 "Photo.c" } #line 4717 "/home/jens/Source/shotwell/src/Photo.vala" _tmp64_ = _path_it; @@ -36530,7 +36630,7 @@ static void library_photo_source_collection_real_postprocess_imported_media (Med _tmp68_ = name; #line 4719 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp68_ != NULL) { -#line 36529 "Photo.c" +#line 36629 "Photo.c" GeeHashMultiMap* _tmp69_ = NULL; const gchar* _tmp70_ = NULL; Tag* _tmp71_ = NULL; @@ -36550,17 +36650,17 @@ static void library_photo_source_collection_real_postprocess_imported_media (Med gee_multi_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp69_, GEE_TYPE_MULTI_MAP, GeeMultiMap), _tmp72_, _tmp73_); #line 4720 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_tmp72_); -#line 36549 "Photo.c" +#line 36649 "Photo.c" } #line 4717 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (name); #line 4717 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (path); -#line 36555 "Photo.c" +#line 36655 "Photo.c" } #line 4717 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_path_it); -#line 36559 "Photo.c" +#line 36659 "Photo.c" } } #line 4680 "/home/jens/Source/shotwell/src/Photo.vala" @@ -36573,11 +36673,11 @@ static void library_photo_source_collection_real_postprocess_imported_media (Med _g_object_unref0 (photo); #line 4680 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (media); -#line 36572 "Photo.c" +#line 36672 "Photo.c" } #line 4680 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_media_it); -#line 36576 "Photo.c" +#line 36676 "Photo.c" } { GeeIterator* _media_it = NULL; @@ -36591,7 +36691,7 @@ static void library_photo_source_collection_real_postprocess_imported_media (Med _media_it = _tmp75_; #line 4725 "/home/jens/Source/shotwell/src/Photo.vala" while (TRUE) { -#line 36590 "Photo.c" +#line 36690 "Photo.c" GeeIterator* _tmp76_ = NULL; gboolean _tmp77_ = FALSE; MediaSource* media = NULL; @@ -36609,7 +36709,7 @@ static void library_photo_source_collection_real_postprocess_imported_media (Med if (!_tmp77_) { #line 4725 "/home/jens/Source/shotwell/src/Photo.vala" break; -#line 36608 "Photo.c" +#line 36708 "Photo.c" } #line 4725 "/home/jens/Source/shotwell/src/Photo.vala" _tmp78_ = _media_it; @@ -36631,11 +36731,11 @@ static void library_photo_source_collection_real_postprocess_imported_media (Med _g_object_unref0 (photo); #line 4725 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (media); -#line 36630 "Photo.c" +#line 36730 "Photo.c" } #line 4725 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_media_it); -#line 36634 "Photo.c" +#line 36734 "Photo.c" } { GeeIterator* _tag_it = NULL; @@ -36660,7 +36760,7 @@ static void library_photo_source_collection_real_postprocess_imported_media (Med _tag_it = _tmp87_; #line 4730 "/home/jens/Source/shotwell/src/Photo.vala" while (TRUE) { -#line 36659 "Photo.c" +#line 36759 "Photo.c" GeeIterator* _tmp88_ = NULL; gboolean _tmp89_ = FALSE; Tag* tag = NULL; @@ -36679,7 +36779,7 @@ static void library_photo_source_collection_real_postprocess_imported_media (Med if (!_tmp89_) { #line 4730 "/home/jens/Source/shotwell/src/Photo.vala" break; -#line 36678 "Photo.c" +#line 36778 "Photo.c" } #line 4730 "/home/jens/Source/shotwell/src/Photo.vala" _tmp90_ = _tag_it; @@ -36703,11 +36803,11 @@ static void library_photo_source_collection_real_postprocess_imported_media (Med _g_object_unref0 (_tmp96_); #line 4730 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (tag); -#line 36702 "Photo.c" +#line 36802 "Photo.c" } #line 4730 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_tag_it); -#line 36706 "Photo.c" +#line 36806 "Photo.c" } #line 4733 "/home/jens/Source/shotwell/src/Photo.vala" _tmp97_ = media_sources; @@ -36715,7 +36815,7 @@ static void library_photo_source_collection_real_postprocess_imported_media (Med MEDIA_SOURCE_COLLECTION_CLASS (library_photo_source_collection_parent_class)->postprocess_imported_media (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection), _tmp97_); #line 4678 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (map); -#line 36714 "Photo.c" +#line 36814 "Photo.c" } @@ -36732,7 +36832,7 @@ static void library_photo_source_collection_real_notify_master_reimported (Libra _tmp1_ = metadata; #line 4738 "/home/jens/Source/shotwell/src/Photo.vala" g_signal_emit_by_name (self, "master-reimported", _tmp0_, _tmp1_); -#line 36731 "Photo.c" +#line 36831 "Photo.c" } @@ -36741,7 +36841,7 @@ void library_photo_source_collection_notify_master_reimported (LibraryPhotoSourc g_return_if_fail (IS_LIBRARY_PHOTO_SOURCE_COLLECTION (self)); #line 4737 "/home/jens/Source/shotwell/src/Photo.vala" LIBRARY_PHOTO_SOURCE_COLLECTION_GET_CLASS (self)->notify_master_reimported (self, photo, metadata); -#line 36740 "Photo.c" +#line 36840 "Photo.c" } @@ -36758,7 +36858,7 @@ static void library_photo_source_collection_real_notify_editable_reimported (Lib _tmp1_ = metadata; #line 4743 "/home/jens/Source/shotwell/src/Photo.vala" g_signal_emit_by_name (self, "editable-reimported", _tmp0_, _tmp1_); -#line 36757 "Photo.c" +#line 36857 "Photo.c" } @@ -36767,7 +36867,7 @@ void library_photo_source_collection_notify_editable_reimported (LibraryPhotoSou g_return_if_fail (IS_LIBRARY_PHOTO_SOURCE_COLLECTION (self)); #line 4742 "/home/jens/Source/shotwell/src/Photo.vala" LIBRARY_PHOTO_SOURCE_COLLECTION_GET_CLASS (self)->notify_editable_reimported (self, photo, metadata); -#line 36766 "Photo.c" +#line 36866 "Photo.c" } @@ -36784,7 +36884,7 @@ static void library_photo_source_collection_real_notify_source_reimported (Libra _tmp1_ = metadata; #line 4748 "/home/jens/Source/shotwell/src/Photo.vala" g_signal_emit_by_name (self, "source-reimported", _tmp0_, _tmp1_); -#line 36783 "Photo.c" +#line 36883 "Photo.c" } @@ -36793,7 +36893,7 @@ void library_photo_source_collection_notify_source_reimported (LibraryPhotoSourc g_return_if_fail (IS_LIBRARY_PHOTO_SOURCE_COLLECTION (self)); #line 4747 "/home/jens/Source/shotwell/src/Photo.vala" LIBRARY_PHOTO_SOURCE_COLLECTION_GET_CLASS (self)->notify_source_reimported (self, photo, metadata); -#line 36792 "Photo.c" +#line 36892 "Photo.c" } @@ -36810,7 +36910,7 @@ static void library_photo_source_collection_real_notify_baseline_reimported (Lib _tmp1_ = metadata; #line 4753 "/home/jens/Source/shotwell/src/Photo.vala" g_signal_emit_by_name (self, "baseline-reimported", _tmp0_, _tmp1_); -#line 36809 "Photo.c" +#line 36909 "Photo.c" } @@ -36819,7 +36919,7 @@ void library_photo_source_collection_notify_baseline_reimported (LibraryPhotoSou g_return_if_fail (IS_LIBRARY_PHOTO_SOURCE_COLLECTION (self)); #line 4752 "/home/jens/Source/shotwell/src/Photo.vala" LIBRARY_PHOTO_SOURCE_COLLECTION_GET_CLASS (self)->notify_baseline_reimported (self, photo, metadata); -#line 36818 "Photo.c" +#line 36918 "Photo.c" } @@ -36841,7 +36941,7 @@ static MediaSource* library_photo_source_collection_real_fetch_by_numeric_id (Me result = G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_MEDIA_SOURCE, MediaSource); #line 4757 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 36840 "Photo.c" +#line 36940 "Photo.c" } @@ -36860,7 +36960,7 @@ static void library_photo_source_collection_on_trashcan_contents_altered (Librar _tmp1_ = removed; #line 4762 "/home/jens/Source/shotwell/src/Photo.vala" g_signal_emit_by_name (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection), "trashcan-contents-altered", G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_COLLECTION, GeeCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_COLLECTION, GeeCollection)); -#line 36859 "Photo.c" +#line 36959 "Photo.c" } @@ -36882,7 +36982,7 @@ static gboolean library_photo_source_collection_check_if_trashed_photo (LibraryP result = _tmp1_; #line 4767 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 36881 "Photo.c" +#line 36981 "Photo.c" } @@ -36901,7 +37001,7 @@ static void library_photo_source_collection_on_offline_contents_altered (Library _tmp1_ = removed; #line 4772 "/home/jens/Source/shotwell/src/Photo.vala" g_signal_emit_by_name (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection), "offline-contents-altered", G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_COLLECTION, GeeCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_COLLECTION, GeeCollection)); -#line 36900 "Photo.c" +#line 37000 "Photo.c" } @@ -36923,7 +37023,7 @@ static gboolean library_photo_source_collection_check_if_offline_photo (LibraryP result = _tmp1_; #line 4777 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 36922 "Photo.c" +#line 37022 "Photo.c" } @@ -36946,7 +37046,7 @@ static glong string_strnlen (gchar* str, glong maxlen) { _tmp3_ = end; #line 1296 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" if (_tmp3_ == NULL) { -#line 36945 "Photo.c" +#line 37045 "Photo.c" glong _tmp4_ = 0L; #line 1297 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp4_ = maxlen; @@ -36954,7 +37054,7 @@ static glong string_strnlen (gchar* str, glong maxlen) { result = _tmp4_; #line 1297 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" return result; -#line 36953 "Photo.c" +#line 37053 "Photo.c" } else { gchar* _tmp5_ = NULL; gchar* _tmp6_ = NULL; @@ -36966,7 +37066,7 @@ static glong string_strnlen (gchar* str, glong maxlen) { result = (glong) (_tmp5_ - _tmp6_); #line 1299 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" return result; -#line 36965 "Photo.c" +#line 37065 "Photo.c" } } @@ -36990,21 +37090,21 @@ static gchar* string_substring (const gchar* self, glong offset, glong len) { _tmp1_ = offset; #line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" if (_tmp1_ >= ((glong) 0)) { -#line 36989 "Photo.c" +#line 37089 "Photo.c" glong _tmp2_ = 0L; #line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp2_ = len; #line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp0_ = _tmp2_ >= ((glong) 0); -#line 36995 "Photo.c" +#line 37095 "Photo.c" } else { #line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp0_ = FALSE; -#line 36999 "Photo.c" +#line 37099 "Photo.c" } #line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" if (_tmp0_) { -#line 37003 "Photo.c" +#line 37103 "Photo.c" glong _tmp3_ = 0L; glong _tmp4_ = 0L; glong _tmp5_ = 0L; @@ -37016,7 +37116,7 @@ static gchar* string_substring (const gchar* self, glong offset, glong len) { _tmp5_ = string_strnlen ((gchar*) self, _tmp3_ + _tmp4_); #line 1310 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" string_length = _tmp5_; -#line 37015 "Photo.c" +#line 37115 "Photo.c" } else { gint _tmp6_ = 0; gint _tmp7_ = 0; @@ -37026,13 +37126,13 @@ static gchar* string_substring (const gchar* self, glong offset, glong len) { _tmp7_ = _tmp6_; #line 1312 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" string_length = (glong) _tmp7_; -#line 37025 "Photo.c" +#line 37125 "Photo.c" } #line 1315 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp8_ = offset; #line 1315 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" if (_tmp8_ < ((glong) 0)) { -#line 37031 "Photo.c" +#line 37131 "Photo.c" glong _tmp9_ = 0L; glong _tmp10_ = 0L; glong _tmp11_ = 0L; @@ -37046,7 +37146,7 @@ static gchar* string_substring (const gchar* self, glong offset, glong len) { _tmp11_ = offset; #line 1317 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" g_return_val_if_fail (_tmp11_ >= ((glong) 0), NULL); -#line 37045 "Photo.c" +#line 37145 "Photo.c" } else { glong _tmp12_ = 0L; glong _tmp13_ = 0L; @@ -37056,13 +37156,13 @@ static gchar* string_substring (const gchar* self, glong offset, glong len) { _tmp13_ = string_length; #line 1319 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" g_return_val_if_fail (_tmp12_ <= _tmp13_, NULL); -#line 37055 "Photo.c" +#line 37155 "Photo.c" } #line 1321 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp14_ = len; #line 1321 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" if (_tmp14_ < ((glong) 0)) { -#line 37061 "Photo.c" +#line 37161 "Photo.c" glong _tmp15_ = 0L; glong _tmp16_ = 0L; #line 1322 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" @@ -37071,7 +37171,7 @@ static gchar* string_substring (const gchar* self, glong offset, glong len) { _tmp16_ = offset; #line 1322 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" len = _tmp15_ - _tmp16_; -#line 37070 "Photo.c" +#line 37170 "Photo.c" } #line 1324 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp17_ = offset; @@ -37091,7 +37191,7 @@ static gchar* string_substring (const gchar* self, glong offset, glong len) { result = _tmp22_; #line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" return result; -#line 37090 "Photo.c" +#line 37190 "Photo.c" } @@ -37137,7 +37237,7 @@ static MediaSource* library_photo_source_collection_real_fetch_by_source_id (Med _g_free0 (numeric_only); #line 4784 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 37136 "Photo.c" +#line 37236 "Photo.c" } @@ -37169,7 +37269,7 @@ static GeeCollection* library_photo_source_collection_real_get_event_source_ids result = _tmp4_; #line 4788 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 37168 "Photo.c" +#line 37268 "Photo.c" } @@ -37192,7 +37292,7 @@ LibraryPhoto* library_photo_source_collection_fetch (LibraryPhotoSourceCollectio result = G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_LIBRARY_PHOTO, LibraryPhoto); #line 4792 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 37191 "Photo.c" +#line 37291 "Photo.c" } @@ -37215,7 +37315,7 @@ LibraryPhoto* library_photo_source_collection_fetch_by_editable_file (LibraryPho result = (LibraryPhoto*) _tmp2_; #line 4796 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 37214 "Photo.c" +#line 37314 "Photo.c" } @@ -37238,7 +37338,7 @@ LibraryPhoto* library_photo_source_collection_fetch_by_raw_development_file (Lib result = (LibraryPhoto*) _tmp2_; #line 4800 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 37237 "Photo.c" +#line 37337 "Photo.c" } @@ -37286,7 +37386,7 @@ static void library_photo_source_collection_compare_backing (LibraryPhotoSourceC _backing_photo_row_unref0 (_tmp2_); #line 4806 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp5_) { -#line 37285 "Photo.c" +#line 37385 "Photo.c" GeeCollection* _tmp6_ = NULL; LibraryPhoto* _tmp7_ = NULL; #line 4807 "/home/jens/Source/shotwell/src/Photo.vala" @@ -37295,7 +37395,7 @@ static void library_photo_source_collection_compare_backing (LibraryPhotoSourceC _tmp7_ = photo; #line 4807 "/home/jens/Source/shotwell/src/Photo.vala" gee_collection_add (_tmp6_, _tmp7_); -#line 37294 "Photo.c" +#line 37394 "Photo.c" } #line 4809 "/home/jens/Source/shotwell/src/Photo.vala" _tmp8_ = photo; @@ -37307,7 +37407,7 @@ static void library_photo_source_collection_compare_backing (LibraryPhotoSourceC _tmp11_ = editable; #line 4810 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp11_ != NULL) { -#line 37306 "Photo.c" +#line 37406 "Photo.c" BackingPhotoRow* _tmp12_ = NULL; GFileInfo* _tmp13_ = NULL; gboolean _tmp14_ = FALSE; @@ -37319,15 +37419,15 @@ static void library_photo_source_collection_compare_backing (LibraryPhotoSourceC _tmp14_ = backing_photo_row_matches_file_info (_tmp12_, _tmp13_); #line 4810 "/home/jens/Source/shotwell/src/Photo.vala" _tmp10_ = _tmp14_; -#line 37318 "Photo.c" +#line 37418 "Photo.c" } else { #line 4810 "/home/jens/Source/shotwell/src/Photo.vala" _tmp10_ = FALSE; -#line 37322 "Photo.c" +#line 37422 "Photo.c" } #line 4810 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp10_) { -#line 37326 "Photo.c" +#line 37426 "Photo.c" GeeCollection* _tmp15_ = NULL; LibraryPhoto* _tmp16_ = NULL; #line 4811 "/home/jens/Source/shotwell/src/Photo.vala" @@ -37336,7 +37436,7 @@ static void library_photo_source_collection_compare_backing (LibraryPhotoSourceC _tmp16_ = photo; #line 4811 "/home/jens/Source/shotwell/src/Photo.vala" gee_collection_add (_tmp15_, _tmp16_); -#line 37335 "Photo.c" +#line 37435 "Photo.c" } #line 4813 "/home/jens/Source/shotwell/src/Photo.vala" _tmp17_ = photo; @@ -37348,7 +37448,7 @@ static void library_photo_source_collection_compare_backing (LibraryPhotoSourceC _tmp19_ = development; #line 4814 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp19_ != NULL) { -#line 37347 "Photo.c" +#line 37447 "Photo.c" { GeeIterator* _row_it = NULL; GeeCollection* _tmp20_ = NULL; @@ -37361,7 +37461,7 @@ static void library_photo_source_collection_compare_backing (LibraryPhotoSourceC _row_it = _tmp21_; #line 4815 "/home/jens/Source/shotwell/src/Photo.vala" while (TRUE) { -#line 37360 "Photo.c" +#line 37460 "Photo.c" GeeIterator* _tmp22_ = NULL; gboolean _tmp23_ = FALSE; BackingPhotoRow* row = NULL; @@ -37378,7 +37478,7 @@ static void library_photo_source_collection_compare_backing (LibraryPhotoSourceC if (!_tmp23_) { #line 4815 "/home/jens/Source/shotwell/src/Photo.vala" break; -#line 37377 "Photo.c" +#line 37477 "Photo.c" } #line 4815 "/home/jens/Source/shotwell/src/Photo.vala" _tmp24_ = _row_it; @@ -37394,7 +37494,7 @@ static void library_photo_source_collection_compare_backing (LibraryPhotoSourceC _tmp28_ = backing_photo_row_matches_file_info (_tmp26_, _tmp27_); #line 4816 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp28_) { -#line 37393 "Photo.c" +#line 37493 "Photo.c" GeeCollection* _tmp29_ = NULL; LibraryPhoto* _tmp30_ = NULL; #line 4817 "/home/jens/Source/shotwell/src/Photo.vala" @@ -37407,22 +37507,22 @@ static void library_photo_source_collection_compare_backing (LibraryPhotoSourceC _backing_photo_row_unref0 (row); #line 4819 "/home/jens/Source/shotwell/src/Photo.vala" break; -#line 37406 "Photo.c" +#line 37506 "Photo.c" } #line 4815 "/home/jens/Source/shotwell/src/Photo.vala" _backing_photo_row_unref0 (row); -#line 37410 "Photo.c" +#line 37510 "Photo.c" } #line 4815 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_row_it); -#line 37414 "Photo.c" +#line 37514 "Photo.c" } } #line 4803 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (development); #line 4803 "/home/jens/Source/shotwell/src/Photo.vala" _backing_photo_row_unref0 (editable); -#line 37421 "Photo.c" +#line 37521 "Photo.c" } @@ -37437,7 +37537,7 @@ void library_photo_source_collection_fetch_by_matching_backing (LibraryPhotoSour g_return_if_fail (GEE_IS_COLLECTION (matches_editable)); #line 4827 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (GEE_IS_COLLECTION (matched_development)); -#line 37436 "Photo.c" +#line 37536 "Photo.c" { GeeIterator* _photo_it = NULL; GeeMultiMap* _tmp0_ = NULL; @@ -37467,7 +37567,7 @@ void library_photo_source_collection_fetch_by_matching_backing (LibraryPhotoSour _photo_it = _tmp6_; #line 4829 "/home/jens/Source/shotwell/src/Photo.vala" while (TRUE) { -#line 37466 "Photo.c" +#line 37566 "Photo.c" GeeIterator* _tmp7_ = NULL; gboolean _tmp8_ = FALSE; LibraryPhoto* photo = NULL; @@ -37486,7 +37586,7 @@ void library_photo_source_collection_fetch_by_matching_backing (LibraryPhotoSour if (!_tmp8_) { #line 4829 "/home/jens/Source/shotwell/src/Photo.vala" break; -#line 37485 "Photo.c" +#line 37585 "Photo.c" } #line 4829 "/home/jens/Source/shotwell/src/Photo.vala" _tmp9_ = _photo_it; @@ -37508,11 +37608,11 @@ void library_photo_source_collection_fetch_by_matching_backing (LibraryPhotoSour library_photo_source_collection_compare_backing (self, _tmp11_, _tmp12_, _tmp13_, _tmp14_, _tmp15_); #line 4829 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (photo); -#line 37507 "Photo.c" +#line 37607 "Photo.c" } #line 4829 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_photo_it); -#line 37511 "Photo.c" +#line 37611 "Photo.c" } { GeeIterator* _media_it = NULL; @@ -37534,7 +37634,7 @@ void library_photo_source_collection_fetch_by_matching_backing (LibraryPhotoSour _media_it = _tmp19_; #line 4832 "/home/jens/Source/shotwell/src/Photo.vala" while (TRUE) { -#line 37533 "Photo.c" +#line 37633 "Photo.c" GeeIterator* _tmp20_ = NULL; gboolean _tmp21_ = FALSE; MediaSource* media = NULL; @@ -37553,7 +37653,7 @@ void library_photo_source_collection_fetch_by_matching_backing (LibraryPhotoSour if (!_tmp21_) { #line 4832 "/home/jens/Source/shotwell/src/Photo.vala" break; -#line 37552 "Photo.c" +#line 37652 "Photo.c" } #line 4832 "/home/jens/Source/shotwell/src/Photo.vala" _tmp22_ = _media_it; @@ -37575,11 +37675,11 @@ void library_photo_source_collection_fetch_by_matching_backing (LibraryPhotoSour library_photo_source_collection_compare_backing (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, TYPE_LIBRARY_PHOTO, LibraryPhoto), _tmp25_, _tmp26_, _tmp27_, _tmp28_); #line 4832 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (media); -#line 37574 "Photo.c" +#line 37674 "Photo.c" } #line 4832 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_media_it); -#line 37578 "Photo.c" +#line 37678 "Photo.c" } } @@ -37590,7 +37690,7 @@ void library_photo_source_collection_get_basename_filesize_duplicate (LibraryPho g_return_if_fail (IS_LIBRARY_PHOTO_SOURCE_COLLECTION (self)); #line 4836 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (basename != NULL); -#line 37589 "Photo.c" +#line 37689 "Photo.c" { GeeIterator* _photo_it = NULL; GeeMultiMap* _tmp0_ = NULL; @@ -37617,7 +37717,7 @@ void library_photo_source_collection_get_basename_filesize_duplicate (LibraryPho _photo_it = _tmp5_; #line 4837 "/home/jens/Source/shotwell/src/Photo.vala" while (TRUE) { -#line 37616 "Photo.c" +#line 37716 "Photo.c" GeeIterator* _tmp6_ = NULL; gboolean _tmp7_ = FALSE; LibraryPhoto* photo = NULL; @@ -37638,7 +37738,7 @@ void library_photo_source_collection_get_basename_filesize_duplicate (LibraryPho if (!_tmp7_) { #line 4837 "/home/jens/Source/shotwell/src/Photo.vala" break; -#line 37637 "Photo.c" +#line 37737 "Photo.c" } #line 4837 "/home/jens/Source/shotwell/src/Photo.vala" _tmp8_ = _photo_it; @@ -37664,7 +37764,7 @@ void library_photo_source_collection_get_basename_filesize_duplicate (LibraryPho _g_object_unref0 (_tmp12_); #line 4838 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp16_) { -#line 37663 "Photo.c" +#line 37763 "Photo.c" LibraryPhoto* _tmp17_ = NULL; PhotoID _tmp18_ = {0}; #line 4839 "/home/jens/Source/shotwell/src/Photo.vala" @@ -37679,15 +37779,15 @@ void library_photo_source_collection_get_basename_filesize_duplicate (LibraryPho _g_object_unref0 (_photo_it); #line 4839 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 37678 "Photo.c" +#line 37778 "Photo.c" } #line 4837 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (photo); -#line 37682 "Photo.c" +#line 37782 "Photo.c" } #line 4837 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_photo_it); -#line 37686 "Photo.c" +#line 37786 "Photo.c" } #line 4842 "/home/jens/Source/shotwell/src/Photo.vala" photo_id_init (&_tmp19_, PHOTO_ID_INVALID); @@ -37695,7 +37795,7 @@ void library_photo_source_collection_get_basename_filesize_duplicate (LibraryPho *result = _tmp19_; #line 4842 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 37694 "Photo.c" +#line 37794 "Photo.c" } @@ -37721,7 +37821,7 @@ gboolean library_photo_source_collection_has_basename_filesize_duplicate (Librar result = _tmp3_; #line 4847 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 37720 "Photo.c" +#line 37820 "Photo.c" } @@ -37756,7 +37856,7 @@ LibraryPhoto* library_photo_source_collection_get_trashed_by_file (LibraryPhotoS _tmp5_ = photo; #line 4852 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp5_ == NULL) { -#line 37755 "Photo.c" +#line 37855 "Photo.c" MediaSourceHoldingTank* _tmp6_ = NULL; LibraryPhotoSourceHoldingTank* _tmp7_ = NULL; GFile* _tmp8_ = NULL; @@ -37775,13 +37875,13 @@ LibraryPhoto* library_photo_source_collection_get_trashed_by_file (LibraryPhotoS photo = G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, TYPE_LIBRARY_PHOTO, LibraryPhoto); #line 4853 "/home/jens/Source/shotwell/src/Photo.vala" _source_holding_tank_unref0 (_tmp7_); -#line 37774 "Photo.c" +#line 37874 "Photo.c" } #line 4856 "/home/jens/Source/shotwell/src/Photo.vala" result = photo; #line 4856 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 37780 "Photo.c" +#line 37880 "Photo.c" } @@ -37812,7 +37912,7 @@ LibraryPhoto* library_photo_source_collection_get_trashed_by_md5 (LibraryPhotoSo result = _tmp4_; #line 4860 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 37811 "Photo.c" +#line 37911 "Photo.c" } @@ -37847,7 +37947,7 @@ LibraryPhoto* library_photo_source_collection_get_offline_by_file (LibraryPhotoS _tmp5_ = photo; #line 4865 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp5_ == NULL) { -#line 37846 "Photo.c" +#line 37946 "Photo.c" MediaSourceHoldingTank* _tmp6_ = NULL; LibraryPhotoSourceHoldingTank* _tmp7_ = NULL; GFile* _tmp8_ = NULL; @@ -37866,13 +37966,13 @@ LibraryPhoto* library_photo_source_collection_get_offline_by_file (LibraryPhotoS photo = G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, TYPE_LIBRARY_PHOTO, LibraryPhoto); #line 4866 "/home/jens/Source/shotwell/src/Photo.vala" _source_holding_tank_unref0 (_tmp7_); -#line 37865 "Photo.c" +#line 37965 "Photo.c" } #line 4869 "/home/jens/Source/shotwell/src/Photo.vala" result = photo; #line 4869 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 37871 "Photo.c" +#line 37971 "Photo.c" } @@ -37903,7 +38003,7 @@ LibraryPhoto* library_photo_source_collection_get_offline_by_md5 (LibraryPhotoSo result = _tmp4_; #line 4873 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 37902 "Photo.c" +#line 38002 "Photo.c" } @@ -37929,7 +38029,7 @@ gint library_photo_source_collection_get_offline_count (LibraryPhotoSourceCollec result = _tmp3_; #line 4877 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 37928 "Photo.c" +#line 38028 "Photo.c" } @@ -37976,11 +38076,11 @@ LibraryPhoto* library_photo_source_collection_get_state_by_file (LibraryPhotoSou if (state) { #line 4885 "/home/jens/Source/shotwell/src/Photo.vala" *state = _vala_state; -#line 37975 "Photo.c" +#line 38075 "Photo.c" } #line 4885 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 37979 "Photo.c" +#line 38079 "Photo.c" } #line 4888 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = file; @@ -38002,11 +38102,11 @@ LibraryPhoto* library_photo_source_collection_get_state_by_file (LibraryPhotoSou if (state) { #line 4892 "/home/jens/Source/shotwell/src/Photo.vala" *state = _vala_state; -#line 38001 "Photo.c" +#line 38101 "Photo.c" } #line 4892 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 38005 "Photo.c" +#line 38105 "Photo.c" } #line 4895 "/home/jens/Source/shotwell/src/Photo.vala" _tmp6_ = file; @@ -38028,11 +38128,11 @@ LibraryPhoto* library_photo_source_collection_get_state_by_file (LibraryPhotoSou if (state) { #line 4899 "/home/jens/Source/shotwell/src/Photo.vala" *state = _vala_state; -#line 38027 "Photo.c" +#line 38127 "Photo.c" } #line 4899 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 38031 "Photo.c" +#line 38131 "Photo.c" } #line 4902 "/home/jens/Source/shotwell/src/Photo.vala" _tmp9_ = file; @@ -38044,7 +38144,7 @@ LibraryPhoto* library_photo_source_collection_get_state_by_file (LibraryPhotoSou if (_tmp11_ == NULL) { #line 4902 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_tmp10_); -#line 38043 "Photo.c" +#line 38143 "Photo.c" } #line 4902 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (photo); @@ -38062,11 +38162,11 @@ LibraryPhoto* library_photo_source_collection_get_state_by_file (LibraryPhotoSou if (state) { #line 4906 "/home/jens/Source/shotwell/src/Photo.vala" *state = _vala_state; -#line 38061 "Photo.c" +#line 38161 "Photo.c" } #line 4906 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 38065 "Photo.c" +#line 38165 "Photo.c" } #line 4909 "/home/jens/Source/shotwell/src/Photo.vala" _tmp13_ = file; @@ -38078,7 +38178,7 @@ LibraryPhoto* library_photo_source_collection_get_state_by_file (LibraryPhotoSou if (_tmp15_ == NULL) { #line 4909 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_tmp14_); -#line 38077 "Photo.c" +#line 38177 "Photo.c" } #line 4909 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (photo); @@ -38096,11 +38196,11 @@ LibraryPhoto* library_photo_source_collection_get_state_by_file (LibraryPhotoSou if (state) { #line 4913 "/home/jens/Source/shotwell/src/Photo.vala" *state = _vala_state; -#line 38095 "Photo.c" +#line 38195 "Photo.c" } #line 4913 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 38099 "Photo.c" +#line 38199 "Photo.c" } #line 4916 "/home/jens/Source/shotwell/src/Photo.vala" _vala_state = LIBRARY_PHOTO_SOURCE_COLLECTION_STATE_UNKNOWN; @@ -38112,11 +38212,11 @@ LibraryPhoto* library_photo_source_collection_get_state_by_file (LibraryPhotoSou if (state) { #line 4918 "/home/jens/Source/shotwell/src/Photo.vala" *state = _vala_state; -#line 38111 "Photo.c" +#line 38211 "Photo.c" } #line 4918 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 38115 "Photo.c" +#line 38215 "Photo.c" } @@ -38149,7 +38249,7 @@ static gboolean library_photo_source_collection_real_has_backlink (SourceCollect result = TRUE; #line 4923 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 38148 "Photo.c" +#line 38248 "Photo.c" } #line 4925 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = media_source_collection_get_trashcan (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection)); @@ -38169,7 +38269,7 @@ static gboolean library_photo_source_collection_real_has_backlink (SourceCollect result = TRUE; #line 4926 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 38168 "Photo.c" +#line 38268 "Photo.c" } #line 4928 "/home/jens/Source/shotwell/src/Photo.vala" _tmp7_ = media_source_collection_get_offline_bin (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection)); @@ -38189,13 +38289,13 @@ static gboolean library_photo_source_collection_real_has_backlink (SourceCollect result = TRUE; #line 4929 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 38188 "Photo.c" +#line 38288 "Photo.c" } #line 4931 "/home/jens/Source/shotwell/src/Photo.vala" result = FALSE; #line 4931 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 38194 "Photo.c" +#line 38294 "Photo.c" } @@ -38236,7 +38336,7 @@ static void library_photo_source_collection_real_remove_backlink (SourceCollecti _tmp6_ = backlink; #line 4938 "/home/jens/Source/shotwell/src/Photo.vala" SOURCE_COLLECTION_CLASS (library_photo_source_collection_parent_class)->remove_backlink (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection), TYPE_SOURCE_COLLECTION, SourceCollection), _tmp6_); -#line 38235 "Photo.c" +#line 38335 "Photo.c" } @@ -38251,7 +38351,7 @@ static TransactionController* library_photo_source_collection_real_get_transacti _tmp0_ = self->priv->_transaction_controller; #line 4456 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp0_ == NULL) { -#line 38250 "Photo.c" +#line 38350 "Photo.c" MediaSourceTransactionController* _tmp1_ = NULL; #line 4457 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = media_source_transaction_controller_new (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection)); @@ -38259,7 +38359,7 @@ static TransactionController* library_photo_source_collection_real_get_transacti _transaction_controller_unref0 (self->priv->_transaction_controller); #line 4457 "/home/jens/Source/shotwell/src/Photo.vala" self->priv->_transaction_controller = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_TRANSACTION_CONTROLLER, TransactionController); -#line 38258 "Photo.c" +#line 38358 "Photo.c" } #line 4459 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = self->priv->_transaction_controller; @@ -38267,7 +38367,7 @@ static TransactionController* library_photo_source_collection_real_get_transacti result = _tmp2_; #line 4459 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 38266 "Photo.c" +#line 38366 "Photo.c" } @@ -38276,7 +38376,7 @@ static void library_photo_source_collection_real_master_reimported (LibraryPhoto g_return_if_fail (IS_LIBRARY_PHOTO (photo)); #line 4477 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail ((metadata == NULL) || IS_PHOTO_METADATA (metadata)); -#line 38275 "Photo.c" +#line 38375 "Photo.c" } @@ -38295,19 +38395,19 @@ static void g_cclosure_user_marshal_VOID__OBJECT_MEDIA_METADATA (GClosure * clos data1 = closure->data; #line 4444 "/home/jens/Source/shotwell/src/Photo.vala" data2 = param_values->data[0].v_pointer; -#line 38294 "Photo.c" +#line 38394 "Photo.c" } else { #line 4444 "/home/jens/Source/shotwell/src/Photo.vala" data1 = param_values->data[0].v_pointer; #line 4444 "/home/jens/Source/shotwell/src/Photo.vala" data2 = closure->data; -#line 38300 "Photo.c" +#line 38400 "Photo.c" } #line 4444 "/home/jens/Source/shotwell/src/Photo.vala" callback = (GMarshalFunc_VOID__OBJECT_MEDIA_METADATA) (marshal_data ? marshal_data : cc->callback); #line 4444 "/home/jens/Source/shotwell/src/Photo.vala" callback (data1, g_value_get_object (param_values + 1), value_get_media_metadata (param_values + 2), data2); -#line 38306 "Photo.c" +#line 38406 "Photo.c" } @@ -38316,7 +38416,7 @@ static void library_photo_source_collection_real_editable_reimported (LibraryPho g_return_if_fail (IS_LIBRARY_PHOTO (photo)); #line 4480 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail ((metadata == NULL) || IS_PHOTO_METADATA (metadata)); -#line 38315 "Photo.c" +#line 38415 "Photo.c" } @@ -38325,7 +38425,7 @@ static void library_photo_source_collection_real_baseline_reimported (LibraryPho g_return_if_fail (IS_LIBRARY_PHOTO (photo)); #line 4483 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail ((metadata == NULL) || IS_PHOTO_METADATA (metadata)); -#line 38324 "Photo.c" +#line 38424 "Photo.c" } @@ -38334,7 +38434,7 @@ static void library_photo_source_collection_real_source_reimported (LibraryPhoto g_return_if_fail (IS_LIBRARY_PHOTO (photo)); #line 4486 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail ((metadata == NULL) || IS_PHOTO_METADATA (metadata)); -#line 38333 "Photo.c" +#line 38433 "Photo.c" } @@ -38346,41 +38446,41 @@ static void library_photo_source_collection_class_init (LibraryPhotoSourceCollec #line 4444 "/home/jens/Source/shotwell/src/Photo.vala" g_type_class_add_private (klass, sizeof (LibraryPhotoSourceCollectionPrivate)); #line 4444 "/home/jens/Source/shotwell/src/Photo.vala" - ((MediaSourceCollectionClass *) klass)->create_trashcan = library_photo_source_collection_real_create_trashcan; + ((MediaSourceCollectionClass *) klass)->create_trashcan = (MediaSourceHoldingTank* (*)(MediaSourceCollection*)) library_photo_source_collection_real_create_trashcan; #line 4444 "/home/jens/Source/shotwell/src/Photo.vala" - ((MediaSourceCollectionClass *) klass)->create_offline_bin = library_photo_source_collection_real_create_offline_bin; + ((MediaSourceCollectionClass *) klass)->create_offline_bin = (MediaSourceHoldingTank* (*)(MediaSourceCollection*)) library_photo_source_collection_real_create_offline_bin; #line 4444 "/home/jens/Source/shotwell/src/Photo.vala" - ((MediaSourceCollectionClass *) klass)->create_media_monitor = library_photo_source_collection_real_create_media_monitor; + ((MediaSourceCollectionClass *) klass)->create_media_monitor = (MediaMonitor* (*)(MediaSourceCollection*, Workers*, GCancellable*)) library_photo_source_collection_real_create_media_monitor; #line 4444 "/home/jens/Source/shotwell/src/Photo.vala" - ((SourceCollectionClass *) klass)->holds_type_of_source = library_photo_source_collection_real_holds_type_of_source; + ((SourceCollectionClass *) klass)->holds_type_of_source = (gboolean (*)(SourceCollection*, DataSource*)) library_photo_source_collection_real_holds_type_of_source; #line 4444 "/home/jens/Source/shotwell/src/Photo.vala" - ((MediaSourceCollectionClass *) klass)->get_typename = library_photo_source_collection_real_get_typename; + ((MediaSourceCollectionClass *) klass)->get_typename = (gchar* (*)(MediaSourceCollection*)) library_photo_source_collection_real_get_typename; #line 4444 "/home/jens/Source/shotwell/src/Photo.vala" - ((MediaSourceCollectionClass *) klass)->is_file_recognized = library_photo_source_collection_real_is_file_recognized; + ((MediaSourceCollectionClass *) klass)->is_file_recognized = (gboolean (*)(MediaSourceCollection*, GFile*)) library_photo_source_collection_real_is_file_recognized; #line 4444 "/home/jens/Source/shotwell/src/Photo.vala" - ((DataCollectionClass *) klass)->notify_contents_altered = library_photo_source_collection_real_notify_contents_altered; + ((DataCollectionClass *) klass)->notify_contents_altered = (void (*)(DataCollection*, GeeIterable*, GeeIterable*)) library_photo_source_collection_real_notify_contents_altered; #line 4444 "/home/jens/Source/shotwell/src/Photo.vala" - ((DataCollectionClass *) klass)->items_altered = library_photo_source_collection_real_items_altered; + ((DataCollectionClass *) klass)->items_altered = (void (*)(DataCollection*, GeeMap*)) library_photo_source_collection_real_items_altered; #line 4444 "/home/jens/Source/shotwell/src/Photo.vala" - ((MediaSourceCollectionClass *) klass)->postprocess_imported_media = library_photo_source_collection_real_postprocess_imported_media; + ((MediaSourceCollectionClass *) klass)->postprocess_imported_media = (void (*)(MediaSourceCollection*, GeeCollection*)) library_photo_source_collection_real_postprocess_imported_media; #line 4444 "/home/jens/Source/shotwell/src/Photo.vala" - ((LibraryPhotoSourceCollectionClass *) klass)->notify_master_reimported = library_photo_source_collection_real_notify_master_reimported; + ((LibraryPhotoSourceCollectionClass *) klass)->notify_master_reimported = (void (*)(LibraryPhotoSourceCollection*, LibraryPhoto*, PhotoMetadata*)) library_photo_source_collection_real_notify_master_reimported; #line 4444 "/home/jens/Source/shotwell/src/Photo.vala" - ((LibraryPhotoSourceCollectionClass *) klass)->notify_editable_reimported = library_photo_source_collection_real_notify_editable_reimported; + ((LibraryPhotoSourceCollectionClass *) klass)->notify_editable_reimported = (void (*)(LibraryPhotoSourceCollection*, LibraryPhoto*, PhotoMetadata*)) library_photo_source_collection_real_notify_editable_reimported; #line 4444 "/home/jens/Source/shotwell/src/Photo.vala" - ((LibraryPhotoSourceCollectionClass *) klass)->notify_source_reimported = library_photo_source_collection_real_notify_source_reimported; + ((LibraryPhotoSourceCollectionClass *) klass)->notify_source_reimported = (void (*)(LibraryPhotoSourceCollection*, LibraryPhoto*, PhotoMetadata*)) library_photo_source_collection_real_notify_source_reimported; #line 4444 "/home/jens/Source/shotwell/src/Photo.vala" - ((LibraryPhotoSourceCollectionClass *) klass)->notify_baseline_reimported = library_photo_source_collection_real_notify_baseline_reimported; + ((LibraryPhotoSourceCollectionClass *) klass)->notify_baseline_reimported = (void (*)(LibraryPhotoSourceCollection*, LibraryPhoto*, PhotoMetadata*)) library_photo_source_collection_real_notify_baseline_reimported; #line 4444 "/home/jens/Source/shotwell/src/Photo.vala" - ((MediaSourceCollectionClass *) klass)->fetch_by_numeric_id = library_photo_source_collection_real_fetch_by_numeric_id; + ((MediaSourceCollectionClass *) klass)->fetch_by_numeric_id = (MediaSource* (*)(MediaSourceCollection*, gint64)) library_photo_source_collection_real_fetch_by_numeric_id; #line 4444 "/home/jens/Source/shotwell/src/Photo.vala" - ((MediaSourceCollectionClass *) klass)->fetch_by_source_id = library_photo_source_collection_real_fetch_by_source_id; + ((MediaSourceCollectionClass *) klass)->fetch_by_source_id = (MediaSource* (*)(MediaSourceCollection*, const gchar*)) library_photo_source_collection_real_fetch_by_source_id; #line 4444 "/home/jens/Source/shotwell/src/Photo.vala" - ((MediaSourceCollectionClass *) klass)->get_event_source_ids = library_photo_source_collection_real_get_event_source_ids; + ((MediaSourceCollectionClass *) klass)->get_event_source_ids = (GeeCollection* (*)(MediaSourceCollection*, EventID*)) library_photo_source_collection_real_get_event_source_ids; #line 4444 "/home/jens/Source/shotwell/src/Photo.vala" - ((SourceCollectionClass *) klass)->has_backlink = library_photo_source_collection_real_has_backlink; + ((SourceCollectionClass *) klass)->has_backlink = (gboolean (*)(SourceCollection*, SourceBacklink*)) library_photo_source_collection_real_has_backlink; #line 4444 "/home/jens/Source/shotwell/src/Photo.vala" - ((SourceCollectionClass *) klass)->remove_backlink = library_photo_source_collection_real_remove_backlink; + ((SourceCollectionClass *) klass)->remove_backlink = (void (*)(SourceCollection*, SourceBacklink*)) library_photo_source_collection_real_remove_backlink; #line 4444 "/home/jens/Source/shotwell/src/Photo.vala" ((LibraryPhotoSourceCollectionClass *) klass)->master_reimported = library_photo_source_collection_real_master_reimported; #line 4444 "/home/jens/Source/shotwell/src/Photo.vala" @@ -38399,7 +38499,7 @@ static void library_photo_source_collection_class_init (LibraryPhotoSourceCollec g_signal_new ("baseline_reimported", TYPE_LIBRARY_PHOTO_SOURCE_COLLECTION, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (LibraryPhotoSourceCollectionClass, baseline_reimported), NULL, NULL, g_cclosure_user_marshal_VOID__OBJECT_MEDIA_METADATA, G_TYPE_NONE, 2, TYPE_LIBRARY_PHOTO, TYPE_PHOTO_METADATA); #line 4444 "/home/jens/Source/shotwell/src/Photo.vala" g_signal_new ("source_reimported", TYPE_LIBRARY_PHOTO_SOURCE_COLLECTION, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (LibraryPhotoSourceCollectionClass, source_reimported), NULL, NULL, g_cclosure_user_marshal_VOID__OBJECT_MEDIA_METADATA, G_TYPE_NONE, 2, TYPE_LIBRARY_PHOTO, TYPE_PHOTO_METADATA); -#line 38398 "Photo.c" +#line 38498 "Photo.c" } @@ -38415,30 +38515,30 @@ static void library_photo_source_collection_instance_init (LibraryPhotoSourceCol #line 4463 "/home/jens/Source/shotwell/src/Photo.vala" self->priv->_transaction_controller = NULL; #line 4464 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp0_ = gee_hash_map_new (g_file_get_type (), (GBoxedCopyFunc) g_object_ref, g_object_unref, TYPE_LIBRARY_PHOTO, (GBoxedCopyFunc) g_object_ref, g_object_unref, _file_hash_gee_hash_data_func, NULL, NULL, _file_equal_gee_equal_data_func, NULL, NULL, NULL, NULL, NULL); + _tmp0_ = gee_hash_map_new (g_file_get_type (), (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, TYPE_LIBRARY_PHOTO, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, _file_hash_gee_hash_data_func, NULL, NULL, _file_equal_gee_equal_data_func, NULL, NULL, NULL, NULL, NULL); #line 4464 "/home/jens/Source/shotwell/src/Photo.vala" self->priv->by_editable_file = _tmp0_; #line 4466 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp1_ = gee_hash_map_new (g_file_get_type (), (GBoxedCopyFunc) g_object_ref, g_object_unref, TYPE_LIBRARY_PHOTO, (GBoxedCopyFunc) g_object_ref, g_object_unref, _file_hash_gee_hash_data_func, NULL, NULL, _file_equal_gee_equal_data_func, NULL, NULL, NULL, NULL, NULL); + _tmp1_ = gee_hash_map_new (g_file_get_type (), (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, TYPE_LIBRARY_PHOTO, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, _file_hash_gee_hash_data_func, NULL, NULL, _file_equal_gee_equal_data_func, NULL, NULL, NULL, NULL, NULL); #line 4466 "/home/jens/Source/shotwell/src/Photo.vala" self->priv->by_raw_development_file = _tmp1_; #line 4468 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp2_ = gee_tree_multi_map_new (G_TYPE_INT64, (GBoxedCopyFunc) _int64_dup, g_free, TYPE_LIBRARY_PHOTO, (GBoxedCopyFunc) g_object_ref, g_object_unref, _int64_compare_gcompare_data_func, NULL, NULL, NULL, NULL, NULL); + _tmp2_ = gee_tree_multi_map_new (G_TYPE_INT64, (GBoxedCopyFunc) _int64_dup, (GDestroyNotify) g_free, TYPE_LIBRARY_PHOTO, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, _int64_compare_gcompare_data_func, NULL, NULL, NULL, NULL, NULL); #line 4468 "/home/jens/Source/shotwell/src/Photo.vala" self->priv->filesize_to_photo = G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_MULTI_MAP, GeeMultiMap); #line 4470 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp3_ = gee_hash_map_new (TYPE_LIBRARY_PHOTO, (GBoxedCopyFunc) g_object_ref, g_object_unref, G_TYPE_INT64, (GBoxedCopyFunc) _int64_dup, g_free, NULL, NULL, NULL, NULL, NULL, NULL, _int64_equal_gee_equal_data_func, NULL, NULL); + _tmp3_ = gee_hash_map_new (TYPE_LIBRARY_PHOTO, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, G_TYPE_INT64, (GBoxedCopyFunc) _int64_dup, (GDestroyNotify) g_free, NULL, NULL, NULL, NULL, NULL, NULL, _int64_equal_gee_equal_data_func, NULL, NULL); #line 4470 "/home/jens/Source/shotwell/src/Photo.vala" self->priv->photo_to_master_filesize = _tmp3_; #line 4472 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp4_ = gee_hash_map_new (TYPE_LIBRARY_PHOTO, (GBoxedCopyFunc) g_object_ref, g_object_unref, G_TYPE_INT64, (GBoxedCopyFunc) _int64_dup, g_free, NULL, NULL, NULL, NULL, NULL, NULL, _int64_equal_gee_equal_data_func, NULL, NULL); + _tmp4_ = gee_hash_map_new (TYPE_LIBRARY_PHOTO, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, G_TYPE_INT64, (GBoxedCopyFunc) _int64_dup, (GDestroyNotify) g_free, NULL, NULL, NULL, NULL, NULL, NULL, _int64_equal_gee_equal_data_func, NULL, NULL); #line 4472 "/home/jens/Source/shotwell/src/Photo.vala" self->priv->photo_to_editable_filesize = _tmp4_; #line 4474 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp5_ = gee_tree_multi_map_new (TYPE_LIBRARY_PHOTO, (GBoxedCopyFunc) g_object_ref, g_object_unref, G_TYPE_INT64, (GBoxedCopyFunc) _int64_dup, g_free, NULL, NULL, NULL, NULL, NULL, NULL); + _tmp5_ = gee_tree_multi_map_new (TYPE_LIBRARY_PHOTO, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, G_TYPE_INT64, (GBoxedCopyFunc) _int64_dup, (GDestroyNotify) g_free, NULL, NULL, NULL, NULL, NULL, NULL); #line 4474 "/home/jens/Source/shotwell/src/Photo.vala" self->priv->photo_to_raw_development_filesize = G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, GEE_TYPE_MULTI_MAP, GeeMultiMap); -#line 38437 "Photo.c" +#line 38537 "Photo.c" } @@ -38462,7 +38562,7 @@ static void library_photo_source_collection_finalize (DataCollection* obj) { _g_object_unref0 (self->priv->photo_to_raw_development_filesize); #line 4444 "/home/jens/Source/shotwell/src/Photo.vala" DATA_COLLECTION_CLASS (library_photo_source_collection_parent_class)->finalize (obj); -#line 38461 "Photo.c" +#line 38561 "Photo.c" } @@ -38481,7 +38581,7 @@ GType library_photo_source_collection_get_type (void) { static void _library_photo_generate_thumbnails_one_shot_callback (gpointer self) { #line 4966 "/home/jens/Source/shotwell/src/Photo.vala" library_photo_generate_thumbnails ((LibraryPhoto*) self); -#line 38480 "Photo.c" +#line 38580 "Photo.c" } @@ -38515,7 +38615,7 @@ static LibraryPhoto* library_photo_construct (GType object_type, PhotoRow* row) _tmp3_ = _tmp2_->flags; #line 4969 "/home/jens/Source/shotwell/src/Photo.vala" if ((_tmp3_ & (LIBRARY_PHOTO_FLAG_TRASH | LIBRARY_PHOTO_FLAG_OFFLINE)) != ((guint64) 0)) { -#line 38514 "Photo.c" +#line 38614 "Photo.c" LibraryPhotoSourceCollection* _tmp4_ = NULL; PhotoRow* _tmp5_ = NULL; const gchar* _tmp6_ = NULL; @@ -38527,7 +38627,7 @@ static LibraryPhoto* library_photo_construct (GType object_type, PhotoRow* row) _tmp6_ = _tmp5_->backlinks; #line 4970 "/home/jens/Source/shotwell/src/Photo.vala" data_source_rehydrate_backlinks (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_SOURCE, DataSource), G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_SOURCE_COLLECTION, SourceCollection), _tmp6_); -#line 38526 "Photo.c" +#line 38626 "Photo.c" } #line 4972 "/home/jens/Source/shotwell/src/Photo.vala" _tmp7_ = row; @@ -38535,7 +38635,7 @@ static LibraryPhoto* library_photo_construct (GType object_type, PhotoRow* row) _tmp8_ = _tmp7_->flags; #line 4972 "/home/jens/Source/shotwell/src/Photo.vala" if ((_tmp8_ & (LIBRARY_PHOTO_FLAG_HIDDEN | LIBRARY_PHOTO_FLAG_FAVORITE)) != ((guint64) 0)) { -#line 38534 "Photo.c" +#line 38634 "Photo.c" PhotoRow* _tmp9_ = NULL; guint64 _tmp10_ = 0ULL; #line 4973 "/home/jens/Source/shotwell/src/Photo.vala" @@ -38544,18 +38644,18 @@ static LibraryPhoto* library_photo_construct (GType object_type, PhotoRow* row) _tmp10_ = _tmp9_->flags; #line 4973 "/home/jens/Source/shotwell/src/Photo.vala" library_photo_upgrade_rating_flags (self, _tmp10_); -#line 38543 "Photo.c" +#line 38643 "Photo.c" } #line 4961 "/home/jens/Source/shotwell/src/Photo.vala" return self; -#line 38547 "Photo.c" +#line 38647 "Photo.c" } static LibraryPhoto* library_photo_new (PhotoRow* row) { #line 4961 "/home/jens/Source/shotwell/src/Photo.vala" return library_photo_construct (TYPE_LIBRARY_PHOTO, row); -#line 38554 "Photo.c" +#line 38654 "Photo.c" } @@ -38605,7 +38705,7 @@ static LibraryPhoto* library_photo_construct_from_import_params (GType object_ty _tmp8_ = _tmp7_->flags; #line 4983 "/home/jens/Source/shotwell/src/Photo.vala" if ((_tmp8_ & (LIBRARY_PHOTO_FLAG_TRASH | LIBRARY_PHOTO_FLAG_OFFLINE)) != ((guint64) 0)) { -#line 38604 "Photo.c" +#line 38704 "Photo.c" LibraryPhotoSourceCollection* _tmp9_ = NULL; PhotoImportParams* _tmp10_ = NULL; PhotoRow* _tmp11_ = NULL; @@ -38620,7 +38720,7 @@ static LibraryPhoto* library_photo_construct_from_import_params (GType object_ty _tmp12_ = _tmp11_->backlinks; #line 4984 "/home/jens/Source/shotwell/src/Photo.vala" data_source_rehydrate_backlinks (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_SOURCE, DataSource), G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, TYPE_SOURCE_COLLECTION, SourceCollection), _tmp12_); -#line 38619 "Photo.c" +#line 38719 "Photo.c" } #line 4986 "/home/jens/Source/shotwell/src/Photo.vala" _tmp13_ = import_params; @@ -38630,7 +38730,7 @@ static LibraryPhoto* library_photo_construct_from_import_params (GType object_ty _tmp15_ = _tmp14_->flags; #line 4986 "/home/jens/Source/shotwell/src/Photo.vala" if ((_tmp15_ & (LIBRARY_PHOTO_FLAG_HIDDEN | LIBRARY_PHOTO_FLAG_FAVORITE)) != ((guint64) 0)) { -#line 38629 "Photo.c" +#line 38729 "Photo.c" PhotoImportParams* _tmp16_ = NULL; PhotoRow* _tmp17_ = NULL; guint64 _tmp18_ = 0ULL; @@ -38642,18 +38742,18 @@ static LibraryPhoto* library_photo_construct_from_import_params (GType object_ty _tmp18_ = _tmp17_->flags; #line 4987 "/home/jens/Source/shotwell/src/Photo.vala" library_photo_upgrade_rating_flags (self, _tmp18_); -#line 38641 "Photo.c" +#line 38741 "Photo.c" } #line 4976 "/home/jens/Source/shotwell/src/Photo.vala" return self; -#line 38645 "Photo.c" +#line 38745 "Photo.c" } static LibraryPhoto* library_photo_new_from_import_params (PhotoImportParams* import_params) { #line 4976 "/home/jens/Source/shotwell/src/Photo.vala" return library_photo_construct_from_import_params (TYPE_LIBRARY_PHOTO, import_params); -#line 38652 "Photo.c" +#line 38752 "Photo.c" } @@ -38703,38 +38803,38 @@ void library_photo_init (ProgressMonitor monitor, void* monitor_target) { #line 4997 "/home/jens/Source/shotwell/src/Photo.vala" all = _tmp4_; #line 4998 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp5_ = gee_array_list_new (TYPE_LIBRARY_PHOTO, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL); + _tmp5_ = gee_array_list_new (TYPE_LIBRARY_PHOTO, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL); #line 4998 "/home/jens/Source/shotwell/src/Photo.vala" all_photos = _tmp5_; #line 4999 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp6_ = gee_array_list_new (TYPE_LIBRARY_PHOTO, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL); + _tmp6_ = gee_array_list_new (TYPE_LIBRARY_PHOTO, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL); #line 4999 "/home/jens/Source/shotwell/src/Photo.vala" trashed_photos = _tmp6_; #line 5000 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp7_ = gee_array_list_new (TYPE_LIBRARY_PHOTO, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL); + _tmp7_ = gee_array_list_new (TYPE_LIBRARY_PHOTO, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL); #line 5000 "/home/jens/Source/shotwell/src/Photo.vala" offline_photos = _tmp7_; #line 5001 "/home/jens/Source/shotwell/src/Photo.vala" _tmp8_ = all; #line 5001 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp9_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, GEE_TYPE_COLLECTION, GeeCollection)); + _tmp9_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); #line 5001 "/home/jens/Source/shotwell/src/Photo.vala" _tmp10_ = _tmp9_; #line 5001 "/home/jens/Source/shotwell/src/Photo.vala" count = _tmp10_; -#line 38721 "Photo.c" +#line 38821 "Photo.c" { gint ctr = 0; #line 5002 "/home/jens/Source/shotwell/src/Photo.vala" ctr = 0; -#line 38726 "Photo.c" +#line 38826 "Photo.c" { gboolean _tmp11_ = FALSE; #line 5002 "/home/jens/Source/shotwell/src/Photo.vala" _tmp11_ = TRUE; #line 5002 "/home/jens/Source/shotwell/src/Photo.vala" while (TRUE) { -#line 38733 "Photo.c" +#line 38833 "Photo.c" gint _tmp13_ = 0; gint _tmp14_ = 0; PhotoRow* row = NULL; @@ -38752,13 +38852,13 @@ void library_photo_init (ProgressMonitor monitor, void* monitor_target) { void* _tmp30__target = NULL; #line 5002 "/home/jens/Source/shotwell/src/Photo.vala" if (!_tmp11_) { -#line 38751 "Photo.c" +#line 38851 "Photo.c" gint _tmp12_ = 0; #line 5002 "/home/jens/Source/shotwell/src/Photo.vala" _tmp12_ = ctr; #line 5002 "/home/jens/Source/shotwell/src/Photo.vala" ctr = _tmp12_ + 1; -#line 38757 "Photo.c" +#line 38857 "Photo.c" } #line 5002 "/home/jens/Source/shotwell/src/Photo.vala" _tmp11_ = FALSE; @@ -38770,7 +38870,7 @@ void library_photo_init (ProgressMonitor monitor, void* monitor_target) { if (!(_tmp13_ < _tmp14_)) { #line 5002 "/home/jens/Source/shotwell/src/Photo.vala" break; -#line 38769 "Photo.c" +#line 38869 "Photo.c" } #line 5003 "/home/jens/Source/shotwell/src/Photo.vala" _tmp15_ = all; @@ -38796,7 +38896,7 @@ void library_photo_init (ProgressMonitor monitor, void* monitor_target) { _tmp22_ = flags; #line 5007 "/home/jens/Source/shotwell/src/Photo.vala" if ((_tmp22_ & LIBRARY_PHOTO_FLAG_TRASH) != ((guint64) 0)) { -#line 38795 "Photo.c" +#line 38895 "Photo.c" GeeArrayList* _tmp23_ = NULL; LibraryPhoto* _tmp24_ = NULL; #line 5008 "/home/jens/Source/shotwell/src/Photo.vala" @@ -38805,14 +38905,14 @@ void library_photo_init (ProgressMonitor monitor, void* monitor_target) { _tmp24_ = photo; #line 5008 "/home/jens/Source/shotwell/src/Photo.vala" gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp24_); -#line 38804 "Photo.c" +#line 38904 "Photo.c" } else { guint64 _tmp25_ = 0ULL; #line 5009 "/home/jens/Source/shotwell/src/Photo.vala" _tmp25_ = flags; #line 5009 "/home/jens/Source/shotwell/src/Photo.vala" if ((_tmp25_ & LIBRARY_PHOTO_FLAG_OFFLINE) != ((guint64) 0)) { -#line 38811 "Photo.c" +#line 38911 "Photo.c" GeeArrayList* _tmp26_ = NULL; LibraryPhoto* _tmp27_ = NULL; #line 5010 "/home/jens/Source/shotwell/src/Photo.vala" @@ -38821,7 +38921,7 @@ void library_photo_init (ProgressMonitor monitor, void* monitor_target) { _tmp27_ = photo; #line 5010 "/home/jens/Source/shotwell/src/Photo.vala" gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp27_); -#line 38820 "Photo.c" +#line 38920 "Photo.c" } else { GeeArrayList* _tmp28_ = NULL; LibraryPhoto* _tmp29_ = NULL; @@ -38831,7 +38931,7 @@ void library_photo_init (ProgressMonitor monitor, void* monitor_target) { _tmp29_ = photo; #line 5012 "/home/jens/Source/shotwell/src/Photo.vala" gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp28_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp29_); -#line 38830 "Photo.c" +#line 38930 "Photo.c" } } #line 5014 "/home/jens/Source/shotwell/src/Photo.vala" @@ -38840,7 +38940,7 @@ void library_photo_init (ProgressMonitor monitor, void* monitor_target) { _tmp30__target = monitor_target; #line 5014 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp30_ != NULL) { -#line 38839 "Photo.c" +#line 38939 "Photo.c" ProgressMonitor _tmp31_ = NULL; void* _tmp31__target = NULL; gint _tmp32_ = 0; @@ -38855,13 +38955,13 @@ void library_photo_init (ProgressMonitor monitor, void* monitor_target) { _tmp33_ = count; #line 5015 "/home/jens/Source/shotwell/src/Photo.vala" _tmp31_ ((guint64) _tmp32_, (guint64) _tmp33_, TRUE, _tmp31__target); -#line 38854 "Photo.c" +#line 38954 "Photo.c" } #line 5002 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (photo); #line 5002 "/home/jens/Source/shotwell/src/Photo.vala" _photo_row_unref0 (row); -#line 38860 "Photo.c" +#line 38960 "Photo.c" } } } @@ -38895,14 +38995,14 @@ void library_photo_init (ProgressMonitor monitor, void* monitor_target) { _g_object_unref0 (all_photos); #line 4990 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (all); -#line 38894 "Photo.c" +#line 38994 "Photo.c" } void library_photo_terminate (void) { #line 5024 "/home/jens/Source/shotwell/src/Photo.vala" photo_terminate_photo (); -#line 38901 "Photo.c" +#line 39001 "Photo.c" } @@ -38951,15 +39051,15 @@ ImportResult library_photo_import_create (PhotoImportParams* params, LibraryPhot if (photo) { #line 5037 "/home/jens/Source/shotwell/src/Photo.vala" *photo = _vala_photo; -#line 38950 "Photo.c" +#line 39050 "Photo.c" } else { #line 5037 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_vala_photo); -#line 38954 "Photo.c" +#line 39054 "Photo.c" } #line 5037 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 38958 "Photo.c" +#line 39058 "Photo.c" } #line 5041 "/home/jens/Source/shotwell/src/Photo.vala" _tmp7_ = params; @@ -38975,15 +39075,15 @@ ImportResult library_photo_import_create (PhotoImportParams* params, LibraryPhot if (photo) { #line 5043 "/home/jens/Source/shotwell/src/Photo.vala" *photo = _vala_photo; -#line 38974 "Photo.c" +#line 39074 "Photo.c" } else { #line 5043 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_vala_photo); -#line 38978 "Photo.c" +#line 39078 "Photo.c" } #line 5043 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 38982 "Photo.c" +#line 39082 "Photo.c" } @@ -38991,7 +39091,7 @@ void library_photo_import_failed (LibraryPhoto* photo) { GError * _inner_error_ = NULL; #line 5046 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (IS_LIBRARY_PHOTO (photo)); -#line 38990 "Photo.c" +#line 39090 "Photo.c" { PhotoTable* _tmp0_ = NULL; PhotoTable* _tmp1_ = NULL; @@ -39013,7 +39113,7 @@ void library_photo_import_failed (LibraryPhoto* photo) { if (G_UNLIKELY (_inner_error_ != NULL)) { #line 5048 "/home/jens/Source/shotwell/src/Photo.vala" if (_inner_error_->domain == DATABASE_ERROR) { -#line 39012 "Photo.c" +#line 39112 "Photo.c" goto __catch406_database_error; } #line 5048 "/home/jens/Source/shotwell/src/Photo.vala" @@ -39022,7 +39122,7 @@ void library_photo_import_failed (LibraryPhoto* photo) { g_clear_error (&_inner_error_); #line 5048 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 39021 "Photo.c" +#line 39121 "Photo.c" } } goto __finally406; @@ -39040,7 +39140,7 @@ void library_photo_import_failed (LibraryPhoto* photo) { app_window_database_error (_tmp4_); #line 5047 "/home/jens/Source/shotwell/src/Photo.vala" _g_error_free0 (err); -#line 39039 "Photo.c" +#line 39139 "Photo.c" } __finally406: #line 5047 "/home/jens/Source/shotwell/src/Photo.vala" @@ -39051,7 +39151,7 @@ void library_photo_import_failed (LibraryPhoto* photo) { g_clear_error (&_inner_error_); #line 5047 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 39050 "Photo.c" +#line 39150 "Photo.c" } } @@ -39075,7 +39175,7 @@ static void library_photo_real_notify_master_reimported (Photo* base, PhotoMetad _tmp2_ = metadata; #line 5057 "/home/jens/Source/shotwell/src/Photo.vala" library_photo_source_collection_notify_master_reimported (_tmp1_, self, _tmp2_); -#line 39074 "Photo.c" +#line 39174 "Photo.c" } @@ -39098,7 +39198,7 @@ static void library_photo_real_notify_editable_reimported (Photo* base, PhotoMet _tmp2_ = metadata; #line 5063 "/home/jens/Source/shotwell/src/Photo.vala" library_photo_source_collection_notify_editable_reimported (_tmp1_, self, _tmp2_); -#line 39097 "Photo.c" +#line 39197 "Photo.c" } @@ -39121,7 +39221,7 @@ static void library_photo_real_notify_source_reimported (Photo* base, PhotoMetad _tmp2_ = metadata; #line 5069 "/home/jens/Source/shotwell/src/Photo.vala" library_photo_source_collection_notify_source_reimported (_tmp1_, self, _tmp2_); -#line 39120 "Photo.c" +#line 39220 "Photo.c" } @@ -39144,7 +39244,7 @@ static void library_photo_real_notify_baseline_reimported (Photo* base, PhotoMet _tmp2_ = metadata; #line 5075 "/home/jens/Source/shotwell/src/Photo.vala" library_photo_source_collection_notify_baseline_reimported (_tmp1_, self, _tmp2_); -#line 39143 "Photo.c" +#line 39243 "Photo.c" } @@ -39152,13 +39252,13 @@ static void library_photo_generate_thumbnails (LibraryPhoto* self) { GError * _inner_error_ = NULL; #line 5078 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (IS_LIBRARY_PHOTO (self)); -#line 39151 "Photo.c" +#line 39251 "Photo.c" { #line 5080 "/home/jens/Source/shotwell/src/Photo.vala" thumbnail_cache_import_from_source (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_THUMBNAIL_SOURCE, ThumbnailSource), TRUE, &_inner_error_); #line 5080 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 39157 "Photo.c" +#line 39257 "Photo.c" goto __catch407_g_error; } } @@ -39188,7 +39288,7 @@ static void library_photo_generate_thumbnails (LibraryPhoto* self) { _g_free0 (_tmp1_); #line 5079 "/home/jens/Source/shotwell/src/Photo.vala" _g_error_free0 (err); -#line 39187 "Photo.c" +#line 39287 "Photo.c" } __finally407: #line 5079 "/home/jens/Source/shotwell/src/Photo.vala" @@ -39199,11 +39299,11 @@ static void library_photo_generate_thumbnails (LibraryPhoto* self) { g_clear_error (&_inner_error_); #line 5079 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 39198 "Photo.c" +#line 39298 "Photo.c" } #line 5086 "/home/jens/Source/shotwell/src/Photo.vala" thumbnail_source_notify_thumbnail_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_THUMBNAIL_SOURCE, ThumbnailSource)); -#line 39202 "Photo.c" +#line 39302 "Photo.c" } @@ -39221,7 +39321,7 @@ GeeCollection* library_photo_get_import_keywords (LibraryPhoto* self) { result = _tmp1_; #line 5091 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 39220 "Photo.c" +#line 39320 "Photo.c" } @@ -39232,7 +39332,7 @@ void library_photo_clear_import_keywords (LibraryPhoto* self) { _g_object_unref0 (self->priv->import_keywords); #line 5095 "/home/jens/Source/shotwell/src/Photo.vala" self->priv->import_keywords = NULL; -#line 39231 "Photo.c" +#line 39331 "Photo.c" } @@ -39249,7 +39349,7 @@ static void library_photo_real_notify_altered (DataObject* base, Alteration* alt _tmp1_ = self->priv->block_thumbnail_generation; #line 5100 "/home/jens/Source/shotwell/src/Photo.vala" if (!_tmp1_) { -#line 39248 "Photo.c" +#line 39348 "Photo.c" Alteration* _tmp2_ = NULL; gboolean _tmp3_ = FALSE; #line 5100 "/home/jens/Source/shotwell/src/Photo.vala" @@ -39258,27 +39358,27 @@ static void library_photo_real_notify_altered (DataObject* base, Alteration* alt _tmp3_ = alteration_has_subject (_tmp2_, "image"); #line 5100 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = _tmp3_; -#line 39257 "Photo.c" +#line 39357 "Photo.c" } else { #line 5100 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = FALSE; -#line 39261 "Photo.c" +#line 39361 "Photo.c" } #line 5100 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp0_) { -#line 39265 "Photo.c" +#line 39365 "Photo.c" OneShotScheduler* _tmp4_ = NULL; #line 5101 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = self->priv->thumbnail_scheduler; #line 5101 "/home/jens/Source/shotwell/src/Photo.vala" one_shot_scheduler_at_priority_idle (_tmp4_, G_PRIORITY_LOW); -#line 39271 "Photo.c" +#line 39371 "Photo.c" } #line 5103 "/home/jens/Source/shotwell/src/Photo.vala" _tmp5_ = alteration; #line 5103 "/home/jens/Source/shotwell/src/Photo.vala" DATA_OBJECT_CLASS (library_photo_parent_class)->notify_altered (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO, Photo), TYPE_DATA_OBJECT, DataObject), _tmp5_); -#line 39277 "Photo.c" +#line 39377 "Photo.c" } @@ -39303,7 +39403,7 @@ static GdkPixbuf* library_photo_real_get_preview_pixbuf (MediaSource* base, Scal g_propagate_error (error, _inner_error_); #line 5107 "/home/jens/Source/shotwell/src/Photo.vala" return NULL; -#line 39302 "Photo.c" +#line 39402 "Photo.c" } #line 5109 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = scaling_perform_on_pixbuf (scaling, pixbuf, GDK_INTERP_BILINEAR, TRUE); @@ -39313,7 +39413,7 @@ static GdkPixbuf* library_photo_real_get_preview_pixbuf (MediaSource* base, Scal _g_object_unref0 (pixbuf); #line 5109 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 39312 "Photo.c" +#line 39412 "Photo.c" } @@ -39331,7 +39431,7 @@ static void library_photo_real_rotate (Photo* base, Rotation rotation) { PHOTO_CLASS (library_photo_parent_class)->rotate (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO, Photo), _tmp0_); #line 5116 "/home/jens/Source/shotwell/src/Photo.vala" self->priv->block_thumbnail_generation = FALSE; -#line 39330 "Photo.c" +#line 39430 "Photo.c" { Rotation _tmp1_ = 0; #line 5124 "/home/jens/Source/shotwell/src/Photo.vala" @@ -39340,7 +39440,7 @@ static void library_photo_real_rotate (Photo* base, Rotation rotation) { thumbnail_cache_rotate (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_THUMBNAIL_SOURCE, ThumbnailSource), _tmp1_, &_inner_error_); #line 5124 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 39339 "Photo.c" +#line 39439 "Photo.c" goto __catch408_g_error; } } @@ -39370,7 +39470,7 @@ static void library_photo_real_rotate (Photo* base, Rotation rotation) { _g_free0 (_tmp3_); #line 5123 "/home/jens/Source/shotwell/src/Photo.vala" _g_error_free0 (err); -#line 39369 "Photo.c" +#line 39469 "Photo.c" } __finally408: #line 5123 "/home/jens/Source/shotwell/src/Photo.vala" @@ -39381,11 +39481,11 @@ static void library_photo_real_rotate (Photo* base, Rotation rotation) { g_clear_error (&_inner_error_); #line 5123 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 39380 "Photo.c" +#line 39480 "Photo.c" } #line 5130 "/home/jens/Source/shotwell/src/Photo.vala" thumbnail_source_notify_thumbnail_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_THUMBNAIL_SOURCE, ThumbnailSource)); -#line 39384 "Photo.c" +#line 39484 "Photo.c" } @@ -39411,7 +39511,7 @@ static GdkPixbuf* library_photo_real_get_thumbnail (ThumbnailSource* base, gint g_propagate_error (error, _inner_error_); #line 5135 "/home/jens/Source/shotwell/src/Photo.vala" return NULL; -#line 39410 "Photo.c" +#line 39510 "Photo.c" } #line 5135 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = _tmp0_; @@ -39423,14 +39523,14 @@ static GdkPixbuf* library_photo_real_get_thumbnail (ThumbnailSource* base, gint _g_object_unref0 (_tmp0_); #line 5135 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 39422 "Photo.c" +#line 39522 "Photo.c" } static void _library_photo_on_duplicate_progress_gfile_progress_callback (gint64 current_num_bytes, gint64 total_num_bytes, gpointer self) { #line 5147 "/home/jens/Source/shotwell/src/Photo.vala" library_photo_on_duplicate_progress ((LibraryPhoto*) self, current_num_bytes, total_num_bytes); -#line 39429 "Photo.c" +#line 39529 "Photo.c" } @@ -39457,7 +39557,7 @@ static void library_photo_duplicate_backing_photo (LibraryPhoto* self, BackingPh if (_tmp1_ == NULL) { #line 5142 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = TRUE; -#line 39456 "Photo.c" +#line 39556 "Photo.c" } else { BackingPhotoRow* _tmp2_ = NULL; const gchar* _tmp3_ = NULL; @@ -39467,7 +39567,7 @@ static void library_photo_duplicate_backing_photo (LibraryPhoto* self, BackingPh _tmp3_ = _tmp2_->filepath; #line 5142 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = _tmp3_ == NULL; -#line 39466 "Photo.c" +#line 39566 "Photo.c" } #line 5142 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp0_) { @@ -39475,7 +39575,7 @@ static void library_photo_duplicate_backing_photo (LibraryPhoto* self, BackingPh *result = backing_id; #line 5143 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 39474 "Photo.c" +#line 39574 "Photo.c" } #line 5145 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = backing; @@ -39491,7 +39591,7 @@ static void library_photo_duplicate_backing_photo (LibraryPhoto* self, BackingPh _tmp8_ = g_file_query_exists (_tmp7_, NULL); #line 5146 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp8_) { -#line 39490 "Photo.c" +#line 39590 "Photo.c" GFile* dupe_file = NULL; GFile* _tmp9_ = NULL; GFile* _tmp10_ = NULL; @@ -39515,7 +39615,7 @@ static void library_photo_duplicate_backing_photo (LibraryPhoto* self, BackingPh _g_object_unref0 (file); #line 5147 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 39514 "Photo.c" +#line 39614 "Photo.c" } #line 5150 "/home/jens/Source/shotwell/src/Photo.vala" _tmp11_ = dupe_file; @@ -39539,13 +39639,13 @@ static void library_photo_duplicate_backing_photo (LibraryPhoto* self, BackingPh _g_object_unref0 (file); #line 5150 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 39538 "Photo.c" +#line 39638 "Photo.c" } #line 5152 "/home/jens/Source/shotwell/src/Photo.vala" _tmp14_ = state; #line 5152 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp14_ != NULL) { -#line 39544 "Photo.c" +#line 39644 "Photo.c" BackingPhotoTable* _tmp15_ = NULL; BackingPhotoTable* _tmp16_ = NULL; BackingPhotoRow* _tmp17_ = NULL; @@ -39575,7 +39675,7 @@ static void library_photo_duplicate_backing_photo (LibraryPhoto* self, BackingPh _g_object_unref0 (file); #line 5153 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 39574 "Photo.c" +#line 39674 "Photo.c" } #line 5154 "/home/jens/Source/shotwell/src/Photo.vala" _tmp18_ = state; @@ -39583,7 +39683,7 @@ static void library_photo_duplicate_backing_photo (LibraryPhoto* self, BackingPh _tmp19_ = _tmp18_->id; #line 5154 "/home/jens/Source/shotwell/src/Photo.vala" backing_id = _tmp19_; -#line 39582 "Photo.c" +#line 39682 "Photo.c" } #line 5146 "/home/jens/Source/shotwell/src/Photo.vala" _backing_photo_row_unref0 (state); @@ -39591,7 +39691,7 @@ static void library_photo_duplicate_backing_photo (LibraryPhoto* self, BackingPh _detected_photo_information_unref0 (detected); #line 5146 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (dupe_file); -#line 39590 "Photo.c" +#line 39690 "Photo.c" } #line 5158 "/home/jens/Source/shotwell/src/Photo.vala" *result = backing_id; @@ -39599,7 +39699,7 @@ static void library_photo_duplicate_backing_photo (LibraryPhoto* self, BackingPh _g_object_unref0 (file); #line 5158 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 39598 "Photo.c" +#line 39698 "Photo.c" } @@ -39684,7 +39784,7 @@ LibraryPhoto* library_photo_duplicate (LibraryPhoto* self, GError** error) { g_propagate_error (error, _inner_error_); #line 5163 "/home/jens/Source/shotwell/src/Photo.vala" return NULL; -#line 39683 "Photo.c" +#line 39783 "Photo.c" } #line 5166 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = photo_get_editable_photo_row (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO, Photo)); @@ -39706,7 +39806,7 @@ LibraryPhoto* library_photo_duplicate (LibraryPhoto* self, GError** error) { _g_object_unref0 (dupe_file); #line 5166 "/home/jens/Source/shotwell/src/Photo.vala" return NULL; -#line 39705 "Photo.c" +#line 39805 "Photo.c" } #line 5167 "/home/jens/Source/shotwell/src/Photo.vala" _tmp8_ = photo_get_raw_development_photo_row (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO, Photo), RAW_DEVELOPER_SHOTWELL); @@ -39728,7 +39828,7 @@ LibraryPhoto* library_photo_duplicate (LibraryPhoto* self, GError** error) { _g_object_unref0 (dupe_file); #line 5167 "/home/jens/Source/shotwell/src/Photo.vala" return NULL; -#line 39727 "Photo.c" +#line 39827 "Photo.c" } #line 5169 "/home/jens/Source/shotwell/src/Photo.vala" _tmp12_ = photo_get_raw_development_photo_row (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO, Photo), RAW_DEVELOPER_CAMERA); @@ -39750,7 +39850,7 @@ LibraryPhoto* library_photo_duplicate (LibraryPhoto* self, GError** error) { _g_object_unref0 (dupe_file); #line 5169 "/home/jens/Source/shotwell/src/Photo.vala" return NULL; -#line 39749 "Photo.c" +#line 39849 "Photo.c" } #line 5171 "/home/jens/Source/shotwell/src/Photo.vala" _tmp16_ = photo_get_raw_development_photo_row (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO, Photo), RAW_DEVELOPER_EMBEDDED); @@ -39772,7 +39872,7 @@ LibraryPhoto* library_photo_duplicate (LibraryPhoto* self, GError** error) { _g_object_unref0 (dupe_file); #line 5171 "/home/jens/Source/shotwell/src/Photo.vala" return NULL; -#line 39771 "Photo.c" +#line 39871 "Photo.c" } #line 5175 "/home/jens/Source/shotwell/src/Photo.vala" _tmp20_ = photo_table_get_instance (); @@ -39846,7 +39946,7 @@ LibraryPhoto* library_photo_duplicate (LibraryPhoto* self, GError** error) { _g_object_unref0 (_tmp44_); #line 5189 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp45_) { -#line 39845 "Photo.c" +#line 39945 "Photo.c" LibraryPhoto* _tmp46_ = NULL; Event* _tmp47_ = NULL; Event* _tmp48_ = NULL; @@ -39863,7 +39963,7 @@ LibraryPhoto* library_photo_duplicate (LibraryPhoto* self, GError** error) { event_attach (_tmp48_, G_TYPE_CHECK_INSTANCE_CAST (_tmp49_, TYPE_MEDIA_SOURCE, MediaSource)); #line 5190 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_tmp48_); -#line 39862 "Photo.c" +#line 39962 "Photo.c" } #line 5193 "/home/jens/Source/shotwell/src/Photo.vala" _tmp50_ = tag_global; @@ -39875,7 +39975,7 @@ LibraryPhoto* library_photo_duplicate (LibraryPhoto* self, GError** error) { _tmp52_ = tags; #line 5194 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp52_ != NULL) { -#line 39874 "Photo.c" +#line 39974 "Photo.c" { GeeIterator* _tag_it = NULL; GeeCollection* _tmp53_ = NULL; @@ -39888,7 +39988,7 @@ LibraryPhoto* library_photo_duplicate (LibraryPhoto* self, GError** error) { _tag_it = _tmp54_; #line 5195 "/home/jens/Source/shotwell/src/Photo.vala" while (TRUE) { -#line 39887 "Photo.c" +#line 39987 "Photo.c" GeeIterator* _tmp55_ = NULL; gboolean _tmp56_ = FALSE; Tag* tag = NULL; @@ -39904,7 +40004,7 @@ LibraryPhoto* library_photo_duplicate (LibraryPhoto* self, GError** error) { if (!_tmp56_) { #line 5195 "/home/jens/Source/shotwell/src/Photo.vala" break; -#line 39903 "Photo.c" +#line 40003 "Photo.c" } #line 5195 "/home/jens/Source/shotwell/src/Photo.vala" _tmp57_ = _tag_it; @@ -39920,11 +40020,11 @@ LibraryPhoto* library_photo_duplicate (LibraryPhoto* self, GError** error) { tag_attach (_tmp59_, G_TYPE_CHECK_INSTANCE_CAST (_tmp60_, TYPE_MEDIA_SOURCE, MediaSource)); #line 5195 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (tag); -#line 39919 "Photo.c" +#line 40019 "Photo.c" } #line 5195 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_tag_it); -#line 39923 "Photo.c" +#line 40023 "Photo.c" } } #line 5200 "/home/jens/Source/shotwell/src/Photo.vala" @@ -39937,7 +40037,7 @@ LibraryPhoto* library_photo_duplicate (LibraryPhoto* self, GError** error) { _g_object_unref0 (dupe_file); #line 5200 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 39936 "Photo.c" +#line 40036 "Photo.c" } @@ -39946,7 +40046,7 @@ static void library_photo_on_duplicate_progress (LibraryPhoto* self, gint64 curr g_return_if_fail (IS_LIBRARY_PHOTO (self)); #line 5204 "/home/jens/Source/shotwell/src/Photo.vala" spin_event_loop (); -#line 39945 "Photo.c" +#line 40045 "Photo.c" } @@ -39963,7 +40063,7 @@ static void library_photo_upgrade_rating_flags (LibraryPhoto* self, guint64 flag media_source_set_rating (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource), RATING_REJECTED); #line 5210 "/home/jens/Source/shotwell/src/Photo.vala" photo_remove_flags (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO, Photo), LIBRARY_PHOTO_FLAG_HIDDEN, NULL); -#line 39962 "Photo.c" +#line 40062 "Photo.c" } #line 5213 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = flags; @@ -39973,7 +40073,7 @@ static void library_photo_upgrade_rating_flags (LibraryPhoto* self, guint64 flag media_source_set_rating (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource), RATING_FIVE); #line 5215 "/home/jens/Source/shotwell/src/Photo.vala" photo_remove_flags (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO, Photo), LIBRARY_PHOTO_FLAG_FAVORITE, NULL); -#line 39972 "Photo.c" +#line 40072 "Photo.c" } } @@ -39990,7 +40090,7 @@ static gboolean library_photo_real_is_trashed (MediaSource* base) { result = _tmp0_; #line 5221 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 39989 "Photo.c" +#line 40089 "Photo.c" } @@ -40000,7 +40100,7 @@ static void library_photo_real_trash (MediaSource* base) { self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO, LibraryPhoto); #line 5225 "/home/jens/Source/shotwell/src/Photo.vala" photo_add_flags (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO, Photo), LIBRARY_PHOTO_FLAG_TRASH, NULL); -#line 39999 "Photo.c" +#line 40099 "Photo.c" } @@ -40010,7 +40110,7 @@ static void library_photo_real_untrash (MediaSource* base) { self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO, LibraryPhoto); #line 5229 "/home/jens/Source/shotwell/src/Photo.vala" photo_remove_flags (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO, Photo), LIBRARY_PHOTO_FLAG_TRASH, NULL); -#line 40009 "Photo.c" +#line 40109 "Photo.c" } @@ -40026,7 +40126,7 @@ static gboolean library_photo_real_is_offline (Monitorable* base) { result = _tmp0_; #line 5233 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 40025 "Photo.c" +#line 40125 "Photo.c" } @@ -40036,7 +40136,7 @@ static void library_photo_real_mark_offline (Monitorable* base) { self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO, LibraryPhoto); #line 5237 "/home/jens/Source/shotwell/src/Photo.vala" photo_add_flags (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO, Photo), LIBRARY_PHOTO_FLAG_OFFLINE, NULL); -#line 40035 "Photo.c" +#line 40135 "Photo.c" } @@ -40046,7 +40146,7 @@ static void library_photo_real_mark_online (Monitorable* base) { self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO, LibraryPhoto); #line 5241 "/home/jens/Source/shotwell/src/Photo.vala" photo_remove_flags (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO, Photo), LIBRARY_PHOTO_FLAG_OFFLINE, NULL); -#line 40045 "Photo.c" +#line 40145 "Photo.c" } @@ -40062,7 +40162,7 @@ static gboolean library_photo_real_is_flagged (Flaggable* base) { result = _tmp0_; #line 5245 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 40061 "Photo.c" +#line 40161 "Photo.c" } @@ -40080,7 +40180,7 @@ static void library_photo_real_mark_flagged (Flaggable* base) { photo_add_flags (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO, Photo), LIBRARY_PHOTO_FLAG_FLAGGED, _tmp1_); #line 5249 "/home/jens/Source/shotwell/src/Photo.vala" _alteration_unref0 (_tmp1_); -#line 40079 "Photo.c" +#line 40179 "Photo.c" } @@ -40098,7 +40198,7 @@ static void library_photo_real_mark_unflagged (Flaggable* base) { photo_remove_flags (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO, Photo), LIBRARY_PHOTO_FLAG_FLAGGED, _tmp1_); #line 5253 "/home/jens/Source/shotwell/src/Photo.vala" _alteration_unref0 (_tmp1_); -#line 40097 "Photo.c" +#line 40197 "Photo.c" } @@ -40107,7 +40207,7 @@ static gboolean library_photo_real_internal_delete_backing (DataSource* base, GE gboolean result = FALSE; gboolean _tmp0_ = FALSE; gboolean _tmp1_ = FALSE; - gboolean _tmp2_ = FALSE; + gboolean _tmp3_ = FALSE; GError * _inner_error_ = NULL; #line 5256 "/home/jens/Source/shotwell/src/Photo.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO, LibraryPhoto); @@ -40117,11 +40217,13 @@ static gboolean library_photo_real_internal_delete_backing (DataSource* base, GE _tmp0_ = _tmp1_; #line 5259 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { +#line 40216 "Photo.c" + gboolean _tmp2_ = FALSE; #line 5259 "/home/jens/Source/shotwell/src/Photo.vala" g_propagate_error (error, _inner_error_); #line 5259 "/home/jens/Source/shotwell/src/Photo.vala" - return FALSE; -#line 40120 "Photo.c" + return _tmp2_; +#line 40222 "Photo.c" } #line 5259 "/home/jens/Source/shotwell/src/Photo.vala" if (!_tmp0_) { @@ -40129,15 +40231,15 @@ static gboolean library_photo_real_internal_delete_backing (DataSource* base, GE result = FALSE; #line 5260 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 40128 "Photo.c" +#line 40230 "Photo.c" } #line 5262 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp2_ = media_source_delete_original_file (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource)); + _tmp3_ = media_source_delete_original_file (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource)); #line 5262 "/home/jens/Source/shotwell/src/Photo.vala" - result = _tmp2_; + result = _tmp3_; #line 5262 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 40136 "Photo.c" +#line 40238 "Photo.c" } @@ -40154,7 +40256,7 @@ static void library_photo_real_destroy (DataSource* base) { photo_id = _tmp0_; #line 5269 "/home/jens/Source/shotwell/src/Photo.vala" thumbnail_cache_remove (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_THUMBNAIL_SOURCE, ThumbnailSource)); -#line 40153 "Photo.c" +#line 40255 "Photo.c" { PhotoTable* _tmp1_ = NULL; PhotoTable* _tmp2_ = NULL; @@ -40173,7 +40275,7 @@ static void library_photo_real_destroy (DataSource* base) { if (G_UNLIKELY (_inner_error_ != NULL)) { #line 5275 "/home/jens/Source/shotwell/src/Photo.vala" if (_inner_error_->domain == DATABASE_ERROR) { -#line 40172 "Photo.c" +#line 40274 "Photo.c" goto __catch409_database_error; } #line 5275 "/home/jens/Source/shotwell/src/Photo.vala" @@ -40182,7 +40284,7 @@ static void library_photo_real_destroy (DataSource* base) { g_clear_error (&_inner_error_); #line 5275 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 40181 "Photo.c" +#line 40283 "Photo.c" } } goto __finally409; @@ -40200,7 +40302,7 @@ static void library_photo_real_destroy (DataSource* base) { app_window_database_error (_tmp4_); #line 5274 "/home/jens/Source/shotwell/src/Photo.vala" _g_error_free0 (err); -#line 40199 "Photo.c" +#line 40301 "Photo.c" } __finally409: #line 5274 "/home/jens/Source/shotwell/src/Photo.vala" @@ -40211,11 +40313,11 @@ static void library_photo_real_destroy (DataSource* base) { g_clear_error (&_inner_error_); #line 5274 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 40210 "Photo.c" +#line 40312 "Photo.c" } #line 5280 "/home/jens/Source/shotwell/src/Photo.vala" DATA_SOURCE_CLASS (library_photo_parent_class)->destroy (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO, Photo), TYPE_DATA_SOURCE, DataSource)); -#line 40214 "Photo.c" +#line 40316 "Photo.c" } @@ -40245,7 +40347,7 @@ gboolean library_photo_has_nontrash_duplicate (GFile* file, const gchar* thumbna result = _tmp5_; #line 5285 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 40244 "Photo.c" +#line 40346 "Photo.c" } @@ -40291,7 +40393,7 @@ void library_photo_get_nontrash_duplicate (GFile* file, const gchar* thumbnail_m if (_tmp7_ == NULL) { #line 5292 "/home/jens/Source/shotwell/src/Photo.vala" _tmp6_ = TRUE; -#line 40290 "Photo.c" +#line 40392 "Photo.c" } else { PhotoID* _tmp8_ = NULL; gint _tmp8__length1 = 0; @@ -40301,11 +40403,11 @@ void library_photo_get_nontrash_duplicate (GFile* file, const gchar* thumbnail_m _tmp8__length1 = ids_length1; #line 5292 "/home/jens/Source/shotwell/src/Photo.vala" _tmp6_ = _tmp8__length1 == 0; -#line 40300 "Photo.c" +#line 40402 "Photo.c" } #line 5292 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp6_) { -#line 40304 "Photo.c" +#line 40406 "Photo.c" PhotoID _tmp9_ = {0}; #line 5293 "/home/jens/Source/shotwell/src/Photo.vala" photo_id_init (&_tmp9_, PHOTO_ID_INVALID); @@ -40315,13 +40417,13 @@ void library_photo_get_nontrash_duplicate (GFile* file, const gchar* thumbnail_m ids = (g_free (ids), NULL); #line 5293 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 40314 "Photo.c" +#line 40416 "Photo.c" } #line 5295 "/home/jens/Source/shotwell/src/Photo.vala" _tmp10_ = ids; #line 5295 "/home/jens/Source/shotwell/src/Photo.vala" _tmp10__length1 = ids_length1; -#line 40320 "Photo.c" +#line 40422 "Photo.c" { PhotoID* id_collection = NULL; gint id_collection_length1 = 0; @@ -40333,11 +40435,11 @@ void library_photo_get_nontrash_duplicate (GFile* file, const gchar* thumbnail_m id_collection_length1 = _tmp10__length1; #line 5295 "/home/jens/Source/shotwell/src/Photo.vala" for (id_it = 0; id_it < _tmp10__length1; id_it = id_it + 1) { -#line 40332 "Photo.c" +#line 40434 "Photo.c" PhotoID id = {0}; #line 5295 "/home/jens/Source/shotwell/src/Photo.vala" id = id_collection[id_it]; -#line 40336 "Photo.c" +#line 40438 "Photo.c" { LibraryPhoto* photo = NULL; LibraryPhotoSourceCollection* _tmp11_ = NULL; @@ -40357,7 +40459,7 @@ void library_photo_get_nontrash_duplicate (GFile* file, const gchar* thumbnail_m _tmp15_ = photo; #line 5297 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp15_ != NULL) { -#line 40356 "Photo.c" +#line 40458 "Photo.c" LibraryPhoto* _tmp16_ = NULL; gboolean _tmp17_ = FALSE; #line 5297 "/home/jens/Source/shotwell/src/Photo.vala" @@ -40366,11 +40468,11 @@ void library_photo_get_nontrash_duplicate (GFile* file, const gchar* thumbnail_m _tmp17_ = media_source_is_trashed (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, TYPE_MEDIA_SOURCE, MediaSource)); #line 5297 "/home/jens/Source/shotwell/src/Photo.vala" _tmp14_ = !_tmp17_; -#line 40365 "Photo.c" +#line 40467 "Photo.c" } else { #line 5297 "/home/jens/Source/shotwell/src/Photo.vala" _tmp14_ = FALSE; -#line 40369 "Photo.c" +#line 40471 "Photo.c" } #line 5297 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp14_) { @@ -40382,11 +40484,11 @@ void library_photo_get_nontrash_duplicate (GFile* file, const gchar* thumbnail_m ids = (g_free (ids), NULL); #line 5298 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 40381 "Photo.c" +#line 40483 "Photo.c" } #line 5295 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (photo); -#line 40385 "Photo.c" +#line 40487 "Photo.c" } } } @@ -40398,7 +40500,7 @@ void library_photo_get_nontrash_duplicate (GFile* file, const gchar* thumbnail_m ids = (g_free (ids), NULL); #line 5301 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 40397 "Photo.c" +#line 40499 "Photo.c" } @@ -40443,7 +40545,7 @@ static gboolean library_photo_real_has_user_generated_metadata (Photo* base) { _tmp3_ = metadata; #line 5308 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp3_ == NULL) { -#line 40442 "Photo.c" +#line 40544 "Photo.c" gboolean _tmp4_ = FALSE; gboolean _tmp5_ = FALSE; GeeList* _tmp6_ = NULL; @@ -40453,7 +40555,7 @@ static gboolean library_photo_real_has_user_generated_metadata (Photo* base) { if (_tmp6_ != NULL) { #line 5309 "/home/jens/Source/shotwell/src/Photo.vala" _tmp5_ = TRUE; -#line 40452 "Photo.c" +#line 40554 "Photo.c" } else { GeeList* _tmp7_ = NULL; gint _tmp8_ = 0; @@ -40466,20 +40568,20 @@ static gboolean library_photo_real_has_user_generated_metadata (Photo* base) { _tmp9_ = _tmp8_; #line 5309 "/home/jens/Source/shotwell/src/Photo.vala" _tmp5_ = _tmp9_ > 0; -#line 40465 "Photo.c" +#line 40567 "Photo.c" } #line 5309 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp5_) { #line 5309 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = TRUE; -#line 40471 "Photo.c" +#line 40573 "Photo.c" } else { Rating _tmp10_ = 0; #line 5309 "/home/jens/Source/shotwell/src/Photo.vala" _tmp10_ = media_source_get_rating (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource)); #line 5309 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = _tmp10_ != RATING_UNRATED; -#line 40478 "Photo.c" +#line 40580 "Photo.c" } #line 5309 "/home/jens/Source/shotwell/src/Photo.vala" result = _tmp4_; @@ -40489,7 +40591,7 @@ static gboolean library_photo_real_has_user_generated_metadata (Photo* base) { _g_object_unref0 (tags); #line 5309 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 40488 "Photo.c" +#line 40590 "Photo.c" } #line 5311 "/home/jens/Source/shotwell/src/Photo.vala" _tmp11_ = media_source_get_rating (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource)); @@ -40507,7 +40609,7 @@ static gboolean library_photo_real_has_user_generated_metadata (Photo* base) { _g_object_unref0 (tags); #line 5312 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 40506 "Photo.c" +#line 40608 "Photo.c" } #line 5314 "/home/jens/Source/shotwell/src/Photo.vala" _tmp14_ = metadata; @@ -40519,7 +40621,7 @@ static gboolean library_photo_real_has_user_generated_metadata (Photo* base) { _tmp17_ = tags; #line 5315 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp17_ != NULL) { -#line 40518 "Photo.c" +#line 40620 "Photo.c" GeeList* _tmp18_ = NULL; gint _tmp19_ = 0; gint _tmp20_ = 0; @@ -40531,11 +40633,11 @@ static gboolean library_photo_real_has_user_generated_metadata (Photo* base) { _tmp20_ = _tmp19_; #line 5315 "/home/jens/Source/shotwell/src/Photo.vala" _tmp16_ = _tmp20_; -#line 40530 "Photo.c" +#line 40632 "Photo.c" } else { #line 5315 "/home/jens/Source/shotwell/src/Photo.vala" _tmp16_ = 0; -#line 40534 "Photo.c" +#line 40636 "Photo.c" } #line 5315 "/home/jens/Source/shotwell/src/Photo.vala" tags_count = _tmp16_; @@ -40543,7 +40645,7 @@ static gboolean library_photo_real_has_user_generated_metadata (Photo* base) { _tmp22_ = keywords; #line 5316 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp22_ != NULL) { -#line 40542 "Photo.c" +#line 40644 "Photo.c" GeeSet* _tmp23_ = NULL; gint _tmp24_ = 0; gint _tmp25_ = 0; @@ -40555,11 +40657,11 @@ static gboolean library_photo_real_has_user_generated_metadata (Photo* base) { _tmp25_ = _tmp24_; #line 5316 "/home/jens/Source/shotwell/src/Photo.vala" _tmp21_ = _tmp25_; -#line 40554 "Photo.c" +#line 40656 "Photo.c" } else { #line 5316 "/home/jens/Source/shotwell/src/Photo.vala" _tmp21_ = 0; -#line 40558 "Photo.c" +#line 40660 "Photo.c" } #line 5316 "/home/jens/Source/shotwell/src/Photo.vala" keywords_count = _tmp21_; @@ -40579,27 +40681,27 @@ static gboolean library_photo_real_has_user_generated_metadata (Photo* base) { _g_object_unref0 (tags); #line 5319 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 40578 "Photo.c" +#line 40680 "Photo.c" } #line 5321 "/home/jens/Source/shotwell/src/Photo.vala" _tmp29_ = tags; #line 5321 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp29_ != NULL) { -#line 40584 "Photo.c" +#line 40686 "Photo.c" GeeSet* _tmp30_ = NULL; #line 5321 "/home/jens/Source/shotwell/src/Photo.vala" _tmp30_ = keywords; #line 5321 "/home/jens/Source/shotwell/src/Photo.vala" _tmp28_ = _tmp30_ != NULL; -#line 40590 "Photo.c" +#line 40692 "Photo.c" } else { #line 5321 "/home/jens/Source/shotwell/src/Photo.vala" _tmp28_ = FALSE; -#line 40594 "Photo.c" +#line 40696 "Photo.c" } #line 5321 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp28_) { -#line 40598 "Photo.c" +#line 40700 "Photo.c" { GeeList* _tag_list = NULL; GeeList* _tmp31_ = NULL; @@ -40627,7 +40729,7 @@ static gboolean library_photo_real_has_user_generated_metadata (Photo* base) { _tag_index = -1; #line 5322 "/home/jens/Source/shotwell/src/Photo.vala" while (TRUE) { -#line 40626 "Photo.c" +#line 40728 "Photo.c" gint _tmp36_ = 0; gint _tmp37_ = 0; gint _tmp38_ = 0; @@ -40655,7 +40757,7 @@ static gboolean library_photo_real_has_user_generated_metadata (Photo* base) { if (!(_tmp37_ < _tmp38_)) { #line 5322 "/home/jens/Source/shotwell/src/Photo.vala" break; -#line 40654 "Photo.c" +#line 40756 "Photo.c" } #line 5322 "/home/jens/Source/shotwell/src/Photo.vala" _tmp39_ = _tag_list; @@ -40701,15 +40803,15 @@ static gboolean library_photo_real_has_user_generated_metadata (Photo* base) { _g_object_unref0 (tags); #line 5324 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 40700 "Photo.c" +#line 40802 "Photo.c" } #line 5322 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (tag); -#line 40704 "Photo.c" +#line 40806 "Photo.c" } #line 5322 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_tag_list); -#line 40708 "Photo.c" +#line 40810 "Photo.c" } } #line 5328 "/home/jens/Source/shotwell/src/Photo.vala" @@ -40722,7 +40824,7 @@ static gboolean library_photo_real_has_user_generated_metadata (Photo* base) { _g_object_unref0 (tags); #line 5328 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 40721 "Photo.c" +#line 40823 "Photo.c" } @@ -40748,16 +40850,16 @@ static void library_photo_real_set_user_metadata_for_export (Photo* base, PhotoM _tmp2_ = photo_tags; #line 5333 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp2_ != NULL) { -#line 40747 "Photo.c" +#line 40849 "Photo.c" GeeCollection* string_tags = NULL; GeeArrayList* _tmp3_ = NULL; PhotoMetadata* _tmp19_ = NULL; GeeCollection* _tmp20_ = NULL; #line 5334 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp3_ = gee_array_list_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, g_free, NULL, NULL, NULL); + _tmp3_ = gee_array_list_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, NULL, NULL, NULL); #line 5334 "/home/jens/Source/shotwell/src/Photo.vala" string_tags = G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_COLLECTION, GeeCollection); -#line 40756 "Photo.c" +#line 40858 "Photo.c" { GeeList* _tag_list = NULL; GeeList* _tmp4_ = NULL; @@ -40785,7 +40887,7 @@ static void library_photo_real_set_user_metadata_for_export (Photo* base, PhotoM _tag_index = -1; #line 5335 "/home/jens/Source/shotwell/src/Photo.vala" while (TRUE) { -#line 40784 "Photo.c" +#line 40886 "Photo.c" gint _tmp9_ = 0; gint _tmp10_ = 0; gint _tmp11_ = 0; @@ -40809,7 +40911,7 @@ static void library_photo_real_set_user_metadata_for_export (Photo* base, PhotoM if (!(_tmp10_ < _tmp11_)) { #line 5335 "/home/jens/Source/shotwell/src/Photo.vala" break; -#line 40808 "Photo.c" +#line 40910 "Photo.c" } #line 5335 "/home/jens/Source/shotwell/src/Photo.vala" _tmp12_ = _tag_list; @@ -40833,11 +40935,11 @@ static void library_photo_real_set_user_metadata_for_export (Photo* base, PhotoM _g_free0 (_tmp18_); #line 5335 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (tag); -#line 40832 "Photo.c" +#line 40934 "Photo.c" } #line 5335 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_tag_list); -#line 40836 "Photo.c" +#line 40938 "Photo.c" } #line 5338 "/home/jens/Source/shotwell/src/Photo.vala" _tmp19_ = metadata; @@ -40847,14 +40949,14 @@ static void library_photo_real_set_user_metadata_for_export (Photo* base, PhotoM photo_metadata_set_keywords (_tmp19_, _tmp20_, PHOTO_METADATA_SET_OPTION_ALL_DOMAINS); #line 5333 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (string_tags); -#line 40846 "Photo.c" +#line 40948 "Photo.c" } else { PhotoMetadata* _tmp21_ = NULL; #line 5340 "/home/jens/Source/shotwell/src/Photo.vala" _tmp21_ = metadata; #line 5340 "/home/jens/Source/shotwell/src/Photo.vala" photo_metadata_set_keywords (_tmp21_, NULL, PHOTO_METADATA_SET_OPTION_ALL_DOMAINS); -#line 40853 "Photo.c" +#line 40955 "Photo.c" } #line 5342 "/home/jens/Source/shotwell/src/Photo.vala" _tmp22_ = metadata; @@ -40864,7 +40966,7 @@ static void library_photo_real_set_user_metadata_for_export (Photo* base, PhotoM photo_metadata_set_rating (_tmp22_, _tmp23_); #line 5331 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (photo_tags); -#line 40863 "Photo.c" +#line 40965 "Photo.c" } @@ -40890,7 +40992,7 @@ static void library_photo_real_apply_user_metadata_for_reimport (Photo* base, Ph _tmp1_ = photo_metadata_has_hierarchical_keywords (_tmp0_); #line 5348 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp1_) { -#line 40889 "Photo.c" +#line 40991 "Photo.c" PhotoMetadata* _tmp2_ = NULL; GeeSet* _tmp3_ = NULL; GeeSet* _tmp4_ = NULL; @@ -40909,7 +41011,7 @@ static void library_photo_real_apply_user_metadata_for_reimport (Photo* base, Ph new_htag_index = _tmp5_; #line 5349 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_tmp4_); -#line 40908 "Photo.c" +#line 41010 "Photo.c" } #line 5353 "/home/jens/Source/shotwell/src/Photo.vala" _tmp6_ = metadata; @@ -40921,7 +41023,7 @@ static void library_photo_real_apply_user_metadata_for_reimport (Photo* base, Ph _tmp8_ = keywords; #line 5354 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp8_ != NULL) { -#line 40920 "Photo.c" +#line 41022 "Photo.c" { GeeIterator* _keyword_it = NULL; GeeCollection* _tmp9_ = NULL; @@ -40934,7 +41036,7 @@ static void library_photo_real_apply_user_metadata_for_reimport (Photo* base, Ph _keyword_it = _tmp10_; #line 5355 "/home/jens/Source/shotwell/src/Photo.vala" while (TRUE) { -#line 40933 "Photo.c" +#line 41035 "Photo.c" GeeIterator* _tmp11_ = NULL; gboolean _tmp12_ = FALSE; gchar* keyword = NULL; @@ -40965,7 +41067,7 @@ static void library_photo_real_apply_user_metadata_for_reimport (Photo* base, Ph if (!_tmp12_) { #line 5355 "/home/jens/Source/shotwell/src/Photo.vala" break; -#line 40964 "Photo.c" +#line 41066 "Photo.c" } #line 5355 "/home/jens/Source/shotwell/src/Photo.vala" _tmp13_ = _keyword_it; @@ -40977,7 +41079,7 @@ static void library_photo_real_apply_user_metadata_for_reimport (Photo* base, Ph _tmp16_ = new_htag_index; #line 5356 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp16_ != NULL) { -#line 40976 "Photo.c" +#line 41078 "Photo.c" HierarchicalTagIndex* _tmp17_ = NULL; const gchar* _tmp18_ = NULL; gboolean _tmp19_ = FALSE; @@ -40989,11 +41091,11 @@ static void library_photo_real_apply_user_metadata_for_reimport (Photo* base, Ph _tmp19_ = hierarchical_tag_index_is_tag_in_index (_tmp17_, _tmp18_); #line 5356 "/home/jens/Source/shotwell/src/Photo.vala" _tmp15_ = _tmp19_; -#line 40988 "Photo.c" +#line 41090 "Photo.c" } else { #line 5356 "/home/jens/Source/shotwell/src/Photo.vala" _tmp15_ = FALSE; -#line 40992 "Photo.c" +#line 41094 "Photo.c" } #line 5356 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp15_) { @@ -41001,7 +41103,7 @@ static void library_photo_real_apply_user_metadata_for_reimport (Photo* base, Ph _g_free0 (keyword); #line 5357 "/home/jens/Source/shotwell/src/Photo.vala" continue; -#line 41000 "Photo.c" +#line 41102 "Photo.c" } #line 5359 "/home/jens/Source/shotwell/src/Photo.vala" _tmp20_ = keyword; @@ -41023,7 +41125,7 @@ static void library_photo_real_apply_user_metadata_for_reimport (Photo* base, Ph _tmp26_ = tag_source_collection_exists (_tmp24_, _tmp25_, FALSE); #line 5363 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp26_) { -#line 41022 "Photo.c" +#line 41124 "Photo.c" const gchar* _tmp27_ = NULL; Tag* _tmp28_ = NULL; Tag* _tmp29_ = NULL; @@ -41045,7 +41147,7 @@ static void library_photo_real_apply_user_metadata_for_reimport (Photo* base, Ph _g_free0 (keyword); #line 5365 "/home/jens/Source/shotwell/src/Photo.vala" continue; -#line 41044 "Photo.c" +#line 41146 "Photo.c" } #line 5368 "/home/jens/Source/shotwell/src/Photo.vala" _tmp30_ = tag_global; @@ -41055,7 +41157,7 @@ static void library_photo_real_apply_user_metadata_for_reimport (Photo* base, Ph _tmp32_ = tag_source_collection_exists (_tmp30_, _tmp31_, FALSE); #line 5368 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp32_) { -#line 41054 "Photo.c" +#line 41156 "Photo.c" const gchar* _tmp33_ = NULL; Tag* _tmp34_ = NULL; Tag* _tmp35_ = NULL; @@ -41077,7 +41179,7 @@ static void library_photo_real_apply_user_metadata_for_reimport (Photo* base, Ph _g_free0 (keyword); #line 5370 "/home/jens/Source/shotwell/src/Photo.vala" continue; -#line 41076 "Photo.c" +#line 41178 "Photo.c" } #line 5373 "/home/jens/Source/shotwell/src/Photo.vala" _tmp36_ = keyword; @@ -41095,18 +41197,18 @@ static void library_photo_real_apply_user_metadata_for_reimport (Photo* base, Ph _g_free0 (safe_keyword); #line 5355 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (keyword); -#line 41094 "Photo.c" +#line 41196 "Photo.c" } #line 5355 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_keyword_it); -#line 41098 "Photo.c" +#line 41200 "Photo.c" } } #line 5377 "/home/jens/Source/shotwell/src/Photo.vala" _tmp39_ = new_htag_index; #line 5377 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp39_ != NULL) { -#line 41105 "Photo.c" +#line 41207 "Photo.c" { GeeIterator* _path_it = NULL; HierarchicalTagIndex* _tmp40_ = NULL; @@ -41130,7 +41232,7 @@ static void library_photo_real_apply_user_metadata_for_reimport (Photo* base, Ph _path_it = _tmp44_; #line 5378 "/home/jens/Source/shotwell/src/Photo.vala" while (TRUE) { -#line 41129 "Photo.c" +#line 41231 "Photo.c" GeeIterator* _tmp45_ = NULL; gboolean _tmp46_ = FALSE; gchar* path = NULL; @@ -41147,7 +41249,7 @@ static void library_photo_real_apply_user_metadata_for_reimport (Photo* base, Ph if (!_tmp46_) { #line 5378 "/home/jens/Source/shotwell/src/Photo.vala" break; -#line 41146 "Photo.c" +#line 41248 "Photo.c" } #line 5378 "/home/jens/Source/shotwell/src/Photo.vala" _tmp47_ = _path_it; @@ -41167,18 +41269,18 @@ static void library_photo_real_apply_user_metadata_for_reimport (Photo* base, Ph _g_object_unref0 (_tmp51_); #line 5378 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (path); -#line 41166 "Photo.c" +#line 41268 "Photo.c" } #line 5378 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_path_it); -#line 41170 "Photo.c" +#line 41272 "Photo.c" } } #line 5345 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (keywords); #line 5345 "/home/jens/Source/shotwell/src/Photo.vala" _hierarchical_tag_index_unref0 (new_htag_index); -#line 41177 "Photo.c" +#line 41279 "Photo.c" } @@ -41188,46 +41290,46 @@ static void library_photo_class_init (LibraryPhotoClass * klass) { #line 4946 "/home/jens/Source/shotwell/src/Photo.vala" g_type_class_add_private (klass, sizeof (LibraryPhotoPrivate)); #line 4946 "/home/jens/Source/shotwell/src/Photo.vala" - ((PhotoClass *) klass)->notify_master_reimported = library_photo_real_notify_master_reimported; + ((PhotoClass *) klass)->notify_master_reimported = (void (*)(Photo*, PhotoMetadata*)) library_photo_real_notify_master_reimported; #line 4946 "/home/jens/Source/shotwell/src/Photo.vala" - ((PhotoClass *) klass)->notify_editable_reimported = library_photo_real_notify_editable_reimported; + ((PhotoClass *) klass)->notify_editable_reimported = (void (*)(Photo*, PhotoMetadata*)) library_photo_real_notify_editable_reimported; #line 4946 "/home/jens/Source/shotwell/src/Photo.vala" - ((PhotoClass *) klass)->notify_source_reimported = library_photo_real_notify_source_reimported; + ((PhotoClass *) klass)->notify_source_reimported = (void (*)(Photo*, PhotoMetadata*)) library_photo_real_notify_source_reimported; #line 4946 "/home/jens/Source/shotwell/src/Photo.vala" - ((PhotoClass *) klass)->notify_baseline_reimported = library_photo_real_notify_baseline_reimported; + ((PhotoClass *) klass)->notify_baseline_reimported = (void (*)(Photo*, PhotoMetadata*)) library_photo_real_notify_baseline_reimported; #line 4946 "/home/jens/Source/shotwell/src/Photo.vala" - ((DataObjectClass *) klass)->notify_altered = library_photo_real_notify_altered; + ((DataObjectClass *) klass)->notify_altered = (void (*)(DataObject*, Alteration*)) library_photo_real_notify_altered; #line 4946 "/home/jens/Source/shotwell/src/Photo.vala" - ((MediaSourceClass *) klass)->get_preview_pixbuf = library_photo_real_get_preview_pixbuf; + ((MediaSourceClass *) klass)->get_preview_pixbuf = (GdkPixbuf* (*)(MediaSource*, Scaling*, GError**)) library_photo_real_get_preview_pixbuf; #line 4946 "/home/jens/Source/shotwell/src/Photo.vala" - ((PhotoClass *) klass)->rotate = library_photo_real_rotate; + ((PhotoClass *) klass)->rotate = (void (*)(Photo*, Rotation)) library_photo_real_rotate; #line 4946 "/home/jens/Source/shotwell/src/Photo.vala" - ((ThumbnailSourceClass *) klass)->get_thumbnail = library_photo_real_get_thumbnail; + ((ThumbnailSourceClass *) klass)->get_thumbnail = (GdkPixbuf* (*)(ThumbnailSource*, gint, GError**)) library_photo_real_get_thumbnail; #line 4946 "/home/jens/Source/shotwell/src/Photo.vala" - ((MediaSourceClass *) klass)->is_trashed = library_photo_real_is_trashed; + ((MediaSourceClass *) klass)->is_trashed = (gboolean (*)(MediaSource*)) library_photo_real_is_trashed; #line 4946 "/home/jens/Source/shotwell/src/Photo.vala" - ((MediaSourceClass *) klass)->trash = library_photo_real_trash; + ((MediaSourceClass *) klass)->trash = (void (*)(MediaSource*)) library_photo_real_trash; #line 4946 "/home/jens/Source/shotwell/src/Photo.vala" - ((MediaSourceClass *) klass)->untrash = library_photo_real_untrash; + ((MediaSourceClass *) klass)->untrash = (void (*)(MediaSource*)) library_photo_real_untrash; #line 4946 "/home/jens/Source/shotwell/src/Photo.vala" - ((MediaSourceClass *) klass)->is_offline = library_photo_real_is_offline; + ((MediaSourceClass *) klass)->is_offline = (gboolean (*)(MediaSource*)) library_photo_real_is_offline; #line 4946 "/home/jens/Source/shotwell/src/Photo.vala" - ((MediaSourceClass *) klass)->mark_offline = library_photo_real_mark_offline; + ((MediaSourceClass *) klass)->mark_offline = (void (*)(MediaSource*)) library_photo_real_mark_offline; #line 4946 "/home/jens/Source/shotwell/src/Photo.vala" - ((MediaSourceClass *) klass)->mark_online = library_photo_real_mark_online; + ((MediaSourceClass *) klass)->mark_online = (void (*)(MediaSource*)) library_photo_real_mark_online; #line 4946 "/home/jens/Source/shotwell/src/Photo.vala" - ((DataSourceClass *) klass)->internal_delete_backing = library_photo_real_internal_delete_backing; + ((DataSourceClass *) klass)->internal_delete_backing = (gboolean (*)(DataSource*, GError**)) library_photo_real_internal_delete_backing; #line 4946 "/home/jens/Source/shotwell/src/Photo.vala" - ((DataSourceClass *) klass)->destroy = library_photo_real_destroy; + ((DataSourceClass *) klass)->destroy = (void (*)(DataSource*)) library_photo_real_destroy; #line 4946 "/home/jens/Source/shotwell/src/Photo.vala" - ((PhotoClass *) klass)->has_user_generated_metadata = library_photo_real_has_user_generated_metadata; + ((PhotoClass *) klass)->has_user_generated_metadata = (gboolean (*)(Photo*)) library_photo_real_has_user_generated_metadata; #line 4946 "/home/jens/Source/shotwell/src/Photo.vala" - ((PhotoClass *) klass)->set_user_metadata_for_export = library_photo_real_set_user_metadata_for_export; + ((PhotoClass *) klass)->set_user_metadata_for_export = (void (*)(Photo*, PhotoMetadata*)) library_photo_real_set_user_metadata_for_export; #line 4946 "/home/jens/Source/shotwell/src/Photo.vala" - ((PhotoClass *) klass)->apply_user_metadata_for_reimport = library_photo_real_apply_user_metadata_for_reimport; + ((PhotoClass *) klass)->apply_user_metadata_for_reimport = (void (*)(Photo*, PhotoMetadata*)) library_photo_real_apply_user_metadata_for_reimport; #line 4946 "/home/jens/Source/shotwell/src/Photo.vala" G_OBJECT_CLASS (klass)->finalize = library_photo_finalize; -#line 41226 "Photo.c" +#line 41328 "Photo.c" } @@ -41240,7 +41342,7 @@ static void library_photo_flaggable_interface_init (FlaggableIface * iface) { iface->mark_flagged = (void (*)(Flaggable*)) library_photo_real_mark_flagged; #line 4946 "/home/jens/Source/shotwell/src/Photo.vala" iface->mark_unflagged = (void (*)(Flaggable*)) library_photo_real_mark_unflagged; -#line 41239 "Photo.c" +#line 41341 "Photo.c" } @@ -41257,7 +41359,7 @@ static void library_photo_monitorable_interface_init (MonitorableIface * iface) iface->set_master_file = (void (*)(Monitorable*, GFile*)) photo_set_master_file; #line 4946 "/home/jens/Source/shotwell/src/Photo.vala" iface->set_master_timestamp = (void (*)(Monitorable*, GFileInfo*)) photo_set_master_timestamp; -#line 41256 "Photo.c" +#line 41358 "Photo.c" } @@ -41268,7 +41370,7 @@ static void library_photo_instance_init (LibraryPhoto * self) { self->priv->block_thumbnail_generation = FALSE; #line 4958 "/home/jens/Source/shotwell/src/Photo.vala" self->priv->thumbnail_scheduler = NULL; -#line 41267 "Photo.c" +#line 41369 "Photo.c" } @@ -41282,7 +41384,7 @@ static void library_photo_finalize (GObject* obj) { _g_object_unref0 (self->priv->import_keywords); #line 4946 "/home/jens/Source/shotwell/src/Photo.vala" G_OBJECT_CLASS (library_photo_parent_class)->finalize (obj); -#line 41281 "Photo.c" +#line 41383 "Photo.c" } @@ -41325,14 +41427,14 @@ LibraryPhotoSourceHoldingTank* library_photo_source_holding_tank_construct (GTyp self = (LibraryPhotoSourceHoldingTank*) media_source_holding_tank_construct (object_type, G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection), _tmp1_, _tmp1__target, _tmp2_, _tmp2__target); #line 5395 "/home/jens/Source/shotwell/src/Photo.vala" return self; -#line 41324 "Photo.c" +#line 41426 "Photo.c" } LibraryPhotoSourceHoldingTank* library_photo_source_holding_tank_new (LibraryPhotoSourceCollection* sources, SourceHoldingTankCheckToKeep check_to_keep, void* check_to_keep_target, GetSourceDatabaseKey get_key, void* get_key_target) { #line 5395 "/home/jens/Source/shotwell/src/Photo.vala" return library_photo_source_holding_tank_construct (TYPE_LIBRARY_PHOTO_SOURCE_HOLDING_TANK, sources, check_to_keep, check_to_keep_target, get_key, get_key_target); -#line 41331 "Photo.c" +#line 41433 "Photo.c" } @@ -41370,7 +41472,7 @@ LibraryPhoto* library_photo_source_holding_tank_fetch_by_backing_file (LibraryPh result = ret; #line 5404 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 41369 "Photo.c" +#line 41471 "Photo.c" } #line 5406 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = self->priv->development_file_map; @@ -41384,21 +41486,21 @@ LibraryPhoto* library_photo_source_holding_tank_fetch_by_backing_file (LibraryPh _g_object_unref0 (ret); #line 5406 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 41383 "Photo.c" +#line 41485 "Photo.c" } static void _library_photo_source_holding_tank_on_editable_replaced_photo_editable_replaced (Photo* _sender, GFile* old_file, GFile* new_file, gpointer self) { #line 5430 "/home/jens/Source/shotwell/src/Photo.vala" library_photo_source_holding_tank_on_editable_replaced ((LibraryPhotoSourceHoldingTank*) self, _sender, old_file, new_file); -#line 41390 "Photo.c" +#line 41492 "Photo.c" } static void _library_photo_source_holding_tank_on_raw_development_modified_photo_raw_development_modified (Photo* _sender, gpointer self) { #line 5431 "/home/jens/Source/shotwell/src/Photo.vala" library_photo_source_holding_tank_on_raw_development_modified ((LibraryPhotoSourceHoldingTank*) self, _sender); -#line 41397 "Photo.c" +#line 41499 "Photo.c" } @@ -41418,7 +41520,7 @@ static void library_photo_source_holding_tank_real_notify_contents_altered (Sour _tmp0_ = added; #line 5411 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp0_ != NULL) { -#line 41417 "Photo.c" +#line 41519 "Photo.c" { GeeIterator* _source_it = NULL; GeeCollection* _tmp1_ = NULL; @@ -41431,7 +41533,7 @@ static void library_photo_source_holding_tank_real_notify_contents_altered (Sour _source_it = _tmp2_; #line 5412 "/home/jens/Source/shotwell/src/Photo.vala" while (TRUE) { -#line 41430 "Photo.c" +#line 41532 "Photo.c" GeeIterator* _tmp3_ = NULL; gboolean _tmp4_ = FALSE; DataSource* source = NULL; @@ -41458,7 +41560,7 @@ static void library_photo_source_holding_tank_real_notify_contents_altered (Sour if (!_tmp4_) { #line 5412 "/home/jens/Source/shotwell/src/Photo.vala" break; -#line 41457 "Photo.c" +#line 41559 "Photo.c" } #line 5412 "/home/jens/Source/shotwell/src/Photo.vala" _tmp5_ = _source_it; @@ -41484,7 +41586,7 @@ static void library_photo_source_holding_tank_real_notify_contents_altered (Sour _g_object_unref0 (_tmp11_); #line 5416 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp12_) { -#line 41483 "Photo.c" +#line 41585 "Photo.c" GeeHashMap* _tmp13_ = NULL; LibraryPhoto* _tmp14_ = NULL; GFile* _tmp15_ = NULL; @@ -41523,7 +41625,7 @@ static void library_photo_source_holding_tank_real_notify_contents_altered (Sour gee_multi_map_set (_tmp18_, _tmp19_, _tmp22_); #line 5418 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_tmp22_); -#line 41522 "Photo.c" +#line 41624 "Photo.c" } #line 5422 "/home/jens/Source/shotwell/src/Photo.vala" _tmp23_ = photo; @@ -41535,7 +41637,7 @@ static void library_photo_source_holding_tank_real_notify_contents_altered (Sour _tmp25_ = raw_files; #line 5423 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp25_ != NULL) { -#line 41534 "Photo.c" +#line 41636 "Photo.c" { GeeIterator* _f_it = NULL; GeeCollection* _tmp26_ = NULL; @@ -41548,7 +41650,7 @@ static void library_photo_source_holding_tank_real_notify_contents_altered (Sour _f_it = _tmp27_; #line 5424 "/home/jens/Source/shotwell/src/Photo.vala" while (TRUE) { -#line 41547 "Photo.c" +#line 41649 "Photo.c" GeeIterator* _tmp28_ = NULL; gboolean _tmp29_ = FALSE; GFile* f = NULL; @@ -41568,7 +41670,7 @@ static void library_photo_source_holding_tank_real_notify_contents_altered (Sour if (!_tmp29_) { #line 5424 "/home/jens/Source/shotwell/src/Photo.vala" break; -#line 41567 "Photo.c" +#line 41669 "Photo.c" } #line 5424 "/home/jens/Source/shotwell/src/Photo.vala" _tmp30_ = _f_it; @@ -41594,11 +41696,11 @@ static void library_photo_source_holding_tank_real_notify_contents_altered (Sour gee_multi_map_set (_tmp35_, _tmp36_, _tmp37_); #line 5424 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (f); -#line 41593 "Photo.c" +#line 41695 "Photo.c" } #line 5424 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_f_it); -#line 41597 "Photo.c" +#line 41699 "Photo.c" } } #line 5430 "/home/jens/Source/shotwell/src/Photo.vala" @@ -41615,18 +41717,18 @@ static void library_photo_source_holding_tank_real_notify_contents_altered (Sour _g_object_unref0 (photo); #line 5412 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (source); -#line 41614 "Photo.c" +#line 41716 "Photo.c" } #line 5412 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_source_it); -#line 41618 "Photo.c" +#line 41720 "Photo.c" } } #line 5435 "/home/jens/Source/shotwell/src/Photo.vala" _tmp40_ = removed; #line 5435 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp40_ != NULL) { -#line 41625 "Photo.c" +#line 41727 "Photo.c" { GeeIterator* _source_it = NULL; GeeCollection* _tmp41_ = NULL; @@ -41639,7 +41741,7 @@ static void library_photo_source_holding_tank_real_notify_contents_altered (Sour _source_it = _tmp42_; #line 5436 "/home/jens/Source/shotwell/src/Photo.vala" while (TRUE) { -#line 41638 "Photo.c" +#line 41740 "Photo.c" GeeIterator* _tmp43_ = NULL; gboolean _tmp44_ = FALSE; DataSource* source = NULL; @@ -41664,7 +41766,7 @@ static void library_photo_source_holding_tank_real_notify_contents_altered (Sour if (!_tmp44_) { #line 5436 "/home/jens/Source/shotwell/src/Photo.vala" break; -#line 41663 "Photo.c" +#line 41765 "Photo.c" } #line 5436 "/home/jens/Source/shotwell/src/Photo.vala" _tmp45_ = _source_it; @@ -41678,7 +41780,7 @@ static void library_photo_source_holding_tank_real_notify_contents_altered (Sour _tmp48_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp47_, TYPE_LIBRARY_PHOTO, LibraryPhoto)); #line 5437 "/home/jens/Source/shotwell/src/Photo.vala" photo = _tmp48_; -#line 41677 "Photo.c" +#line 41779 "Photo.c" { GeeIterator* _f_it = NULL; GeeMultiMap* _tmp49_ = NULL; @@ -41705,7 +41807,7 @@ static void library_photo_source_holding_tank_real_notify_contents_altered (Sour _f_it = _tmp54_; #line 5438 "/home/jens/Source/shotwell/src/Photo.vala" while (TRUE) { -#line 41704 "Photo.c" +#line 41806 "Photo.c" GeeIterator* _tmp55_ = NULL; gboolean _tmp56_ = FALSE; GFile* f = NULL; @@ -41721,7 +41823,7 @@ static void library_photo_source_holding_tank_real_notify_contents_altered (Sour if (!_tmp56_) { #line 5438 "/home/jens/Source/shotwell/src/Photo.vala" break; -#line 41720 "Photo.c" +#line 41822 "Photo.c" } #line 5438 "/home/jens/Source/shotwell/src/Photo.vala" _tmp57_ = _f_it; @@ -41737,11 +41839,11 @@ static void library_photo_source_holding_tank_real_notify_contents_altered (Sour gee_abstract_map_unset (G_TYPE_CHECK_INSTANCE_CAST (_tmp59_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp60_, NULL); #line 5438 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (f); -#line 41736 "Photo.c" +#line 41838 "Photo.c" } #line 5438 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_f_it); -#line 41740 "Photo.c" +#line 41842 "Photo.c" } { GeeIterator* _f_it = NULL; @@ -41769,7 +41871,7 @@ static void library_photo_source_holding_tank_real_notify_contents_altered (Sour _f_it = _tmp66_; #line 5441 "/home/jens/Source/shotwell/src/Photo.vala" while (TRUE) { -#line 41768 "Photo.c" +#line 41870 "Photo.c" GeeIterator* _tmp67_ = NULL; gboolean _tmp68_ = FALSE; GFile* f = NULL; @@ -41785,7 +41887,7 @@ static void library_photo_source_holding_tank_real_notify_contents_altered (Sour if (!_tmp68_) { #line 5441 "/home/jens/Source/shotwell/src/Photo.vala" break; -#line 41784 "Photo.c" +#line 41886 "Photo.c" } #line 5441 "/home/jens/Source/shotwell/src/Photo.vala" _tmp69_ = _f_it; @@ -41801,11 +41903,11 @@ static void library_photo_source_holding_tank_real_notify_contents_altered (Sour gee_abstract_map_unset (G_TYPE_CHECK_INSTANCE_CAST (_tmp71_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp72_, NULL); #line 5441 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (f); -#line 41800 "Photo.c" +#line 41902 "Photo.c" } #line 5441 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_f_it); -#line 41804 "Photo.c" +#line 41906 "Photo.c" } #line 5444 "/home/jens/Source/shotwell/src/Photo.vala" _tmp73_ = self->priv->reverse_editable_file_map; @@ -41835,11 +41937,11 @@ static void library_photo_source_holding_tank_real_notify_contents_altered (Sour _g_object_unref0 (photo); #line 5436 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (source); -#line 41834 "Photo.c" +#line 41936 "Photo.c" } #line 5436 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_source_it); -#line 41838 "Photo.c" +#line 41940 "Photo.c" } } #line 5452 "/home/jens/Source/shotwell/src/Photo.vala" @@ -41848,7 +41950,7 @@ static void library_photo_source_holding_tank_real_notify_contents_altered (Sour _tmp82_ = removed; #line 5452 "/home/jens/Source/shotwell/src/Photo.vala" SOURCE_HOLDING_TANK_CLASS (library_photo_source_holding_tank_parent_class)->notify_contents_altered (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE_HOLDING_TANK, MediaSourceHoldingTank), TYPE_SOURCE_HOLDING_TANK, SourceHoldingTank), _tmp81_, _tmp82_); -#line 41847 "Photo.c" +#line 41949 "Photo.c" } @@ -41884,7 +41986,7 @@ static void library_photo_source_holding_tank_on_editable_replaced (LibraryPhoto _tmp3_ = old_file; #line 5459 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp3_ != NULL) { -#line 41883 "Photo.c" +#line 41985 "Photo.c" GeeHashMap* _tmp4_ = NULL; GFile* _tmp5_ = NULL; GeeMultiMap* _tmp6_ = NULL; @@ -41904,13 +42006,13 @@ static void library_photo_source_holding_tank_on_editable_replaced (LibraryPhoto _tmp8_ = old_file; #line 5461 "/home/jens/Source/shotwell/src/Photo.vala" gee_multi_map_remove (_tmp6_, _tmp7_, _tmp8_); -#line 41903 "Photo.c" +#line 42005 "Photo.c" } #line 5464 "/home/jens/Source/shotwell/src/Photo.vala" _tmp9_ = new_file; #line 5464 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp9_ != NULL) { -#line 41909 "Photo.c" +#line 42011 "Photo.c" GeeHashMap* _tmp10_ = NULL; GFile* _tmp11_ = NULL; LibraryPhoto* _tmp12_ = NULL; @@ -41922,7 +42024,7 @@ static void library_photo_source_holding_tank_on_editable_replaced (LibraryPhoto _tmp12_ = photo; #line 5465 "/home/jens/Source/shotwell/src/Photo.vala" gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp11_, _tmp12_); -#line 41921 "Photo.c" +#line 42023 "Photo.c" } #line 5466 "/home/jens/Source/shotwell/src/Photo.vala" _tmp13_ = self->priv->reverse_editable_file_map; @@ -41934,7 +42036,7 @@ static void library_photo_source_holding_tank_on_editable_replaced (LibraryPhoto gee_multi_map_set (_tmp13_, _tmp14_, _tmp15_); #line 5455 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (photo); -#line 41933 "Photo.c" +#line 42035 "Photo.c" } @@ -41972,7 +42074,7 @@ static void library_photo_source_holding_tank_on_raw_development_modified (Libra _tmp5_ = gee_multi_map_contains (_tmp3_, _tmp4_); #line 5474 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp5_) { -#line 41971 "Photo.c" +#line 42073 "Photo.c" GeeMultiMap* _tmp18_ = NULL; LibraryPhoto* _tmp19_ = NULL; { @@ -42001,7 +42103,7 @@ static void library_photo_source_holding_tank_on_raw_development_modified (Libra _f_it = _tmp11_; #line 5475 "/home/jens/Source/shotwell/src/Photo.vala" while (TRUE) { -#line 42000 "Photo.c" +#line 42102 "Photo.c" GeeIterator* _tmp12_ = NULL; gboolean _tmp13_ = FALSE; GFile* f = NULL; @@ -42017,7 +42119,7 @@ static void library_photo_source_holding_tank_on_raw_development_modified (Libra if (!_tmp13_) { #line 5475 "/home/jens/Source/shotwell/src/Photo.vala" break; -#line 42016 "Photo.c" +#line 42118 "Photo.c" } #line 5475 "/home/jens/Source/shotwell/src/Photo.vala" _tmp14_ = _f_it; @@ -42033,11 +42135,11 @@ static void library_photo_source_holding_tank_on_raw_development_modified (Libra gee_abstract_map_unset (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp17_, NULL); #line 5475 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (f); -#line 42032 "Photo.c" +#line 42134 "Photo.c" } #line 5475 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_f_it); -#line 42036 "Photo.c" +#line 42138 "Photo.c" } #line 5477 "/home/jens/Source/shotwell/src/Photo.vala" _tmp18_ = self->priv->reverse_development_file_map; @@ -42045,7 +42147,7 @@ static void library_photo_source_holding_tank_on_raw_development_modified (Libra _tmp19_ = photo; #line 5477 "/home/jens/Source/shotwell/src/Photo.vala" gee_multi_map_remove_all (_tmp18_, _tmp19_); -#line 42044 "Photo.c" +#line 42146 "Photo.c" } #line 5481 "/home/jens/Source/shotwell/src/Photo.vala" _tmp20_ = photo; @@ -42057,7 +42159,7 @@ static void library_photo_source_holding_tank_on_raw_development_modified (Libra _tmp22_ = raw_list; #line 5482 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp22_ != NULL) { -#line 42056 "Photo.c" +#line 42158 "Photo.c" { GeeIterator* _f_it = NULL; GeeCollection* _tmp23_ = NULL; @@ -42070,7 +42172,7 @@ static void library_photo_source_holding_tank_on_raw_development_modified (Libra _f_it = _tmp24_; #line 5483 "/home/jens/Source/shotwell/src/Photo.vala" while (TRUE) { -#line 42069 "Photo.c" +#line 42171 "Photo.c" GeeIterator* _tmp25_ = NULL; gboolean _tmp26_ = FALSE; GFile* f = NULL; @@ -42090,7 +42192,7 @@ static void library_photo_source_holding_tank_on_raw_development_modified (Libra if (!_tmp26_) { #line 5483 "/home/jens/Source/shotwell/src/Photo.vala" break; -#line 42089 "Photo.c" +#line 42191 "Photo.c" } #line 5483 "/home/jens/Source/shotwell/src/Photo.vala" _tmp27_ = _f_it; @@ -42116,18 +42218,18 @@ static void library_photo_source_holding_tank_on_raw_development_modified (Libra gee_multi_map_set (_tmp32_, _tmp33_, _tmp34_); #line 5483 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (f); -#line 42115 "Photo.c" +#line 42217 "Photo.c" } #line 5483 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_f_it); -#line 42119 "Photo.c" +#line 42221 "Photo.c" } } #line 5469 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (raw_list); #line 5469 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (photo); -#line 42126 "Photo.c" +#line 42228 "Photo.c" } @@ -42139,8 +42241,8 @@ static void library_photo_source_holding_tank_class_init (LibraryPhotoSourceHold #line 5385 "/home/jens/Source/shotwell/src/Photo.vala" g_type_class_add_private (klass, sizeof (LibraryPhotoSourceHoldingTankPrivate)); #line 5385 "/home/jens/Source/shotwell/src/Photo.vala" - ((SourceHoldingTankClass *) klass)->notify_contents_altered = library_photo_source_holding_tank_real_notify_contents_altered; -#line 42139 "Photo.c" + ((SourceHoldingTankClass *) klass)->notify_contents_altered = (void (*)(SourceHoldingTank*, GeeCollection*, GeeCollection*)) library_photo_source_holding_tank_real_notify_contents_altered; +#line 42241 "Photo.c" } @@ -42152,22 +42254,22 @@ static void library_photo_source_holding_tank_instance_init (LibraryPhotoSourceH #line 5385 "/home/jens/Source/shotwell/src/Photo.vala" self->priv = LIBRARY_PHOTO_SOURCE_HOLDING_TANK_GET_PRIVATE (self); #line 5386 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp0_ = gee_hash_map_new (g_file_get_type (), (GBoxedCopyFunc) g_object_ref, g_object_unref, TYPE_LIBRARY_PHOTO, (GBoxedCopyFunc) g_object_ref, g_object_unref, _file_hash_gee_hash_data_func, NULL, NULL, _file_equal_gee_equal_data_func, NULL, NULL, NULL, NULL, NULL); + _tmp0_ = gee_hash_map_new (g_file_get_type (), (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, TYPE_LIBRARY_PHOTO, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, _file_hash_gee_hash_data_func, NULL, NULL, _file_equal_gee_equal_data_func, NULL, NULL, NULL, NULL, NULL); #line 5386 "/home/jens/Source/shotwell/src/Photo.vala" self->priv->editable_file_map = _tmp0_; #line 5388 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp1_ = gee_hash_map_new (g_file_get_type (), (GBoxedCopyFunc) g_object_ref, g_object_unref, TYPE_LIBRARY_PHOTO, (GBoxedCopyFunc) g_object_ref, g_object_unref, _file_hash_gee_hash_data_func, NULL, NULL, _file_equal_gee_equal_data_func, NULL, NULL, NULL, NULL, NULL); + _tmp1_ = gee_hash_map_new (g_file_get_type (), (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, TYPE_LIBRARY_PHOTO, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, _file_hash_gee_hash_data_func, NULL, NULL, _file_equal_gee_equal_data_func, NULL, NULL, NULL, NULL, NULL); #line 5388 "/home/jens/Source/shotwell/src/Photo.vala" self->priv->development_file_map = _tmp1_; #line 5390 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp2_ = gee_hash_multi_map_new (TYPE_LIBRARY_PHOTO, (GBoxedCopyFunc) g_object_ref, g_object_unref, g_file_get_type (), (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL, _file_hash_gee_hash_data_func, NULL, NULL, _file_equal_gee_equal_data_func, NULL, NULL); + _tmp2_ = gee_hash_multi_map_new (TYPE_LIBRARY_PHOTO, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, g_file_get_type (), (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL, _file_hash_gee_hash_data_func, NULL, NULL, _file_equal_gee_equal_data_func, NULL, NULL); #line 5390 "/home/jens/Source/shotwell/src/Photo.vala" self->priv->reverse_editable_file_map = G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_MULTI_MAP, GeeMultiMap); #line 5392 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp3_ = gee_hash_multi_map_new (TYPE_LIBRARY_PHOTO, (GBoxedCopyFunc) g_object_ref, g_object_unref, g_file_get_type (), (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL, _file_hash_gee_hash_data_func, NULL, NULL, _file_equal_gee_equal_data_func, NULL, NULL); + _tmp3_ = gee_hash_multi_map_new (TYPE_LIBRARY_PHOTO, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, g_file_get_type (), (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL, _file_hash_gee_hash_data_func, NULL, NULL, _file_equal_gee_equal_data_func, NULL, NULL); #line 5392 "/home/jens/Source/shotwell/src/Photo.vala" self->priv->reverse_development_file_map = G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_MULTI_MAP, GeeMultiMap); -#line 42166 "Photo.c" +#line 42268 "Photo.c" } @@ -42185,7 +42287,7 @@ static void library_photo_source_holding_tank_finalize (SourceHoldingTank* obj) _g_object_unref0 (self->priv->reverse_development_file_map); #line 5385 "/home/jens/Source/shotwell/src/Photo.vala" SOURCE_HOLDING_TANK_CLASS (library_photo_source_holding_tank_parent_class)->finalize (obj); -#line 42184 "Photo.c" +#line 42286 "Photo.c" } |