diff options
Diffstat (limited to 'src/direct/DirectPhoto.c')
| -rw-r--r-- | src/direct/DirectPhoto.c | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/src/direct/DirectPhoto.c b/src/direct/DirectPhoto.c index 97ebcd5..6e17fe2 100644 --- a/src/direct/DirectPhoto.c +++ b/src/direct/DirectPhoto.c @@ -1,4 +1,4 @@ -/* DirectPhoto.c generated by valac 0.32.1, the Vala compiler +/* DirectPhoto.c generated by valac 0.34.4, the Vala compiler * generated from DirectPhoto.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -1258,7 +1258,7 @@ static void direct_photo_save_dims (DirectPhoto* self) { #line 59 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 1261 "DirectPhoto.c" - goto __catch42_g_error; + goto __catch44_g_error; } #line 59 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" _tmp3_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO, Photo)->backing_photo_row; @@ -1270,8 +1270,8 @@ static void direct_photo_save_dims (DirectPhoto* self) { _g_object_unref0 (_tmp0_); #line 1272 "DirectPhoto.c" } - goto __finally42; - __catch42_g_error: + goto __finally44; + __catch44_g_error: { GError* e = NULL; gchar* _tmp5_ = NULL; @@ -1292,7 +1292,7 @@ static void direct_photo_save_dims (DirectPhoto* self) { _g_error_free0 (e); #line 1294 "DirectPhoto.c" } - __finally42: + __finally44: #line 58 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 58 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" @@ -1337,7 +1337,7 @@ ImportResult direct_photo_demand_load (DirectPhoto* self) { #line 75 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 1340 "DirectPhoto.c" - goto __catch43_g_error; + goto __catch45_g_error; } #line 76 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" _tmp2_ = reimport_state; @@ -1346,11 +1346,11 @@ ImportResult direct_photo_demand_load (DirectPhoto* self) { #line 76 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 1349 "DirectPhoto.c" - goto __catch43_g_error; + goto __catch45_g_error; } } - goto __finally43; - __catch43_g_error: + goto __finally45; + __catch45_g_error: { GError* err = NULL; GError* _tmp3_ = NULL; @@ -1375,7 +1375,7 @@ ImportResult direct_photo_demand_load (DirectPhoto* self) { return result; #line 1377 "DirectPhoto.c" } - __finally43: + __finally45: #line 74 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 74 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" @@ -2563,7 +2563,7 @@ gchar* direct_photo_source_collection_fetch (DirectPhotoSourceCollection* self, #line 289 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" _photo_reimport_master_state_unref0 (reimport_state); #line 2566 "DirectPhoto.c" - goto __catch44_g_error; + goto __catch46_g_error; } #line 289 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" if (_tmp12_) { @@ -2582,7 +2582,7 @@ gchar* direct_photo_source_collection_fetch (DirectPhotoSourceCollection* self, #line 290 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" _photo_reimport_master_state_unref0 (reimport_state); #line 2585 "DirectPhoto.c" - goto __catch44_g_error; + goto __catch46_g_error; } #line 291 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" _tmp18_ = should_restore_ori; @@ -2613,8 +2613,8 @@ gchar* direct_photo_source_collection_fetch (DirectPhotoSourceCollection* self, _photo_reimport_master_state_unref0 (reimport_state); #line 2615 "DirectPhoto.c" } - goto __finally44; - __catch44_g_error: + goto __finally46; + __catch46_g_error: { GError* err = NULL; GError* _tmp22_ = NULL; @@ -2638,7 +2638,7 @@ gchar* direct_photo_source_collection_fetch (DirectPhotoSourceCollection* self, _g_error_free0 (err); #line 2640 "DirectPhoto.c" } - __finally44: + __finally46: #line 278 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 278 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" @@ -2791,7 +2791,7 @@ static void direct_photo_source_collection_instance_init (DirectPhotoSourceColle #line 177 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" self->priv->prepared_photos = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_COLLECTION, GeeCollection); #line 178 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - _tmp1_ = gee_hash_map_new (G_TYPE_FILE, (GBoxedCopyFunc) g_object_ref, g_object_unref, TYPE_DIRECT_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, g_object_unref, TYPE_DIRECT_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); #line 178 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" self->priv->file_map = _tmp1_; #line 2798 "DirectPhoto.c" |