diff options
author | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2017-04-14 18:51:46 +0200 |
---|---|---|
committer | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2017-04-14 18:51:46 +0200 |
commit | 9e7cd144725a270e0460b21747619f447ca87684 (patch) | |
tree | 77916a766425839c1a2466afd2eb1244371b6b9b /src/PhotoPage.c | |
parent | 3253d99365813f2d2ffd05e10cbb8c11f53d746e (diff) |
New upstream version 0.26.1upstream/0.26.1
Diffstat (limited to 'src/PhotoPage.c')
-rw-r--r-- | src/PhotoPage.c | 1582 |
1 files changed, 792 insertions, 790 deletions
diff --git a/src/PhotoPage.c b/src/PhotoPage.c index 579add0..63363e0 100644 --- a/src/PhotoPage.c +++ b/src/PhotoPage.c @@ -1,4 +1,4 @@ -/* PhotoPage.c generated by valac 0.34.4, the Vala compiler +/* PhotoPage.c generated by valac 0.34.7, the Vala compiler * generated from PhotoPage.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -4034,7 +4034,7 @@ static void zoom_buffer_iso_source_fetch_job_class_init (ZoomBufferIsoSourceFetc #line 15 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_type_class_add_private (klass, sizeof (ZoomBufferIsoSourceFetchJobPrivate)); #line 15 "/home/jens/Source/shotwell/src/PhotoPage.vala" - ((BackgroundJobClass *) klass)->execute = zoom_buffer_iso_source_fetch_job_real_execute; + ((BackgroundJobClass *) klass)->execute = (void (*)(BackgroundJob*)) zoom_buffer_iso_source_fetch_job_real_execute; #line 4035 "PhotoPage.c" } @@ -4195,7 +4195,7 @@ static void zoom_buffer_transformation_job_class_init (ZoomBufferTransformationJ #line 42 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_type_class_add_private (klass, sizeof (ZoomBufferTransformationJobPrivate)); #line 42 "/home/jens/Source/shotwell/src/PhotoPage.vala" - ((BackgroundJobClass *) klass)->execute = zoom_buffer_transformation_job_real_execute; + ((BackgroundJobClass *) klass)->execute = (void (*)(BackgroundJob*)) zoom_buffer_transformation_job_real_execute; #line 4196 "PhotoPage.c" } @@ -8911,9 +8911,9 @@ static gboolean editing_host_page_update_pixbuf (EditingHostPage* self) { Dimensions max_dim = {0}; Photo* _tmp2_ = NULL; Dimensions _tmp3_ = {0}; - gboolean _tmp17_ = FALSE; - gboolean _tmp25_ = FALSE; + gboolean _tmp18_ = FALSE; gboolean _tmp26_ = FALSE; + gboolean _tmp27_ = FALSE; GError * _inner_error_ = NULL; #line 1269 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_val_if_fail (IS_EDITING_HOST_PAGE (self), FALSE); @@ -9030,6 +9030,8 @@ static gboolean editing_host_page_update_pixbuf (EditingHostPage* self) { __finally248: #line 1281 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { +#line 9029 "PhotoPage.c" + gboolean _tmp17_ = FALSE; #line 1281 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (pixbuf); #line 1281 "/home/jens/Source/shotwell/src/PhotoPage.vala" @@ -9039,82 +9041,82 @@ static gboolean editing_host_page_update_pixbuf (EditingHostPage* self) { #line 1281 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_clear_error (&_inner_error_); #line 1281 "/home/jens/Source/shotwell/src/PhotoPage.vala" - return FALSE; -#line 9039 "PhotoPage.c" + return _tmp17_; +#line 9041 "PhotoPage.c" } #line 1293 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp17_ = self->priv->photo_missing; + _tmp18_ = self->priv->photo_missing; #line 1293 "/home/jens/Source/shotwell/src/PhotoPage.vala" - if (!_tmp17_) { -#line 9045 "PhotoPage.c" - GdkPixbuf* _tmp18_ = NULL; - GdkPixbuf* _tmp22_ = NULL; + if (!_tmp18_) { +#line 9047 "PhotoPage.c" + GdkPixbuf* _tmp19_ = NULL; + GdkPixbuf* _tmp23_ = NULL; #line 1295 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp18_ = pixbuf; + _tmp19_ = pixbuf; #line 1295 "/home/jens/Source/shotwell/src/PhotoPage.vala" - if (_tmp18_ == NULL) { -#line 9052 "PhotoPage.c" - PixbufCache* _tmp19_ = NULL; - Photo* _tmp20_ = NULL; - GdkPixbuf* _tmp21_ = NULL; + if (_tmp19_ == NULL) { +#line 9054 "PhotoPage.c" + PixbufCache* _tmp20_ = NULL; + Photo* _tmp21_ = NULL; + GdkPixbuf* _tmp22_ = NULL; #line 1296 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp19_ = self->priv->cache; + _tmp20_ = self->priv->cache; #line 1296 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp20_ = photo; + _tmp21_ = photo; #line 1296 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp21_ = pixbuf_cache_get_ready_pixbuf (_tmp19_, _tmp20_); + _tmp22_ = pixbuf_cache_get_ready_pixbuf (_tmp20_, _tmp21_); #line 1296 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (pixbuf); #line 1296 "/home/jens/Source/shotwell/src/PhotoPage.vala" - pixbuf = _tmp21_; -#line 9066 "PhotoPage.c" + pixbuf = _tmp22_; +#line 9068 "PhotoPage.c" } #line 1299 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp22_ = pixbuf; + _tmp23_ = pixbuf; #line 1299 "/home/jens/Source/shotwell/src/PhotoPage.vala" - if (_tmp22_ == NULL) { -#line 9072 "PhotoPage.c" - PixbufCache* _tmp23_ = NULL; - Photo* _tmp24_ = NULL; + if (_tmp23_ == NULL) { +#line 9074 "PhotoPage.c" + PixbufCache* _tmp24_ = NULL; + Photo* _tmp25_ = NULL; #line 1300 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp23_ = self->priv->cache; + _tmp24_ = self->priv->cache; #line 1300 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp24_ = photo; + _tmp25_ = photo; #line 1300 "/home/jens/Source/shotwell/src/PhotoPage.vala" - pixbuf_cache_prefetch (_tmp23_, _tmp24_, BACKGROUND_JOB_JOB_PRIORITY_NORMAL, FALSE); -#line 9081 "PhotoPage.c" + pixbuf_cache_prefetch (_tmp24_, _tmp25_, BACKGROUND_JOB_JOB_PRIORITY_NORMAL, FALSE); +#line 9083 "PhotoPage.c" } } #line 1303 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp26_ = self->priv->photo_missing; + _tmp27_ = self->priv->photo_missing; #line 1303 "/home/jens/Source/shotwell/src/PhotoPage.vala" - if (!_tmp26_) { -#line 9088 "PhotoPage.c" - GdkPixbuf* _tmp27_ = NULL; + if (!_tmp27_) { +#line 9090 "PhotoPage.c" + GdkPixbuf* _tmp28_ = NULL; #line 1303 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp27_ = pixbuf; + _tmp28_ = pixbuf; #line 1303 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp25_ = _tmp27_ != NULL; -#line 9094 "PhotoPage.c" + _tmp26_ = _tmp28_ != NULL; +#line 9096 "PhotoPage.c" } else { #line 1303 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp25_ = FALSE; -#line 9098 "PhotoPage.c" + _tmp26_ = FALSE; +#line 9100 "PhotoPage.c" } #line 1303 "/home/jens/Source/shotwell/src/PhotoPage.vala" - if (_tmp25_) { -#line 9102 "PhotoPage.c" - GdkPixbuf* _tmp28_ = NULL; - Dimensions _tmp29_ = {0}; + if (_tmp26_) { +#line 9104 "PhotoPage.c" + GdkPixbuf* _tmp29_ = NULL; + Dimensions _tmp30_ = {0}; #line 1304 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp28_ = pixbuf; + _tmp29_ = pixbuf; #line 1304 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp29_ = max_dim; + _tmp30_ = max_dim; #line 1304 "/home/jens/Source/shotwell/src/PhotoPage.vala" - single_photo_page_set_pixbuf (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), _tmp28_, &_tmp29_, NULL); + single_photo_page_set_pixbuf (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), _tmp29_, &_tmp30_, NULL); #line 1305 "/home/jens/Source/shotwell/src/PhotoPage.vala" self->priv->pixbuf_dirty = FALSE; -#line 9113 "PhotoPage.c" +#line 9115 "PhotoPage.c" } #line 1312 "/home/jens/Source/shotwell/src/PhotoPage.vala" result = FALSE; @@ -9124,7 +9126,7 @@ static gboolean editing_host_page_update_pixbuf (EditingHostPage* self) { _g_object_unref0 (photo); #line 1312 "/home/jens/Source/shotwell/src/PhotoPage.vala" return result; -#line 9123 "PhotoPage.c" +#line 9125 "PhotoPage.c" } @@ -9141,7 +9143,7 @@ static void editing_host_page_real_on_resize (Page* base, GdkRectangle* rect) { PAGE_CLASS (editing_host_page_parent_class)->on_resize (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), TYPE_PAGE, Page), &_tmp0_); #line 1318 "/home/jens/Source/shotwell/src/PhotoPage.vala" editing_host_page_track_tool_window (self); -#line 9140 "PhotoPage.c" +#line 9142 "PhotoPage.c" } @@ -9157,7 +9159,7 @@ static void editing_host_page_real_on_resize_finished (Page* base, GdkRectangle* self->priv->pixbuf_dirty = TRUE; #line 1328 "/home/jens/Source/shotwell/src/PhotoPage.vala" editing_host_page_update_pixbuf (self); -#line 9156 "PhotoPage.c" +#line 9158 "PhotoPage.c" } @@ -9170,7 +9172,7 @@ static void editing_host_page_on_viewport_resized (EditingHostPage* self) { self->priv->pixbuf_dirty = TRUE; #line 1337 "/home/jens/Source/shotwell/src/PhotoPage.vala" editing_host_page_update_pixbuf (self); -#line 9169 "PhotoPage.c" +#line 9171 "PhotoPage.c" } @@ -9254,21 +9256,21 @@ static void editing_host_page_real_update_actions (Page* base, gint selected_cou _tmp13_ = photo; #line 1349 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp13_ != NULL) { -#line 9253 "PhotoPage.c" +#line 9255 "PhotoPage.c" gboolean _tmp14_ = FALSE; #line 1349 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp14_ = self->priv->photo_missing; #line 1349 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp12_ = !_tmp14_; -#line 9259 "PhotoPage.c" +#line 9261 "PhotoPage.c" } else { #line 1349 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp12_ = FALSE; -#line 9263 "PhotoPage.c" +#line 9265 "PhotoPage.c" } #line 1349 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp12_) { -#line 9267 "PhotoPage.c" +#line 9269 "PhotoPage.c" Photo* _tmp15_ = NULL; gboolean _tmp16_ = FALSE; #line 1349 "/home/jens/Source/shotwell/src/PhotoPage.vala" @@ -9277,15 +9279,15 @@ static void editing_host_page_real_update_actions (Page* base, gint selected_cou _tmp16_ = photo_check_can_rotate (_tmp15_); #line 1349 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp11_ = _tmp16_; -#line 9276 "PhotoPage.c" +#line 9278 "PhotoPage.c" } else { #line 1349 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp11_ = FALSE; -#line 9280 "PhotoPage.c" +#line 9282 "PhotoPage.c" } #line 1349 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp11_) { -#line 9284 "PhotoPage.c" +#line 9286 "PhotoPage.c" Photo* _tmp17_ = NULL; gboolean _tmp18_ = FALSE; #line 1350 "/home/jens/Source/shotwell/src/PhotoPage.vala" @@ -9294,11 +9296,11 @@ static void editing_host_page_real_update_actions (Page* base, gint selected_cou _tmp18_ = editing_host_page_is_rotate_available (self, _tmp17_); #line 1350 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp10_ = _tmp18_; -#line 9293 "PhotoPage.c" +#line 9295 "PhotoPage.c" } else { #line 1350 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp10_ = FALSE; -#line 9297 "PhotoPage.c" +#line 9299 "PhotoPage.c" } #line 1349 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp19_ = self->priv->rotate_button; @@ -9308,21 +9310,21 @@ static void editing_host_page_real_update_actions (Page* base, gint selected_cou _tmp22_ = photo; #line 1351 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp22_ != NULL) { -#line 9307 "PhotoPage.c" +#line 9309 "PhotoPage.c" gboolean _tmp23_ = FALSE; #line 1351 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp23_ = self->priv->photo_missing; #line 1351 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp21_ = !_tmp23_; -#line 9313 "PhotoPage.c" +#line 9315 "PhotoPage.c" } else { #line 1351 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp21_ = FALSE; -#line 9317 "PhotoPage.c" +#line 9319 "PhotoPage.c" } #line 1351 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp21_) { -#line 9321 "PhotoPage.c" +#line 9323 "PhotoPage.c" Photo* _tmp24_ = NULL; Scaling _tmp25_ = {0}; gboolean _tmp26_ = FALSE; @@ -9334,11 +9336,11 @@ static void editing_host_page_real_update_actions (Page* base, gint selected_cou _tmp26_ = editing_tools_crop_tool_is_available (_tmp24_, &_tmp25_); #line 1352 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp20_ = _tmp26_; -#line 9333 "PhotoPage.c" +#line 9335 "PhotoPage.c" } else { #line 1352 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp20_ = FALSE; -#line 9337 "PhotoPage.c" +#line 9339 "PhotoPage.c" } #line 1351 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp27_ = self->priv->crop_button; @@ -9348,21 +9350,21 @@ static void editing_host_page_real_update_actions (Page* base, gint selected_cou _tmp30_ = photo; #line 1353 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp30_ != NULL) { -#line 9347 "PhotoPage.c" +#line 9349 "PhotoPage.c" gboolean _tmp31_ = FALSE; #line 1353 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp31_ = self->priv->photo_missing; #line 1353 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp29_ = !_tmp31_; -#line 9353 "PhotoPage.c" +#line 9355 "PhotoPage.c" } else { #line 1353 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp29_ = FALSE; -#line 9357 "PhotoPage.c" +#line 9359 "PhotoPage.c" } #line 1353 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp29_) { -#line 9361 "PhotoPage.c" +#line 9363 "PhotoPage.c" Photo* _tmp32_ = NULL; Scaling _tmp33_ = {0}; gboolean _tmp34_ = FALSE; @@ -9374,11 +9376,11 @@ static void editing_host_page_real_update_actions (Page* base, gint selected_cou _tmp34_ = editing_tools_redeye_tool_is_available (_tmp32_, &_tmp33_); #line 1354 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp28_ = _tmp34_; -#line 9373 "PhotoPage.c" +#line 9375 "PhotoPage.c" } else { #line 1354 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp28_ = FALSE; -#line 9377 "PhotoPage.c" +#line 9379 "PhotoPage.c" } #line 1353 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp35_ = self->priv->redeye_button; @@ -9388,21 +9390,21 @@ static void editing_host_page_real_update_actions (Page* base, gint selected_cou _tmp38_ = photo; #line 1355 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp38_ != NULL) { -#line 9387 "PhotoPage.c" +#line 9389 "PhotoPage.c" gboolean _tmp39_ = FALSE; #line 1355 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp39_ = self->priv->photo_missing; #line 1355 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp37_ = !_tmp39_; -#line 9393 "PhotoPage.c" +#line 9395 "PhotoPage.c" } else { #line 1355 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp37_ = FALSE; -#line 9397 "PhotoPage.c" +#line 9399 "PhotoPage.c" } #line 1355 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp37_) { -#line 9401 "PhotoPage.c" +#line 9403 "PhotoPage.c" Photo* _tmp40_ = NULL; Scaling _tmp41_ = {0}; gboolean _tmp42_ = FALSE; @@ -9414,11 +9416,11 @@ static void editing_host_page_real_update_actions (Page* base, gint selected_cou _tmp42_ = editing_tools_adjust_tool_is_available (_tmp40_, &_tmp41_); #line 1356 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp36_ = _tmp42_; -#line 9413 "PhotoPage.c" +#line 9415 "PhotoPage.c" } else { #line 1356 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp36_ = FALSE; -#line 9417 "PhotoPage.c" +#line 9419 "PhotoPage.c" } #line 1355 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp43_ = self->priv->adjust_button; @@ -9428,21 +9430,21 @@ static void editing_host_page_real_update_actions (Page* base, gint selected_cou _tmp46_ = photo; #line 1357 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp46_ != NULL) { -#line 9427 "PhotoPage.c" +#line 9429 "PhotoPage.c" gboolean _tmp47_ = FALSE; #line 1357 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp47_ = self->priv->photo_missing; #line 1357 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp45_ = !_tmp47_; -#line 9433 "PhotoPage.c" +#line 9435 "PhotoPage.c" } else { #line 1357 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp45_ = FALSE; -#line 9437 "PhotoPage.c" +#line 9439 "PhotoPage.c" } #line 1357 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp45_) { -#line 9441 "PhotoPage.c" +#line 9443 "PhotoPage.c" Photo* _tmp48_ = NULL; gboolean _tmp49_ = FALSE; #line 1358 "/home/jens/Source/shotwell/src/PhotoPage.vala" @@ -9451,11 +9453,11 @@ static void editing_host_page_real_update_actions (Page* base, gint selected_cou _tmp49_ = editing_host_page_is_enhance_available (self, _tmp48_); #line 1358 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp44_ = _tmp49_; -#line 9450 "PhotoPage.c" +#line 9452 "PhotoPage.c" } else { #line 1358 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp44_ = FALSE; -#line 9454 "PhotoPage.c" +#line 9456 "PhotoPage.c" } #line 1357 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp50_ = self->priv->enhance_button; @@ -9465,21 +9467,21 @@ static void editing_host_page_real_update_actions (Page* base, gint selected_cou _tmp53_ = photo; #line 1359 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp53_ != NULL) { -#line 9464 "PhotoPage.c" +#line 9466 "PhotoPage.c" gboolean _tmp54_ = FALSE; #line 1359 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp54_ = self->priv->photo_missing; #line 1359 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp52_ = !_tmp54_; -#line 9470 "PhotoPage.c" +#line 9472 "PhotoPage.c" } else { #line 1359 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp52_ = FALSE; -#line 9474 "PhotoPage.c" +#line 9476 "PhotoPage.c" } #line 1359 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp52_) { -#line 9478 "PhotoPage.c" +#line 9480 "PhotoPage.c" Photo* _tmp55_ = NULL; Scaling _tmp56_ = {0}; gboolean _tmp57_ = FALSE; @@ -9491,11 +9493,11 @@ static void editing_host_page_real_update_actions (Page* base, gint selected_cou _tmp57_ = editing_tools_straighten_tool_is_available (_tmp55_, &_tmp56_); #line 1360 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp51_ = _tmp57_; -#line 9490 "PhotoPage.c" +#line 9492 "PhotoPage.c" } else { #line 1360 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp51_ = FALSE; -#line 9494 "PhotoPage.c" +#line 9496 "PhotoPage.c" } #line 1359 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp58_ = self->priv->straighten_button; @@ -9509,7 +9511,7 @@ static void editing_host_page_real_update_actions (Page* base, gint selected_cou PAGE_CLASS (editing_host_page_parent_class)->update_actions (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), TYPE_PAGE, Page), _tmp59_, _tmp60_); #line 1340 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (photo); -#line 9508 "PhotoPage.c" +#line 9510 "PhotoPage.c" } @@ -9528,51 +9530,51 @@ static gboolean editing_host_page_real_on_shift_pressed (Page* base, GdkEventKey _tmp3_ = self->priv->current_tool; #line 1367 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp3_ == NULL) { -#line 9527 "PhotoPage.c" +#line 9529 "PhotoPage.c" gboolean _tmp4_ = FALSE; #line 1367 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp4_ = page_get_ctrl_pressed (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); #line 1367 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp2_ = !_tmp4_; -#line 9533 "PhotoPage.c" +#line 9535 "PhotoPage.c" } else { #line 1367 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp2_ = FALSE; -#line 9537 "PhotoPage.c" +#line 9539 "PhotoPage.c" } #line 1367 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp2_) { -#line 9541 "PhotoPage.c" +#line 9543 "PhotoPage.c" gboolean _tmp5_ = FALSE; #line 1367 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp5_ = page_get_alt_pressed (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); #line 1367 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp1_ = !_tmp5_; -#line 9547 "PhotoPage.c" +#line 9549 "PhotoPage.c" } else { #line 1367 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp1_ = FALSE; -#line 9551 "PhotoPage.c" +#line 9553 "PhotoPage.c" } #line 1367 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp1_) { -#line 9555 "PhotoPage.c" +#line 9557 "PhotoPage.c" gboolean _tmp6_ = FALSE; #line 1367 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp6_ = editing_host_page_has_photo (self); #line 1367 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp0_ = _tmp6_; -#line 9561 "PhotoPage.c" +#line 9563 "PhotoPage.c" } else { #line 1367 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp0_ = FALSE; -#line 9565 "PhotoPage.c" +#line 9567 "PhotoPage.c" } #line 1367 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp0_) { #line 1368 "/home/jens/Source/shotwell/src/PhotoPage.vala" editing_host_page_swap_in_original (self); -#line 9571 "PhotoPage.c" +#line 9573 "PhotoPage.c" } #line 1370 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp7_ = event; @@ -9582,7 +9584,7 @@ static gboolean editing_host_page_real_on_shift_pressed (Page* base, GdkEventKey result = _tmp8_; #line 1370 "/home/jens/Source/shotwell/src/PhotoPage.vala" return result; -#line 9581 "PhotoPage.c" +#line 9583 "PhotoPage.c" } @@ -9600,7 +9602,7 @@ static gboolean editing_host_page_real_on_shift_released (Page* base, GdkEventKe if (_tmp0_ == NULL) { #line 1375 "/home/jens/Source/shotwell/src/PhotoPage.vala" editing_host_page_swap_out_original (self); -#line 9599 "PhotoPage.c" +#line 9601 "PhotoPage.c" } #line 1377 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp1_ = event; @@ -9610,7 +9612,7 @@ static gboolean editing_host_page_real_on_shift_released (Page* base, GdkEventKe result = _tmp2_; #line 1377 "/home/jens/Source/shotwell/src/PhotoPage.vala" return result; -#line 9609 "PhotoPage.c" +#line 9611 "PhotoPage.c" } @@ -9628,7 +9630,7 @@ static gboolean editing_host_page_real_on_alt_pressed (Page* base, GdkEventKey* if (_tmp0_ == NULL) { #line 1382 "/home/jens/Source/shotwell/src/PhotoPage.vala" editing_host_page_swap_out_original (self); -#line 9627 "PhotoPage.c" +#line 9629 "PhotoPage.c" } #line 1384 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp1_ = event; @@ -9638,7 +9640,7 @@ static gboolean editing_host_page_real_on_alt_pressed (Page* base, GdkEventKey* result = _tmp2_; #line 1384 "/home/jens/Source/shotwell/src/PhotoPage.vala" return result; -#line 9637 "PhotoPage.c" +#line 9639 "PhotoPage.c" } @@ -9656,37 +9658,37 @@ static gboolean editing_host_page_real_on_alt_released (Page* base, GdkEventKey* _tmp2_ = self->priv->current_tool; #line 1388 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp2_ == NULL) { -#line 9655 "PhotoPage.c" +#line 9657 "PhotoPage.c" gboolean _tmp3_ = FALSE; #line 1388 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp3_ = page_get_shift_pressed (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); #line 1388 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp1_ = _tmp3_; -#line 9661 "PhotoPage.c" +#line 9663 "PhotoPage.c" } else { #line 1388 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp1_ = FALSE; -#line 9665 "PhotoPage.c" +#line 9667 "PhotoPage.c" } #line 1388 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp1_) { -#line 9669 "PhotoPage.c" +#line 9671 "PhotoPage.c" gboolean _tmp4_ = FALSE; #line 1388 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp4_ = page_get_ctrl_pressed (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); #line 1388 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp0_ = !_tmp4_; -#line 9675 "PhotoPage.c" +#line 9677 "PhotoPage.c" } else { #line 1388 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp0_ = FALSE; -#line 9679 "PhotoPage.c" +#line 9681 "PhotoPage.c" } #line 1388 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp0_) { #line 1389 "/home/jens/Source/shotwell/src/PhotoPage.vala" editing_host_page_swap_in_original (self); -#line 9685 "PhotoPage.c" +#line 9687 "PhotoPage.c" } #line 1391 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp5_ = event; @@ -9696,7 +9698,7 @@ static gboolean editing_host_page_real_on_alt_released (Page* base, GdkEventKey* result = _tmp6_; #line 1391 "/home/jens/Source/shotwell/src/PhotoPage.vala" return result; -#line 9695 "PhotoPage.c" +#line 9697 "PhotoPage.c" } @@ -9712,7 +9714,7 @@ static void editing_host_page_swap_in_original (EditingHostPage* self) { GError * _inner_error_ = NULL; #line 1394 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_if_fail (IS_EDITING_HOST_PAGE (self)); -#line 9711 "PhotoPage.c" +#line 9713 "PhotoPage.c" { GdkPixbuf* _tmp0_ = NULL; Photo* _tmp1_ = NULL; @@ -9737,7 +9739,7 @@ static void editing_host_page_swap_in_original (EditingHostPage* self) { _tmp0_ = _tmp4_; #line 1398 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 9736 "PhotoPage.c" +#line 9738 "PhotoPage.c" goto __catch249_g_error; } #line 1397 "/home/jens/Source/shotwell/src/PhotoPage.vala" @@ -9756,7 +9758,7 @@ static void editing_host_page_swap_in_original (EditingHostPage* self) { _g_object_unref0 (_tmp6_); #line 1396 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (_tmp0_); -#line 9755 "PhotoPage.c" +#line 9757 "PhotoPage.c" } goto __finally249; __catch249_g_error: @@ -9772,7 +9774,7 @@ static void editing_host_page_swap_in_original (EditingHostPage* self) { _g_object_unref0 (original); #line 1400 "/home/jens/Source/shotwell/src/PhotoPage.vala" return; -#line 9771 "PhotoPage.c" +#line 9773 "PhotoPage.c" } __finally249: #line 1396 "/home/jens/Source/shotwell/src/PhotoPage.vala" @@ -9785,7 +9787,7 @@ static void editing_host_page_swap_in_original (EditingHostPage* self) { g_clear_error (&_inner_error_); #line 1396 "/home/jens/Source/shotwell/src/PhotoPage.vala" return; -#line 9784 "PhotoPage.c" +#line 9786 "PhotoPage.c" } #line 1404 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp9_ = single_photo_page_get_unscaled_pixbuf (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage)); @@ -9803,7 +9805,7 @@ static void editing_host_page_swap_in_original (EditingHostPage* self) { single_photo_page_save_zoom_state (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage)); #line 1410 "/home/jens/Source/shotwell/src/PhotoPage.vala" single_photo_page_cancel_zoom (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage)); -#line 9802 "PhotoPage.c" +#line 9804 "PhotoPage.c" } #line 1413 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp12_ = original; @@ -9819,7 +9821,7 @@ static void editing_host_page_swap_in_original (EditingHostPage* self) { _g_object_unref0 (_tmp14_); #line 1394 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (original); -#line 9818 "PhotoPage.c" +#line 9820 "PhotoPage.c" } @@ -9831,7 +9833,7 @@ static void editing_host_page_swap_out_original (EditingHostPage* self) { _tmp0_ = self->priv->swapped; #line 1417 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp0_ != NULL) { -#line 9830 "PhotoPage.c" +#line 9832 "PhotoPage.c" GdkPixbuf* _tmp1_ = NULL; Photo* _tmp2_ = NULL; Photo* _tmp3_ = NULL; @@ -9856,7 +9858,7 @@ static void editing_host_page_swap_out_original (EditingHostPage* self) { _g_object_unref0 (self->priv->swapped); #line 1424 "/home/jens/Source/shotwell/src/PhotoPage.vala" self->priv->swapped = NULL; -#line 9855 "PhotoPage.c" +#line 9857 "PhotoPage.c" } } @@ -9864,7 +9866,7 @@ static void editing_host_page_swap_out_original (EditingHostPage* self) { static gpointer _editing_tools_editing_tool_ref0 (gpointer self) { #line 1468 "/home/jens/Source/shotwell/src/PhotoPage.vala" return self ? editing_tools_editing_tool_ref (self) : NULL; -#line 9863 "PhotoPage.c" +#line 9865 "PhotoPage.c" } @@ -9915,7 +9917,7 @@ static void editing_host_page_activate_tool (EditingHostPage* self, EditingTools _g_object_unref0 (_tmp3_); #line 1443 "/home/jens/Source/shotwell/src/PhotoPage.vala" max_dim = _tmp5_; -#line 9914 "PhotoPage.c" +#line 9916 "PhotoPage.c" { Dimensions tool_pixbuf_dim = {0}; Dimensions _tmp6_ = {0}; @@ -9953,7 +9955,7 @@ static void editing_host_page_activate_tool (EditingHostPage* self, EditingTools _tmp7_ = _tmp14_; #line 1446 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 9952 "PhotoPage.c" +#line 9954 "PhotoPage.c" goto __catch250_g_error; } #line 1446 "/home/jens/Source/shotwell/src/PhotoPage.vala" @@ -9968,17 +9970,17 @@ static void editing_host_page_activate_tool (EditingHostPage* self, EditingTools _tmp16_ = unscaled; #line 1448 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp16_ != NULL) { -#line 9967 "PhotoPage.c" +#line 9969 "PhotoPage.c" Dimensions _tmp17_ = {0}; #line 1449 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp17_ = tool_pixbuf_dim; #line 1449 "/home/jens/Source/shotwell/src/PhotoPage.vala" max_dim = _tmp17_; -#line 9973 "PhotoPage.c" +#line 9975 "PhotoPage.c" } #line 1444 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (_tmp7_); -#line 9977 "PhotoPage.c" +#line 9979 "PhotoPage.c" } goto __finally250; __catch250_g_error: @@ -10014,7 +10016,7 @@ static void editing_host_page_activate_tool (EditingHostPage* self, EditingTools _g_object_unref0 (unscaled); #line 1458 "/home/jens/Source/shotwell/src/PhotoPage.vala" return; -#line 10013 "PhotoPage.c" +#line 10015 "PhotoPage.c" } __finally250: #line 1444 "/home/jens/Source/shotwell/src/PhotoPage.vala" @@ -10027,13 +10029,13 @@ static void editing_host_page_activate_tool (EditingHostPage* self, EditingTools g_clear_error (&_inner_error_); #line 1444 "/home/jens/Source/shotwell/src/PhotoPage.vala" return; -#line 10026 "PhotoPage.c" +#line 10028 "PhotoPage.c" } #line 1461 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp22_ = unscaled; #line 1461 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp22_ != NULL) { -#line 10032 "PhotoPage.c" +#line 10034 "PhotoPage.c" GdkPixbuf* _tmp23_ = NULL; Dimensions _tmp24_ = {0}; #line 1462 "/home/jens/Source/shotwell/src/PhotoPage.vala" @@ -10042,7 +10044,7 @@ static void editing_host_page_activate_tool (EditingHostPage* self, EditingTools _tmp24_ = max_dim; #line 1462 "/home/jens/Source/shotwell/src/PhotoPage.vala" single_photo_page_set_pixbuf (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), _tmp23_, &_tmp24_, NULL); -#line 10041 "PhotoPage.c" +#line 10043 "PhotoPage.c" } #line 1465 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp25_ = editing_host_page_editing_host_canvas_new (self); @@ -10070,42 +10072,42 @@ static void editing_host_page_activate_tool (EditingHostPage* self, EditingTools _editing_tools_photo_canvas_unref0 (photo_canvas); #line 1428 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (unscaled); -#line 10069 "PhotoPage.c" +#line 10071 "PhotoPage.c" } static void _editing_host_page_on_tool_activated_editing_tools_editing_tool_activated (EditingToolsEditingTool* _sender, gpointer self) { #line 1499 "/home/jens/Source/shotwell/src/PhotoPage.vala" editing_host_page_on_tool_activated ((EditingHostPage*) self); -#line 10076 "PhotoPage.c" +#line 10078 "PhotoPage.c" } static void _editing_host_page_on_tool_deactivated_editing_tools_editing_tool_deactivated (EditingToolsEditingTool* _sender, gpointer self) { #line 1500 "/home/jens/Source/shotwell/src/PhotoPage.vala" editing_host_page_on_tool_deactivated ((EditingHostPage*) self); -#line 10083 "PhotoPage.c" +#line 10085 "PhotoPage.c" } static void _editing_host_page_on_tool_applied_editing_tools_editing_tool_applied (EditingToolsEditingTool* _sender, Command* command, GdkPixbuf* new_pixbuf, Dimensions* new_max_dim, gboolean needs_improvement, gpointer self) { #line 1501 "/home/jens/Source/shotwell/src/PhotoPage.vala" editing_host_page_on_tool_applied ((EditingHostPage*) self, command, new_pixbuf, new_max_dim, needs_improvement); -#line 10090 "PhotoPage.c" +#line 10092 "PhotoPage.c" } static void _editing_host_page_on_tool_cancelled_editing_tools_editing_tool_cancelled (EditingToolsEditingTool* _sender, gpointer self) { #line 1502 "/home/jens/Source/shotwell/src/PhotoPage.vala" editing_host_page_on_tool_cancelled ((EditingHostPage*) self); -#line 10097 "PhotoPage.c" +#line 10099 "PhotoPage.c" } static void _editing_host_page_on_tool_aborted_editing_tools_editing_tool_aborted (EditingToolsEditingTool* _sender, gpointer self) { #line 1503 "/home/jens/Source/shotwell/src/PhotoPage.vala" editing_host_page_on_tool_aborted ((EditingHostPage*) self); -#line 10104 "PhotoPage.c" +#line 10106 "PhotoPage.c" } @@ -10114,7 +10116,7 @@ static gboolean _editing_host_page_update_pixbuf_gsource_func (gpointer self) { result = editing_host_page_update_pixbuf ((EditingHostPage*) self); #line 1530 "/home/jens/Source/shotwell/src/PhotoPage.vala" return result; -#line 10113 "PhotoPage.c" +#line 10115 "PhotoPage.c" } @@ -10158,7 +10160,7 @@ static void editing_host_page_deactivate_tool (EditingHostPage* self, Command* c if (_tmp0_ == NULL) { #line 1481 "/home/jens/Source/shotwell/src/PhotoPage.vala" return; -#line 10157 "PhotoPage.c" +#line 10159 "PhotoPage.c" } #line 1483 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp1_ = self->priv->current_tool; @@ -10180,7 +10182,7 @@ static void editing_host_page_deactivate_tool (EditingHostPage* self, Command* c _tmp6_ = tool_window; #line 1488 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp6_ != NULL) { -#line 10179 "PhotoPage.c" +#line 10181 "PhotoPage.c" EditingToolsEditingToolWindow* _tmp7_ = NULL; gboolean _tmp8_ = FALSE; #line 1488 "/home/jens/Source/shotwell/src/PhotoPage.vala" @@ -10189,15 +10191,15 @@ static void editing_host_page_deactivate_tool (EditingHostPage* self, Command* c _tmp8_ = editing_tools_editing_tool_window_has_user_moved (_tmp7_); #line 1488 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp5_ = _tmp8_; -#line 10188 "PhotoPage.c" +#line 10190 "PhotoPage.c" } else { #line 1488 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp5_ = FALSE; -#line 10192 "PhotoPage.c" +#line 10194 "PhotoPage.c" } #line 1488 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp5_) { -#line 10196 "PhotoPage.c" +#line 10198 "PhotoPage.c" gint last_location_x = 0; gint last_location_y = 0; EditingToolsEditingToolWindow* _tmp9_ = NULL; @@ -10255,7 +10257,7 @@ static void editing_host_page_deactivate_tool (EditingHostPage* self, Command* c gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp22_, (gpointer) ((gintptr) _tmp23_)); #line 1492 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_free0 (_tmp22_); -#line 10254 "PhotoPage.c" +#line 10256 "PhotoPage.c" } #line 1497 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp24_ = tool; @@ -10305,7 +10307,7 @@ static void editing_host_page_deactivate_tool (EditingHostPage* self, Command* c _tmp35_ = new_pixbuf; #line 1513 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp35_ != NULL) { -#line 10304 "PhotoPage.c" +#line 10306 "PhotoPage.c" GdkPixbuf* _tmp36_ = NULL; GdkPixbuf* _tmp37_ = NULL; #line 1514 "/home/jens/Source/shotwell/src/PhotoPage.vala" @@ -10316,14 +10318,14 @@ static void editing_host_page_deactivate_tool (EditingHostPage* self, Command* c _g_object_unref0 (replacement); #line 1514 "/home/jens/Source/shotwell/src/PhotoPage.vala" replacement = _tmp37_; -#line 10315 "PhotoPage.c" +#line 10317 "PhotoPage.c" } else { GdkPixbuf* _tmp38_ = NULL; #line 1515 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp38_ = self->priv->cancel_editing_pixbuf; #line 1515 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp38_ != NULL) { -#line 10322 "PhotoPage.c" +#line 10324 "PhotoPage.c" GdkPixbuf* _tmp39_ = NULL; GdkPixbuf* _tmp40_ = NULL; GdkPixbuf* _tmp41_ = NULL; @@ -10344,18 +10346,18 @@ static void editing_host_page_deactivate_tool (EditingHostPage* self, Command* c *new_max_dim = _tmp42_; #line 1518 "/home/jens/Source/shotwell/src/PhotoPage.vala" needs_improvement = FALSE; -#line 10343 "PhotoPage.c" +#line 10345 "PhotoPage.c" } else { #line 1520 "/home/jens/Source/shotwell/src/PhotoPage.vala" needs_improvement = TRUE; -#line 10347 "PhotoPage.c" +#line 10349 "PhotoPage.c" } } #line 1523 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp43_ = replacement; #line 1523 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp43_ != NULL) { -#line 10354 "PhotoPage.c" +#line 10356 "PhotoPage.c" GdkPixbuf* _tmp44_ = NULL; Dimensions _tmp45_ = {0}; #line 1524 "/home/jens/Source/shotwell/src/PhotoPage.vala" @@ -10364,7 +10366,7 @@ static void editing_host_page_deactivate_tool (EditingHostPage* self, Command* c _tmp45_ = *new_max_dim; #line 1524 "/home/jens/Source/shotwell/src/PhotoPage.vala" single_photo_page_set_pixbuf (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), _tmp44_, &_tmp45_, NULL); -#line 10363 "PhotoPage.c" +#line 10365 "PhotoPage.c" } #line 1525 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (self->priv->cancel_editing_pixbuf); @@ -10378,13 +10380,13 @@ static void editing_host_page_deactivate_tool (EditingHostPage* self, Command* c self->priv->pixbuf_dirty = TRUE; #line 1530 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_idle_add_full (G_PRIORITY_DEFAULT_IDLE, _editing_host_page_update_pixbuf_gsource_func, g_object_ref (self), g_object_unref); -#line 10377 "PhotoPage.c" +#line 10379 "PhotoPage.c" } #line 1534 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp47_ = command; #line 1534 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp47_ != NULL) { -#line 10383 "PhotoPage.c" +#line 10385 "PhotoPage.c" CommandManager* _tmp48_ = NULL; CommandManager* _tmp49_ = NULL; Command* _tmp50_ = NULL; @@ -10398,7 +10400,7 @@ static void editing_host_page_deactivate_tool (EditingHostPage* self, Command* c command_manager_execute (_tmp49_, _tmp50_); #line 1535 "/home/jens/Source/shotwell/src/PhotoPage.vala" _command_manager_unref0 (_tmp49_); -#line 10397 "PhotoPage.c" +#line 10399 "PhotoPage.c" } #line 1478 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (replacement); @@ -10406,7 +10408,7 @@ static void editing_host_page_deactivate_tool (EditingHostPage* self, Command* c _g_object_unref0 (tool_window); #line 1478 "/home/jens/Source/shotwell/src/PhotoPage.vala" _editing_tools_editing_tool_unref0 (tool); -#line 10405 "PhotoPage.c" +#line 10407 "PhotoPage.c" } @@ -10418,7 +10420,7 @@ static gboolean editing_host_page_real_on_double_click (EditingHostPage* self, G result = FALSE; #line 1541 "/home/jens/Source/shotwell/src/PhotoPage.vala" return result; -#line 10417 "PhotoPage.c" +#line 10419 "PhotoPage.c" } @@ -10427,7 +10429,7 @@ gboolean editing_host_page_on_double_click (EditingHostPage* self, GdkEventButto g_return_val_if_fail (IS_EDITING_HOST_PAGE (self), FALSE); #line 1540 "/home/jens/Source/shotwell/src/PhotoPage.vala" return EDITING_HOST_PAGE_GET_CLASS (self)->on_double_click (self, event); -#line 10426 "PhotoPage.c" +#line 10428 "PhotoPage.c" } @@ -10461,14 +10463,14 @@ static gboolean editing_host_page_real_on_left_click (Page* base, GdkEventButton _tmp1_ = _tmp0_->type; #line 1547 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp1_ == GDK_2BUTTON_PRESS) { -#line 10460 "PhotoPage.c" +#line 10462 "PhotoPage.c" gboolean _tmp2_ = FALSE; EditingToolsEditingTool* _tmp3_ = NULL; #line 1548 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp3_ = self->priv->current_tool; #line 1548 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp3_ == NULL) { -#line 10467 "PhotoPage.c" +#line 10469 "PhotoPage.c" GdkEventButton* _tmp4_ = NULL; gboolean _tmp5_ = FALSE; #line 1548 "/home/jens/Source/shotwell/src/PhotoPage.vala" @@ -10477,17 +10479,17 @@ static gboolean editing_host_page_real_on_left_click (Page* base, GdkEventButton _tmp5_ = editing_host_page_on_double_click (self, _tmp4_); #line 1548 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp2_ = _tmp5_; -#line 10476 "PhotoPage.c" +#line 10478 "PhotoPage.c" } else { #line 1548 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp2_ = FALSE; -#line 10480 "PhotoPage.c" +#line 10482 "PhotoPage.c" } #line 1548 "/home/jens/Source/shotwell/src/PhotoPage.vala" result = _tmp2_; #line 1548 "/home/jens/Source/shotwell/src/PhotoPage.vala" return result; -#line 10486 "PhotoPage.c" +#line 10488 "PhotoPage.c" } #line 1550 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp6_ = event; @@ -10505,7 +10507,7 @@ static gboolean editing_host_page_real_on_left_click (Page* base, GdkEventButton _tmp11_ = self->priv->current_tool; #line 1555 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp11_ == NULL) { -#line 10504 "PhotoPage.c" +#line 10506 "PhotoPage.c" GtkScale* _tmp12_ = NULL; gdouble _tmp13_ = 0.0; #line 1555 "/home/jens/Source/shotwell/src/PhotoPage.vala" @@ -10514,15 +10516,15 @@ static gboolean editing_host_page_real_on_left_click (Page* base, GdkEventButton _tmp13_ = gtk_range_get_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, gtk_range_get_type (), GtkRange)); #line 1555 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp10_ = _tmp13_ != 0.0; -#line 10513 "PhotoPage.c" +#line 10515 "PhotoPage.c" } else { #line 1555 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp10_ = FALSE; -#line 10517 "PhotoPage.c" +#line 10519 "PhotoPage.c" } #line 1555 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp10_) { -#line 10521 "PhotoPage.c" +#line 10523 "PhotoPage.c" GdkEventButton* _tmp14_ = NULL; gdouble _tmp15_ = 0.0; GdkEventButton* _tmp16_ = NULL; @@ -10547,7 +10549,7 @@ static gboolean editing_host_page_real_on_left_click (Page* base, GdkEventButton result = TRUE; #line 1561 "/home/jens/Source/shotwell/src/PhotoPage.vala" return result; -#line 10546 "PhotoPage.c" +#line 10548 "PhotoPage.c" } #line 1565 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp18_ = self->priv->current_tool; @@ -10557,7 +10559,7 @@ static gboolean editing_host_page_real_on_left_click (Page* base, GdkEventButton result = FALSE; #line 1566 "/home/jens/Source/shotwell/src/PhotoPage.vala" return result; -#line 10556 "PhotoPage.c" +#line 10558 "PhotoPage.c" } #line 1571 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp19_ = x; @@ -10571,7 +10573,7 @@ static gboolean editing_host_page_real_on_left_click (Page* base, GdkEventButton result = TRUE; #line 1572 "/home/jens/Source/shotwell/src/PhotoPage.vala" return result; -#line 10570 "PhotoPage.c" +#line 10572 "PhotoPage.c" } #line 1574 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp22_ = self->priv->current_tool; @@ -10585,7 +10587,7 @@ static gboolean editing_host_page_real_on_left_click (Page* base, GdkEventButton result = TRUE; #line 1577 "/home/jens/Source/shotwell/src/PhotoPage.vala" return result; -#line 10584 "PhotoPage.c" +#line 10586 "PhotoPage.c" } @@ -10611,7 +10613,7 @@ static gboolean editing_host_page_real_on_left_released (Page* base, GdkEventBut _tmp0_ = self->priv->is_pan_in_progress; #line 1581 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp0_) { -#line 10610 "PhotoPage.c" +#line 10612 "PhotoPage.c" GdkPoint viewport_center = {0}; ZoomState _tmp1_ = {0}; GdkPoint _tmp2_ = {0}; @@ -10698,7 +10700,7 @@ static gboolean editing_host_page_real_on_left_released (Page* base, GdkEventBut self->priv->is_pan_in_progress = FALSE; #line 1593 "/home/jens/Source/shotwell/src/PhotoPage.vala" page_restore_cursor_hiding (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); -#line 10697 "PhotoPage.c" +#line 10699 "PhotoPage.c" } #line 1598 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp21_ = self->priv->current_tool; @@ -10708,7 +10710,7 @@ static gboolean editing_host_page_real_on_left_released (Page* base, GdkEventBut result = FALSE; #line 1599 "/home/jens/Source/shotwell/src/PhotoPage.vala" return result; -#line 10707 "PhotoPage.c" +#line 10709 "PhotoPage.c" } #line 1601 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp22_ = self->priv->current_tool; @@ -10734,7 +10736,7 @@ static gboolean editing_host_page_real_on_left_released (Page* base, GdkEventBut _g_object_unref0 (_tmp29_); #line 1603 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp30_) { -#line 10733 "PhotoPage.c" +#line 10735 "PhotoPage.c" EditingToolsEditingTool* _tmp31_ = NULL; EditingToolsEditingToolWindow* _tmp32_ = NULL; EditingToolsEditingToolWindow* _tmp33_ = NULL; @@ -10748,13 +10750,13 @@ static gboolean editing_host_page_real_on_left_released (Page* base, GdkEventBut gtk_window_present (G_TYPE_CHECK_INSTANCE_CAST (_tmp33_, gtk_window_get_type (), GtkWindow)); #line 1604 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (_tmp33_); -#line 10747 "PhotoPage.c" +#line 10749 "PhotoPage.c" } #line 1606 "/home/jens/Source/shotwell/src/PhotoPage.vala" result = FALSE; #line 1606 "/home/jens/Source/shotwell/src/PhotoPage.vala" return result; -#line 10753 "PhotoPage.c" +#line 10755 "PhotoPage.c" } @@ -10775,7 +10777,7 @@ static gboolean editing_host_page_real_on_right_click (Page* base, GdkEventButto result = _tmp1_; #line 1610 "/home/jens/Source/shotwell/src/PhotoPage.vala" return result; -#line 10774 "PhotoPage.c" +#line 10776 "PhotoPage.c" } @@ -10784,7 +10786,7 @@ static gboolean _editing_host_page_on_fetch_original_gsource_func (gpointer self result = editing_host_page_on_fetch_original ((EditingHostPage*) self); #line 1622 "/home/jens/Source/shotwell/src/PhotoPage.vala" return result; -#line 10783 "PhotoPage.c" +#line 10785 "PhotoPage.c" } @@ -10824,7 +10826,7 @@ static void editing_host_page_on_photos_altered (EditingHostPage* self, GeeMap* if (_tmp4_) { #line 1615 "/home/jens/Source/shotwell/src/PhotoPage.vala" return; -#line 10823 "PhotoPage.c" +#line 10825 "PhotoPage.c" } #line 1617 "/home/jens/Source/shotwell/src/PhotoPage.vala" self->priv->pixbuf_dirty = TRUE; @@ -10842,7 +10844,7 @@ static void editing_host_page_on_photos_altered (EditingHostPage* self, GeeMap* if (_tmp8_) { #line 1622 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_idle_add_full (G_PRIORITY_DEFAULT_IDLE, _editing_host_page_on_fetch_original_gsource_func, g_object_ref (self), g_object_unref); -#line 10841 "PhotoPage.c" +#line 10843 "PhotoPage.c" } #line 1624 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp9_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); @@ -10862,7 +10864,7 @@ static void editing_host_page_on_photos_altered (EditingHostPage* self, GeeMap* _data_collection_unref0 (_tmp13_); #line 1624 "/home/jens/Source/shotwell/src/PhotoPage.vala" _data_collection_unref0 (_tmp10_); -#line 10861 "PhotoPage.c" +#line 10863 "PhotoPage.c" } @@ -10871,7 +10873,7 @@ static void editing_host_page_on_view_contents_ordering_altered (EditingHostPage g_return_if_fail (IS_EDITING_HOST_PAGE (self)); #line 1628 "/home/jens/Source/shotwell/src/PhotoPage.vala" editing_host_page_refresh_caches (self, "on_view_contents_ordering_altered"); -#line 10870 "PhotoPage.c" +#line 10872 "PhotoPage.c" } @@ -10884,7 +10886,7 @@ static gboolean editing_host_page_on_fetch_original (EditingHostPage* self) { _tmp0_ = editing_host_page_has_photo (self); #line 1632 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp0_) { -#line 10883 "PhotoPage.c" +#line 10885 "PhotoPage.c" PixbufCache* _tmp1_ = NULL; Photo* _tmp2_ = NULL; Photo* _tmp3_ = NULL; @@ -10898,13 +10900,13 @@ static gboolean editing_host_page_on_fetch_original (EditingHostPage* self) { pixbuf_cache_prefetch (_tmp1_, _tmp3_, BACKGROUND_JOB_JOB_PRIORITY_LOW, FALSE); #line 1633 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (_tmp3_); -#line 10897 "PhotoPage.c" +#line 10899 "PhotoPage.c" } #line 1635 "/home/jens/Source/shotwell/src/PhotoPage.vala" result = FALSE; #line 1635 "/home/jens/Source/shotwell/src/PhotoPage.vala" return result; -#line 10903 "PhotoPage.c" +#line 10905 "PhotoPage.c" } @@ -10955,7 +10957,7 @@ static gboolean editing_host_page_is_panning_possible (EditingHostPage* self) { _tmp10_ = _tmp9_.width; #line 1646 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp8_ >= _tmp10_) { -#line 10954 "PhotoPage.c" +#line 10956 "PhotoPage.c" Dimensions _tmp11_ = {0}; gint _tmp12_ = 0; Dimensions _tmp13_ = {0}; @@ -10970,17 +10972,17 @@ static gboolean editing_host_page_is_panning_possible (EditingHostPage* self) { _tmp14_ = _tmp13_.height; #line 1646 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp6_ = _tmp12_ >= _tmp14_; -#line 10969 "PhotoPage.c" +#line 10971 "PhotoPage.c" } else { #line 1646 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp6_ = FALSE; -#line 10973 "PhotoPage.c" +#line 10975 "PhotoPage.c" } #line 1646 "/home/jens/Source/shotwell/src/PhotoPage.vala" result = !_tmp6_; #line 1646 "/home/jens/Source/shotwell/src/PhotoPage.vala" return result; -#line 10979 "PhotoPage.c" +#line 10981 "PhotoPage.c" } @@ -10994,11 +10996,11 @@ static void editing_host_page_update_cursor_for_zoom_context (EditingHostPage* s if (_tmp0_) { #line 1651 "/home/jens/Source/shotwell/src/PhotoPage.vala" page_set_page_cursor (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), GDK_FLEUR); -#line 10993 "PhotoPage.c" +#line 10995 "PhotoPage.c" } else { #line 1653 "/home/jens/Source/shotwell/src/PhotoPage.vala" page_set_page_cursor (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), GDK_LEFT_PTR); -#line 10997 "PhotoPage.c" +#line 10999 "PhotoPage.c" } } @@ -11021,7 +11023,7 @@ static gboolean editing_host_page_real_on_motion (Page* base, GdkEventMotion* ev _tmp0_ = self->priv->current_tool; #line 1658 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp0_ != NULL) { -#line 11020 "PhotoPage.c" +#line 11022 "PhotoPage.c" EditingToolsEditingTool* _tmp1_ = NULL; gint _tmp2_ = 0; gint _tmp3_ = 0; @@ -11045,7 +11047,7 @@ static gboolean editing_host_page_real_on_motion (Page* base, GdkEventMotion* ev result = TRUE; #line 1664 "/home/jens/Source/shotwell/src/PhotoPage.vala" return result; -#line 11044 "PhotoPage.c" +#line 11046 "PhotoPage.c" } #line 1667 "/home/jens/Source/shotwell/src/PhotoPage.vala" editing_host_page_update_cursor_for_zoom_context (self); @@ -11053,7 +11055,7 @@ static gboolean editing_host_page_real_on_motion (Page* base, GdkEventMotion* ev _tmp6_ = self->priv->is_pan_in_progress; #line 1669 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp6_) { -#line 11052 "PhotoPage.c" +#line 11054 "PhotoPage.c" gint delta_x = 0; GdkEventMotion* _tmp7_ = NULL; gdouble _tmp8_ = 0.0; @@ -11127,7 +11129,7 @@ static gboolean editing_host_page_real_on_motion (Page* base, GdkEventMotion* ev result = TRUE; #line 1680 "/home/jens/Source/shotwell/src/PhotoPage.vala" return result; -#line 11126 "PhotoPage.c" +#line 11128 "PhotoPage.c" } #line 1683 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp24_ = event; @@ -11143,7 +11145,7 @@ static gboolean editing_host_page_real_on_motion (Page* base, GdkEventMotion* ev result = _tmp28_; #line 1683 "/home/jens/Source/shotwell/src/PhotoPage.vala" return result; -#line 11142 "PhotoPage.c" +#line 11144 "PhotoPage.c" } @@ -11158,7 +11160,7 @@ static gboolean editing_host_page_real_on_leave_notify_event (Page* base) { _tmp0_ = self->priv->current_tool; #line 1687 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp0_ != NULL) { -#line 11157 "PhotoPage.c" +#line 11159 "PhotoPage.c" EditingToolsEditingTool* _tmp1_ = NULL; gboolean _tmp2_ = FALSE; #line 1688 "/home/jens/Source/shotwell/src/PhotoPage.vala" @@ -11169,7 +11171,7 @@ static gboolean editing_host_page_real_on_leave_notify_event (Page* base) { result = _tmp2_; #line 1688 "/home/jens/Source/shotwell/src/PhotoPage.vala" return result; -#line 11168 "PhotoPage.c" +#line 11170 "PhotoPage.c" } #line 1690 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp3_ = PAGE_CLASS (editing_host_page_parent_class)->on_leave_notify_event (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), TYPE_PAGE, Page)); @@ -11177,7 +11179,7 @@ static gboolean editing_host_page_real_on_leave_notify_event (Page* base) { result = _tmp3_; #line 1690 "/home/jens/Source/shotwell/src/PhotoPage.vala" return result; -#line 11176 "PhotoPage.c" +#line 11178 "PhotoPage.c" } @@ -11189,7 +11191,7 @@ static void editing_host_page_track_tool_window (EditingHostPage* self) { _tmp0_ = self->priv->current_tool; #line 1695 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp0_ != NULL) { -#line 11188 "PhotoPage.c" +#line 11190 "PhotoPage.c" EditingToolsEditingToolWindow* tool_window = NULL; EditingToolsEditingTool* _tmp1_ = NULL; EditingToolsEditingToolWindow* _tmp2_ = NULL; @@ -11205,7 +11207,7 @@ static void editing_host_page_track_tool_window (EditingHostPage* self) { _tmp4_ = tool_window; #line 1697 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp4_ != NULL) { -#line 11204 "PhotoPage.c" +#line 11206 "PhotoPage.c" EditingToolsEditingToolWindow* _tmp5_ = NULL; gboolean _tmp6_ = FALSE; #line 1697 "/home/jens/Source/shotwell/src/PhotoPage.vala" @@ -11214,21 +11216,21 @@ static void editing_host_page_track_tool_window (EditingHostPage* self) { _tmp6_ = editing_tools_editing_tool_window_has_user_moved (_tmp5_); #line 1697 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp3_ = !_tmp6_; -#line 11213 "PhotoPage.c" +#line 11215 "PhotoPage.c" } else { #line 1697 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp3_ = FALSE; -#line 11217 "PhotoPage.c" +#line 11219 "PhotoPage.c" } #line 1697 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp3_) { #line 1698 "/home/jens/Source/shotwell/src/PhotoPage.vala" editing_host_page_place_tool_window (self); -#line 11223 "PhotoPage.c" +#line 11225 "PhotoPage.c" } #line 1695 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (tool_window); -#line 11227 "PhotoPage.c" +#line 11229 "PhotoPage.c" } } @@ -11246,7 +11248,7 @@ static void editing_host_page_real_on_move (Page* base, GdkRectangle* rect) { _tmp0_ = *rect; #line 1705 "/home/jens/Source/shotwell/src/PhotoPage.vala" PAGE_CLASS (editing_host_page_parent_class)->on_move (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), TYPE_PAGE, Page), &_tmp0_); -#line 11245 "PhotoPage.c" +#line 11247 "PhotoPage.c" } @@ -11266,7 +11268,7 @@ static void editing_host_page_real_on_move_finished (Page* base, GdkRectangle* r _tmp1_ = *rect; #line 1711 "/home/jens/Source/shotwell/src/PhotoPage.vala" PAGE_CLASS (editing_host_page_parent_class)->on_move_finished (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), TYPE_PAGE, Page), &_tmp1_); -#line 11265 "PhotoPage.c" +#line 11267 "PhotoPage.c" } @@ -11305,7 +11307,7 @@ static gboolean editing_host_page_on_keyboard_pan_event (EditingHostPage* self, static GQuark _tmp6_label10 = 0; #line 1718 "/home/jens/Source/shotwell/src/PhotoPage.vala" static GQuark _tmp6_label11 = 0; -#line 11304 "PhotoPage.c" +#line 11306 "PhotoPage.c" ZoomState new_zoom_state = {0}; ZoomState _tmp12_ = {0}; GdkPoint _tmp13_ = {0}; @@ -11336,7 +11338,7 @@ static gboolean editing_host_page_on_keyboard_pan_event (EditingHostPage* self, if (((_tmp7_ == ((0 != _tmp6_label0) ? _tmp6_label0 : (_tmp6_label0 = g_quark_from_static_string ("Left")))) || (_tmp7_ == ((0 != _tmp6_label1) ? _tmp6_label1 : (_tmp6_label1 = g_quark_from_static_string ("KP_Left"))))) || (_tmp7_ == ((0 != _tmp6_label2) ? _tmp6_label2 : (_tmp6_label2 = g_quark_from_static_string ("KP_4"))))) { #line 1718 "/home/jens/Source/shotwell/src/PhotoPage.vala" switch (0) { -#line 11335 "PhotoPage.c" +#line 11337 "PhotoPage.c" default: { gint _tmp8_ = 0; @@ -11346,13 +11348,13 @@ static gboolean editing_host_page_on_keyboard_pan_event (EditingHostPage* self, viewport_center.x = _tmp8_ - EDITING_HOST_PAGE_PAN_INCREMENT_SIZE; #line 1723 "/home/jens/Source/shotwell/src/PhotoPage.vala" break; -#line 11345 "PhotoPage.c" +#line 11347 "PhotoPage.c" } } } else if (((_tmp7_ == ((0 != _tmp6_label3) ? _tmp6_label3 : (_tmp6_label3 = g_quark_from_static_string ("Right")))) || (_tmp7_ == ((0 != _tmp6_label4) ? _tmp6_label4 : (_tmp6_label4 = g_quark_from_static_string ("KP_Right"))))) || (_tmp7_ == ((0 != _tmp6_label5) ? _tmp6_label5 : (_tmp6_label5 = g_quark_from_static_string ("KP_6"))))) { #line 1718 "/home/jens/Source/shotwell/src/PhotoPage.vala" switch (0) { -#line 11351 "PhotoPage.c" +#line 11353 "PhotoPage.c" default: { gint _tmp9_ = 0; @@ -11362,13 +11364,13 @@ static gboolean editing_host_page_on_keyboard_pan_event (EditingHostPage* self, viewport_center.x = _tmp9_ + EDITING_HOST_PAGE_PAN_INCREMENT_SIZE; #line 1729 "/home/jens/Source/shotwell/src/PhotoPage.vala" break; -#line 11361 "PhotoPage.c" +#line 11363 "PhotoPage.c" } } } else if (((_tmp7_ == ((0 != _tmp6_label6) ? _tmp6_label6 : (_tmp6_label6 = g_quark_from_static_string ("Down")))) || (_tmp7_ == ((0 != _tmp6_label7) ? _tmp6_label7 : (_tmp6_label7 = g_quark_from_static_string ("KP_Down"))))) || (_tmp7_ == ((0 != _tmp6_label8) ? _tmp6_label8 : (_tmp6_label8 = g_quark_from_static_string ("KP_2"))))) { #line 1718 "/home/jens/Source/shotwell/src/PhotoPage.vala" switch (0) { -#line 11367 "PhotoPage.c" +#line 11369 "PhotoPage.c" default: { gint _tmp10_ = 0; @@ -11378,13 +11380,13 @@ static gboolean editing_host_page_on_keyboard_pan_event (EditingHostPage* self, viewport_center.y = _tmp10_ + EDITING_HOST_PAGE_PAN_INCREMENT_SIZE; #line 1735 "/home/jens/Source/shotwell/src/PhotoPage.vala" break; -#line 11377 "PhotoPage.c" +#line 11379 "PhotoPage.c" } } } else if (((_tmp7_ == ((0 != _tmp6_label9) ? _tmp6_label9 : (_tmp6_label9 = g_quark_from_static_string ("Up")))) || (_tmp7_ == ((0 != _tmp6_label10) ? _tmp6_label10 : (_tmp6_label10 = g_quark_from_static_string ("KP_Up"))))) || (_tmp7_ == ((0 != _tmp6_label11) ? _tmp6_label11 : (_tmp6_label11 = g_quark_from_static_string ("KP_8"))))) { #line 1718 "/home/jens/Source/shotwell/src/PhotoPage.vala" switch (0) { -#line 11383 "PhotoPage.c" +#line 11385 "PhotoPage.c" default: { gint _tmp11_ = 0; @@ -11394,20 +11396,20 @@ static gboolean editing_host_page_on_keyboard_pan_event (EditingHostPage* self, viewport_center.y = _tmp11_ - EDITING_HOST_PAGE_PAN_INCREMENT_SIZE; #line 1741 "/home/jens/Source/shotwell/src/PhotoPage.vala" break; -#line 11393 "PhotoPage.c" +#line 11395 "PhotoPage.c" } } } else { #line 1718 "/home/jens/Source/shotwell/src/PhotoPage.vala" switch (0) { -#line 11399 "PhotoPage.c" +#line 11401 "PhotoPage.c" default: { #line 1744 "/home/jens/Source/shotwell/src/PhotoPage.vala" result = FALSE; #line 1744 "/home/jens/Source/shotwell/src/PhotoPage.vala" return result; -#line 11406 "PhotoPage.c" +#line 11408 "PhotoPage.c" } } } @@ -11427,7 +11429,7 @@ static gboolean editing_host_page_on_keyboard_pan_event (EditingHostPage* self, result = TRUE; #line 1751 "/home/jens/Source/shotwell/src/PhotoPage.vala" return result; -#line 11426 "PhotoPage.c" +#line 11428 "PhotoPage.c" } @@ -11460,7 +11462,7 @@ static gboolean editing_host_page_real_key_press_event (GtkWidget* base, GdkEven static GQuark _tmp13_label6 = 0; #line 1775 "/home/jens/Source/shotwell/src/PhotoPage.vala" static GQuark _tmp13_label7 = 0; -#line 11459 "PhotoPage.c" +#line 11461 "PhotoPage.c" gboolean _tmp15_ = FALSE; gboolean _tmp16_ = FALSE; #line 1754 "/home/jens/Source/shotwell/src/PhotoPage.vala" @@ -11471,7 +11473,7 @@ static gboolean editing_host_page_real_key_press_event (GtkWidget* base, GdkEven _tmp0_ = self->priv->current_tool; #line 1756 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp0_ != NULL) { -#line 11470 "PhotoPage.c" +#line 11472 "PhotoPage.c" EditingToolsEditingTool* _tmp1_ = NULL; GdkEventKey* _tmp2_ = NULL; gboolean _tmp3_ = FALSE; @@ -11487,14 +11489,14 @@ static gboolean editing_host_page_real_key_press_event (GtkWidget* base, GdkEven result = TRUE; #line 1758 "/home/jens/Source/shotwell/src/PhotoPage.vala" return result; -#line 11486 "PhotoPage.c" +#line 11488 "PhotoPage.c" } } #line 1762 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp4_ = editing_host_page_is_panning_possible (self); #line 1762 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp4_) { -#line 11493 "PhotoPage.c" +#line 11495 "PhotoPage.c" GdkEventKey* _tmp5_ = NULL; gboolean _tmp6_ = FALSE; #line 1763 "/home/jens/Source/shotwell/src/PhotoPage.vala" @@ -11507,7 +11509,7 @@ static gboolean editing_host_page_real_key_press_event (GtkWidget* base, GdkEven result = TRUE; #line 1764 "/home/jens/Source/shotwell/src/PhotoPage.vala" return result; -#line 11506 "PhotoPage.c" +#line 11508 "PhotoPage.c" } } #line 1770 "/home/jens/Source/shotwell/src/PhotoPage.vala" @@ -11520,7 +11522,7 @@ static gboolean editing_host_page_real_key_press_event (GtkWidget* base, GdkEven result = TRUE; #line 1771 "/home/jens/Source/shotwell/src/PhotoPage.vala" return result; -#line 11519 "PhotoPage.c" +#line 11521 "PhotoPage.c" } #line 1773 "/home/jens/Source/shotwell/src/PhotoPage.vala" handled = TRUE; @@ -11538,51 +11540,51 @@ static gboolean editing_host_page_real_key_press_event (GtkWidget* base, GdkEven if ((_tmp14_ == ((0 != _tmp13_label0) ? _tmp13_label0 : (_tmp13_label0 = g_quark_from_static_string ("Down")))) || (_tmp14_ == ((0 != _tmp13_label1) ? _tmp13_label1 : (_tmp13_label1 = g_quark_from_static_string ("KP_Down"))))) { #line 1775 "/home/jens/Source/shotwell/src/PhotoPage.vala" switch (0) { -#line 11537 "PhotoPage.c" +#line 11539 "PhotoPage.c" default: { #line 1780 "/home/jens/Source/shotwell/src/PhotoPage.vala" break; -#line 11542 "PhotoPage.c" +#line 11544 "PhotoPage.c" } } } else if (((_tmp14_ == ((0 != _tmp13_label2) ? _tmp13_label2 : (_tmp13_label2 = g_quark_from_static_string ("equal")))) || (_tmp14_ == ((0 != _tmp13_label3) ? _tmp13_label3 : (_tmp13_label3 = g_quark_from_static_string ("plus"))))) || (_tmp14_ == ((0 != _tmp13_label4) ? _tmp13_label4 : (_tmp13_label4 = g_quark_from_static_string ("KP_Add"))))) { #line 1775 "/home/jens/Source/shotwell/src/PhotoPage.vala" switch (0) { -#line 11548 "PhotoPage.c" +#line 11550 "PhotoPage.c" default: { #line 1785 "/home/jens/Source/shotwell/src/PhotoPage.vala" page_activate_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "IncreaseSize"); #line 1786 "/home/jens/Source/shotwell/src/PhotoPage.vala" break; -#line 11555 "PhotoPage.c" +#line 11557 "PhotoPage.c" } } } else if (((_tmp14_ == ((0 != _tmp13_label5) ? _tmp13_label5 : (_tmp13_label5 = g_quark_from_static_string ("minus")))) || (_tmp14_ == ((0 != _tmp13_label6) ? _tmp13_label6 : (_tmp13_label6 = g_quark_from_static_string ("underscore"))))) || (_tmp14_ == ((0 != _tmp13_label7) ? _tmp13_label7 : (_tmp13_label7 = g_quark_from_static_string ("KP_Subtract"))))) { #line 1775 "/home/jens/Source/shotwell/src/PhotoPage.vala" switch (0) { -#line 11561 "PhotoPage.c" +#line 11563 "PhotoPage.c" default: { #line 1792 "/home/jens/Source/shotwell/src/PhotoPage.vala" page_activate_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "DecreaseSize"); #line 1793 "/home/jens/Source/shotwell/src/PhotoPage.vala" break; -#line 11568 "PhotoPage.c" +#line 11570 "PhotoPage.c" } } } else { #line 1775 "/home/jens/Source/shotwell/src/PhotoPage.vala" switch (0) { -#line 11574 "PhotoPage.c" +#line 11576 "PhotoPage.c" default: { #line 1796 "/home/jens/Source/shotwell/src/PhotoPage.vala" handled = FALSE; #line 1797 "/home/jens/Source/shotwell/src/PhotoPage.vala" break; -#line 11581 "PhotoPage.c" +#line 11583 "PhotoPage.c" } } } @@ -11594,11 +11596,11 @@ static gboolean editing_host_page_real_key_press_event (GtkWidget* base, GdkEven result = TRUE; #line 1801 "/home/jens/Source/shotwell/src/PhotoPage.vala" return result; -#line 11593 "PhotoPage.c" +#line 11595 "PhotoPage.c" } #line 1803 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (GTK_WIDGET_CLASS (editing_host_page_parent_class)->key_press_event != NULL) { -#line 11597 "PhotoPage.c" +#line 11599 "PhotoPage.c" GdkEventKey* _tmp17_ = NULL; gboolean _tmp18_ = FALSE; #line 1803 "/home/jens/Source/shotwell/src/PhotoPage.vala" @@ -11607,17 +11609,17 @@ static gboolean editing_host_page_real_key_press_event (GtkWidget* base, GdkEven _tmp18_ = GTK_WIDGET_CLASS (editing_host_page_parent_class)->key_press_event (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), gtk_widget_get_type (), GtkWidget), _tmp17_); #line 1803 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp16_ = _tmp18_; -#line 11606 "PhotoPage.c" +#line 11608 "PhotoPage.c" } else { #line 1803 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp16_ = TRUE; -#line 11610 "PhotoPage.c" +#line 11612 "PhotoPage.c" } #line 1803 "/home/jens/Source/shotwell/src/PhotoPage.vala" result = _tmp16_; #line 1803 "/home/jens/Source/shotwell/src/PhotoPage.vala" return result; -#line 11616 "PhotoPage.c" +#line 11618 "PhotoPage.c" } @@ -11634,7 +11636,7 @@ static void editing_host_page_real_new_surface (SinglePhotoPage* base, cairo_t* _tmp0_ = self->priv->current_tool; #line 1808 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp0_ != NULL) { -#line 11633 "PhotoPage.c" +#line 11635 "PhotoPage.c" EditingToolsEditingTool* _tmp1_ = NULL; EditingToolsPhotoCanvas* _tmp2_ = NULL; cairo_t* _tmp3_ = NULL; @@ -11649,7 +11651,7 @@ static void editing_host_page_real_new_surface (SinglePhotoPage* base, cairo_t* _tmp4_ = *dim; #line 1809 "/home/jens/Source/shotwell/src/PhotoPage.vala" editing_tools_photo_canvas_set_surface (_tmp2_, _tmp3_, &_tmp4_); -#line 11648 "PhotoPage.c" +#line 11650 "PhotoPage.c" } } @@ -11668,21 +11670,21 @@ static void editing_host_page_real_updated_pixbuf (SinglePhotoPage* base, GdkPix _tmp1_ = self->priv->current_tool; #line 1816 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp1_ != NULL) { -#line 11667 "PhotoPage.c" +#line 11669 "PhotoPage.c" SinglePhotoPageUpdateReason _tmp2_ = 0; #line 1816 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp2_ = reason; #line 1816 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp0_ = _tmp2_ != SINGLE_PHOTO_PAGE_UPDATE_REASON_QUALITY_IMPROVEMENT; -#line 11673 "PhotoPage.c" +#line 11675 "PhotoPage.c" } else { #line 1816 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp0_ = FALSE; -#line 11677 "PhotoPage.c" +#line 11679 "PhotoPage.c" } #line 1816 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp0_) { -#line 11681 "PhotoPage.c" +#line 11683 "PhotoPage.c" EditingToolsEditingTool* _tmp3_ = NULL; EditingToolsPhotoCanvas* _tmp4_ = NULL; Dimensions _tmp5_ = {0}; @@ -11704,7 +11706,7 @@ static void editing_host_page_real_updated_pixbuf (SinglePhotoPage* base, GdkPix _g_object_unref0 (self->priv->cancel_editing_pixbuf); #line 1818 "/home/jens/Source/shotwell/src/PhotoPage.vala" self->priv->cancel_editing_pixbuf = NULL; -#line 11703 "PhotoPage.c" +#line 11705 "PhotoPage.c" } } @@ -11715,7 +11717,7 @@ static GdkPixbuf* editing_host_page_real_get_bottom_left_trinket (EditingHostPag result = NULL; #line 1823 "/home/jens/Source/shotwell/src/PhotoPage.vala" return result; -#line 11714 "PhotoPage.c" +#line 11716 "PhotoPage.c" } @@ -11724,7 +11726,7 @@ GdkPixbuf* editing_host_page_get_bottom_left_trinket (EditingHostPage* self, gin g_return_val_if_fail (IS_EDITING_HOST_PAGE (self), NULL); #line 1822 "/home/jens/Source/shotwell/src/PhotoPage.vala" return EDITING_HOST_PAGE_GET_CLASS (self)->get_bottom_left_trinket (self, scale); -#line 11723 "PhotoPage.c" +#line 11725 "PhotoPage.c" } @@ -11734,7 +11736,7 @@ static GdkPixbuf* editing_host_page_real_get_top_left_trinket (EditingHostPage* result = NULL; #line 1827 "/home/jens/Source/shotwell/src/PhotoPage.vala" return result; -#line 11733 "PhotoPage.c" +#line 11735 "PhotoPage.c" } @@ -11743,7 +11745,7 @@ GdkPixbuf* editing_host_page_get_top_left_trinket (EditingHostPage* self, gint s g_return_val_if_fail (IS_EDITING_HOST_PAGE (self), NULL); #line 1826 "/home/jens/Source/shotwell/src/PhotoPage.vala" return EDITING_HOST_PAGE_GET_CLASS (self)->get_top_left_trinket (self, scale); -#line 11742 "PhotoPage.c" +#line 11744 "PhotoPage.c" } @@ -11753,7 +11755,7 @@ static GdkPixbuf* editing_host_page_real_get_top_right_trinket (EditingHostPage* result = NULL; #line 1831 "/home/jens/Source/shotwell/src/PhotoPage.vala" return result; -#line 11752 "PhotoPage.c" +#line 11754 "PhotoPage.c" } @@ -11762,7 +11764,7 @@ GdkPixbuf* editing_host_page_get_top_right_trinket (EditingHostPage* self, gint g_return_val_if_fail (IS_EDITING_HOST_PAGE (self), NULL); #line 1830 "/home/jens/Source/shotwell/src/PhotoPage.vala" return EDITING_HOST_PAGE_GET_CLASS (self)->get_top_right_trinket (self, scale); -#line 11761 "PhotoPage.c" +#line 11763 "PhotoPage.c" } @@ -11772,7 +11774,7 @@ static GdkPixbuf* editing_host_page_real_get_bottom_right_trinket (EditingHostPa result = NULL; #line 1835 "/home/jens/Source/shotwell/src/PhotoPage.vala" return result; -#line 11771 "PhotoPage.c" +#line 11773 "PhotoPage.c" } @@ -11781,7 +11783,7 @@ GdkPixbuf* editing_host_page_get_bottom_right_trinket (EditingHostPage* self, gi g_return_val_if_fail (IS_EDITING_HOST_PAGE (self), NULL); #line 1834 "/home/jens/Source/shotwell/src/PhotoPage.vala" return EDITING_HOST_PAGE_GET_CLASS (self)->get_bottom_right_trinket (self, scale); -#line 11780 "PhotoPage.c" +#line 11782 "PhotoPage.c" } @@ -11815,7 +11817,7 @@ static void editing_host_page_real_paint (SinglePhotoPage* base, cairo_t* ctx, D _tmp0_ = self->priv->current_tool; #line 1839 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp0_ != NULL) { -#line 11814 "PhotoPage.c" +#line 11816 "PhotoPage.c" EditingToolsEditingTool* _tmp1_ = NULL; cairo_t* _tmp2_ = NULL; #line 1840 "/home/jens/Source/shotwell/src/PhotoPage.vala" @@ -11826,27 +11828,27 @@ static void editing_host_page_real_paint (SinglePhotoPage* base, cairo_t* ctx, D editing_tools_editing_tool_paint (_tmp1_, _tmp2_); #line 1842 "/home/jens/Source/shotwell/src/PhotoPage.vala" return; -#line 11825 "PhotoPage.c" +#line 11827 "PhotoPage.c" } #line 1845 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp4_ = self->priv->photo_missing; #line 1845 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp4_) { -#line 11831 "PhotoPage.c" +#line 11833 "PhotoPage.c" gboolean _tmp5_ = FALSE; #line 1845 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp5_ = editing_host_page_has_photo (self); #line 1845 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp3_ = _tmp5_; -#line 11837 "PhotoPage.c" +#line 11839 "PhotoPage.c" } else { #line 1845 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp3_ = FALSE; -#line 11841 "PhotoPage.c" +#line 11843 "PhotoPage.c" } #line 1845 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp3_) { -#line 11845 "PhotoPage.c" +#line 11847 "PhotoPage.c" cairo_t* _tmp6_ = NULL; cairo_t* _tmp7_ = NULL; Dimensions _tmp8_ = {0}; @@ -11918,7 +11920,7 @@ static void editing_host_page_real_paint (SinglePhotoPage* base, cairo_t* ctx, D _g_object_unref0 (_tmp16_); #line 1851 "/home/jens/Source/shotwell/src/PhotoPage.vala" return; -#line 11917 "PhotoPage.c" +#line 11919 "PhotoPage.c" } #line 1854 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp23_ = ctx; @@ -11934,7 +11936,7 @@ static void editing_host_page_real_paint (SinglePhotoPage* base, cairo_t* ctx, D if (!_tmp26_) { #line 1857 "/home/jens/Source/shotwell/src/PhotoPage.vala" return; -#line 11933 "PhotoPage.c" +#line 11935 "PhotoPage.c" } #line 1860 "/home/jens/Source/shotwell/src/PhotoPage.vala" single_photo_page_get_scaled_pixbuf_position (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), &_tmp27_); @@ -11948,7 +11950,7 @@ static void editing_host_page_real_paint (SinglePhotoPage* base, cairo_t* ctx, D _tmp29_ = trinket; #line 1863 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp29_ != NULL) { -#line 11947 "PhotoPage.c" +#line 11949 "PhotoPage.c" gint x = 0; GdkRectangle _tmp30_ = {0}; gint _tmp31_ = 0; @@ -12030,7 +12032,7 @@ static void editing_host_page_real_paint (SinglePhotoPage* base, cairo_t* ctx, D _tmp52_ = ctx; #line 1868 "/home/jens/Source/shotwell/src/PhotoPage.vala" cairo_fill (_tmp52_); -#line 12029 "PhotoPage.c" +#line 12031 "PhotoPage.c" } #line 1871 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp53_ = editing_host_page_get_top_left_trinket (self, EDITING_HOST_PAGE_TRINKET_SCALE); @@ -12042,7 +12044,7 @@ static void editing_host_page_real_paint (SinglePhotoPage* base, cairo_t* ctx, D _tmp54_ = trinket; #line 1872 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp54_ != NULL) { -#line 12041 "PhotoPage.c" +#line 12043 "PhotoPage.c" gint x = 0; GdkRectangle _tmp55_ = {0}; gint _tmp56_ = 0; @@ -12109,7 +12111,7 @@ static void editing_host_page_real_paint (SinglePhotoPage* base, cairo_t* ctx, D _tmp72_ = ctx; #line 1877 "/home/jens/Source/shotwell/src/PhotoPage.vala" cairo_fill (_tmp72_); -#line 12108 "PhotoPage.c" +#line 12110 "PhotoPage.c" } #line 1880 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp73_ = editing_host_page_get_top_right_trinket (self, EDITING_HOST_PAGE_TRINKET_SCALE); @@ -12121,7 +12123,7 @@ static void editing_host_page_real_paint (SinglePhotoPage* base, cairo_t* ctx, D _tmp74_ = trinket; #line 1881 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp74_ != NULL) { -#line 12120 "PhotoPage.c" +#line 12122 "PhotoPage.c" gint x = 0; GdkRectangle _tmp75_ = {0}; gint _tmp76_ = 0; @@ -12203,7 +12205,7 @@ static void editing_host_page_real_paint (SinglePhotoPage* base, cairo_t* ctx, D _tmp97_ = ctx; #line 1886 "/home/jens/Source/shotwell/src/PhotoPage.vala" cairo_fill (_tmp97_); -#line 12202 "PhotoPage.c" +#line 12204 "PhotoPage.c" } #line 1889 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp98_ = editing_host_page_get_bottom_right_trinket (self, EDITING_HOST_PAGE_TRINKET_SCALE); @@ -12215,7 +12217,7 @@ static void editing_host_page_real_paint (SinglePhotoPage* base, cairo_t* ctx, D _tmp99_ = trinket; #line 1890 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp99_ != NULL) { -#line 12214 "PhotoPage.c" +#line 12216 "PhotoPage.c" gint x = 0; GdkRectangle _tmp100_ = {0}; gint _tmp101_ = 0; @@ -12312,11 +12314,11 @@ static void editing_host_page_real_paint (SinglePhotoPage* base, cairo_t* ctx, D _tmp127_ = ctx; #line 1895 "/home/jens/Source/shotwell/src/PhotoPage.vala" cairo_fill (_tmp127_); -#line 12311 "PhotoPage.c" +#line 12313 "PhotoPage.c" } #line 1838 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (trinket); -#line 12315 "PhotoPage.c" +#line 12317 "PhotoPage.c" } @@ -12333,7 +12335,7 @@ gboolean editing_host_page_is_rotate_available (EditingHostPage* self, Photo* ph result = !_tmp0_; #line 1900 "/home/jens/Source/shotwell/src/PhotoPage.vala" return result; -#line 12332 "PhotoPage.c" +#line 12334 "PhotoPage.c" } @@ -12369,7 +12371,7 @@ static void editing_host_page_rotate (EditingHostPage* self, Rotation rotation, if (!_tmp1_) { #line 1909 "/home/jens/Source/shotwell/src/PhotoPage.vala" return; -#line 12368 "PhotoPage.c" +#line 12370 "PhotoPage.c" } #line 1911 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp2_ = editing_host_page_get_photo (self); @@ -12401,7 +12403,7 @@ static void editing_host_page_rotate (EditingHostPage* self, Rotation rotation, _command_manager_unref0 (_tmp10_); #line 1903 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (command); -#line 12400 "PhotoPage.c" +#line 12402 "PhotoPage.c" } @@ -12410,7 +12412,7 @@ void editing_host_page_on_rotate_clockwise (EditingHostPage* self) { g_return_if_fail (IS_EDITING_HOST_PAGE (self)); #line 1917 "/home/jens/Source/shotwell/src/PhotoPage.vala" editing_host_page_rotate (self, ROTATION_CLOCKWISE, RESOURCES_ROTATE_CW_FULL_LABEL, RESOURCES_ROTATE_CW_TOOLTIP); -#line 12409 "PhotoPage.c" +#line 12411 "PhotoPage.c" } @@ -12419,7 +12421,7 @@ void editing_host_page_on_rotate_counterclockwise (EditingHostPage* self) { g_return_if_fail (IS_EDITING_HOST_PAGE (self)); #line 1921 "/home/jens/Source/shotwell/src/PhotoPage.vala" editing_host_page_rotate (self, ROTATION_COUNTERCLOCKWISE, RESOURCES_ROTATE_CCW_FULL_LABEL, RESOURCES_ROTATE_CCW_TOOLTIP); -#line 12418 "PhotoPage.c" +#line 12420 "PhotoPage.c" } @@ -12428,7 +12430,7 @@ void editing_host_page_on_flip_horizontally (EditingHostPage* self) { g_return_if_fail (IS_EDITING_HOST_PAGE (self)); #line 1925 "/home/jens/Source/shotwell/src/PhotoPage.vala" editing_host_page_rotate (self, ROTATION_MIRROR, RESOURCES_HFLIP_LABEL, ""); -#line 12427 "PhotoPage.c" +#line 12429 "PhotoPage.c" } @@ -12437,7 +12439,7 @@ void editing_host_page_on_flip_vertically (EditingHostPage* self) { g_return_if_fail (IS_EDITING_HOST_PAGE (self)); #line 1929 "/home/jens/Source/shotwell/src/PhotoPage.vala" editing_host_page_rotate (self, ROTATION_UPSIDE_DOWN, RESOURCES_VFLIP_LABEL, ""); -#line 12436 "PhotoPage.c" +#line 12438 "PhotoPage.c" } @@ -12465,7 +12467,7 @@ void editing_host_page_on_revert (EditingHostPage* self) { if (_tmp0_) { #line 1934 "/home/jens/Source/shotwell/src/PhotoPage.vala" return; -#line 12464 "PhotoPage.c" +#line 12466 "PhotoPage.c" } #line 1936 "/home/jens/Source/shotwell/src/PhotoPage.vala" dimensions_init (&_tmp1_, 0, 0); @@ -12477,7 +12479,7 @@ void editing_host_page_on_revert (EditingHostPage* self) { if (!_tmp2_) { #line 1939 "/home/jens/Source/shotwell/src/PhotoPage.vala" return; -#line 12476 "PhotoPage.c" +#line 12478 "PhotoPage.c" } #line 1941 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp3_ = editing_host_page_get_photo (self); @@ -12491,7 +12493,7 @@ void editing_host_page_on_revert (EditingHostPage* self) { _g_object_unref0 (_tmp4_); #line 1941 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp6_) { -#line 12490 "PhotoPage.c" +#line 12492 "PhotoPage.c" AppWindow* _tmp7_ = NULL; AppWindow* _tmp8_ = NULL; ViewCollection* _tmp9_ = NULL; @@ -12528,7 +12530,7 @@ void editing_host_page_on_revert (EditingHostPage* self) { if (_tmp14_) { #line 1944 "/home/jens/Source/shotwell/src/PhotoPage.vala" return; -#line 12527 "PhotoPage.c" +#line 12529 "PhotoPage.c" } #line 1947 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp15_ = editing_host_page_get_photo (self); @@ -12538,7 +12540,7 @@ void editing_host_page_on_revert (EditingHostPage* self) { photo_revert_to_master (_tmp16_, TRUE); #line 1947 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (_tmp16_); -#line 12537 "PhotoPage.c" +#line 12539 "PhotoPage.c" } #line 1950 "/home/jens/Source/shotwell/src/PhotoPage.vala" single_photo_page_cancel_zoom (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage)); @@ -12568,7 +12570,7 @@ void editing_host_page_on_revert (EditingHostPage* self) { _command_manager_unref0 (_tmp22_); #line 1932 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (command); -#line 12567 "PhotoPage.c" +#line 12569 "PhotoPage.c" } @@ -12606,7 +12608,7 @@ void editing_host_page_on_edit_title (EditingHostPage* self) { _g_object_unref0 (_tmp1_); #line 1960 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp2_) { -#line 12605 "PhotoPage.c" +#line 12607 "PhotoPage.c" Photo* _tmp3_ = NULL; LibraryPhoto* _tmp4_ = NULL; #line 1961 "/home/jens/Source/shotwell/src/PhotoPage.vala" @@ -12617,19 +12619,19 @@ void editing_host_page_on_edit_title (EditingHostPage* self) { if (_tmp4_ == NULL) { #line 1961 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (_tmp3_); -#line 12616 "PhotoPage.c" +#line 12618 "PhotoPage.c" } #line 1961 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (item); #line 1961 "/home/jens/Source/shotwell/src/PhotoPage.vala" item = _tmp4_; -#line 12622 "PhotoPage.c" +#line 12624 "PhotoPage.c" } else { #line 1963 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (item); #line 1963 "/home/jens/Source/shotwell/src/PhotoPage.vala" return; -#line 12628 "PhotoPage.c" +#line 12630 "PhotoPage.c" } #line 1965 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp5_ = item; @@ -12663,7 +12665,7 @@ void editing_host_page_on_edit_title (EditingHostPage* self) { _g_object_unref0 (item); #line 1968 "/home/jens/Source/shotwell/src/PhotoPage.vala" return; -#line 12662 "PhotoPage.c" +#line 12664 "PhotoPage.c" } #line 1970 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp13_ = item; @@ -12691,7 +12693,7 @@ void editing_host_page_on_edit_title (EditingHostPage* self) { _text_entry_dialog_mediator_unref0 (edit_title_dialog); #line 1958 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (item); -#line 12690 "PhotoPage.c" +#line 12692 "PhotoPage.c" } @@ -12729,7 +12731,7 @@ void editing_host_page_on_edit_comment (EditingHostPage* self) { _g_object_unref0 (_tmp1_); #line 1976 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp2_) { -#line 12728 "PhotoPage.c" +#line 12730 "PhotoPage.c" Photo* _tmp3_ = NULL; LibraryPhoto* _tmp4_ = NULL; #line 1977 "/home/jens/Source/shotwell/src/PhotoPage.vala" @@ -12740,19 +12742,19 @@ void editing_host_page_on_edit_comment (EditingHostPage* self) { if (_tmp4_ == NULL) { #line 1977 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (_tmp3_); -#line 12739 "PhotoPage.c" +#line 12741 "PhotoPage.c" } #line 1977 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (item); #line 1977 "/home/jens/Source/shotwell/src/PhotoPage.vala" item = _tmp4_; -#line 12745 "PhotoPage.c" +#line 12747 "PhotoPage.c" } else { #line 1979 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (item); #line 1979 "/home/jens/Source/shotwell/src/PhotoPage.vala" return; -#line 12751 "PhotoPage.c" +#line 12753 "PhotoPage.c" } #line 1981 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp5_ = item; @@ -12786,7 +12788,7 @@ void editing_host_page_on_edit_comment (EditingHostPage* self) { _g_object_unref0 (item); #line 1984 "/home/jens/Source/shotwell/src/PhotoPage.vala" return; -#line 12785 "PhotoPage.c" +#line 12787 "PhotoPage.c" } #line 1986 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp13_ = item; @@ -12814,7 +12816,7 @@ void editing_host_page_on_edit_comment (EditingHostPage* self) { _multi_text_entry_dialog_mediator_unref0 (edit_comment_dialog); #line 1974 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (item); -#line 12813 "PhotoPage.c" +#line 12815 "PhotoPage.c" } @@ -12841,7 +12843,7 @@ void editing_host_page_on_adjust_date_time (EditingHostPage* self) { if (!_tmp0_) { #line 1992 "/home/jens/Source/shotwell/src/PhotoPage.vala" return; -#line 12840 "PhotoPage.c" +#line 12842 "PhotoPage.c" } #line 1994 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp1_ = editing_host_page_get_photo (self); @@ -12869,7 +12871,7 @@ void editing_host_page_on_adjust_date_time (EditingHostPage* self) { modify_originals = _tmp8_; #line 1998 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp9_) { -#line 12868 "PhotoPage.c" +#line 12870 "PhotoPage.c" ViewCollection* _tmp10_ = NULL; ViewCollection* _tmp11_ = NULL; GeeList* _tmp12_ = NULL; @@ -12924,11 +12926,11 @@ void editing_host_page_on_adjust_date_time (EditingHostPage* self) { _command_manager_unref0 (_tmp21_); #line 1998 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (command); -#line 12923 "PhotoPage.c" +#line 12925 "PhotoPage.c" } #line 1990 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (dialog); -#line 12927 "PhotoPage.c" +#line 12929 "PhotoPage.c" } @@ -12940,7 +12942,7 @@ void editing_host_page_on_set_background (EditingHostPage* self) { _tmp0_ = editing_host_page_has_photo (self); #line 2008 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp0_) { -#line 12939 "PhotoPage.c" +#line 12941 "PhotoPage.c" SetBackgroundPhotoDialog* dialog = NULL; SetBackgroundPhotoDialog* _tmp1_ = NULL; gboolean desktop = FALSE; @@ -12965,7 +12967,7 @@ void editing_host_page_on_set_background (EditingHostPage* self) { screensaver = _tmp4_; #line 2011 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp5_) { -#line 12964 "PhotoPage.c" +#line 12966 "PhotoPage.c" AppWindow* _tmp6_ = NULL; AppWindow* _tmp7_ = NULL; Photo* _tmp8_ = NULL; @@ -13002,11 +13004,11 @@ void editing_host_page_on_set_background (EditingHostPage* self) { page_window_set_normal_cursor (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, TYPE_PAGE_WINDOW, PageWindow)); #line 2014 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (_tmp13_); -#line 13001 "PhotoPage.c" +#line 13003 "PhotoPage.c" } #line 2008 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (dialog); -#line 13005 "PhotoPage.c" +#line 13007 "PhotoPage.c" } } @@ -13014,7 +13016,7 @@ void editing_host_page_on_set_background (EditingHostPage* self) { static void _editing_host_page_on_rotate_counterclockwise_gtk_tool_button_clicked (GtkToolButton* _sender, gpointer self) { #line 2024 "/home/jens/Source/shotwell/src/PhotoPage.vala" editing_host_page_on_rotate_counterclockwise ((EditingHostPage*) self); -#line 13013 "PhotoPage.c" +#line 13015 "PhotoPage.c" } @@ -13060,7 +13062,7 @@ static gboolean editing_host_page_real_on_ctrl_pressed (Page* base, GdkEventKey* if (_tmp6_ == NULL) { #line 2027 "/home/jens/Source/shotwell/src/PhotoPage.vala" editing_host_page_swap_out_original (self); -#line 13059 "PhotoPage.c" +#line 13061 "PhotoPage.c" } #line 2029 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp7_ = event; @@ -13070,7 +13072,7 @@ static gboolean editing_host_page_real_on_ctrl_pressed (Page* base, GdkEventKey* result = _tmp8_; #line 2029 "/home/jens/Source/shotwell/src/PhotoPage.vala" return result; -#line 13069 "PhotoPage.c" +#line 13071 "PhotoPage.c" } @@ -13116,37 +13118,37 @@ static gboolean editing_host_page_real_on_ctrl_released (Page* base, GdkEventKey _tmp8_ = self->priv->current_tool; #line 2039 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp8_ == NULL) { -#line 13115 "PhotoPage.c" +#line 13117 "PhotoPage.c" gboolean _tmp9_ = FALSE; #line 2039 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp9_ = page_get_shift_pressed (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); #line 2039 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp7_ = _tmp9_; -#line 13121 "PhotoPage.c" +#line 13123 "PhotoPage.c" } else { #line 2039 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp7_ = FALSE; -#line 13125 "PhotoPage.c" +#line 13127 "PhotoPage.c" } #line 2039 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp7_) { -#line 13129 "PhotoPage.c" +#line 13131 "PhotoPage.c" gboolean _tmp10_ = FALSE; #line 2039 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp10_ = page_get_alt_pressed (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); #line 2039 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp6_ = !_tmp10_; -#line 13135 "PhotoPage.c" +#line 13137 "PhotoPage.c" } else { #line 2039 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp6_ = FALSE; -#line 13139 "PhotoPage.c" +#line 13141 "PhotoPage.c" } #line 2039 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp6_) { #line 2040 "/home/jens/Source/shotwell/src/PhotoPage.vala" editing_host_page_swap_in_original (self); -#line 13145 "PhotoPage.c" +#line 13147 "PhotoPage.c" } #line 2042 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp11_ = event; @@ -13156,7 +13158,7 @@ static gboolean editing_host_page_real_on_ctrl_released (Page* base, GdkEventKey result = _tmp12_; #line 2042 "/home/jens/Source/shotwell/src/PhotoPage.vala" return result; -#line 13155 "PhotoPage.c" +#line 13157 "PhotoPage.c" } @@ -13191,7 +13193,7 @@ void editing_host_page_on_tool_button_toggled (EditingHostPage* self, GtkToggleT _tmp3_ = _tmp2_; #line 2048 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (!_tmp3_) { -#line 13190 "PhotoPage.c" +#line 13192 "PhotoPage.c" GtkToggleToolButton* _tmp4_ = NULL; GtkToggleToolButton* _tmp5_ = NULL; #line 2048 "/home/jens/Source/shotwell/src/PhotoPage.vala" @@ -13200,11 +13202,11 @@ void editing_host_page_on_tool_button_toggled (EditingHostPage* self, GtkToggleT _tmp5_ = toggle; #line 2048 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp0_ = _tmp4_ == _tmp5_; -#line 13199 "PhotoPage.c" +#line 13201 "PhotoPage.c" } else { #line 2048 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp0_ = FALSE; -#line 13203 "PhotoPage.c" +#line 13205 "PhotoPage.c" } #line 2048 "/home/jens/Source/shotwell/src/PhotoPage.vala" deactivating_only = _tmp0_; @@ -13220,7 +13222,7 @@ void editing_host_page_on_tool_button_toggled (EditingHostPage* self, GtkToggleT page_restore_cursor_hiding (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); #line 2053 "/home/jens/Source/shotwell/src/PhotoPage.vala" return; -#line 13219 "PhotoPage.c" +#line 13221 "PhotoPage.c" } #line 2056 "/home/jens/Source/shotwell/src/PhotoPage.vala" page_suspend_cursor_hiding (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); @@ -13264,7 +13266,7 @@ void editing_host_page_on_tool_button_toggled (EditingHostPage* self, GtkToggleT editing_host_page_activate_tool (self, _tmp17_); #line 2045 "/home/jens/Source/shotwell/src/PhotoPage.vala" _editing_tools_editing_tool_unref0 (tool); -#line 13263 "PhotoPage.c" +#line 13265 "PhotoPage.c" } @@ -13286,7 +13288,7 @@ static void editing_host_page_on_tool_activated (EditingHostPage* self) { _tmp2_ = self->priv->current_editing_toggle; #line 2074 "/home/jens/Source/shotwell/src/PhotoPage.vala" gtk_toggle_tool_button_set_active (_tmp2_, TRUE); -#line 13285 "PhotoPage.c" +#line 13287 "PhotoPage.c" } @@ -13308,7 +13310,7 @@ static void editing_host_page_on_tool_deactivated (EditingHostPage* self) { _tmp2_ = self->priv->current_editing_toggle; #line 2080 "/home/jens/Source/shotwell/src/PhotoPage.vala" gtk_toggle_tool_button_set_active (_tmp2_, FALSE); -#line 13307 "PhotoPage.c" +#line 13309 "PhotoPage.c" } @@ -13335,7 +13337,7 @@ static void editing_host_page_on_tool_applied (EditingHostPage* self, Command* c _tmp3_ = needs_improvement; #line 2085 "/home/jens/Source/shotwell/src/PhotoPage.vala" editing_host_page_deactivate_tool (self, _tmp0_, _tmp1_, &_tmp2_, _tmp3_); -#line 13334 "PhotoPage.c" +#line 13336 "PhotoPage.c" } @@ -13351,7 +13353,7 @@ static void editing_host_page_on_tool_cancelled (EditingHostPage* self) { single_photo_page_restore_zoom_state (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage)); #line 2092 "/home/jens/Source/shotwell/src/PhotoPage.vala" single_photo_page_repaint (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), NULL); -#line 13350 "PhotoPage.c" +#line 13352 "PhotoPage.c" } @@ -13365,7 +13367,7 @@ static void editing_host_page_on_tool_aborted (EditingHostPage* self) { editing_host_page_deactivate_tool (self, NULL, NULL, &_tmp0_, FALSE); #line 2097 "/home/jens/Source/shotwell/src/PhotoPage.vala" editing_host_page_set_photo_missing (self, TRUE); -#line 13364 "PhotoPage.c" +#line 13366 "PhotoPage.c" } @@ -13383,7 +13385,7 @@ void editing_host_page_toggle_crop (EditingHostPage* self) { _tmp2_ = gtk_toggle_tool_button_get_active (_tmp1_); #line 2101 "/home/jens/Source/shotwell/src/PhotoPage.vala" gtk_toggle_tool_button_set_active (_tmp0_, !_tmp2_); -#line 13382 "PhotoPage.c" +#line 13384 "PhotoPage.c" } @@ -13401,7 +13403,7 @@ void editing_host_page_toggle_straighten (EditingHostPage* self) { _tmp2_ = gtk_toggle_tool_button_get_active (_tmp1_); #line 2105 "/home/jens/Source/shotwell/src/PhotoPage.vala" gtk_toggle_tool_button_set_active (_tmp0_, !_tmp2_); -#line 13400 "PhotoPage.c" +#line 13402 "PhotoPage.c" } @@ -13419,7 +13421,7 @@ void editing_host_page_toggle_redeye (EditingHostPage* self) { _tmp2_ = gtk_toggle_tool_button_get_active (_tmp1_); #line 2109 "/home/jens/Source/shotwell/src/PhotoPage.vala" gtk_toggle_tool_button_set_active (_tmp0_, !_tmp2_); -#line 13418 "PhotoPage.c" +#line 13420 "PhotoPage.c" } @@ -13437,7 +13439,7 @@ void editing_host_page_toggle_adjust (EditingHostPage* self) { _tmp2_ = gtk_toggle_tool_button_get_active (_tmp1_); #line 2113 "/home/jens/Source/shotwell/src/PhotoPage.vala" gtk_toggle_tool_button_set_active (_tmp0_, !_tmp2_); -#line 13436 "PhotoPage.c" +#line 13438 "PhotoPage.c" } @@ -13446,7 +13448,7 @@ static EditingToolsEditingTool* _editing_tools_straighten_tool_factory_editing_t result = editing_tools_straighten_tool_factory (); #line 2117 "/home/jens/Source/shotwell/src/PhotoPage.vala" return result; -#line 13445 "PhotoPage.c" +#line 13447 "PhotoPage.c" } @@ -13458,7 +13460,7 @@ static void editing_host_page_on_straighten_toggled (EditingHostPage* self) { _tmp0_ = self->priv->straighten_button; #line 2117 "/home/jens/Source/shotwell/src/PhotoPage.vala" editing_host_page_on_tool_button_toggled (self, _tmp0_, _editing_tools_straighten_tool_factory_editing_tools_editing_tool_factory); -#line 13457 "PhotoPage.c" +#line 13459 "PhotoPage.c" } @@ -13467,7 +13469,7 @@ static EditingToolsEditingTool* _editing_tools_crop_tool_factory_editing_tools_e result = editing_tools_crop_tool_factory (); #line 2121 "/home/jens/Source/shotwell/src/PhotoPage.vala" return result; -#line 13466 "PhotoPage.c" +#line 13468 "PhotoPage.c" } @@ -13479,7 +13481,7 @@ static void editing_host_page_on_crop_toggled (EditingHostPage* self) { _tmp0_ = self->priv->crop_button; #line 2121 "/home/jens/Source/shotwell/src/PhotoPage.vala" editing_host_page_on_tool_button_toggled (self, _tmp0_, _editing_tools_crop_tool_factory_editing_tools_editing_tool_factory); -#line 13478 "PhotoPage.c" +#line 13480 "PhotoPage.c" } @@ -13488,7 +13490,7 @@ static EditingToolsEditingTool* _editing_tools_redeye_tool_factory_editing_tools result = editing_tools_redeye_tool_factory (); #line 2125 "/home/jens/Source/shotwell/src/PhotoPage.vala" return result; -#line 13487 "PhotoPage.c" +#line 13489 "PhotoPage.c" } @@ -13500,7 +13502,7 @@ static void editing_host_page_on_redeye_toggled (EditingHostPage* self) { _tmp0_ = self->priv->redeye_button; #line 2125 "/home/jens/Source/shotwell/src/PhotoPage.vala" editing_host_page_on_tool_button_toggled (self, _tmp0_, _editing_tools_redeye_tool_factory_editing_tools_editing_tool_factory); -#line 13499 "PhotoPage.c" +#line 13501 "PhotoPage.c" } @@ -13509,7 +13511,7 @@ static EditingToolsEditingTool* _editing_tools_adjust_tool_factory_editing_tools result = editing_tools_adjust_tool_factory (); #line 2129 "/home/jens/Source/shotwell/src/PhotoPage.vala" return result; -#line 13508 "PhotoPage.c" +#line 13510 "PhotoPage.c" } @@ -13521,7 +13523,7 @@ static void editing_host_page_on_adjust_toggled (EditingHostPage* self) { _tmp0_ = self->priv->adjust_button; #line 2129 "/home/jens/Source/shotwell/src/PhotoPage.vala" editing_host_page_on_tool_button_toggled (self, _tmp0_, _editing_tools_adjust_tool_factory_editing_tools_editing_tool_factory); -#line 13520 "PhotoPage.c" +#line 13522 "PhotoPage.c" } @@ -13538,7 +13540,7 @@ gboolean editing_host_page_is_enhance_available (EditingHostPage* self, Photo* p result = !_tmp0_; #line 2133 "/home/jens/Source/shotwell/src/PhotoPage.vala" return result; -#line 13537 "PhotoPage.c" +#line 13539 "PhotoPage.c" } @@ -13563,7 +13565,7 @@ void editing_host_page_on_enhance (EditingHostPage* self) { _tmp0_ = self->priv->current_tool; #line 2140 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (!G_TYPE_CHECK_INSTANCE_TYPE (_tmp0_, EDITING_TOOLS_TYPE_ADJUST_TOOL)) { -#line 13562 "PhotoPage.c" +#line 13564 "PhotoPage.c" Dimensions _tmp1_ = {0}; #line 2141 "/home/jens/Source/shotwell/src/PhotoPage.vala" dimensions_init (&_tmp1_, 0, 0); @@ -13571,7 +13573,7 @@ void editing_host_page_on_enhance (EditingHostPage* self) { editing_host_page_deactivate_tool (self, NULL, NULL, &_tmp1_, FALSE); #line 2143 "/home/jens/Source/shotwell/src/PhotoPage.vala" single_photo_page_cancel_zoom (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage)); -#line 13570 "PhotoPage.c" +#line 13572 "PhotoPage.c" } #line 2146 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp2_ = editing_host_page_has_photo (self); @@ -13579,7 +13581,7 @@ void editing_host_page_on_enhance (EditingHostPage* self) { if (!_tmp2_) { #line 2147 "/home/jens/Source/shotwell/src/PhotoPage.vala" return; -#line 13578 "PhotoPage.c" +#line 13580 "PhotoPage.c" } #line 2149 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp3_ = self->priv->current_tool; @@ -13591,7 +13593,7 @@ void editing_host_page_on_enhance (EditingHostPage* self) { _tmp5_ = adjust_tool; #line 2150 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp5_ != NULL) { -#line 13590 "PhotoPage.c" +#line 13592 "PhotoPage.c" EditingToolsAdjustTool* _tmp6_ = NULL; #line 2151 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp6_ = adjust_tool; @@ -13601,7 +13603,7 @@ void editing_host_page_on_enhance (EditingHostPage* self) { _editing_tools_editing_tool_unref0 (adjust_tool); #line 2153 "/home/jens/Source/shotwell/src/PhotoPage.vala" return; -#line 13600 "PhotoPage.c" +#line 13602 "PhotoPage.c" } #line 2156 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp7_ = editing_host_page_get_photo (self); @@ -13629,7 +13631,7 @@ void editing_host_page_on_enhance (EditingHostPage* self) { _g_object_unref0 (command); #line 2136 "/home/jens/Source/shotwell/src/PhotoPage.vala" _editing_tools_editing_tool_unref0 (adjust_tool); -#line 13628 "PhotoPage.c" +#line 13630 "PhotoPage.c" } @@ -13647,7 +13649,7 @@ void editing_host_page_on_copy_adjustments (EditingHostPage* self) { if (!_tmp0_) { #line 2162 "/home/jens/Source/shotwell/src/PhotoPage.vala" return; -#line 13646 "PhotoPage.c" +#line 13648 "PhotoPage.c" } #line 2163 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp1_ = editing_host_page_get_photo (self); @@ -13665,7 +13667,7 @@ void editing_host_page_on_copy_adjustments (EditingHostPage* self) { _g_object_unref0 (_tmp2_); #line 2164 "/home/jens/Source/shotwell/src/PhotoPage.vala" page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "PasteColorAdjustments", TRUE); -#line 13664 "PhotoPage.c" +#line 13666 "PhotoPage.c" } @@ -13695,14 +13697,14 @@ void editing_host_page_on_paste_adjustments (EditingHostPage* self) { if (!_tmp2_) { #line 2169 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp1_ = TRUE; -#line 13694 "PhotoPage.c" +#line 13696 "PhotoPage.c" } else { PixelTransformationBundle* _tmp3_ = NULL; #line 2169 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp3_ = copied_adjustments; #line 2169 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp1_ = _tmp3_ == NULL; -#line 13701 "PhotoPage.c" +#line 13703 "PhotoPage.c" } #line 2169 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp1_) { @@ -13710,7 +13712,7 @@ void editing_host_page_on_paste_adjustments (EditingHostPage* self) { _pixel_transformation_bundle_unref0 (copied_adjustments); #line 2170 "/home/jens/Source/shotwell/src/PhotoPage.vala" return; -#line 13709 "PhotoPage.c" +#line 13711 "PhotoPage.c" } #line 2172 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp4_ = editing_host_page_get_photo (self); @@ -13740,7 +13742,7 @@ void editing_host_page_on_paste_adjustments (EditingHostPage* self) { _g_object_unref0 (command); #line 2167 "/home/jens/Source/shotwell/src/PhotoPage.vala" _pixel_transformation_bundle_unref0 (copied_adjustments); -#line 13739 "PhotoPage.c" +#line 13741 "PhotoPage.c" } @@ -13798,7 +13800,7 @@ static void editing_host_page_place_tool_window (EditingHostPage* self) { if (_tmp0_ == NULL) { #line 2179 "/home/jens/Source/shotwell/src/PhotoPage.vala" return; -#line 13797 "PhotoPage.c" +#line 13799 "PhotoPage.c" } #line 2181 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp1_ = self->priv->current_tool; @@ -13814,7 +13816,7 @@ static void editing_host_page_place_tool_window (EditingHostPage* self) { _g_object_unref0 (tool_window); #line 2183 "/home/jens/Source/shotwell/src/PhotoPage.vala" return; -#line 13813 "PhotoPage.c" +#line 13815 "PhotoPage.c" } #line 2186 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp4_ = tool_window; @@ -13858,7 +13860,7 @@ static void editing_host_page_place_tool_window (EditingHostPage* self) { _g_free0 (_tmp15_); #line 2195 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp17_) { -#line 13857 "PhotoPage.c" +#line 13859 "PhotoPage.c" GeeHashMap* _tmp18_ = NULL; EditingToolsEditingTool* _tmp19_ = NULL; const gchar* _tmp20_ = NULL; @@ -13903,7 +13905,7 @@ static void editing_host_page_place_tool_window (EditingHostPage* self) { y = (gint) ((gintptr) _tmp29_); #line 2197 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_free0 (_tmp28_); -#line 13902 "PhotoPage.c" +#line 13904 "PhotoPage.c" } else { GtkWindow* _tmp30_ = NULL; GtkWindow* _tmp31_ = NULL; @@ -13926,7 +13928,7 @@ static void editing_host_page_place_tool_window (EditingHostPage* self) { _g_object_unref0 (_tmp31_); #line 2200 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp34_) { -#line 13925 "PhotoPage.c" +#line 13927 "PhotoPage.c" gint rx = 0; gint ry = 0; GtkWindow* _tmp35_ = NULL; @@ -14001,7 +14003,7 @@ static void editing_host_page_place_tool_window (EditingHostPage* self) { cheight = _tmp49_; #line 2218 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (G_TYPE_CHECK_INSTANCE_TYPE (self, TYPE_DIRECT_PHOTO_PAGE)) { -#line 14000 "PhotoPage.c" +#line 14002 "PhotoPage.c" gint _tmp51_ = 0; gint _tmp52_ = 0; gint _tmp53_ = 0; @@ -14019,7 +14021,7 @@ static void editing_host_page_place_tool_window (EditingHostPage* self) { _tmp55_ = _tmp54_.width; #line 2218 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp50_ = ((_tmp51_ + _tmp52_) + (_tmp53_ / 2)) - (_tmp55_ / 2); -#line 14018 "PhotoPage.c" +#line 14020 "PhotoPage.c" } else { gint _tmp56_ = 0; gint _tmp57_ = 0; @@ -14032,7 +14034,7 @@ static void editing_host_page_place_tool_window (EditingHostPage* self) { _tmp58_ = cwidth; #line 2219 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp50_ = (_tmp56_ + _tmp57_) + (_tmp58_ / 2); -#line 14031 "PhotoPage.c" +#line 14033 "PhotoPage.c" } #line 2218 "/home/jens/Source/shotwell/src/PhotoPage.vala" x = _tmp50_; @@ -14048,7 +14050,7 @@ static void editing_host_page_place_tool_window (EditingHostPage* self) { _tmp63_ = _tmp62_.height; #line 2220 "/home/jens/Source/shotwell/src/PhotoPage.vala" y = ((_tmp59_ + _tmp60_) + _tmp61_) - ((_tmp63_ / 4) * 3); -#line 14047 "PhotoPage.c" +#line 14049 "PhotoPage.c" } else { GtkWindow* _tmp64_ = NULL; GtkWindow* _tmp65_ = NULL; @@ -14127,13 +14129,13 @@ static void editing_host_page_place_tool_window (EditingHostPage* self) { _tmp82_ = self->priv->current_tool; #line 2235 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp82_, EDITING_TOOLS_TYPE_ADJUST_TOOL)) { -#line 14126 "PhotoPage.c" +#line 14128 "PhotoPage.c" gint _tmp83_ = 0; #line 2236 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp83_ = x; #line 2236 "/home/jens/Source/shotwell/src/PhotoPage.vala" x = (_tmp83_ * 3) / 4; -#line 14132 "PhotoPage.c" +#line 14134 "PhotoPage.c" } else { gint _tmp84_ = 0; GtkAllocation _tmp85_ = {0}; @@ -14146,11 +14148,11 @@ static void editing_host_page_place_tool_window (EditingHostPage* self) { _tmp86_ = _tmp85_.width; #line 2238 "/home/jens/Source/shotwell/src/PhotoPage.vala" x = (_tmp84_ - _tmp86_) / 2; -#line 14145 "PhotoPage.c" +#line 14147 "PhotoPage.c" } #line 2200 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (screen); -#line 14149 "PhotoPage.c" +#line 14151 "PhotoPage.c" } } #line 2244 "/home/jens/Source/shotwell/src/PhotoPage.vala" @@ -14215,7 +14217,7 @@ static void editing_host_page_place_tool_window (EditingHostPage* self) { _g_object_unref0 (screen); #line 2177 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (tool_window); -#line 14214 "PhotoPage.c" +#line 14216 "PhotoPage.c" } @@ -14249,7 +14251,7 @@ static void editing_host_page_real_on_next_photo (SinglePhotoPage* base) { if (!_tmp1_) { #line 2257 "/home/jens/Source/shotwell/src/PhotoPage.vala" return; -#line 14248 "PhotoPage.c" +#line 14250 "PhotoPage.c" } #line 2259 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp2_ = editing_host_page_get_photo (self); @@ -14287,7 +14289,7 @@ static void editing_host_page_real_on_next_photo (SinglePhotoPage* base) { _g_object_unref0 (current_photo); #line 2264 "/home/jens/Source/shotwell/src/PhotoPage.vala" return; -#line 14286 "PhotoPage.c" +#line 14288 "PhotoPage.c" } #line 2267 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp11_ = current; @@ -14295,14 +14297,14 @@ static void editing_host_page_real_on_next_photo (SinglePhotoPage* base) { _tmp12_ = _g_object_ref0 (_tmp11_); #line 2267 "/home/jens/Source/shotwell/src/PhotoPage.vala" next = _tmp12_; -#line 14294 "PhotoPage.c" +#line 14296 "PhotoPage.c" { gboolean _tmp13_ = FALSE; #line 2268 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp13_ = TRUE; #line 2268 "/home/jens/Source/shotwell/src/PhotoPage.vala" while (TRUE) { -#line 14301 "PhotoPage.c" +#line 14303 "PhotoPage.c" ViewCollection* _tmp14_ = NULL; ViewCollection* _tmp15_ = NULL; DataView* _tmp16_ = NULL; @@ -14318,7 +14320,7 @@ static void editing_host_page_real_on_next_photo (SinglePhotoPage* base) { Photo* _tmp25_ = NULL; #line 2268 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (!_tmp13_) { -#line 14317 "PhotoPage.c" +#line 14319 "PhotoPage.c" } #line 2268 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp13_ = FALSE; @@ -14342,7 +14344,7 @@ static void editing_host_page_real_on_next_photo (SinglePhotoPage* base) { if (_tmp18_ == NULL) { #line 2271 "/home/jens/Source/shotwell/src/PhotoPage.vala" break; -#line 14341 "PhotoPage.c" +#line 14343 "PhotoPage.c" } #line 2273 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp19_ = next; @@ -14354,7 +14356,7 @@ static void editing_host_page_real_on_next_photo (SinglePhotoPage* base) { if (_tmp21_ == NULL) { #line 2273 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (_tmp20_); -#line 14353 "PhotoPage.c" +#line 14355 "PhotoPage.c" } #line 2273 "/home/jens/Source/shotwell/src/PhotoPage.vala" next_photo = _tmp21_; @@ -14366,7 +14368,7 @@ static void editing_host_page_real_on_next_photo (SinglePhotoPage* base) { _g_object_unref0 (next_photo); #line 2275 "/home/jens/Source/shotwell/src/PhotoPage.vala" continue; -#line 14365 "PhotoPage.c" +#line 14367 "PhotoPage.c" } #line 2277 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp23_ = next_photo; @@ -14378,7 +14380,7 @@ static void editing_host_page_real_on_next_photo (SinglePhotoPage* base) { _g_object_unref0 (next_photo); #line 2278 "/home/jens/Source/shotwell/src/PhotoPage.vala" break; -#line 14377 "PhotoPage.c" +#line 14379 "PhotoPage.c" } #line 2280 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp25_ = next_photo; @@ -14388,7 +14390,7 @@ static void editing_host_page_real_on_next_photo (SinglePhotoPage* base) { _g_object_unref0 (next_photo); #line 2282 "/home/jens/Source/shotwell/src/PhotoPage.vala" break; -#line 14387 "PhotoPage.c" +#line 14389 "PhotoPage.c" } } #line 2253 "/home/jens/Source/shotwell/src/PhotoPage.vala" @@ -14397,7 +14399,7 @@ static void editing_host_page_real_on_next_photo (SinglePhotoPage* base) { _g_object_unref0 (current); #line 2253 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (current_photo); -#line 14396 "PhotoPage.c" +#line 14398 "PhotoPage.c" } @@ -14431,7 +14433,7 @@ static void editing_host_page_real_on_previous_photo (SinglePhotoPage* base) { if (!_tmp1_) { #line 2290 "/home/jens/Source/shotwell/src/PhotoPage.vala" return; -#line 14430 "PhotoPage.c" +#line 14432 "PhotoPage.c" } #line 2292 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp2_ = editing_host_page_get_photo (self); @@ -14469,7 +14471,7 @@ static void editing_host_page_real_on_previous_photo (SinglePhotoPage* base) { _g_object_unref0 (current_photo); #line 2297 "/home/jens/Source/shotwell/src/PhotoPage.vala" return; -#line 14468 "PhotoPage.c" +#line 14470 "PhotoPage.c" } #line 2300 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp11_ = current; @@ -14477,14 +14479,14 @@ static void editing_host_page_real_on_previous_photo (SinglePhotoPage* base) { _tmp12_ = _g_object_ref0 (_tmp11_); #line 2300 "/home/jens/Source/shotwell/src/PhotoPage.vala" previous = _tmp12_; -#line 14476 "PhotoPage.c" +#line 14478 "PhotoPage.c" { gboolean _tmp13_ = FALSE; #line 2301 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp13_ = TRUE; #line 2301 "/home/jens/Source/shotwell/src/PhotoPage.vala" while (TRUE) { -#line 14483 "PhotoPage.c" +#line 14485 "PhotoPage.c" ViewCollection* _tmp14_ = NULL; ViewCollection* _tmp15_ = NULL; DataView* _tmp16_ = NULL; @@ -14500,7 +14502,7 @@ static void editing_host_page_real_on_previous_photo (SinglePhotoPage* base) { Photo* _tmp25_ = NULL; #line 2301 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (!_tmp13_) { -#line 14499 "PhotoPage.c" +#line 14501 "PhotoPage.c" } #line 2301 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp13_ = FALSE; @@ -14524,7 +14526,7 @@ static void editing_host_page_real_on_previous_photo (SinglePhotoPage* base) { if (_tmp18_ == NULL) { #line 2304 "/home/jens/Source/shotwell/src/PhotoPage.vala" break; -#line 14523 "PhotoPage.c" +#line 14525 "PhotoPage.c" } #line 2306 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp19_ = previous; @@ -14536,7 +14538,7 @@ static void editing_host_page_real_on_previous_photo (SinglePhotoPage* base) { if (_tmp21_ == NULL) { #line 2306 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (_tmp20_); -#line 14535 "PhotoPage.c" +#line 14537 "PhotoPage.c" } #line 2306 "/home/jens/Source/shotwell/src/PhotoPage.vala" previous_photo = _tmp21_; @@ -14548,7 +14550,7 @@ static void editing_host_page_real_on_previous_photo (SinglePhotoPage* base) { _g_object_unref0 (previous_photo); #line 2308 "/home/jens/Source/shotwell/src/PhotoPage.vala" continue; -#line 14547 "PhotoPage.c" +#line 14549 "PhotoPage.c" } #line 2310 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp23_ = previous_photo; @@ -14560,7 +14562,7 @@ static void editing_host_page_real_on_previous_photo (SinglePhotoPage* base) { _g_object_unref0 (previous_photo); #line 2311 "/home/jens/Source/shotwell/src/PhotoPage.vala" break; -#line 14559 "PhotoPage.c" +#line 14561 "PhotoPage.c" } #line 2313 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp25_ = previous_photo; @@ -14570,7 +14572,7 @@ static void editing_host_page_real_on_previous_photo (SinglePhotoPage* base) { _g_object_unref0 (previous_photo); #line 2315 "/home/jens/Source/shotwell/src/PhotoPage.vala" break; -#line 14569 "PhotoPage.c" +#line 14571 "PhotoPage.c" } } #line 2286 "/home/jens/Source/shotwell/src/PhotoPage.vala" @@ -14579,7 +14581,7 @@ static void editing_host_page_real_on_previous_photo (SinglePhotoPage* base) { _g_object_unref0 (current); #line 2286 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (current_photo); -#line 14578 "PhotoPage.c" +#line 14580 "PhotoPage.c" } @@ -14594,7 +14596,7 @@ gboolean editing_host_page_has_current_tool (EditingHostPage* self) { result = _tmp0_ != NULL; #line 2320 "/home/jens/Source/shotwell/src/PhotoPage.vala" return result; -#line 14593 "PhotoPage.c" +#line 14595 "PhotoPage.c" } @@ -14605,7 +14607,7 @@ void editing_host_page_unset_view_collection (EditingHostPage* self) { _data_collection_unref0 (self->priv->parent_view); #line 2324 "/home/jens/Source/shotwell/src/PhotoPage.vala" self->priv->parent_view = NULL; -#line 14604 "PhotoPage.c" +#line 14606 "PhotoPage.c" } @@ -14692,14 +14694,14 @@ static EditingHostPageEditingHostCanvas* editing_host_page_editing_host_canvas_c self->priv->host_page = _tmp20_; #line 377 "/home/jens/Source/shotwell/src/PhotoPage.vala" return self; -#line 14691 "PhotoPage.c" +#line 14693 "PhotoPage.c" } static EditingHostPageEditingHostCanvas* editing_host_page_editing_host_canvas_new (EditingHostPage* host_page) { #line 377 "/home/jens/Source/shotwell/src/PhotoPage.vala" return editing_host_page_editing_host_canvas_construct (EDITING_HOST_PAGE_TYPE_EDITING_HOST_CANVAS, host_page); -#line 14698 "PhotoPage.c" +#line 14700 "PhotoPage.c" } @@ -14712,7 +14714,7 @@ static void editing_host_page_editing_host_canvas_real_repaint (EditingToolsPhot _tmp0_ = self->priv->host_page; #line 386 "/home/jens/Source/shotwell/src/PhotoPage.vala" single_photo_page_repaint (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), NULL); -#line 14711 "PhotoPage.c" +#line 14713 "PhotoPage.c" } @@ -14724,15 +14726,15 @@ static void editing_host_page_editing_host_canvas_class_init (EditingHostPageEdi #line 374 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_type_class_add_private (klass, sizeof (EditingHostPageEditingHostCanvasPrivate)); #line 374 "/home/jens/Source/shotwell/src/PhotoPage.vala" - ((EditingToolsPhotoCanvasClass *) klass)->repaint = editing_host_page_editing_host_canvas_real_repaint; -#line 14724 "PhotoPage.c" + ((EditingToolsPhotoCanvasClass *) klass)->repaint = (void (*)(EditingToolsPhotoCanvas*)) editing_host_page_editing_host_canvas_real_repaint; +#line 14726 "PhotoPage.c" } static void editing_host_page_editing_host_canvas_instance_init (EditingHostPageEditingHostCanvas * self) { #line 374 "/home/jens/Source/shotwell/src/PhotoPage.vala" self->priv = EDITING_HOST_PAGE_EDITING_HOST_CANVAS_GET_PRIVATE (self); -#line 14731 "PhotoPage.c" +#line 14733 "PhotoPage.c" } @@ -14744,7 +14746,7 @@ static void editing_host_page_editing_host_canvas_finalize (EditingToolsPhotoCan _g_object_unref0 (self->priv->host_page); #line 374 "/home/jens/Source/shotwell/src/PhotoPage.vala" EDITING_TOOLS_PHOTO_CANVAS_CLASS (editing_host_page_editing_host_canvas_parent_class)->finalize (obj); -#line 14743 "PhotoPage.c" +#line 14745 "PhotoPage.c" } @@ -14766,104 +14768,104 @@ static void editing_host_page_class_init (EditingHostPageClass * klass) { #line 364 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_type_class_add_private (klass, sizeof (EditingHostPagePrivate)); #line 364 "/home/jens/Source/shotwell/src/PhotoPage.vala" - ((EditingHostPageClass *) klass)->on_zoom_slider_key_press = editing_host_page_real_on_zoom_slider_key_press; + ((EditingHostPageClass *) klass)->on_zoom_slider_key_press = (gboolean (*)(EditingHostPage*, GdkEventKey*)) editing_host_page_real_on_zoom_slider_key_press; #line 364 "/home/jens/Source/shotwell/src/PhotoPage.vala" - ((EditingHostPageClass *) klass)->on_increase_size = editing_host_page_real_on_increase_size; + ((EditingHostPageClass *) klass)->on_increase_size = (void (*)(EditingHostPage*)) editing_host_page_real_on_increase_size; #line 364 "/home/jens/Source/shotwell/src/PhotoPage.vala" - ((EditingHostPageClass *) klass)->on_decrease_size = editing_host_page_real_on_decrease_size; + ((EditingHostPageClass *) klass)->on_decrease_size = (void (*)(EditingHostPage*)) editing_host_page_real_on_decrease_size; #line 364 "/home/jens/Source/shotwell/src/PhotoPage.vala" - ((SinglePhotoPageClass *) klass)->save_zoom_state = editing_host_page_real_save_zoom_state; + ((SinglePhotoPageClass *) klass)->save_zoom_state = (void (*)(SinglePhotoPage*)) editing_host_page_real_save_zoom_state; #line 364 "/home/jens/Source/shotwell/src/PhotoPage.vala" - ((SinglePhotoPageClass *) klass)->get_zoom_buffer = editing_host_page_real_get_zoom_buffer; + ((SinglePhotoPageClass *) klass)->get_zoom_buffer = (ZoomBuffer* (*)(SinglePhotoPage*)) editing_host_page_real_get_zoom_buffer; #line 364 "/home/jens/Source/shotwell/src/PhotoPage.vala" - ((PageClass *) klass)->on_mousewheel_up = editing_host_page_real_on_mousewheel_up; + ((PageClass *) klass)->on_mousewheel_up = (gboolean (*)(Page*, GdkEventScroll*)) editing_host_page_real_on_mousewheel_up; #line 364 "/home/jens/Source/shotwell/src/PhotoPage.vala" - ((PageClass *) klass)->on_mousewheel_down = editing_host_page_real_on_mousewheel_down; + ((PageClass *) klass)->on_mousewheel_down = (gboolean (*)(Page*, GdkEventScroll*)) editing_host_page_real_on_mousewheel_down; #line 364 "/home/jens/Source/shotwell/src/PhotoPage.vala" - ((SinglePhotoPageClass *) klass)->restore_zoom_state = editing_host_page_real_restore_zoom_state; + ((SinglePhotoPageClass *) klass)->restore_zoom_state = (void (*)(SinglePhotoPage*)) editing_host_page_real_restore_zoom_state; #line 364 "/home/jens/Source/shotwell/src/PhotoPage.vala" - ((SinglePhotoPageClass *) klass)->is_zoom_supported = editing_host_page_real_is_zoom_supported; + ((SinglePhotoPageClass *) klass)->is_zoom_supported = (gboolean (*)(SinglePhotoPage*)) editing_host_page_real_is_zoom_supported; #line 364 "/home/jens/Source/shotwell/src/PhotoPage.vala" - ((PageClass *) klass)->set_container = editing_host_page_real_set_container; + ((PageClass *) klass)->set_container = (void (*)(Page*, GtkWindow*)) editing_host_page_real_set_container; #line 364 "/home/jens/Source/shotwell/src/PhotoPage.vala" - ((EditingHostPageClass *) klass)->photo_changing = editing_host_page_real_photo_changing; + ((EditingHostPageClass *) klass)->photo_changing = (void (*)(EditingHostPage*, Photo*)) editing_host_page_real_photo_changing; #line 364 "/home/jens/Source/shotwell/src/PhotoPage.vala" - ((GtkWidgetClass *) klass)->realize = editing_host_page_real_realize; + ((GtkWidgetClass *) klass)->realize = (void (*)(GtkWidget*)) editing_host_page_real_realize; #line 364 "/home/jens/Source/shotwell/src/PhotoPage.vala" - ((PageClass *) klass)->switched_to = editing_host_page_real_switched_to; + ((PageClass *) klass)->switched_to = (void (*)(Page*)) editing_host_page_real_switched_to; #line 364 "/home/jens/Source/shotwell/src/PhotoPage.vala" - ((PageClass *) klass)->switching_from = editing_host_page_real_switching_from; + ((PageClass *) klass)->switching_from = (void (*)(Page*)) editing_host_page_real_switching_from; #line 364 "/home/jens/Source/shotwell/src/PhotoPage.vala" - ((PageClass *) klass)->switching_to_fullscreen = editing_host_page_real_switching_to_fullscreen; + ((PageClass *) klass)->switching_to_fullscreen = (void (*)(Page*, FullscreenWindow*)) editing_host_page_real_switching_to_fullscreen; #line 364 "/home/jens/Source/shotwell/src/PhotoPage.vala" - ((PageClass *) klass)->returning_from_fullscreen = editing_host_page_real_returning_from_fullscreen; + ((PageClass *) klass)->returning_from_fullscreen = (void (*)(Page*, FullscreenWindow*)) editing_host_page_real_returning_from_fullscreen; #line 364 "/home/jens/Source/shotwell/src/PhotoPage.vala" - ((EditingHostPageClass *) klass)->create_photo_view = editing_host_page_real_create_photo_view; + ((EditingHostPageClass *) klass)->create_photo_view = (DataView* (*)(EditingHostPage*, DataSource*)) editing_host_page_real_create_photo_view; #line 364 "/home/jens/Source/shotwell/src/PhotoPage.vala" - ((EditingHostPageClass *) klass)->update_ui = editing_host_page_real_update_ui; + ((EditingHostPageClass *) klass)->update_ui = (void (*)(EditingHostPage*, gboolean)) editing_host_page_real_update_ui; #line 364 "/home/jens/Source/shotwell/src/PhotoPage.vala" - ((EditingHostPageClass *) klass)->notify_photo_backing_missing = editing_host_page_real_notify_photo_backing_missing; + ((EditingHostPageClass *) klass)->notify_photo_backing_missing = (void (*)(EditingHostPage*, Photo*, gboolean)) editing_host_page_real_notify_photo_backing_missing; #line 364 "/home/jens/Source/shotwell/src/PhotoPage.vala" - ((EditingHostPageClass *) klass)->confirm_replace_photo = editing_host_page_real_confirm_replace_photo; + ((EditingHostPageClass *) klass)->confirm_replace_photo = (gboolean (*)(EditingHostPage*, Photo*, Photo*)) editing_host_page_real_confirm_replace_photo; #line 364 "/home/jens/Source/shotwell/src/PhotoPage.vala" - ((SinglePhotoPageClass *) klass)->cancel_zoom = editing_host_page_real_cancel_zoom; + ((SinglePhotoPageClass *) klass)->cancel_zoom = (void (*)(SinglePhotoPage*)) editing_host_page_real_cancel_zoom; #line 364 "/home/jens/Source/shotwell/src/PhotoPage.vala" - ((PageClass *) klass)->on_resize = editing_host_page_real_on_resize; + ((PageClass *) klass)->on_resize = (void (*)(Page*, GdkRectangle*)) editing_host_page_real_on_resize; #line 364 "/home/jens/Source/shotwell/src/PhotoPage.vala" - ((PageClass *) klass)->on_resize_finished = editing_host_page_real_on_resize_finished; + ((PageClass *) klass)->on_resize_finished = (void (*)(Page*, GdkRectangle*)) editing_host_page_real_on_resize_finished; #line 364 "/home/jens/Source/shotwell/src/PhotoPage.vala" - ((PageClass *) klass)->update_actions = editing_host_page_real_update_actions; + ((PageClass *) klass)->update_actions = (void (*)(Page*, gint, gint)) editing_host_page_real_update_actions; #line 364 "/home/jens/Source/shotwell/src/PhotoPage.vala" - ((PageClass *) klass)->on_shift_pressed = editing_host_page_real_on_shift_pressed; + ((PageClass *) klass)->on_shift_pressed = (gboolean (*)(Page*, GdkEventKey*)) editing_host_page_real_on_shift_pressed; #line 364 "/home/jens/Source/shotwell/src/PhotoPage.vala" - ((PageClass *) klass)->on_shift_released = editing_host_page_real_on_shift_released; + ((PageClass *) klass)->on_shift_released = (gboolean (*)(Page*, GdkEventKey*)) editing_host_page_real_on_shift_released; #line 364 "/home/jens/Source/shotwell/src/PhotoPage.vala" - ((PageClass *) klass)->on_alt_pressed = editing_host_page_real_on_alt_pressed; + ((PageClass *) klass)->on_alt_pressed = (gboolean (*)(Page*, GdkEventKey*)) editing_host_page_real_on_alt_pressed; #line 364 "/home/jens/Source/shotwell/src/PhotoPage.vala" - ((PageClass *) klass)->on_alt_released = editing_host_page_real_on_alt_released; + ((PageClass *) klass)->on_alt_released = (gboolean (*)(Page*, GdkEventKey*)) editing_host_page_real_on_alt_released; #line 364 "/home/jens/Source/shotwell/src/PhotoPage.vala" - ((EditingHostPageClass *) klass)->on_double_click = editing_host_page_real_on_double_click; + ((EditingHostPageClass *) klass)->on_double_click = (gboolean (*)(EditingHostPage*, GdkEventButton*)) editing_host_page_real_on_double_click; #line 364 "/home/jens/Source/shotwell/src/PhotoPage.vala" - ((PageClass *) klass)->on_left_click = editing_host_page_real_on_left_click; + ((PageClass *) klass)->on_left_click = (gboolean (*)(Page*, GdkEventButton*)) editing_host_page_real_on_left_click; #line 364 "/home/jens/Source/shotwell/src/PhotoPage.vala" - ((PageClass *) klass)->on_left_released = editing_host_page_real_on_left_released; + ((PageClass *) klass)->on_left_released = (gboolean (*)(Page*, GdkEventButton*)) editing_host_page_real_on_left_released; #line 364 "/home/jens/Source/shotwell/src/PhotoPage.vala" - ((PageClass *) klass)->on_right_click = editing_host_page_real_on_right_click; + ((PageClass *) klass)->on_right_click = (gboolean (*)(Page*, GdkEventButton*)) editing_host_page_real_on_right_click; #line 364 "/home/jens/Source/shotwell/src/PhotoPage.vala" - ((PageClass *) klass)->on_motion = editing_host_page_real_on_motion; + ((PageClass *) klass)->on_motion = (gboolean (*)(Page*, GdkEventMotion*, gint, gint, GdkModifierType)) editing_host_page_real_on_motion; #line 364 "/home/jens/Source/shotwell/src/PhotoPage.vala" - ((PageClass *) klass)->on_leave_notify_event = editing_host_page_real_on_leave_notify_event; + ((PageClass *) klass)->on_leave_notify_event = (gboolean (*)(Page*)) editing_host_page_real_on_leave_notify_event; #line 364 "/home/jens/Source/shotwell/src/PhotoPage.vala" - ((PageClass *) klass)->on_move = editing_host_page_real_on_move; + ((PageClass *) klass)->on_move = (void (*)(Page*, GdkRectangle*)) editing_host_page_real_on_move; #line 364 "/home/jens/Source/shotwell/src/PhotoPage.vala" - ((PageClass *) klass)->on_move_finished = editing_host_page_real_on_move_finished; + ((PageClass *) klass)->on_move_finished = (void (*)(Page*, GdkRectangle*)) editing_host_page_real_on_move_finished; #line 364 "/home/jens/Source/shotwell/src/PhotoPage.vala" - ((GtkWidgetClass *) klass)->key_press_event = editing_host_page_real_key_press_event; + ((GtkWidgetClass *) klass)->key_press_event = (gboolean (*)(GtkWidget*, GdkEventKey*)) editing_host_page_real_key_press_event; #line 364 "/home/jens/Source/shotwell/src/PhotoPage.vala" - ((SinglePhotoPageClass *) klass)->new_surface = editing_host_page_real_new_surface; + ((SinglePhotoPageClass *) klass)->new_surface = (void (*)(SinglePhotoPage*, cairo_t*, Dimensions*)) editing_host_page_real_new_surface; #line 364 "/home/jens/Source/shotwell/src/PhotoPage.vala" - ((SinglePhotoPageClass *) klass)->updated_pixbuf = editing_host_page_real_updated_pixbuf; + ((SinglePhotoPageClass *) klass)->updated_pixbuf = (void (*)(SinglePhotoPage*, GdkPixbuf*, SinglePhotoPageUpdateReason, Dimensions*)) editing_host_page_real_updated_pixbuf; #line 364 "/home/jens/Source/shotwell/src/PhotoPage.vala" - ((EditingHostPageClass *) klass)->get_bottom_left_trinket = editing_host_page_real_get_bottom_left_trinket; + ((EditingHostPageClass *) klass)->get_bottom_left_trinket = (GdkPixbuf* (*)(EditingHostPage*, gint)) editing_host_page_real_get_bottom_left_trinket; #line 364 "/home/jens/Source/shotwell/src/PhotoPage.vala" - ((EditingHostPageClass *) klass)->get_top_left_trinket = editing_host_page_real_get_top_left_trinket; + ((EditingHostPageClass *) klass)->get_top_left_trinket = (GdkPixbuf* (*)(EditingHostPage*, gint)) editing_host_page_real_get_top_left_trinket; #line 364 "/home/jens/Source/shotwell/src/PhotoPage.vala" - ((EditingHostPageClass *) klass)->get_top_right_trinket = editing_host_page_real_get_top_right_trinket; + ((EditingHostPageClass *) klass)->get_top_right_trinket = (GdkPixbuf* (*)(EditingHostPage*, gint)) editing_host_page_real_get_top_right_trinket; #line 364 "/home/jens/Source/shotwell/src/PhotoPage.vala" - ((EditingHostPageClass *) klass)->get_bottom_right_trinket = editing_host_page_real_get_bottom_right_trinket; + ((EditingHostPageClass *) klass)->get_bottom_right_trinket = (GdkPixbuf* (*)(EditingHostPage*, gint)) editing_host_page_real_get_bottom_right_trinket; #line 364 "/home/jens/Source/shotwell/src/PhotoPage.vala" - ((SinglePhotoPageClass *) klass)->paint = editing_host_page_real_paint; + ((SinglePhotoPageClass *) klass)->paint = (void (*)(SinglePhotoPage*, cairo_t*, Dimensions*)) editing_host_page_real_paint; #line 364 "/home/jens/Source/shotwell/src/PhotoPage.vala" - ((PageClass *) klass)->on_ctrl_pressed = editing_host_page_real_on_ctrl_pressed; + ((PageClass *) klass)->on_ctrl_pressed = (gboolean (*)(Page*, GdkEventKey*)) editing_host_page_real_on_ctrl_pressed; #line 364 "/home/jens/Source/shotwell/src/PhotoPage.vala" - ((PageClass *) klass)->on_ctrl_released = editing_host_page_real_on_ctrl_released; + ((PageClass *) klass)->on_ctrl_released = (gboolean (*)(Page*, GdkEventKey*)) editing_host_page_real_on_ctrl_released; #line 364 "/home/jens/Source/shotwell/src/PhotoPage.vala" - ((SinglePhotoPageClass *) klass)->on_next_photo = editing_host_page_real_on_next_photo; + ((SinglePhotoPageClass *) klass)->on_next_photo = (void (*)(SinglePhotoPage*)) editing_host_page_real_on_next_photo; #line 364 "/home/jens/Source/shotwell/src/PhotoPage.vala" - ((SinglePhotoPageClass *) klass)->on_previous_photo = editing_host_page_real_on_previous_photo; + ((SinglePhotoPageClass *) klass)->on_previous_photo = (void (*)(SinglePhotoPage*)) editing_host_page_real_on_previous_photo; #line 364 "/home/jens/Source/shotwell/src/PhotoPage.vala" G_OBJECT_CLASS (klass)->finalize = editing_host_page_finalize; -#line 14862 "PhotoPage.c" +#line 14864 "PhotoPage.c" } @@ -14928,10 +14930,10 @@ static void editing_host_page_instance_init (EditingHostPage * self) { #line 414 "/home/jens/Source/shotwell/src/PhotoPage.vala" self->priv->zoom_buffer = NULL; #line 415 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp2_ = gee_hash_map_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, g_free, G_TYPE_INT, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); + _tmp2_ = gee_hash_map_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, G_TYPE_INT, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); #line 415 "/home/jens/Source/shotwell/src/PhotoPage.vala" self->priv->last_locations = _tmp2_; -#line 14930 "PhotoPage.c" +#line 14932 "PhotoPage.c" } @@ -15015,7 +15017,7 @@ static void editing_host_page_finalize (GObject* obj) { _g_object_unref0 (self->priv->last_locations); #line 364 "/home/jens/Source/shotwell/src/PhotoPage.vala" G_OBJECT_CLASS (editing_host_page_parent_class)->finalize (obj); -#line 15014 "PhotoPage.c" +#line 15016 "PhotoPage.c" } @@ -15034,364 +15036,364 @@ GType editing_host_page_get_type (void) { static void _library_photo_page_on_photo_destroyed_source_collection_item_destroyed (SourceCollection* _sender, DataSource* source, gpointer self) { #line 2364 "/home/jens/Source/shotwell/src/PhotoPage.vala" library_photo_page_on_photo_destroyed ((LibraryPhotoPage*) self, source); -#line 15033 "PhotoPage.c" +#line 15035 "PhotoPage.c" } static void _library_photo_page_on_metadata_altered_data_collection_items_altered (DataCollection* _sender, GeeMap* items, gpointer self) { #line 2365 "/home/jens/Source/shotwell/src/PhotoPage.vala" library_photo_page_on_metadata_altered ((LibraryPhotoPage*) self, items); -#line 15040 "PhotoPage.c" +#line 15042 "PhotoPage.c" } static void _library_photo_page_on_external_app_changed_configuration_facade_external_app_changed (ConfigurationFacade* _sender, gpointer self) { #line 2366 "/home/jens/Source/shotwell/src/PhotoPage.vala" library_photo_page_on_external_app_changed ((LibraryPhotoPage*) self); -#line 15047 "PhotoPage.c" +#line 15049 "PhotoPage.c" } static void _library_photo_page_on_export_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) { #line 2388 "/home/jens/Source/shotwell/src/PhotoPage.vala" library_photo_page_on_export ((LibraryPhotoPage*) self); -#line 15054 "PhotoPage.c" +#line 15056 "PhotoPage.c" } static void _library_photo_page_on_print_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) { #line 2388 "/home/jens/Source/shotwell/src/PhotoPage.vala" library_photo_page_on_print ((LibraryPhotoPage*) self); -#line 15061 "PhotoPage.c" +#line 15063 "PhotoPage.c" } static void _library_photo_page_on_publish_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) { #line 2388 "/home/jens/Source/shotwell/src/PhotoPage.vala" library_photo_page_on_publish ((LibraryPhotoPage*) self); -#line 15068 "PhotoPage.c" +#line 15070 "PhotoPage.c" } static void _library_photo_page_on_remove_from_library_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) { #line 2388 "/home/jens/Source/shotwell/src/PhotoPage.vala" library_photo_page_on_remove_from_library ((LibraryPhotoPage*) self); -#line 15075 "PhotoPage.c" +#line 15077 "PhotoPage.c" } static void _library_photo_page_on_move_to_trash_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) { #line 2388 "/home/jens/Source/shotwell/src/PhotoPage.vala" library_photo_page_on_move_to_trash ((LibraryPhotoPage*) self); -#line 15082 "PhotoPage.c" +#line 15084 "PhotoPage.c" } static void _single_photo_page_on_previous_photo_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) { #line 2388 "/home/jens/Source/shotwell/src/PhotoPage.vala" single_photo_page_on_previous_photo ((SinglePhotoPage*) self); -#line 15089 "PhotoPage.c" +#line 15091 "PhotoPage.c" } static void _single_photo_page_on_next_photo_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) { #line 2388 "/home/jens/Source/shotwell/src/PhotoPage.vala" single_photo_page_on_next_photo ((SinglePhotoPage*) self); -#line 15096 "PhotoPage.c" +#line 15098 "PhotoPage.c" } static void _editing_host_page_on_rotate_clockwise_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) { #line 2388 "/home/jens/Source/shotwell/src/PhotoPage.vala" editing_host_page_on_rotate_clockwise ((EditingHostPage*) self); -#line 15103 "PhotoPage.c" +#line 15105 "PhotoPage.c" } static void _editing_host_page_on_rotate_counterclockwise_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) { #line 2388 "/home/jens/Source/shotwell/src/PhotoPage.vala" editing_host_page_on_rotate_counterclockwise ((EditingHostPage*) self); -#line 15110 "PhotoPage.c" +#line 15112 "PhotoPage.c" } static void _editing_host_page_on_flip_horizontally_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) { #line 2388 "/home/jens/Source/shotwell/src/PhotoPage.vala" editing_host_page_on_flip_horizontally ((EditingHostPage*) self); -#line 15117 "PhotoPage.c" +#line 15119 "PhotoPage.c" } static void _editing_host_page_on_flip_vertically_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) { #line 2388 "/home/jens/Source/shotwell/src/PhotoPage.vala" editing_host_page_on_flip_vertically ((EditingHostPage*) self); -#line 15124 "PhotoPage.c" +#line 15126 "PhotoPage.c" } static void _editing_host_page_on_enhance_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) { #line 2388 "/home/jens/Source/shotwell/src/PhotoPage.vala" editing_host_page_on_enhance ((EditingHostPage*) self); -#line 15131 "PhotoPage.c" +#line 15133 "PhotoPage.c" } static void _editing_host_page_on_copy_adjustments_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) { #line 2388 "/home/jens/Source/shotwell/src/PhotoPage.vala" editing_host_page_on_copy_adjustments ((EditingHostPage*) self); -#line 15138 "PhotoPage.c" +#line 15140 "PhotoPage.c" } static void _editing_host_page_on_paste_adjustments_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) { #line 2388 "/home/jens/Source/shotwell/src/PhotoPage.vala" editing_host_page_on_paste_adjustments ((EditingHostPage*) self); -#line 15145 "PhotoPage.c" +#line 15147 "PhotoPage.c" } static void _editing_host_page_toggle_crop_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) { #line 2388 "/home/jens/Source/shotwell/src/PhotoPage.vala" editing_host_page_toggle_crop ((EditingHostPage*) self); -#line 15152 "PhotoPage.c" +#line 15154 "PhotoPage.c" } static void _editing_host_page_toggle_straighten_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) { #line 2388 "/home/jens/Source/shotwell/src/PhotoPage.vala" editing_host_page_toggle_straighten ((EditingHostPage*) self); -#line 15159 "PhotoPage.c" +#line 15161 "PhotoPage.c" } static void _editing_host_page_toggle_redeye_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) { #line 2388 "/home/jens/Source/shotwell/src/PhotoPage.vala" editing_host_page_toggle_redeye ((EditingHostPage*) self); -#line 15166 "PhotoPage.c" +#line 15168 "PhotoPage.c" } static void _editing_host_page_toggle_adjust_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) { #line 2388 "/home/jens/Source/shotwell/src/PhotoPage.vala" editing_host_page_toggle_adjust ((EditingHostPage*) self); -#line 15173 "PhotoPage.c" +#line 15175 "PhotoPage.c" } static void _editing_host_page_on_revert_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) { #line 2388 "/home/jens/Source/shotwell/src/PhotoPage.vala" editing_host_page_on_revert ((EditingHostPage*) self); -#line 15180 "PhotoPage.c" +#line 15182 "PhotoPage.c" } static void _editing_host_page_on_edit_title_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) { #line 2388 "/home/jens/Source/shotwell/src/PhotoPage.vala" editing_host_page_on_edit_title ((EditingHostPage*) self); -#line 15187 "PhotoPage.c" +#line 15189 "PhotoPage.c" } static void _editing_host_page_on_edit_comment_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) { #line 2388 "/home/jens/Source/shotwell/src/PhotoPage.vala" editing_host_page_on_edit_comment ((EditingHostPage*) self); -#line 15194 "PhotoPage.c" +#line 15196 "PhotoPage.c" } static void _editing_host_page_on_adjust_date_time_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) { #line 2388 "/home/jens/Source/shotwell/src/PhotoPage.vala" editing_host_page_on_adjust_date_time ((EditingHostPage*) self); -#line 15201 "PhotoPage.c" +#line 15203 "PhotoPage.c" } static void _library_photo_page_on_external_edit_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) { #line 2388 "/home/jens/Source/shotwell/src/PhotoPage.vala" library_photo_page_on_external_edit ((LibraryPhotoPage*) self); -#line 15208 "PhotoPage.c" +#line 15210 "PhotoPage.c" } static void _library_photo_page_on_external_edit_raw_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) { #line 2388 "/home/jens/Source/shotwell/src/PhotoPage.vala" library_photo_page_on_external_edit_raw ((LibraryPhotoPage*) self); -#line 15215 "PhotoPage.c" +#line 15217 "PhotoPage.c" } static void _library_photo_page_on_send_to_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) { #line 2388 "/home/jens/Source/shotwell/src/PhotoPage.vala" library_photo_page_on_send_to ((LibraryPhotoPage*) self); -#line 15222 "PhotoPage.c" +#line 15224 "PhotoPage.c" } static void _editing_host_page_on_set_background_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) { #line 2388 "/home/jens/Source/shotwell/src/PhotoPage.vala" editing_host_page_on_set_background ((EditingHostPage*) self); -#line 15229 "PhotoPage.c" +#line 15231 "PhotoPage.c" } static void _library_photo_page_on_flag_unflag_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) { #line 2388 "/home/jens/Source/shotwell/src/PhotoPage.vala" library_photo_page_on_flag_unflag ((LibraryPhotoPage*) self); -#line 15236 "PhotoPage.c" +#line 15238 "PhotoPage.c" } static void _library_photo_page_on_increase_rating_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) { #line 2388 "/home/jens/Source/shotwell/src/PhotoPage.vala" library_photo_page_on_increase_rating ((LibraryPhotoPage*) self); -#line 15243 "PhotoPage.c" +#line 15245 "PhotoPage.c" } static void _library_photo_page_on_decrease_rating_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) { #line 2388 "/home/jens/Source/shotwell/src/PhotoPage.vala" library_photo_page_on_decrease_rating ((LibraryPhotoPage*) self); -#line 15250 "PhotoPage.c" +#line 15252 "PhotoPage.c" } static void _library_photo_page_on_rate_rejected_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) { #line 2388 "/home/jens/Source/shotwell/src/PhotoPage.vala" library_photo_page_on_rate_rejected ((LibraryPhotoPage*) self); -#line 15257 "PhotoPage.c" +#line 15259 "PhotoPage.c" } static void _library_photo_page_on_rate_unrated_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) { #line 2388 "/home/jens/Source/shotwell/src/PhotoPage.vala" library_photo_page_on_rate_unrated ((LibraryPhotoPage*) self); -#line 15264 "PhotoPage.c" +#line 15266 "PhotoPage.c" } static void _library_photo_page_on_rate_one_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) { #line 2388 "/home/jens/Source/shotwell/src/PhotoPage.vala" library_photo_page_on_rate_one ((LibraryPhotoPage*) self); -#line 15271 "PhotoPage.c" +#line 15273 "PhotoPage.c" } static void _library_photo_page_on_rate_two_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) { #line 2388 "/home/jens/Source/shotwell/src/PhotoPage.vala" library_photo_page_on_rate_two ((LibraryPhotoPage*) self); -#line 15278 "PhotoPage.c" +#line 15280 "PhotoPage.c" } static void _library_photo_page_on_rate_three_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) { #line 2388 "/home/jens/Source/shotwell/src/PhotoPage.vala" library_photo_page_on_rate_three ((LibraryPhotoPage*) self); -#line 15285 "PhotoPage.c" +#line 15287 "PhotoPage.c" } static void _library_photo_page_on_rate_four_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) { #line 2388 "/home/jens/Source/shotwell/src/PhotoPage.vala" library_photo_page_on_rate_four ((LibraryPhotoPage*) self); -#line 15292 "PhotoPage.c" +#line 15294 "PhotoPage.c" } static void _library_photo_page_on_rate_five_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) { #line 2388 "/home/jens/Source/shotwell/src/PhotoPage.vala" library_photo_page_on_rate_five ((LibraryPhotoPage*) self); -#line 15299 "PhotoPage.c" +#line 15301 "PhotoPage.c" } static void _editing_host_page_on_increase_size_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) { #line 2388 "/home/jens/Source/shotwell/src/PhotoPage.vala" editing_host_page_on_increase_size ((EditingHostPage*) self); -#line 15306 "PhotoPage.c" +#line 15308 "PhotoPage.c" } static void _editing_host_page_on_decrease_size_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) { #line 2388 "/home/jens/Source/shotwell/src/PhotoPage.vala" editing_host_page_on_decrease_size ((EditingHostPage*) self); -#line 15313 "PhotoPage.c" +#line 15315 "PhotoPage.c" } static void _editing_host_page_snap_zoom_to_min_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) { #line 2388 "/home/jens/Source/shotwell/src/PhotoPage.vala" editing_host_page_snap_zoom_to_min ((EditingHostPage*) self); -#line 15320 "PhotoPage.c" +#line 15322 "PhotoPage.c" } static void _editing_host_page_snap_zoom_to_isomorphic_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) { #line 2388 "/home/jens/Source/shotwell/src/PhotoPage.vala" editing_host_page_snap_zoom_to_isomorphic ((EditingHostPage*) self); -#line 15327 "PhotoPage.c" +#line 15329 "PhotoPage.c" } static void _editing_host_page_snap_zoom_to_max_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) { #line 2388 "/home/jens/Source/shotwell/src/PhotoPage.vala" editing_host_page_snap_zoom_to_max ((EditingHostPage*) self); -#line 15334 "PhotoPage.c" +#line 15336 "PhotoPage.c" } static void _library_photo_page_on_add_tags_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) { #line 2388 "/home/jens/Source/shotwell/src/PhotoPage.vala" library_photo_page_on_add_tags ((LibraryPhotoPage*) self); -#line 15341 "PhotoPage.c" +#line 15343 "PhotoPage.c" } static void _library_photo_page_on_modify_tags_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) { #line 2388 "/home/jens/Source/shotwell/src/PhotoPage.vala" library_photo_page_on_modify_tags ((LibraryPhotoPage*) self); -#line 15348 "PhotoPage.c" +#line 15350 "PhotoPage.c" } static void _library_photo_page_on_slideshow_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) { #line 2388 "/home/jens/Source/shotwell/src/PhotoPage.vala" library_photo_page_on_slideshow ((LibraryPhotoPage*) self); -#line 15355 "PhotoPage.c" +#line 15357 "PhotoPage.c" } static void _page_on_action_toggle_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) { #line 2388 "/home/jens/Source/shotwell/src/PhotoPage.vala" page_on_action_toggle ((Page*) self, action, parameter); -#line 15362 "PhotoPage.c" +#line 15364 "PhotoPage.c" } static void _library_photo_page_on_display_ratings_gsimple_action_change_state_callback (GSimpleAction* action, GVariant* value, gpointer self) { #line 2388 "/home/jens/Source/shotwell/src/PhotoPage.vala" library_photo_page_on_display_ratings ((LibraryPhotoPage*) self, action, value); -#line 15369 "PhotoPage.c" +#line 15371 "PhotoPage.c" } static void _library_photo_page_on_photos_altered_data_collection_items_altered (DataCollection* _sender, GeeMap* items, gpointer self) { #line 2348 "/home/jens/Source/shotwell/src/PhotoPage.vala" library_photo_page_on_photos_altered ((LibraryPhotoPage*) self); -#line 15376 "PhotoPage.c" +#line 15378 "PhotoPage.c" } static void _library_photo_page_on_photo_unlinking_source_collection_items_unlinking (SourceCollection* _sender, GeeCollection* unlinking, gpointer self) { #line 2359 "/home/jens/Source/shotwell/src/PhotoPage.vala" library_photo_page_on_photo_unlinking ((LibraryPhotoPage*) self, unlinking); -#line 15383 "PhotoPage.c" +#line 15385 "PhotoPage.c" } static void _library_photo_page_on_photo_relinked_source_collection_items_relinked (SourceCollection* _sender, GeeCollection* relinked, gpointer self) { #line 2360 "/home/jens/Source/shotwell/src/PhotoPage.vala" library_photo_page_on_photo_relinked ((LibraryPhotoPage*) self, relinked); -#line 15390 "PhotoPage.c" +#line 15392 "PhotoPage.c" } @@ -15457,14 +15459,14 @@ LibraryPhotoPage* library_photo_page_construct (GType object_type) { g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, TYPE_SOURCE_COLLECTION, SourceCollection), "items-relinked", (GCallback) _library_photo_page_on_photo_relinked_source_collection_items_relinked, self, 0); #line 2344 "/home/jens/Source/shotwell/src/PhotoPage.vala" return self; -#line 15456 "PhotoPage.c" +#line 15458 "PhotoPage.c" } LibraryPhotoPage* library_photo_page_new (void) { #line 2344 "/home/jens/Source/shotwell/src/PhotoPage.vala" return library_photo_page_construct (TYPE_LIBRARY_PHOTO_PAGE); -#line 15463 "PhotoPage.c" +#line 15465 "PhotoPage.c" } @@ -15495,7 +15497,7 @@ gboolean library_photo_page_not_trashed_view_filter (LibraryPhotoPage* self, Dat result = _tmp4_; #line 2370 "/home/jens/Source/shotwell/src/PhotoPage.vala" return result; -#line 15494 "PhotoPage.c" +#line 15496 "PhotoPage.c" } @@ -15509,7 +15511,7 @@ static void library_photo_page_on_photo_unlinking (LibraryPhotoPage* self, GeeCo _tmp0_ = self->priv->filter; #line 2374 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_signal_emit_by_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_VIEW_FILTER, ViewFilter), "refresh"); -#line 15508 "PhotoPage.c" +#line 15510 "PhotoPage.c" } @@ -15523,7 +15525,7 @@ static void library_photo_page_on_photo_relinked (LibraryPhotoPage* self, GeeCol _tmp0_ = self->priv->filter; #line 2378 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_signal_emit_by_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_VIEW_FILTER, ViewFilter), "refresh"); -#line 15522 "PhotoPage.c" +#line 15524 "PhotoPage.c" } @@ -15548,28 +15550,28 @@ static void library_photo_page_real_init_collect_ui_filenames (Page* base, GeeLi _tmp2_ = ui_filenames; #line 2385 "/home/jens/Source/shotwell/src/PhotoPage.vala" gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_COLLECTION, GeeCollection), "photo.ui"); -#line 15547 "PhotoPage.c" +#line 15549 "PhotoPage.c" } static GVariant* _variant_new16 (gboolean value) { #line 2444 "/home/jens/Source/shotwell/src/PhotoPage.vala" return g_variant_ref_sink (g_variant_new_boolean (value)); -#line 15554 "PhotoPage.c" +#line 15556 "PhotoPage.c" } static GVariant* _variant_new17 (const gchar* value) { #line 2446 "/home/jens/Source/shotwell/src/PhotoPage.vala" return g_variant_ref_sink (g_variant_new_string (value)); -#line 15561 "PhotoPage.c" +#line 15563 "PhotoPage.c" } static void _library_photo_page_on_raw_developer_changed_g_simple_action_change_state (GSimpleAction* _sender, GVariant* value, gpointer self) { #line 2448 "/home/jens/Source/shotwell/src/PhotoPage.vala" library_photo_page_on_raw_developer_changed ((LibraryPhotoPage*) self, _sender, value); -#line 15568 "PhotoPage.c" +#line 15570 "PhotoPage.c" } @@ -15617,7 +15619,7 @@ static void library_photo_page_real_add_actions (Page* base, GActionMap* map) { if (_tmp3_ == NULL) { #line 2444 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (_tmp2_); -#line 15616 "PhotoPage.c" +#line 15618 "PhotoPage.c" } #line 2444 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp4_ = _tmp3_; @@ -15655,11 +15657,11 @@ static void library_photo_page_real_add_actions (Page* base, GActionMap* map) { if (_tmp14_ == RAW_DEVELOPER_SHOTWELL) { #line 2447 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp13_ = "Shotwell"; -#line 15654 "PhotoPage.c" +#line 15656 "PhotoPage.c" } else { #line 2447 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp13_ = "Camera"; -#line 15658 "PhotoPage.c" +#line 15660 "PhotoPage.c" } #line 2446 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp15_ = G_VARIANT_TYPE_STRING; @@ -15683,7 +15685,7 @@ static void library_photo_page_real_add_actions (Page* base, GActionMap* map) { g_action_map_add_action (_tmp19_, G_TYPE_CHECK_INSTANCE_CAST (action, g_action_get_type (), GAction)); #line 2440 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (action); -#line 15682 "PhotoPage.c" +#line 15684 "PhotoPage.c" } @@ -15698,7 +15700,7 @@ static void library_photo_page_real_remove_actions (Page* base, GActionMap* map) _tmp0_ = map; #line 2454 "/home/jens/Source/shotwell/src/PhotoPage.vala" PAGE_CLASS (library_photo_page_parent_class)->remove_actions (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage), TYPE_PAGE, Page), _tmp0_); -#line 15697 "PhotoPage.c" +#line 15699 "PhotoPage.c" { GActionEntry* entry_collection = NULL; gint entry_collection_length1 = 0; @@ -15710,11 +15712,11 @@ static void library_photo_page_real_remove_actions (Page* base, GActionMap* map) entry_collection_length1 = G_N_ELEMENTS (LIBRARY_PHOTO_PAGE_entries); #line 2455 "/home/jens/Source/shotwell/src/PhotoPage.vala" for (entry_it = 0; entry_it < G_N_ELEMENTS (LIBRARY_PHOTO_PAGE_entries); entry_it = entry_it + 1) { -#line 15709 "PhotoPage.c" +#line 15711 "PhotoPage.c" GActionEntry entry = {0}; #line 2455 "/home/jens/Source/shotwell/src/PhotoPage.vala" entry = entry_collection[entry_it]; -#line 15713 "PhotoPage.c" +#line 15715 "PhotoPage.c" { GActionMap* _tmp1_ = NULL; GActionEntry _tmp2_ = {0}; @@ -15727,7 +15729,7 @@ static void library_photo_page_real_remove_actions (Page* base, GActionMap* map) _tmp3_ = _tmp2_.name; #line 2456 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_action_map_remove_action (_tmp1_, _tmp3_); -#line 15726 "PhotoPage.c" +#line 15728 "PhotoPage.c" } } } @@ -15737,7 +15739,7 @@ static void library_photo_page_real_remove_actions (Page* base, GActionMap* map) static gpointer _injection_group_ref0 (gpointer self) { #line 2466 "/home/jens/Source/shotwell/src/PhotoPage.vala" return self ? injection_group_ref (self) : NULL; -#line 15736 "PhotoPage.c" +#line 15738 "PhotoPage.c" } @@ -15748,13 +15750,13 @@ static void _vala_array_add82 (InjectionGroup*** array, int* length, int* size, *size = (*size) ? (2 * (*size)) : 4; #line 2466 "/home/jens/Source/shotwell/src/PhotoPage.vala" *array = g_renew (InjectionGroup*, *array, (*size) + 1); -#line 15747 "PhotoPage.c" +#line 15749 "PhotoPage.c" } #line 2466 "/home/jens/Source/shotwell/src/PhotoPage.vala" (*array)[(*length)++] = value; #line 2466 "/home/jens/Source/shotwell/src/PhotoPage.vala" (*array)[*length] = NULL; -#line 15753 "PhotoPage.c" +#line 15755 "PhotoPage.c" } @@ -15765,13 +15767,13 @@ static void _vala_array_add83 (InjectionGroup*** array, int* length, int* size, *size = (*size) ? (2 * (*size)) : 4; #line 2471 "/home/jens/Source/shotwell/src/PhotoPage.vala" *array = g_renew (InjectionGroup*, *array, (*size) + 1); -#line 15764 "PhotoPage.c" +#line 15766 "PhotoPage.c" } #line 2471 "/home/jens/Source/shotwell/src/PhotoPage.vala" (*array)[(*length)++] = value; #line 2471 "/home/jens/Source/shotwell/src/PhotoPage.vala" (*array)[*length] = NULL; -#line 15770 "PhotoPage.c" +#line 15772 "PhotoPage.c" } @@ -15782,13 +15784,13 @@ static void _vala_array_add84 (InjectionGroup*** array, int* length, int* size, *size = (*size) ? (2 * (*size)) : 4; #line 2476 "/home/jens/Source/shotwell/src/PhotoPage.vala" *array = g_renew (InjectionGroup*, *array, (*size) + 1); -#line 15781 "PhotoPage.c" +#line 15783 "PhotoPage.c" } #line 2476 "/home/jens/Source/shotwell/src/PhotoPage.vala" (*array)[(*length)++] = value; #line 2476 "/home/jens/Source/shotwell/src/PhotoPage.vala" (*array)[*length] = NULL; -#line 15787 "PhotoPage.c" +#line 15789 "PhotoPage.c" } @@ -15886,7 +15888,7 @@ static InjectionGroup** library_photo_page_real_init_collect_injection_groups (P if (result_length1) { #line 2478 "/home/jens/Source/shotwell/src/PhotoPage.vala" *result_length1 = _tmp14__length1; -#line 15885 "PhotoPage.c" +#line 15887 "PhotoPage.c" } #line 2478 "/home/jens/Source/shotwell/src/PhotoPage.vala" result = _tmp14_; @@ -15898,7 +15900,7 @@ static InjectionGroup** library_photo_page_real_init_collect_injection_groups (P _injection_group_unref0 (print_group); #line 2478 "/home/jens/Source/shotwell/src/PhotoPage.vala" return result; -#line 15897 "PhotoPage.c" +#line 15899 "PhotoPage.c" } @@ -15936,7 +15938,7 @@ static void library_photo_page_on_display_ratings (LibraryPhotoPage* self, GSimp _tmp5_ = value; #line 2487 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_simple_action_set_state (_tmp4_, _tmp5_); -#line 15935 "PhotoPage.c" +#line 15937 "PhotoPage.c" } @@ -15955,7 +15957,7 @@ static void library_photo_page_set_display_ratings (LibraryPhotoPage* self, gboo if (_tmp1_ == NULL) { #line 2492 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (_tmp0_); -#line 15954 "PhotoPage.c" +#line 15956 "PhotoPage.c" } #line 2492 "/home/jens/Source/shotwell/src/PhotoPage.vala" action = _tmp1_; @@ -15963,7 +15965,7 @@ static void library_photo_page_set_display_ratings (LibraryPhotoPage* self, gboo _tmp2_ = action; #line 2493 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp2_ != NULL) { -#line 15962 "PhotoPage.c" +#line 15964 "PhotoPage.c" GSimpleAction* _tmp3_ = NULL; gboolean _tmp4_ = FALSE; #line 2494 "/home/jens/Source/shotwell/src/PhotoPage.vala" @@ -15972,11 +15974,11 @@ static void library_photo_page_set_display_ratings (LibraryPhotoPage* self, gboo _tmp4_ = display; #line 2494 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_simple_action_set_enabled (_tmp3_, _tmp4_); -#line 15971 "PhotoPage.c" +#line 15973 "PhotoPage.c" } #line 2491 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (action); -#line 15975 "PhotoPage.c" +#line 15977 "PhotoPage.c" } @@ -16032,7 +16034,7 @@ static void library_photo_page_real_update_actions (Page* base, gint selected_co _tmp5_ = editing_host_page_has_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage)); #line 2499 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp5_) { -#line 16031 "PhotoPage.c" +#line 16033 "PhotoPage.c" Photo* _tmp6_ = NULL; Photo* _tmp7_ = NULL; gboolean _tmp8_ = FALSE; @@ -16046,11 +16048,11 @@ static void library_photo_page_real_update_actions (Page* base, gint selected_co _tmp4_ = _tmp8_; #line 2499 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (_tmp7_); -#line 16045 "PhotoPage.c" +#line 16047 "PhotoPage.c" } else { #line 2499 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp4_ = FALSE; -#line 16049 "PhotoPage.c" +#line 16051 "PhotoPage.c" } #line 2499 "/home/jens/Source/shotwell/src/PhotoPage.vala" rotate_possible = _tmp4_; @@ -16058,7 +16060,7 @@ static void library_photo_page_real_update_actions (Page* base, gint selected_co _tmp10_ = editing_host_page_has_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage)); #line 2500 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp10_) { -#line 16057 "PhotoPage.c" +#line 16059 "PhotoPage.c" Photo* _tmp11_ = NULL; Photo* _tmp12_ = NULL; PhotoFileFormat _tmp13_ = 0; @@ -16072,11 +16074,11 @@ static void library_photo_page_real_update_actions (Page* base, gint selected_co _tmp9_ = _tmp13_ == PHOTO_FILE_FORMAT_RAW; #line 2500 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (_tmp12_); -#line 16071 "PhotoPage.c" +#line 16073 "PhotoPage.c" } else { #line 2500 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp9_ = FALSE; -#line 16075 "PhotoPage.c" +#line 16077 "PhotoPage.c" } #line 2500 "/home/jens/Source/shotwell/src/PhotoPage.vala" is_raw = _tmp9_; @@ -16084,7 +16086,7 @@ static void library_photo_page_real_update_actions (Page* base, gint selected_co _tmp15_ = editing_host_page_has_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage)); #line 2503 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp15_) { -#line 16083 "PhotoPage.c" +#line 16085 "PhotoPage.c" ConfigFacade* _tmp16_ = NULL; ConfigFacade* _tmp17_ = NULL; gchar* _tmp18_ = NULL; @@ -16103,11 +16105,11 @@ static void library_photo_page_real_update_actions (Page* base, gint selected_co _g_free0 (_tmp19_); #line 2503 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (_tmp17_); -#line 16102 "PhotoPage.c" +#line 16104 "PhotoPage.c" } else { #line 2503 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp14_ = FALSE; -#line 16106 "PhotoPage.c" +#line 16108 "PhotoPage.c" } #line 2502 "/home/jens/Source/shotwell/src/PhotoPage.vala" page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "ExternalEdit", _tmp14_); @@ -16115,7 +16117,7 @@ static void library_photo_page_real_update_actions (Page* base, gint selected_co _tmp21_ = editing_host_page_has_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage)); #line 2505 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp21_) { -#line 16114 "PhotoPage.c" +#line 16116 "PhotoPage.c" gboolean _tmp22_ = FALSE; Photo* _tmp23_ = NULL; Photo* _tmp24_ = NULL; @@ -16135,7 +16137,7 @@ static void library_photo_page_real_update_actions (Page* base, gint selected_co if (_tmp26_) { #line 2506 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp22_ = TRUE; -#line 16134 "PhotoPage.c" +#line 16136 "PhotoPage.c" } else { Photo* _tmp27_ = NULL; Photo* _tmp28_ = NULL; @@ -16150,15 +16152,15 @@ static void library_photo_page_real_update_actions (Page* base, gint selected_co _tmp22_ = _tmp29_; #line 2506 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (_tmp28_); -#line 16149 "PhotoPage.c" +#line 16151 "PhotoPage.c" } #line 2506 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp20_ = _tmp22_; -#line 16153 "PhotoPage.c" +#line 16155 "PhotoPage.c" } else { #line 2506 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp20_ = FALSE; -#line 16157 "PhotoPage.c" +#line 16159 "PhotoPage.c" } #line 2505 "/home/jens/Source/shotwell/src/PhotoPage.vala" page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Revert", _tmp20_); @@ -16166,17 +16168,17 @@ static void library_photo_page_real_update_actions (Page* base, gint selected_co _tmp31_ = editing_host_page_has_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage)); #line 2508 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp31_) { -#line 16165 "PhotoPage.c" +#line 16167 "PhotoPage.c" gboolean _tmp32_ = FALSE; #line 2508 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp32_ = editing_host_page_get_photo_missing (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage)); #line 2508 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp30_ = !_tmp32_; -#line 16171 "PhotoPage.c" +#line 16173 "PhotoPage.c" } else { #line 2508 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp30_ = FALSE; -#line 16175 "PhotoPage.c" +#line 16177 "PhotoPage.c" } #line 2508 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp30_) { @@ -16184,7 +16186,7 @@ static void library_photo_page_real_update_actions (Page* base, gint selected_co library_photo_page_update_rating_menu_item_sensitivity (self); #line 2510 "/home/jens/Source/shotwell/src/PhotoPage.vala" library_photo_page_update_development_menu_item_sensitivity (self); -#line 16183 "PhotoPage.c" +#line 16185 "PhotoPage.c" } #line 2513 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp33_ = editing_host_page_has_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage)); @@ -16194,7 +16196,7 @@ static void library_photo_page_real_update_actions (Page* base, gint selected_co _tmp35_ = editing_host_page_has_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage)); #line 2515 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp35_) { -#line 16193 "PhotoPage.c" +#line 16195 "PhotoPage.c" Photo* _tmp36_ = NULL; Photo* _tmp37_ = NULL; gboolean _tmp38_ = FALSE; @@ -16208,11 +16210,11 @@ static void library_photo_page_real_update_actions (Page* base, gint selected_co _tmp34_ = _tmp38_; #line 2515 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (_tmp37_); -#line 16207 "PhotoPage.c" +#line 16209 "PhotoPage.c" } else { #line 2515 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp34_ = FALSE; -#line 16211 "PhotoPage.c" +#line 16213 "PhotoPage.c" } #line 2515 "/home/jens/Source/shotwell/src/PhotoPage.vala" page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "CopyColorAdjustments", _tmp34_); @@ -16248,7 +16250,7 @@ static void library_photo_page_real_update_actions (Page* base, gint selected_co _tmp46_ = editing_host_page_has_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage)); #line 2525 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp46_) { -#line 16247 "PhotoPage.c" +#line 16249 "PhotoPage.c" Photo* _tmp47_ = NULL; Photo* _tmp48_ = NULL; Scaling _tmp49_ = {0}; @@ -16281,7 +16283,7 @@ static void library_photo_page_real_update_actions (Page* base, gint selected_co page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RedEye", _tmp54_); #line 2527 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (_tmp52_); -#line 16280 "PhotoPage.c" +#line 16282 "PhotoPage.c" } #line 2531 "/home/jens/Source/shotwell/src/PhotoPage.vala" library_photo_page_update_flag_action (self); @@ -16289,7 +16291,7 @@ static void library_photo_page_real_update_actions (Page* base, gint selected_co _tmp56_ = is_raw; #line 2534 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp56_) { -#line 16288 "PhotoPage.c" +#line 16290 "PhotoPage.c" ConfigFacade* _tmp57_ = NULL; ConfigFacade* _tmp58_ = NULL; gchar* _tmp59_ = NULL; @@ -16308,11 +16310,11 @@ static void library_photo_page_real_update_actions (Page* base, gint selected_co _g_free0 (_tmp60_); #line 2534 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (_tmp58_); -#line 16307 "PhotoPage.c" +#line 16309 "PhotoPage.c" } else { #line 2534 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp55_ = FALSE; -#line 16311 "PhotoPage.c" +#line 16313 "PhotoPage.c" } #line 2533 "/home/jens/Source/shotwell/src/PhotoPage.vala" page_set_action_visible (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "ExternalEditRAW", _tmp55_); @@ -16322,7 +16324,7 @@ static void library_photo_page_real_update_actions (Page* base, gint selected_co _tmp62_ = count; #line 2536 "/home/jens/Source/shotwell/src/PhotoPage.vala" PAGE_CLASS (library_photo_page_parent_class)->update_actions (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage), TYPE_PAGE, Page), _tmp61_, _tmp62_); -#line 16321 "PhotoPage.c" +#line 16323 "PhotoPage.c" } @@ -16335,7 +16337,7 @@ static void library_photo_page_on_photos_altered (LibraryPhotoPage* self) { _tmp1_ = editing_host_page_has_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage)); #line 2540 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp1_) { -#line 16334 "PhotoPage.c" +#line 16336 "PhotoPage.c" gboolean _tmp2_ = FALSE; Photo* _tmp3_ = NULL; Photo* _tmp4_ = NULL; @@ -16355,7 +16357,7 @@ static void library_photo_page_on_photos_altered (LibraryPhotoPage* self) { if (_tmp6_) { #line 2541 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp2_ = TRUE; -#line 16354 "PhotoPage.c" +#line 16356 "PhotoPage.c" } else { Photo* _tmp7_ = NULL; Photo* _tmp8_ = NULL; @@ -16370,21 +16372,21 @@ static void library_photo_page_on_photos_altered (LibraryPhotoPage* self) { _tmp2_ = _tmp9_; #line 2541 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (_tmp8_); -#line 16369 "PhotoPage.c" +#line 16371 "PhotoPage.c" } #line 2541 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp0_ = _tmp2_; -#line 16373 "PhotoPage.c" +#line 16375 "PhotoPage.c" } else { #line 2541 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp0_ = FALSE; -#line 16377 "PhotoPage.c" +#line 16379 "PhotoPage.c" } #line 2540 "/home/jens/Source/shotwell/src/PhotoPage.vala" page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Revert", _tmp0_); #line 2542 "/home/jens/Source/shotwell/src/PhotoPage.vala" library_photo_page_update_flag_action (self); -#line 16383 "PhotoPage.c" +#line 16385 "PhotoPage.c" } @@ -16398,7 +16400,7 @@ static void library_photo_page_on_raw_developer_changed (LibraryPhotoPage* self, static GQuark _tmp3_label0 = 0; #line 2549 "/home/jens/Source/shotwell/src/PhotoPage.vala" static GQuark _tmp3_label1 = 0; -#line 16397 "PhotoPage.c" +#line 16399 "PhotoPage.c" RawDeveloper _tmp5_ = 0; GSimpleAction* _tmp6_ = NULL; GVariant* _tmp7_ = NULL; @@ -16420,38 +16422,38 @@ static void library_photo_page_on_raw_developer_changed (LibraryPhotoPage* self, if (_tmp4_ == ((0 != _tmp3_label0) ? _tmp3_label0 : (_tmp3_label0 = g_quark_from_static_string ("Shotwell")))) { #line 2549 "/home/jens/Source/shotwell/src/PhotoPage.vala" switch (0) { -#line 16419 "PhotoPage.c" +#line 16421 "PhotoPage.c" default: { #line 2551 "/home/jens/Source/shotwell/src/PhotoPage.vala" developer = RAW_DEVELOPER_SHOTWELL; #line 2552 "/home/jens/Source/shotwell/src/PhotoPage.vala" break; -#line 16426 "PhotoPage.c" +#line 16428 "PhotoPage.c" } } } else if (_tmp4_ == ((0 != _tmp3_label1) ? _tmp3_label1 : (_tmp3_label1 = g_quark_from_static_string ("Camera")))) { #line 2549 "/home/jens/Source/shotwell/src/PhotoPage.vala" switch (0) { -#line 16432 "PhotoPage.c" +#line 16434 "PhotoPage.c" default: { #line 2554 "/home/jens/Source/shotwell/src/PhotoPage.vala" developer = RAW_DEVELOPER_CAMERA; #line 2555 "/home/jens/Source/shotwell/src/PhotoPage.vala" break; -#line 16439 "PhotoPage.c" +#line 16441 "PhotoPage.c" } } } else { #line 2549 "/home/jens/Source/shotwell/src/PhotoPage.vala" switch (0) { -#line 16445 "PhotoPage.c" +#line 16447 "PhotoPage.c" default: { #line 2557 "/home/jens/Source/shotwell/src/PhotoPage.vala" break; -#line 16450 "PhotoPage.c" +#line 16452 "PhotoPage.c" } } } @@ -16465,7 +16467,7 @@ static void library_photo_page_on_raw_developer_changed (LibraryPhotoPage* self, _tmp7_ = value; #line 2562 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_simple_action_set_state (_tmp6_, _tmp7_); -#line 16464 "PhotoPage.c" +#line 16466 "PhotoPage.c" } @@ -16503,7 +16505,7 @@ static void library_photo_page_real_developer_changed (LibraryPhotoPage* self, R if (_tmp3_) { #line 2567 "/home/jens/Source/shotwell/src/PhotoPage.vala" return; -#line 16502 "PhotoPage.c" +#line 16504 "PhotoPage.c" } #line 2569 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp4_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); @@ -16525,7 +16527,7 @@ static void library_photo_page_real_developer_changed (LibraryPhotoPage* self, R if (_tmp11_ == NULL) { #line 2569 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (_tmp10_); -#line 16524 "PhotoPage.c" +#line 16526 "PhotoPage.c" } #line 2569 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp12_ = _tmp11_; @@ -16543,7 +16545,7 @@ static void library_photo_page_real_developer_changed (LibraryPhotoPage* self, R if (_tmp14_ == NULL) { #line 2570 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp13_ = TRUE; -#line 16542 "PhotoPage.c" +#line 16544 "PhotoPage.c" } else { RawDeveloper _tmp15_ = 0; Photo* _tmp16_ = NULL; @@ -16559,7 +16561,7 @@ static void library_photo_page_real_developer_changed (LibraryPhotoPage* self, R _tmp18_ = raw_developer_is_equivalent (_tmp15_, _tmp17_); #line 2570 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp13_ = _tmp18_; -#line 16558 "PhotoPage.c" +#line 16560 "PhotoPage.c" } #line 2570 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp13_) { @@ -16567,7 +16569,7 @@ static void library_photo_page_real_developer_changed (LibraryPhotoPage* self, R _g_object_unref0 (photo); #line 2571 "/home/jens/Source/shotwell/src/PhotoPage.vala" return; -#line 16566 "PhotoPage.c" +#line 16568 "PhotoPage.c" } #line 2575 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp20_ = photo; @@ -16577,18 +16579,18 @@ static void library_photo_page_real_developer_changed (LibraryPhotoPage* self, R if (!_tmp21_) { #line 2575 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp19_ = TRUE; -#line 16576 "PhotoPage.c" +#line 16578 "PhotoPage.c" } else { gboolean _tmp22_ = FALSE; #line 2575 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp22_ = dialogs_confirm_warn_developer_changed (1); #line 2575 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp19_ = _tmp22_; -#line 16583 "PhotoPage.c" +#line 16585 "PhotoPage.c" } #line 2575 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp19_) { -#line 16587 "PhotoPage.c" +#line 16589 "PhotoPage.c" SetRawDeveloperCommand* command = NULL; ViewCollection* _tmp23_ = NULL; ViewCollection* _tmp24_ = NULL; @@ -16634,11 +16636,11 @@ static void library_photo_page_real_developer_changed (LibraryPhotoPage* self, R library_photo_page_update_development_menu_item_sensitivity (self); #line 2575 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (command); -#line 16633 "PhotoPage.c" +#line 16635 "PhotoPage.c" } #line 2565 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (photo); -#line 16637 "PhotoPage.c" +#line 16639 "PhotoPage.c" } @@ -16647,7 +16649,7 @@ void library_photo_page_developer_changed (LibraryPhotoPage* self, RawDeveloper g_return_if_fail (IS_LIBRARY_PHOTO_PAGE (self)); #line 2565 "/home/jens/Source/shotwell/src/PhotoPage.vala" LIBRARY_PHOTO_PAGE_GET_CLASS (self)->developer_changed (self, rd); -#line 16646 "PhotoPage.c" +#line 16648 "PhotoPage.c" } @@ -16659,14 +16661,14 @@ static void library_photo_page_update_flag_action (LibraryPhotoPage* self) { _tmp0_ = editing_host_page_has_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage)); #line 2585 "/home/jens/Source/shotwell/src/PhotoPage.vala" page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Flag", _tmp0_); -#line 16658 "PhotoPage.c" +#line 16660 "PhotoPage.c" } static void _library_photo_page_on_page_destroyed_gtk_widget_destroy (GtkWidget* _sender, gpointer self) { #line 2595 "/home/jens/Source/shotwell/src/PhotoPage.vala" library_photo_page_on_page_destroyed ((LibraryPhotoPage*) self); -#line 16665 "PhotoPage.c" +#line 16667 "PhotoPage.c" } @@ -16701,7 +16703,7 @@ void library_photo_page_display_for_collection (LibraryPhotoPage* self, Collecti _tmp4_ = view; #line 2597 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp4_ != NULL) { -#line 16700 "PhotoPage.c" +#line 16702 "PhotoPage.c" ViewCollection* _tmp5_ = NULL; ViewCollection* _tmp6_ = NULL; #line 2597 "/home/jens/Source/shotwell/src/PhotoPage.vala" @@ -16712,7 +16714,7 @@ void library_photo_page_display_for_collection (LibraryPhotoPage* self, Collecti _data_collection_unref0 (_tmp3_); #line 2597 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp3_ = _tmp6_; -#line 16711 "PhotoPage.c" +#line 16713 "PhotoPage.c" } else { CollectionPage* _tmp7_ = NULL; ViewCollection* _tmp8_ = NULL; @@ -16724,7 +16726,7 @@ void library_photo_page_display_for_collection (LibraryPhotoPage* self, Collecti _data_collection_unref0 (_tmp3_); #line 2597 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp3_ = _tmp8_; -#line 16723 "PhotoPage.c" +#line 16725 "PhotoPage.c" } #line 2597 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp9_ = photo; @@ -16732,7 +16734,7 @@ void library_photo_page_display_for_collection (LibraryPhotoPage* self, Collecti editing_host_page_display_copy_of (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage), _tmp3_, _tmp9_); #line 2592 "/home/jens/Source/shotwell/src/PhotoPage.vala" _data_collection_unref0 (_tmp3_); -#line 16731 "PhotoPage.c" +#line 16733 "PhotoPage.c" } @@ -16745,7 +16747,7 @@ void library_photo_page_on_page_destroyed (LibraryPhotoPage* self) { self->priv->return_page = NULL; #line 2604 "/home/jens/Source/shotwell/src/PhotoPage.vala" editing_host_page_unset_view_collection (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage)); -#line 16744 "PhotoPage.c" +#line 16746 "PhotoPage.c" } @@ -16763,7 +16765,7 @@ CollectionPage* library_photo_page_get_controller_page (LibraryPhotoPage* self) result = _tmp1_; #line 2608 "/home/jens/Source/shotwell/src/PhotoPage.vala" return result; -#line 16762 "PhotoPage.c" +#line 16764 "PhotoPage.c" } @@ -16800,7 +16802,7 @@ static void library_photo_page_real_switched_to (Page* base) { library_photo_page_set_display_ratings (self, _tmp4_); #line 2622 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (_tmp3_); -#line 16799 "PhotoPage.c" +#line 16801 "PhotoPage.c" } @@ -16810,7 +16812,7 @@ static void library_photo_page_real_switching_from (Page* base) { self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO_PAGE, LibraryPhotoPage); #line 2627 "/home/jens/Source/shotwell/src/PhotoPage.vala" PAGE_CLASS (library_photo_page_parent_class)->switching_from (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage), TYPE_PAGE, Page)); -#line 16809 "PhotoPage.c" +#line 16811 "PhotoPage.c" { GActionEntry* entry_collection = NULL; gint entry_collection_length1 = 0; @@ -16822,11 +16824,11 @@ static void library_photo_page_real_switching_from (Page* base) { entry_collection_length1 = G_N_ELEMENTS (LIBRARY_PHOTO_PAGE_entries); #line 2628 "/home/jens/Source/shotwell/src/PhotoPage.vala" for (entry_it = 0; entry_it < G_N_ELEMENTS (LIBRARY_PHOTO_PAGE_entries); entry_it = entry_it + 1) { -#line 16821 "PhotoPage.c" +#line 16823 "PhotoPage.c" GActionEntry entry = {0}; #line 2628 "/home/jens/Source/shotwell/src/PhotoPage.vala" entry = entry_collection[entry_it]; -#line 16825 "PhotoPage.c" +#line 16827 "PhotoPage.c" { AppWindow* _tmp0_ = NULL; AppWindow* _tmp1_ = NULL; @@ -16844,7 +16846,7 @@ static void library_photo_page_real_switching_from (Page* base) { g_action_map_remove_action (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, g_action_map_get_type (), GActionMap), _tmp3_); #line 2629 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (_tmp1_); -#line 16843 "PhotoPage.c" +#line 16845 "PhotoPage.c" } } } @@ -16870,7 +16872,7 @@ static GdkPixbuf* library_photo_page_real_get_bottom_left_trinket (EditingHostPa if (!_tmp1_) { #line 2634 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp0_ = TRUE; -#line 16869 "PhotoPage.c" +#line 16871 "PhotoPage.c" } else { ConfigFacade* _tmp2_ = NULL; ConfigFacade* _tmp3_ = NULL; @@ -16885,7 +16887,7 @@ static GdkPixbuf* library_photo_page_real_get_bottom_left_trinket (EditingHostPa _tmp0_ = !_tmp4_; #line 2634 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (_tmp3_); -#line 16884 "PhotoPage.c" +#line 16886 "PhotoPage.c" } #line 2634 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp0_) { @@ -16893,7 +16895,7 @@ static GdkPixbuf* library_photo_page_real_get_bottom_left_trinket (EditingHostPa result = NULL; #line 2635 "/home/jens/Source/shotwell/src/PhotoPage.vala" return result; -#line 16892 "PhotoPage.c" +#line 16894 "PhotoPage.c" } #line 2637 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp5_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage)); @@ -16913,7 +16915,7 @@ static GdkPixbuf* library_photo_page_real_get_bottom_left_trinket (EditingHostPa result = _tmp10_; #line 2637 "/home/jens/Source/shotwell/src/PhotoPage.vala" return result; -#line 16912 "PhotoPage.c" +#line 16914 "PhotoPage.c" } @@ -16931,7 +16933,7 @@ static GdkPixbuf* library_photo_page_real_get_top_right_trinket (EditingHostPage if (!_tmp1_) { #line 2641 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp0_ = TRUE; -#line 16930 "PhotoPage.c" +#line 16932 "PhotoPage.c" } else { Photo* _tmp2_ = NULL; LibraryPhoto* _tmp3_ = NULL; @@ -16946,7 +16948,7 @@ static GdkPixbuf* library_photo_page_real_get_top_right_trinket (EditingHostPage _tmp0_ = !_tmp4_; #line 2641 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (_tmp3_); -#line 16945 "PhotoPage.c" +#line 16947 "PhotoPage.c" } #line 2641 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp0_) { @@ -16954,7 +16956,7 @@ static GdkPixbuf* library_photo_page_real_get_top_right_trinket (EditingHostPage result = NULL; #line 2642 "/home/jens/Source/shotwell/src/PhotoPage.vala" return result; -#line 16953 "PhotoPage.c" +#line 16955 "PhotoPage.c" } #line 2644 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp5_ = resources_get_icon (RESOURCES_ICON_FLAGGED_TRINKET, RESOURCES_DEFAULT_ICON_SCALE); @@ -16962,7 +16964,7 @@ static GdkPixbuf* library_photo_page_real_get_top_right_trinket (EditingHostPage result = _tmp5_; #line 2644 "/home/jens/Source/shotwell/src/PhotoPage.vala" return result; -#line 16961 "PhotoPage.c" +#line 16963 "PhotoPage.c" } @@ -16992,7 +16994,7 @@ static void library_photo_page_on_slideshow (LibraryPhotoPage* self) { _g_object_unref0 (photo); #line 2650 "/home/jens/Source/shotwell/src/PhotoPage.vala" return; -#line 16991 "PhotoPage.c" +#line 16993 "PhotoPage.c" } #line 2652 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp2_ = app_window_get_instance (); @@ -17022,7 +17024,7 @@ static void library_photo_page_on_slideshow (LibraryPhotoPage* self) { _g_object_unref0 (_tmp3_); #line 2647 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (photo); -#line 17021 "PhotoPage.c" +#line 17023 "PhotoPage.c" } @@ -17041,17 +17043,17 @@ static void library_photo_page_update_zoom_menu_item_sensitivity (LibraryPhotoPa _tmp2_ = zoom_state_is_max (&_tmp1_); #line 2657 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (!_tmp2_) { -#line 17040 "PhotoPage.c" +#line 17042 "PhotoPage.c" gboolean _tmp3_ = FALSE; #line 2657 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp3_ = editing_host_page_get_photo_missing (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage)); #line 2657 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp0_ = !_tmp3_; -#line 17046 "PhotoPage.c" +#line 17048 "PhotoPage.c" } else { #line 2657 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp0_ = FALSE; -#line 17050 "PhotoPage.c" +#line 17052 "PhotoPage.c" } #line 2657 "/home/jens/Source/shotwell/src/PhotoPage.vala" page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "IncreaseSize", _tmp0_); @@ -17061,21 +17063,21 @@ static void library_photo_page_update_zoom_menu_item_sensitivity (LibraryPhotoPa _tmp6_ = zoom_state_is_default (&_tmp5_); #line 2658 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (!_tmp6_) { -#line 17060 "PhotoPage.c" +#line 17062 "PhotoPage.c" gboolean _tmp7_ = FALSE; #line 2658 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp7_ = editing_host_page_get_photo_missing (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage)); #line 2658 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp4_ = !_tmp7_; -#line 17066 "PhotoPage.c" +#line 17068 "PhotoPage.c" } else { #line 2658 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp4_ = FALSE; -#line 17070 "PhotoPage.c" +#line 17072 "PhotoPage.c" } #line 2658 "/home/jens/Source/shotwell/src/PhotoPage.vala" page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "DecreaseSize", _tmp4_); -#line 17074 "PhotoPage.c" +#line 17076 "PhotoPage.c" } @@ -17087,7 +17089,7 @@ static void library_photo_page_real_on_increase_size (EditingHostPage* base) { EDITING_HOST_PAGE_CLASS (library_photo_page_parent_class)->on_increase_size (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage)); #line 2664 "/home/jens/Source/shotwell/src/PhotoPage.vala" library_photo_page_update_zoom_menu_item_sensitivity (self); -#line 17086 "PhotoPage.c" +#line 17088 "PhotoPage.c" } @@ -17099,7 +17101,7 @@ static void library_photo_page_real_on_decrease_size (EditingHostPage* base) { EDITING_HOST_PAGE_CLASS (library_photo_page_parent_class)->on_decrease_size (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage)); #line 2670 "/home/jens/Source/shotwell/src/PhotoPage.vala" library_photo_page_update_zoom_menu_item_sensitivity (self); -#line 17098 "PhotoPage.c" +#line 17100 "PhotoPage.c" } @@ -17125,7 +17127,7 @@ static gboolean library_photo_page_real_on_zoom_slider_key_press (EditingHostPag result = TRUE; #line 2675 "/home/jens/Source/shotwell/src/PhotoPage.vala" return result; -#line 17124 "PhotoPage.c" +#line 17126 "PhotoPage.c" } #line 2677 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp2_ = event; @@ -17141,13 +17143,13 @@ static gboolean library_photo_page_real_on_zoom_slider_key_press (EditingHostPag result = TRUE; #line 2679 "/home/jens/Source/shotwell/src/PhotoPage.vala" return result; -#line 17140 "PhotoPage.c" +#line 17142 "PhotoPage.c" } else { #line 2681 "/home/jens/Source/shotwell/src/PhotoPage.vala" result = FALSE; #line 2681 "/home/jens/Source/shotwell/src/PhotoPage.vala" return result; -#line 17146 "PhotoPage.c" +#line 17148 "PhotoPage.c" } } @@ -17227,7 +17229,7 @@ static void library_photo_page_real_update_ui (EditingHostPage* base, gboolean m _tmp1_ = missing; #line 2724 "/home/jens/Source/shotwell/src/PhotoPage.vala" EDITING_HOST_PAGE_CLASS (library_photo_page_parent_class)->update_ui (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage), _tmp1_); -#line 17226 "PhotoPage.c" +#line 17228 "PhotoPage.c" } @@ -17244,20 +17246,20 @@ static void library_photo_page_real_notify_photo_backing_missing (EditingHostPag _tmp0_ = missing; #line 2728 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp0_) { -#line 17243 "PhotoPage.c" +#line 17245 "PhotoPage.c" Photo* _tmp1_ = NULL; #line 2729 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp1_ = photo; #line 2729 "/home/jens/Source/shotwell/src/PhotoPage.vala" media_source_mark_offline (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_LIBRARY_PHOTO, LibraryPhoto), TYPE_MEDIA_SOURCE, MediaSource)); -#line 17249 "PhotoPage.c" +#line 17251 "PhotoPage.c" } else { Photo* _tmp2_ = NULL; #line 2731 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp2_ = photo; #line 2731 "/home/jens/Source/shotwell/src/PhotoPage.vala" media_source_mark_online (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_LIBRARY_PHOTO, LibraryPhoto), TYPE_MEDIA_SOURCE, MediaSource)); -#line 17256 "PhotoPage.c" +#line 17258 "PhotoPage.c" } #line 2733 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp3_ = photo; @@ -17265,7 +17267,7 @@ static void library_photo_page_real_notify_photo_backing_missing (EditingHostPag _tmp4_ = missing; #line 2733 "/home/jens/Source/shotwell/src/PhotoPage.vala" EDITING_HOST_PAGE_CLASS (library_photo_page_parent_class)->notify_photo_backing_missing (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage), _tmp3_, _tmp4_); -#line 17264 "PhotoPage.c" +#line 17266 "PhotoPage.c" } @@ -17321,7 +17323,7 @@ static gboolean library_photo_page_real_key_press_event (GtkWidget* base, GdkEve g_return_val_if_fail (event != NULL, FALSE); #line 2737 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (GTK_WIDGET_CLASS (library_photo_page_parent_class)->key_press_event != NULL) { -#line 17320 "PhotoPage.c" +#line 17322 "PhotoPage.c" GdkEventKey* _tmp1_ = NULL; gboolean _tmp2_ = FALSE; #line 2737 "/home/jens/Source/shotwell/src/PhotoPage.vala" @@ -17330,11 +17332,11 @@ static gboolean library_photo_page_real_key_press_event (GtkWidget* base, GdkEve _tmp2_ = GTK_WIDGET_CLASS (library_photo_page_parent_class)->key_press_event (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage), gtk_widget_get_type (), GtkWidget), _tmp1_); #line 2737 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp0_ = _tmp2_ == TRUE; -#line 17329 "PhotoPage.c" +#line 17331 "PhotoPage.c" } else { #line 2737 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp0_ = FALSE; -#line 17333 "PhotoPage.c" +#line 17335 "PhotoPage.c" } #line 2737 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp0_) { @@ -17342,7 +17344,7 @@ static gboolean library_photo_page_real_key_press_event (GtkWidget* base, GdkEve result = TRUE; #line 2738 "/home/jens/Source/shotwell/src/PhotoPage.vala" return result; -#line 17341 "PhotoPage.c" +#line 17343 "PhotoPage.c" } #line 2740 "/home/jens/Source/shotwell/src/PhotoPage.vala" handled = TRUE; @@ -17360,7 +17362,7 @@ static gboolean library_photo_page_real_key_press_event (GtkWidget* base, GdkEve if (((_tmp8_ == ((0 != _tmp7_label0) ? _tmp7_label0 : (_tmp7_label0 = g_quark_from_static_string ("Escape")))) || (_tmp8_ == ((0 != _tmp7_label1) ? _tmp7_label1 : (_tmp7_label1 = g_quark_from_static_string ("Return"))))) || (_tmp8_ == ((0 != _tmp7_label2) ? _tmp7_label2 : (_tmp7_label2 = g_quark_from_static_string ("KP_Enter"))))) { #line 2741 "/home/jens/Source/shotwell/src/PhotoPage.vala" switch (0) { -#line 17359 "PhotoPage.c" +#line 17361 "PhotoPage.c" default: { GtkWindow* _tmp9_ = NULL; @@ -17378,193 +17380,193 @@ static gboolean library_photo_page_real_key_press_event (GtkWidget* base, GdkEve if (_tmp11_) { #line 2746 "/home/jens/Source/shotwell/src/PhotoPage.vala" library_photo_page_return_to_collection (self); -#line 17377 "PhotoPage.c" +#line 17379 "PhotoPage.c" } #line 2747 "/home/jens/Source/shotwell/src/PhotoPage.vala" break; -#line 17381 "PhotoPage.c" +#line 17383 "PhotoPage.c" } } } else if (_tmp8_ == ((0 != _tmp7_label3) ? _tmp7_label3 : (_tmp7_label3 = g_quark_from_static_string ("Delete")))) { #line 2741 "/home/jens/Source/shotwell/src/PhotoPage.vala" switch (0) { -#line 17387 "PhotoPage.c" +#line 17389 "PhotoPage.c" default: { #line 2753 "/home/jens/Source/shotwell/src/PhotoPage.vala" page_activate_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "MoveToTrash"); #line 2754 "/home/jens/Source/shotwell/src/PhotoPage.vala" break; -#line 17394 "PhotoPage.c" +#line 17396 "PhotoPage.c" } } } else if ((_tmp8_ == ((0 != _tmp7_label4) ? _tmp7_label4 : (_tmp7_label4 = g_quark_from_static_string ("period")))) || (_tmp8_ == ((0 != _tmp7_label5) ? _tmp7_label5 : (_tmp7_label5 = g_quark_from_static_string ("greater"))))) { #line 2741 "/home/jens/Source/shotwell/src/PhotoPage.vala" switch (0) { -#line 17400 "PhotoPage.c" +#line 17402 "PhotoPage.c" default: { #line 2758 "/home/jens/Source/shotwell/src/PhotoPage.vala" page_activate_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "IncreaseRating"); #line 2759 "/home/jens/Source/shotwell/src/PhotoPage.vala" break; -#line 17407 "PhotoPage.c" +#line 17409 "PhotoPage.c" } } } else if ((_tmp8_ == ((0 != _tmp7_label6) ? _tmp7_label6 : (_tmp7_label6 = g_quark_from_static_string ("comma")))) || (_tmp8_ == ((0 != _tmp7_label7) ? _tmp7_label7 : (_tmp7_label7 = g_quark_from_static_string ("less"))))) { #line 2741 "/home/jens/Source/shotwell/src/PhotoPage.vala" switch (0) { -#line 17413 "PhotoPage.c" +#line 17415 "PhotoPage.c" default: { #line 2763 "/home/jens/Source/shotwell/src/PhotoPage.vala" page_activate_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "DecreaseRating"); #line 2764 "/home/jens/Source/shotwell/src/PhotoPage.vala" break; -#line 17420 "PhotoPage.c" +#line 17422 "PhotoPage.c" } } } else if (_tmp8_ == ((0 != _tmp7_label8) ? _tmp7_label8 : (_tmp7_label8 = g_quark_from_static_string ("KP_1")))) { #line 2741 "/home/jens/Source/shotwell/src/PhotoPage.vala" switch (0) { -#line 17426 "PhotoPage.c" +#line 17428 "PhotoPage.c" default: { #line 2767 "/home/jens/Source/shotwell/src/PhotoPage.vala" page_activate_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RateOne"); #line 2768 "/home/jens/Source/shotwell/src/PhotoPage.vala" break; -#line 17433 "PhotoPage.c" +#line 17435 "PhotoPage.c" } } } else if (_tmp8_ == ((0 != _tmp7_label9) ? _tmp7_label9 : (_tmp7_label9 = g_quark_from_static_string ("KP_2")))) { #line 2741 "/home/jens/Source/shotwell/src/PhotoPage.vala" switch (0) { -#line 17439 "PhotoPage.c" +#line 17441 "PhotoPage.c" default: { #line 2771 "/home/jens/Source/shotwell/src/PhotoPage.vala" page_activate_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RateTwo"); #line 2772 "/home/jens/Source/shotwell/src/PhotoPage.vala" break; -#line 17446 "PhotoPage.c" +#line 17448 "PhotoPage.c" } } } else if (_tmp8_ == ((0 != _tmp7_label10) ? _tmp7_label10 : (_tmp7_label10 = g_quark_from_static_string ("KP_3")))) { #line 2741 "/home/jens/Source/shotwell/src/PhotoPage.vala" switch (0) { -#line 17452 "PhotoPage.c" +#line 17454 "PhotoPage.c" default: { #line 2775 "/home/jens/Source/shotwell/src/PhotoPage.vala" page_activate_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RateThree"); #line 2776 "/home/jens/Source/shotwell/src/PhotoPage.vala" break; -#line 17459 "PhotoPage.c" +#line 17461 "PhotoPage.c" } } } else if (_tmp8_ == ((0 != _tmp7_label11) ? _tmp7_label11 : (_tmp7_label11 = g_quark_from_static_string ("KP_4")))) { #line 2741 "/home/jens/Source/shotwell/src/PhotoPage.vala" switch (0) { -#line 17465 "PhotoPage.c" +#line 17467 "PhotoPage.c" default: { #line 2779 "/home/jens/Source/shotwell/src/PhotoPage.vala" page_activate_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RateFour"); #line 2780 "/home/jens/Source/shotwell/src/PhotoPage.vala" break; -#line 17472 "PhotoPage.c" +#line 17474 "PhotoPage.c" } } } else if (_tmp8_ == ((0 != _tmp7_label12) ? _tmp7_label12 : (_tmp7_label12 = g_quark_from_static_string ("KP_5")))) { #line 2741 "/home/jens/Source/shotwell/src/PhotoPage.vala" switch (0) { -#line 17478 "PhotoPage.c" +#line 17480 "PhotoPage.c" default: { #line 2783 "/home/jens/Source/shotwell/src/PhotoPage.vala" page_activate_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RateFive"); #line 2784 "/home/jens/Source/shotwell/src/PhotoPage.vala" break; -#line 17485 "PhotoPage.c" +#line 17487 "PhotoPage.c" } } } else if (_tmp8_ == ((0 != _tmp7_label13) ? _tmp7_label13 : (_tmp7_label13 = g_quark_from_static_string ("KP_0")))) { #line 2741 "/home/jens/Source/shotwell/src/PhotoPage.vala" switch (0) { -#line 17491 "PhotoPage.c" +#line 17493 "PhotoPage.c" default: { #line 2787 "/home/jens/Source/shotwell/src/PhotoPage.vala" page_activate_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RateUnrated"); #line 2788 "/home/jens/Source/shotwell/src/PhotoPage.vala" break; -#line 17498 "PhotoPage.c" +#line 17500 "PhotoPage.c" } } } else if (_tmp8_ == ((0 != _tmp7_label14) ? _tmp7_label14 : (_tmp7_label14 = g_quark_from_static_string ("KP_9")))) { #line 2741 "/home/jens/Source/shotwell/src/PhotoPage.vala" switch (0) { -#line 17504 "PhotoPage.c" +#line 17506 "PhotoPage.c" default: { #line 2791 "/home/jens/Source/shotwell/src/PhotoPage.vala" page_activate_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RateRejected"); #line 2792 "/home/jens/Source/shotwell/src/PhotoPage.vala" break; -#line 17511 "PhotoPage.c" +#line 17513 "PhotoPage.c" } } } else if (_tmp8_ == ((0 != _tmp7_label15) ? _tmp7_label15 : (_tmp7_label15 = g_quark_from_static_string ("bracketright")))) { #line 2741 "/home/jens/Source/shotwell/src/PhotoPage.vala" switch (0) { -#line 17517 "PhotoPage.c" +#line 17519 "PhotoPage.c" default: { #line 2795 "/home/jens/Source/shotwell/src/PhotoPage.vala" page_activate_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RotateClockwise"); #line 2796 "/home/jens/Source/shotwell/src/PhotoPage.vala" break; -#line 17524 "PhotoPage.c" +#line 17526 "PhotoPage.c" } } } else if (_tmp8_ == ((0 != _tmp7_label16) ? _tmp7_label16 : (_tmp7_label16 = g_quark_from_static_string ("bracketleft")))) { #line 2741 "/home/jens/Source/shotwell/src/PhotoPage.vala" switch (0) { -#line 17530 "PhotoPage.c" +#line 17532 "PhotoPage.c" default: { #line 2799 "/home/jens/Source/shotwell/src/PhotoPage.vala" page_activate_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RotateCounterclockwise"); #line 2800 "/home/jens/Source/shotwell/src/PhotoPage.vala" break; -#line 17537 "PhotoPage.c" +#line 17539 "PhotoPage.c" } } } else if (_tmp8_ == ((0 != _tmp7_label17) ? _tmp7_label17 : (_tmp7_label17 = g_quark_from_static_string ("slash")))) { #line 2741 "/home/jens/Source/shotwell/src/PhotoPage.vala" switch (0) { -#line 17543 "PhotoPage.c" +#line 17545 "PhotoPage.c" default: { #line 2803 "/home/jens/Source/shotwell/src/PhotoPage.vala" page_activate_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Flag"); #line 2804 "/home/jens/Source/shotwell/src/PhotoPage.vala" break; -#line 17550 "PhotoPage.c" +#line 17552 "PhotoPage.c" } } } else { #line 2741 "/home/jens/Source/shotwell/src/PhotoPage.vala" switch (0) { -#line 17556 "PhotoPage.c" +#line 17558 "PhotoPage.c" default: { #line 2807 "/home/jens/Source/shotwell/src/PhotoPage.vala" handled = FALSE; #line 2808 "/home/jens/Source/shotwell/src/PhotoPage.vala" break; -#line 17563 "PhotoPage.c" +#line 17565 "PhotoPage.c" } } } @@ -17572,7 +17574,7 @@ static gboolean library_photo_page_real_key_press_event (GtkWidget* base, GdkEve result = handled; #line 2811 "/home/jens/Source/shotwell/src/PhotoPage.vala" return result; -#line 17571 "PhotoPage.c" +#line 17573 "PhotoPage.c" } @@ -17595,7 +17597,7 @@ static gboolean library_photo_page_real_on_double_click (EditingHostPage* base, if (_tmp1_ == NULL) { #line 2815 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (_tmp0_); -#line 17594 "PhotoPage.c" +#line 17596 "PhotoPage.c" } #line 2815 "/home/jens/Source/shotwell/src/PhotoPage.vala" fs = _tmp1_; @@ -17605,14 +17607,14 @@ static gboolean library_photo_page_real_on_double_click (EditingHostPage* base, if (_tmp2_ == NULL) { #line 2817 "/home/jens/Source/shotwell/src/PhotoPage.vala" self->priv->return_to_collection_on_release = TRUE; -#line 17604 "PhotoPage.c" +#line 17606 "PhotoPage.c" } else { FullscreenWindow* _tmp3_ = NULL; #line 2819 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp3_ = fs; #line 2819 "/home/jens/Source/shotwell/src/PhotoPage.vala" fullscreen_window_close (_tmp3_); -#line 17611 "PhotoPage.c" +#line 17613 "PhotoPage.c" } #line 2821 "/home/jens/Source/shotwell/src/PhotoPage.vala" result = TRUE; @@ -17620,7 +17622,7 @@ static gboolean library_photo_page_real_on_double_click (EditingHostPage* base, _g_object_unref0 (fs); #line 2821 "/home/jens/Source/shotwell/src/PhotoPage.vala" return result; -#line 17619 "PhotoPage.c" +#line 17621 "PhotoPage.c" } @@ -17646,7 +17648,7 @@ static gboolean library_photo_page_real_on_left_released (Page* base, GdkEventBu result = TRUE; #line 2829 "/home/jens/Source/shotwell/src/PhotoPage.vala" return result; -#line 17645 "PhotoPage.c" +#line 17647 "PhotoPage.c" } #line 2832 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp1_ = event; @@ -17656,7 +17658,7 @@ static gboolean library_photo_page_real_on_left_released (Page* base, GdkEventBu result = _tmp2_; #line 2832 "/home/jens/Source/shotwell/src/PhotoPage.vala" return result; -#line 17655 "PhotoPage.c" +#line 17657 "PhotoPage.c" } @@ -17671,7 +17673,7 @@ static GtkMenu* library_photo_page_get_context_menu (LibraryPhotoPage* self) { _tmp0_ = self->priv->context_menu; #line 2838 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp0_ == NULL) { -#line 17670 "PhotoPage.c" +#line 17672 "PhotoPage.c" GMenuModel* model = NULL; GtkBuilder* _tmp1_ = NULL; GObject* _tmp2_ = NULL; @@ -17703,7 +17705,7 @@ static GtkMenu* library_photo_page_get_context_menu (LibraryPhotoPage* self) { gtk_menu_attach_to_widget (_tmp6_, G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget), NULL); #line 2838 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (model); -#line 17702 "PhotoPage.c" +#line 17704 "PhotoPage.c" } #line 2845 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp7_ = self->priv->context_menu; @@ -17713,7 +17715,7 @@ static GtkMenu* library_photo_page_get_context_menu (LibraryPhotoPage* self) { result = _tmp8_; #line 2845 "/home/jens/Source/shotwell/src/PhotoPage.vala" return result; -#line 17712 "PhotoPage.c" +#line 17714 "PhotoPage.c" } @@ -17741,7 +17743,7 @@ static gboolean library_photo_page_real_on_context_buttonpress (Page* base, GdkE result = TRUE; #line 2851 "/home/jens/Source/shotwell/src/PhotoPage.vala" return result; -#line 17740 "PhotoPage.c" +#line 17742 "PhotoPage.c" } @@ -17764,7 +17766,7 @@ static gboolean library_photo_page_real_on_context_keypress (Page* base) { result = TRUE; #line 2857 "/home/jens/Source/shotwell/src/PhotoPage.vala" return result; -#line 17763 "PhotoPage.c" +#line 17765 "PhotoPage.c" } @@ -17776,7 +17778,7 @@ static void library_photo_page_return_to_collection (LibraryPhotoPage* self) { _tmp0_ = self->priv->return_page; #line 2862 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (NULL != _tmp0_) { -#line 17775 "PhotoPage.c" +#line 17777 "PhotoPage.c" LibraryWindow* _tmp1_ = NULL; LibraryWindow* _tmp2_ = NULL; CollectionPage* _tmp3_ = NULL; @@ -17790,7 +17792,7 @@ static void library_photo_page_return_to_collection (LibraryPhotoPage* self) { library_window_switch_to_page (_tmp2_, G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_PAGE, Page)); #line 2863 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (_tmp2_); -#line 17789 "PhotoPage.c" +#line 17791 "PhotoPage.c" } else { LibraryWindow* _tmp4_ = NULL; LibraryWindow* _tmp5_ = NULL; @@ -17802,7 +17804,7 @@ static void library_photo_page_return_to_collection (LibraryPhotoPage* self) { library_window_switch_to_library_page (_tmp5_); #line 2865 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (_tmp5_); -#line 17801 "PhotoPage.c" +#line 17803 "PhotoPage.c" } } @@ -17821,7 +17823,7 @@ static void library_photo_page_on_remove_from_library (LibraryPhotoPage* self) { #line 2869 "/home/jens/Source/shotwell/src/PhotoPage.vala" photo = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_LIBRARY_PHOTO, LibraryPhoto); #line 2871 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp1_ = gee_array_list_new (TYPE_LIBRARY_PHOTO, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL); + _tmp1_ = gee_array_list_new (TYPE_LIBRARY_PHOTO, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL); #line 2871 "/home/jens/Source/shotwell/src/PhotoPage.vala" photos = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_COLLECTION, GeeCollection); #line 2872 "/home/jens/Source/shotwell/src/PhotoPage.vala" @@ -17836,7 +17838,7 @@ static void library_photo_page_on_remove_from_library (LibraryPhotoPage* self) { _g_object_unref0 (photos); #line 2868 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (photo); -#line 17835 "PhotoPage.c" +#line 17837 "PhotoPage.c" } @@ -17869,13 +17871,13 @@ static void library_photo_page_on_move_to_trash (LibraryPhotoPage* self) { if (!_tmp0_) { #line 2879 "/home/jens/Source/shotwell/src/PhotoPage.vala" return; -#line 17868 "PhotoPage.c" +#line 17870 "PhotoPage.c" } #line 2886 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp1_ = self->priv->return_page; #line 2886 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp1_, TYPE_EVENT_PAGE)) { -#line 17874 "PhotoPage.c" +#line 17876 "PhotoPage.c" LibraryWindow* _tmp2_ = NULL; LibraryWindow* _tmp3_ = NULL; #line 2887 "/home/jens/Source/shotwell/src/PhotoPage.vala" @@ -17886,14 +17888,14 @@ static void library_photo_page_on_move_to_trash (LibraryPhotoPage* self) { library_window_set_page_switching_enabled (_tmp3_, FALSE); #line 2887 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (_tmp3_); -#line 17885 "PhotoPage.c" +#line 17887 "PhotoPage.c" } #line 2890 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp4_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage)); #line 2890 "/home/jens/Source/shotwell/src/PhotoPage.vala" photo = G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_LIBRARY_PHOTO, LibraryPhoto); #line 2892 "/home/jens/Source/shotwell/src/PhotoPage.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 2892 "/home/jens/Source/shotwell/src/PhotoPage.vala" photos = G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, GEE_TYPE_COLLECTION, GeeCollection); #line 2893 "/home/jens/Source/shotwell/src/PhotoPage.vala" @@ -17918,7 +17920,7 @@ static void library_photo_page_on_move_to_trash (LibraryPhotoPage* self) { _g_object_unref0 (_tmp10_); #line 2900 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp12_) { -#line 17917 "PhotoPage.c" +#line 17919 "PhotoPage.c" LibraryWindow* _tmp13_ = NULL; LibraryWindow* _tmp14_ = NULL; GtkWindow* _tmp15_ = NULL; @@ -17944,7 +17946,7 @@ static void library_photo_page_on_move_to_trash (LibraryPhotoPage* self) { _g_object_unref0 (_tmp16_); #line 2905 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp17_) { -#line 17943 "PhotoPage.c" +#line 17945 "PhotoPage.c" GtkWindow* _tmp18_ = NULL; FullscreenWindow* _tmp19_ = NULL; #line 2906 "/home/jens/Source/shotwell/src/PhotoPage.vala" @@ -17955,7 +17957,7 @@ static void library_photo_page_on_move_to_trash (LibraryPhotoPage* self) { fullscreen_window_close (_tmp19_); #line 2906 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (_tmp19_); -#line 17954 "PhotoPage.c" +#line 17956 "PhotoPage.c" } #line 2908 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp20_ = library_window_get_app (); @@ -17965,7 +17967,7 @@ static void library_photo_page_on_move_to_trash (LibraryPhotoPage* self) { library_window_switch_to_library_page (_tmp21_); #line 2908 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (_tmp21_); -#line 17964 "PhotoPage.c" +#line 17966 "PhotoPage.c" } #line 2911 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp22_ = page_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); @@ -17995,7 +17997,7 @@ static void library_photo_page_on_move_to_trash (LibraryPhotoPage* self) { _g_object_unref0 (photos); #line 2877 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (photo); -#line 17994 "PhotoPage.c" +#line 17996 "PhotoPage.c" } @@ -18007,7 +18009,7 @@ static void library_photo_page_on_flag_unflag (LibraryPhotoPage* self) { _tmp0_ = editing_host_page_has_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage)); #line 2916 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp0_) { -#line 18006 "PhotoPage.c" +#line 18008 "PhotoPage.c" GeeArrayList* photo_list = NULL; GeeArrayList* _tmp1_ = NULL; GeeArrayList* _tmp2_ = NULL; @@ -18022,7 +18024,7 @@ static void library_photo_page_on_flag_unflag (LibraryPhotoPage* self) { FlagUnflagCommand* _tmp11_ = NULL; FlagUnflagCommand* _tmp12_ = NULL; #line 2917 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp1_ = gee_array_list_new (TYPE_MEDIA_SOURCE, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL); + _tmp1_ = gee_array_list_new (TYPE_MEDIA_SOURCE, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL); #line 2917 "/home/jens/Source/shotwell/src/PhotoPage.vala" photo_list = _tmp1_; #line 2918 "/home/jens/Source/shotwell/src/PhotoPage.vala" @@ -18061,7 +18063,7 @@ static void library_photo_page_on_flag_unflag (LibraryPhotoPage* self) { _command_manager_unref0 (_tmp6_); #line 2916 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (photo_list); -#line 18060 "PhotoPage.c" +#line 18062 "PhotoPage.c" } } @@ -18076,7 +18078,7 @@ static void library_photo_page_on_photo_destroyed (LibraryPhotoPage* self, DataS _tmp0_ = source; #line 2925 "/home/jens/Source/shotwell/src/PhotoPage.vala" library_photo_page_on_photo_removed (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_LIBRARY_PHOTO, LibraryPhoto)); -#line 18075 "PhotoPage.c" +#line 18077 "PhotoPage.c" } @@ -18108,7 +18110,7 @@ static void library_photo_page_on_photo_removed (LibraryPhotoPage* self, Library if (_tmp1_ == NULL) { #line 2930 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp0_ = TRUE; -#line 18107 "PhotoPage.c" +#line 18109 "PhotoPage.c" } else { LibraryPhoto* _tmp2_ = NULL; Photo* _tmp3_ = NULL; @@ -18126,13 +18128,13 @@ static void library_photo_page_on_photo_removed (LibraryPhotoPage* self, Library _tmp0_ = !_tmp5_; #line 2930 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (_tmp4_); -#line 18125 "PhotoPage.c" +#line 18127 "PhotoPage.c" } #line 2930 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp0_) { #line 2931 "/home/jens/Source/shotwell/src/PhotoPage.vala" return; -#line 18131 "PhotoPage.c" +#line 18133 "PhotoPage.c" } #line 2934 "/home/jens/Source/shotwell/src/PhotoPage.vala" single_photo_page_on_next_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage)); @@ -18176,7 +18178,7 @@ static void library_photo_page_on_photo_removed (LibraryPhotoPage* self, Library _g_object_unref0 (_tmp17_); #line 2938 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp19_) { -#line 18175 "PhotoPage.c" +#line 18177 "PhotoPage.c" LibraryWindow* _tmp20_ = NULL; LibraryWindow* _tmp21_ = NULL; #line 2941 "/home/jens/Source/shotwell/src/PhotoPage.vala" @@ -18187,11 +18189,11 @@ static void library_photo_page_on_photo_removed (LibraryPhotoPage* self, Library library_window_switch_to_library_page (_tmp21_); #line 2941 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (_tmp21_); -#line 18186 "PhotoPage.c" +#line 18188 "PhotoPage.c" } #line 2928 "/home/jens/Source/shotwell/src/PhotoPage.vala" _data_collection_unref0 (view); -#line 18190 "PhotoPage.c" +#line 18192 "PhotoPage.c" } @@ -18214,7 +18216,7 @@ static void library_photo_page_on_print (LibraryPhotoPage* self) { _data_collection_unref0 (_tmp1_); #line 2946 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp3_) { -#line 18213 "PhotoPage.c" +#line 18215 "PhotoPage.c" PrintManager* _tmp4_ = NULL; PrintManager* _tmp5_ = NULL; ViewCollection* _tmp6_ = NULL; @@ -18241,7 +18243,7 @@ static void library_photo_page_on_print (LibraryPhotoPage* self) { _data_collection_unref0 (_tmp7_); #line 2947 "/home/jens/Source/shotwell/src/PhotoPage.vala" _print_manager_unref0 (_tmp5_); -#line 18240 "PhotoPage.c" +#line 18242 "PhotoPage.c" } } @@ -18255,7 +18257,7 @@ static void library_photo_page_on_external_app_changed (LibraryPhotoPage* self) _tmp1_ = editing_host_page_has_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage)); #line 2953 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp1_) { -#line 18254 "PhotoPage.c" +#line 18256 "PhotoPage.c" ConfigFacade* _tmp2_ = NULL; ConfigFacade* _tmp3_ = NULL; gchar* _tmp4_ = NULL; @@ -18274,15 +18276,15 @@ static void library_photo_page_on_external_app_changed (LibraryPhotoPage* self) _g_free0 (_tmp5_); #line 2954 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (_tmp3_); -#line 18273 "PhotoPage.c" +#line 18275 "PhotoPage.c" } else { #line 2953 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp0_ = FALSE; -#line 18277 "PhotoPage.c" +#line 18279 "PhotoPage.c" } #line 2953 "/home/jens/Source/shotwell/src/PhotoPage.vala" page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "ExternalEdit", _tmp0_); -#line 18281 "PhotoPage.c" +#line 18283 "PhotoPage.c" } @@ -18297,7 +18299,7 @@ static void library_photo_page_on_external_edit (LibraryPhotoPage* self) { if (!_tmp0_) { #line 2959 "/home/jens/Source/shotwell/src/PhotoPage.vala" return; -#line 18296 "PhotoPage.c" +#line 18298 "PhotoPage.c" } { AppWindow* _tmp1_ = NULL; @@ -18324,7 +18326,7 @@ static void library_photo_page_on_external_edit (LibraryPhotoPage* self) { _g_object_unref0 (_tmp4_); #line 2963 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 18323 "PhotoPage.c" +#line 18325 "PhotoPage.c" goto __catch251_g_error; } #line 2964 "/home/jens/Source/shotwell/src/PhotoPage.vala" @@ -18335,7 +18337,7 @@ static void library_photo_page_on_external_edit (LibraryPhotoPage* self) { page_window_set_normal_cursor (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, TYPE_PAGE_WINDOW, PageWindow)); #line 2964 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (_tmp6_); -#line 18334 "PhotoPage.c" +#line 18336 "PhotoPage.c" } goto __finally251; __catch251_g_error: @@ -18370,7 +18372,7 @@ static void library_photo_page_on_external_edit (LibraryPhotoPage* self) { _g_object_unref0 (_tmp11_); #line 2961 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_error_free0 (err); -#line 18369 "PhotoPage.c" +#line 18371 "PhotoPage.c" } __finally251: #line 2961 "/home/jens/Source/shotwell/src/PhotoPage.vala" @@ -18381,7 +18383,7 @@ static void library_photo_page_on_external_edit (LibraryPhotoPage* self) { g_clear_error (&_inner_error_); #line 2961 "/home/jens/Source/shotwell/src/PhotoPage.vala" return; -#line 18380 "PhotoPage.c" +#line 18382 "PhotoPage.c" } } @@ -18401,7 +18403,7 @@ static void library_photo_page_on_external_edit_raw (LibraryPhotoPage* self) { if (!_tmp0_) { #line 2974 "/home/jens/Source/shotwell/src/PhotoPage.vala" return; -#line 18400 "PhotoPage.c" +#line 18402 "PhotoPage.c" } #line 2976 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp1_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage)); @@ -18417,7 +18419,7 @@ static void library_photo_page_on_external_edit_raw (LibraryPhotoPage* self) { if (_tmp4_) { #line 2977 "/home/jens/Source/shotwell/src/PhotoPage.vala" return; -#line 18416 "PhotoPage.c" +#line 18418 "PhotoPage.c" } { AppWindow* _tmp5_ = NULL; @@ -18444,7 +18446,7 @@ static void library_photo_page_on_external_edit_raw (LibraryPhotoPage* self) { _g_object_unref0 (_tmp8_); #line 2981 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 18443 "PhotoPage.c" +#line 18445 "PhotoPage.c" goto __catch252_g_error; } #line 2982 "/home/jens/Source/shotwell/src/PhotoPage.vala" @@ -18455,7 +18457,7 @@ static void library_photo_page_on_external_edit_raw (LibraryPhotoPage* self) { page_window_set_normal_cursor (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, TYPE_PAGE_WINDOW, PageWindow)); #line 2982 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (_tmp10_); -#line 18454 "PhotoPage.c" +#line 18456 "PhotoPage.c" } goto __finally252; __catch252_g_error: @@ -18490,7 +18492,7 @@ static void library_photo_page_on_external_edit_raw (LibraryPhotoPage* self) { _g_free0 (_tmp15_); #line 2979 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_error_free0 (err); -#line 18489 "PhotoPage.c" +#line 18491 "PhotoPage.c" } __finally252: #line 2979 "/home/jens/Source/shotwell/src/PhotoPage.vala" @@ -18501,7 +18503,7 @@ static void library_photo_page_on_external_edit_raw (LibraryPhotoPage* self) { g_clear_error (&_inner_error_); #line 2979 "/home/jens/Source/shotwell/src/PhotoPage.vala" return; -#line 18500 "PhotoPage.c" +#line 18502 "PhotoPage.c" } } @@ -18514,7 +18516,7 @@ static void library_photo_page_on_send_to (LibraryPhotoPage* self) { _tmp0_ = editing_host_page_has_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage)); #line 2990 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp0_) { -#line 18513 "PhotoPage.c" +#line 18515 "PhotoPage.c" ViewCollection* _tmp1_ = NULL; ViewCollection* _tmp2_ = NULL; GeeList* _tmp3_ = NULL; @@ -18533,7 +18535,7 @@ static void library_photo_page_on_send_to (LibraryPhotoPage* self) { _g_object_unref0 (_tmp4_); #line 2991 "/home/jens/Source/shotwell/src/PhotoPage.vala" _data_collection_unref0 (_tmp2_); -#line 18532 "PhotoPage.c" +#line 18534 "PhotoPage.c" } } @@ -18573,7 +18575,7 @@ static void library_photo_page_on_export (LibraryPhotoPage* self) { if (!_tmp0_) { #line 2996 "/home/jens/Source/shotwell/src/PhotoPage.vala" return; -#line 18572 "PhotoPage.c" +#line 18574 "PhotoPage.c" } #line 2998 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp1_ = _ ("Export Photo"); @@ -18601,7 +18603,7 @@ static void library_photo_page_on_export (LibraryPhotoPage* self) { _g_object_unref0 (export_dialog); #line 3004 "/home/jens/Source/shotwell/src/PhotoPage.vala" return; -#line 18600 "PhotoPage.c" +#line 18602 "PhotoPage.c" } #line 3006 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp8_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage)); @@ -18633,7 +18635,7 @@ static void library_photo_page_on_export (LibraryPhotoPage* self) { _g_object_unref0 (export_dialog); #line 3009 "/home/jens/Source/shotwell/src/PhotoPage.vala" return; -#line 18632 "PhotoPage.c" +#line 18634 "PhotoPage.c" } #line 3011 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp16_ = constraint; @@ -18643,7 +18645,7 @@ static void library_photo_page_on_export (LibraryPhotoPage* self) { scaling_for_constraint (_tmp16_, _tmp17_, FALSE, &_tmp18_); #line 3011 "/home/jens/Source/shotwell/src/PhotoPage.vala" scaling = _tmp18_; -#line 18642 "PhotoPage.c" +#line 18644 "PhotoPage.c" { Photo* _tmp19_ = NULL; Photo* _tmp20_ = NULL; @@ -18695,7 +18697,7 @@ static void library_photo_page_on_export (LibraryPhotoPage* self) { _g_object_unref0 (_tmp20_); #line 3014 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 18694 "PhotoPage.c" +#line 18696 "PhotoPage.c" goto __catch253_g_error; } } @@ -18739,7 +18741,7 @@ static void library_photo_page_on_export (LibraryPhotoPage* self) { _g_free0 (_tmp36_); #line 3013 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_error_free0 (err); -#line 18738 "PhotoPage.c" +#line 18740 "PhotoPage.c" } __finally253: #line 3013 "/home/jens/Source/shotwell/src/PhotoPage.vala" @@ -18754,13 +18756,13 @@ static void library_photo_page_on_export (LibraryPhotoPage* self) { g_clear_error (&_inner_error_); #line 3013 "/home/jens/Source/shotwell/src/PhotoPage.vala" return; -#line 18753 "PhotoPage.c" +#line 18755 "PhotoPage.c" } #line 2994 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (save_as); #line 2994 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (export_dialog); -#line 18759 "PhotoPage.c" +#line 18761 "PhotoPage.c" } @@ -18783,7 +18785,7 @@ static void library_photo_page_on_publish (LibraryPhotoPage* self) { _data_collection_unref0 (_tmp1_); #line 3023 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp3_) { -#line 18782 "PhotoPage.c" +#line 18784 "PhotoPage.c" ViewCollection* _tmp4_ = NULL; ViewCollection* _tmp5_ = NULL; GeeList* _tmp6_ = NULL; @@ -18802,7 +18804,7 @@ static void library_photo_page_on_publish (LibraryPhotoPage* self) { _g_object_unref0 (_tmp7_); #line 3024 "/home/jens/Source/shotwell/src/PhotoPage.vala" _data_collection_unref0 (_tmp5_); -#line 18801 "PhotoPage.c" +#line 18803 "PhotoPage.c" } } @@ -18826,20 +18828,20 @@ static void library_photo_page_on_increase_rating (LibraryPhotoPage* self) { if (!_tmp1_) { #line 3029 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp0_ = TRUE; -#line 18825 "PhotoPage.c" +#line 18827 "PhotoPage.c" } else { gboolean _tmp2_ = FALSE; #line 3029 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp2_ = editing_host_page_get_photo_missing (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage)); #line 3029 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp0_ = _tmp2_; -#line 18832 "PhotoPage.c" +#line 18834 "PhotoPage.c" } #line 3029 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp0_) { #line 3030 "/home/jens/Source/shotwell/src/PhotoPage.vala" return; -#line 18838 "PhotoPage.c" +#line 18840 "PhotoPage.c" } #line 3032 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp3_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage)); @@ -18867,7 +18869,7 @@ static void library_photo_page_on_increase_rating (LibraryPhotoPage* self) { library_photo_page_update_rating_menu_item_sensitivity (self); #line 3028 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (command); -#line 18866 "PhotoPage.c" +#line 18868 "PhotoPage.c" } @@ -18890,20 +18892,20 @@ static void library_photo_page_on_decrease_rating (LibraryPhotoPage* self) { if (!_tmp1_) { #line 3039 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp0_ = TRUE; -#line 18889 "PhotoPage.c" +#line 18891 "PhotoPage.c" } else { gboolean _tmp2_ = FALSE; #line 3039 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp2_ = editing_host_page_get_photo_missing (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage)); #line 3039 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp0_ = _tmp2_; -#line 18896 "PhotoPage.c" +#line 18898 "PhotoPage.c" } #line 3039 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp0_) { #line 3040 "/home/jens/Source/shotwell/src/PhotoPage.vala" return; -#line 18902 "PhotoPage.c" +#line 18904 "PhotoPage.c" } #line 3042 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp3_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage)); @@ -18931,7 +18933,7 @@ static void library_photo_page_on_decrease_rating (LibraryPhotoPage* self) { library_photo_page_update_rating_menu_item_sensitivity (self); #line 3038 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (command); -#line 18930 "PhotoPage.c" +#line 18932 "PhotoPage.c" } @@ -18955,20 +18957,20 @@ static void library_photo_page_on_set_rating (LibraryPhotoPage* self, Rating rat if (!_tmp1_) { #line 3049 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp0_ = TRUE; -#line 18954 "PhotoPage.c" +#line 18956 "PhotoPage.c" } else { gboolean _tmp2_ = FALSE; #line 3049 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp2_ = editing_host_page_get_photo_missing (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage)); #line 3049 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp0_ = _tmp2_; -#line 18961 "PhotoPage.c" +#line 18963 "PhotoPage.c" } #line 3049 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp0_) { #line 3050 "/home/jens/Source/shotwell/src/PhotoPage.vala" return; -#line 18967 "PhotoPage.c" +#line 18969 "PhotoPage.c" } #line 3052 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp3_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage)); @@ -18998,7 +19000,7 @@ static void library_photo_page_on_set_rating (LibraryPhotoPage* self, Rating rat library_photo_page_update_rating_menu_item_sensitivity (self); #line 3048 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (command); -#line 18997 "PhotoPage.c" +#line 18999 "PhotoPage.c" } @@ -19007,7 +19009,7 @@ static void library_photo_page_on_rate_rejected (LibraryPhotoPage* self) { g_return_if_fail (IS_LIBRARY_PHOTO_PAGE (self)); #line 3059 "/home/jens/Source/shotwell/src/PhotoPage.vala" library_photo_page_on_set_rating (self, RATING_REJECTED); -#line 19006 "PhotoPage.c" +#line 19008 "PhotoPage.c" } @@ -19016,7 +19018,7 @@ static void library_photo_page_on_rate_unrated (LibraryPhotoPage* self) { g_return_if_fail (IS_LIBRARY_PHOTO_PAGE (self)); #line 3063 "/home/jens/Source/shotwell/src/PhotoPage.vala" library_photo_page_on_set_rating (self, RATING_UNRATED); -#line 19015 "PhotoPage.c" +#line 19017 "PhotoPage.c" } @@ -19025,7 +19027,7 @@ static void library_photo_page_on_rate_one (LibraryPhotoPage* self) { g_return_if_fail (IS_LIBRARY_PHOTO_PAGE (self)); #line 3067 "/home/jens/Source/shotwell/src/PhotoPage.vala" library_photo_page_on_set_rating (self, RATING_ONE); -#line 19024 "PhotoPage.c" +#line 19026 "PhotoPage.c" } @@ -19034,7 +19036,7 @@ static void library_photo_page_on_rate_two (LibraryPhotoPage* self) { g_return_if_fail (IS_LIBRARY_PHOTO_PAGE (self)); #line 3071 "/home/jens/Source/shotwell/src/PhotoPage.vala" library_photo_page_on_set_rating (self, RATING_TWO); -#line 19033 "PhotoPage.c" +#line 19035 "PhotoPage.c" } @@ -19043,7 +19045,7 @@ static void library_photo_page_on_rate_three (LibraryPhotoPage* self) { g_return_if_fail (IS_LIBRARY_PHOTO_PAGE (self)); #line 3075 "/home/jens/Source/shotwell/src/PhotoPage.vala" library_photo_page_on_set_rating (self, RATING_THREE); -#line 19042 "PhotoPage.c" +#line 19044 "PhotoPage.c" } @@ -19052,7 +19054,7 @@ static void library_photo_page_on_rate_four (LibraryPhotoPage* self) { g_return_if_fail (IS_LIBRARY_PHOTO_PAGE (self)); #line 3079 "/home/jens/Source/shotwell/src/PhotoPage.vala" library_photo_page_on_set_rating (self, RATING_FOUR); -#line 19051 "PhotoPage.c" +#line 19053 "PhotoPage.c" } @@ -19061,7 +19063,7 @@ static void library_photo_page_on_rate_five (LibraryPhotoPage* self) { g_return_if_fail (IS_LIBRARY_PHOTO_PAGE (self)); #line 3083 "/home/jens/Source/shotwell/src/PhotoPage.vala" library_photo_page_on_set_rating (self, RATING_FIVE); -#line 19060 "PhotoPage.c" +#line 19062 "PhotoPage.c" } @@ -19191,21 +19193,21 @@ static void library_photo_page_update_rating_menu_item_sensitivity (LibraryPhoto page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "DecreaseRating", _tmp28_); #line 3095 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (_tmp26_); -#line 19190 "PhotoPage.c" +#line 19192 "PhotoPage.c" } static GVariant* _variant_new18 (const gchar* value) { #line 3107 "/home/jens/Source/shotwell/src/PhotoPage.vala" return g_variant_ref_sink (g_variant_new_string (value)); -#line 19197 "PhotoPage.c" +#line 19199 "PhotoPage.c" } static GVariant* _variant_new19 (const gchar* value) { #line 3112 "/home/jens/Source/shotwell/src/PhotoPage.vala" return g_variant_ref_sink (g_variant_new_string (value)); -#line 19204 "PhotoPage.c" +#line 19206 "PhotoPage.c" } @@ -19239,7 +19241,7 @@ static void library_photo_page_update_development_menu_item_sensitivity (Library _tmp5_ = format; #line 3102 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp5_ == PHOTO_FILE_FORMAT_RAW) { -#line 19238 "PhotoPage.c" +#line 19240 "PhotoPage.c" Photo* _tmp6_ = NULL; Photo* _tmp7_ = NULL; RawDeveloper _tmp8_ = 0; @@ -19258,7 +19260,7 @@ static void library_photo_page_update_development_menu_item_sensitivity (Library switch (_tmp9_) { #line 3105 "/home/jens/Source/shotwell/src/PhotoPage.vala" case RAW_DEVELOPER_SHOTWELL: -#line 19257 "PhotoPage.c" +#line 19259 "PhotoPage.c" { GAction* _tmp10_ = NULL; GAction* _tmp11_ = NULL; @@ -19277,13 +19279,13 @@ static void library_photo_page_update_development_menu_item_sensitivity (Library _g_object_unref0 (_tmp11_); #line 3108 "/home/jens/Source/shotwell/src/PhotoPage.vala" break; -#line 19276 "PhotoPage.c" +#line 19278 "PhotoPage.c" } #line 3105 "/home/jens/Source/shotwell/src/PhotoPage.vala" case RAW_DEVELOPER_CAMERA: #line 3105 "/home/jens/Source/shotwell/src/PhotoPage.vala" case RAW_DEVELOPER_EMBEDDED: -#line 19282 "PhotoPage.c" +#line 19284 "PhotoPage.c" { GAction* _tmp13_ = NULL; GAction* _tmp14_ = NULL; @@ -19302,13 +19304,13 @@ static void library_photo_page_update_development_menu_item_sensitivity (Library _g_object_unref0 (_tmp14_); #line 3113 "/home/jens/Source/shotwell/src/PhotoPage.vala" break; -#line 19301 "PhotoPage.c" +#line 19303 "PhotoPage.c" } default: { #line 3116 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_assert_not_reached (); -#line 19307 "PhotoPage.c" +#line 19309 "PhotoPage.c" } } } @@ -19340,7 +19342,7 @@ static void library_photo_page_on_metadata_altered (LibraryPhotoPage* self, GeeM _g_object_unref0 (_tmp3_); #line 3122 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp5_) { -#line 19339 "PhotoPage.c" +#line 19341 "PhotoPage.c" GeeMap* _tmp6_ = NULL; Photo* _tmp7_ = NULL; Photo* _tmp8_ = NULL; @@ -19365,17 +19367,17 @@ static void library_photo_page_on_metadata_altered (LibraryPhotoPage* self, GeeM _alteration_unref0 (_tmp10_); #line 3122 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (_tmp8_); -#line 19364 "PhotoPage.c" +#line 19366 "PhotoPage.c" } else { #line 3122 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp0_ = FALSE; -#line 19368 "PhotoPage.c" +#line 19370 "PhotoPage.c" } #line 3122 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp0_) { #line 3123 "/home/jens/Source/shotwell/src/PhotoPage.vala" single_photo_page_repaint (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), NULL); -#line 19374 "PhotoPage.c" +#line 19376 "PhotoPage.c" } } @@ -19413,7 +19415,7 @@ static void library_photo_page_on_add_tags (LibraryPhotoPage* self) { _tmp4__length1 = names_length1; #line 3129 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp4_ != NULL) { -#line 19412 "PhotoPage.c" +#line 19414 "PhotoPage.c" CommandManager* _tmp5_ = NULL; CommandManager* _tmp6_ = NULL; HierarchicalTagIndex* _tmp7_ = NULL; @@ -19474,13 +19476,13 @@ static void library_photo_page_on_add_tags (LibraryPhotoPage* self) { _hierarchical_tag_index_unref0 (_tmp8_); #line 3130 "/home/jens/Source/shotwell/src/PhotoPage.vala" _command_manager_unref0 (_tmp6_); -#line 19473 "PhotoPage.c" +#line 19475 "PhotoPage.c" } #line 3126 "/home/jens/Source/shotwell/src/PhotoPage.vala" names = (_vala_array_free (names, names_length1, (GDestroyNotify) g_free), NULL); #line 3126 "/home/jens/Source/shotwell/src/PhotoPage.vala" _text_entry_dialog_mediator_unref0 (dialog); -#line 19479 "PhotoPage.c" +#line 19481 "PhotoPage.c" } @@ -19549,7 +19551,7 @@ static void library_photo_page_on_modify_tags (LibraryPhotoPage* self) { _g_object_unref0 (photo); #line 3143 "/home/jens/Source/shotwell/src/PhotoPage.vala" return; -#line 19548 "PhotoPage.c" +#line 19550 "PhotoPage.c" } #line 3145 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp11_ = page_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); @@ -19575,7 +19577,7 @@ static void library_photo_page_on_modify_tags (LibraryPhotoPage* self) { _text_entry_dialog_mediator_unref0 (dialog); #line 3136 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (photo); -#line 19574 "PhotoPage.c" +#line 19576 "PhotoPage.c" } @@ -19607,7 +19609,7 @@ static gboolean library_photo_page_library_photo_page_view_filter_real_predicate result = _tmp4_; #line 2336 "/home/jens/Source/shotwell/src/PhotoPage.vala" return result; -#line 19606 "PhotoPage.c" +#line 19608 "PhotoPage.c" } @@ -19617,14 +19619,14 @@ static LibraryPhotoPageLibraryPhotoPageViewFilter* library_photo_page_library_ph self = (LibraryPhotoPageLibraryPhotoPageViewFilter*) view_filter_construct (object_type); #line 2334 "/home/jens/Source/shotwell/src/PhotoPage.vala" return self; -#line 19616 "PhotoPage.c" +#line 19618 "PhotoPage.c" } static LibraryPhotoPageLibraryPhotoPageViewFilter* library_photo_page_library_photo_page_view_filter_new (void) { #line 2334 "/home/jens/Source/shotwell/src/PhotoPage.vala" return library_photo_page_library_photo_page_view_filter_construct (LIBRARY_PHOTO_PAGE_TYPE_LIBRARY_PHOTO_PAGE_VIEW_FILTER); -#line 19623 "PhotoPage.c" +#line 19625 "PhotoPage.c" } @@ -19632,8 +19634,8 @@ static void library_photo_page_library_photo_page_view_filter_class_init (Librar #line 2334 "/home/jens/Source/shotwell/src/PhotoPage.vala" library_photo_page_library_photo_page_view_filter_parent_class = g_type_class_peek_parent (klass); #line 2334 "/home/jens/Source/shotwell/src/PhotoPage.vala" - ((ViewFilterClass *) klass)->predicate = library_photo_page_library_photo_page_view_filter_real_predicate; -#line 19632 "PhotoPage.c" + ((ViewFilterClass *) klass)->predicate = (gboolean (*)(ViewFilter*, DataView*)) library_photo_page_library_photo_page_view_filter_real_predicate; +#line 19634 "PhotoPage.c" } @@ -19659,48 +19661,48 @@ static void library_photo_page_class_init (LibraryPhotoPageClass * klass) { #line 2332 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_type_class_add_private (klass, sizeof (LibraryPhotoPagePrivate)); #line 2332 "/home/jens/Source/shotwell/src/PhotoPage.vala" - ((PageClass *) klass)->init_collect_ui_filenames = library_photo_page_real_init_collect_ui_filenames; + ((PageClass *) klass)->init_collect_ui_filenames = (void (*)(Page*, GeeList*)) library_photo_page_real_init_collect_ui_filenames; #line 2332 "/home/jens/Source/shotwell/src/PhotoPage.vala" - ((PageClass *) klass)->add_actions = library_photo_page_real_add_actions; + ((PageClass *) klass)->add_actions = (void (*)(Page*, GActionMap*)) library_photo_page_real_add_actions; #line 2332 "/home/jens/Source/shotwell/src/PhotoPage.vala" - ((PageClass *) klass)->remove_actions = library_photo_page_real_remove_actions; + ((PageClass *) klass)->remove_actions = (void (*)(Page*, GActionMap*)) library_photo_page_real_remove_actions; #line 2332 "/home/jens/Source/shotwell/src/PhotoPage.vala" - ((PageClass *) klass)->init_collect_injection_groups = library_photo_page_real_init_collect_injection_groups; + ((PageClass *) klass)->init_collect_injection_groups = (InjectionGroup** (*)(Page*, int*)) library_photo_page_real_init_collect_injection_groups; #line 2332 "/home/jens/Source/shotwell/src/PhotoPage.vala" - ((PageClass *) klass)->update_actions = library_photo_page_real_update_actions; + ((PageClass *) klass)->update_actions = (void (*)(Page*, gint, gint)) library_photo_page_real_update_actions; #line 2332 "/home/jens/Source/shotwell/src/PhotoPage.vala" - ((LibraryPhotoPageClass *) klass)->developer_changed = library_photo_page_real_developer_changed; + ((LibraryPhotoPageClass *) klass)->developer_changed = (void (*)(LibraryPhotoPage*, RawDeveloper)) library_photo_page_real_developer_changed; #line 2332 "/home/jens/Source/shotwell/src/PhotoPage.vala" - ((PageClass *) klass)->switched_to = library_photo_page_real_switched_to; + ((PageClass *) klass)->switched_to = (void (*)(Page*)) library_photo_page_real_switched_to; #line 2332 "/home/jens/Source/shotwell/src/PhotoPage.vala" - ((PageClass *) klass)->switching_from = library_photo_page_real_switching_from; + ((PageClass *) klass)->switching_from = (void (*)(Page*)) library_photo_page_real_switching_from; #line 2332 "/home/jens/Source/shotwell/src/PhotoPage.vala" - ((EditingHostPageClass *) klass)->get_bottom_left_trinket = library_photo_page_real_get_bottom_left_trinket; + ((EditingHostPageClass *) klass)->get_bottom_left_trinket = (GdkPixbuf* (*)(EditingHostPage*, gint)) library_photo_page_real_get_bottom_left_trinket; #line 2332 "/home/jens/Source/shotwell/src/PhotoPage.vala" - ((EditingHostPageClass *) klass)->get_top_right_trinket = library_photo_page_real_get_top_right_trinket; + ((EditingHostPageClass *) klass)->get_top_right_trinket = (GdkPixbuf* (*)(EditingHostPage*, gint)) library_photo_page_real_get_top_right_trinket; #line 2332 "/home/jens/Source/shotwell/src/PhotoPage.vala" - ((EditingHostPageClass *) klass)->on_increase_size = library_photo_page_real_on_increase_size; + ((EditingHostPageClass *) klass)->on_increase_size = (void (*)(EditingHostPage*)) library_photo_page_real_on_increase_size; #line 2332 "/home/jens/Source/shotwell/src/PhotoPage.vala" - ((EditingHostPageClass *) klass)->on_decrease_size = library_photo_page_real_on_decrease_size; + ((EditingHostPageClass *) klass)->on_decrease_size = (void (*)(EditingHostPage*)) library_photo_page_real_on_decrease_size; #line 2332 "/home/jens/Source/shotwell/src/PhotoPage.vala" - ((EditingHostPageClass *) klass)->on_zoom_slider_key_press = library_photo_page_real_on_zoom_slider_key_press; + ((EditingHostPageClass *) klass)->on_zoom_slider_key_press = (gboolean (*)(EditingHostPage*, GdkEventKey*)) library_photo_page_real_on_zoom_slider_key_press; #line 2332 "/home/jens/Source/shotwell/src/PhotoPage.vala" - ((EditingHostPageClass *) klass)->update_ui = library_photo_page_real_update_ui; + ((EditingHostPageClass *) klass)->update_ui = (void (*)(EditingHostPage*, gboolean)) library_photo_page_real_update_ui; #line 2332 "/home/jens/Source/shotwell/src/PhotoPage.vala" - ((EditingHostPageClass *) klass)->notify_photo_backing_missing = library_photo_page_real_notify_photo_backing_missing; + ((EditingHostPageClass *) klass)->notify_photo_backing_missing = (void (*)(EditingHostPage*, Photo*, gboolean)) library_photo_page_real_notify_photo_backing_missing; #line 2332 "/home/jens/Source/shotwell/src/PhotoPage.vala" - ((GtkWidgetClass *) klass)->key_press_event = library_photo_page_real_key_press_event; + ((GtkWidgetClass *) klass)->key_press_event = (gboolean (*)(GtkWidget*, GdkEventKey*)) library_photo_page_real_key_press_event; #line 2332 "/home/jens/Source/shotwell/src/PhotoPage.vala" - ((EditingHostPageClass *) klass)->on_double_click = library_photo_page_real_on_double_click; + ((EditingHostPageClass *) klass)->on_double_click = (gboolean (*)(EditingHostPage*, GdkEventButton*)) library_photo_page_real_on_double_click; #line 2332 "/home/jens/Source/shotwell/src/PhotoPage.vala" - ((PageClass *) klass)->on_left_released = library_photo_page_real_on_left_released; + ((PageClass *) klass)->on_left_released = (gboolean (*)(Page*, GdkEventButton*)) library_photo_page_real_on_left_released; #line 2332 "/home/jens/Source/shotwell/src/PhotoPage.vala" - ((PageClass *) klass)->on_context_buttonpress = library_photo_page_real_on_context_buttonpress; + ((PageClass *) klass)->on_context_buttonpress = (gboolean (*)(Page*, GdkEventButton*)) library_photo_page_real_on_context_buttonpress; #line 2332 "/home/jens/Source/shotwell/src/PhotoPage.vala" - ((PageClass *) klass)->on_context_keypress = library_photo_page_real_on_context_keypress; + ((PageClass *) klass)->on_context_keypress = (gboolean (*)(Page*)) library_photo_page_real_on_context_keypress; #line 2332 "/home/jens/Source/shotwell/src/PhotoPage.vala" G_OBJECT_CLASS (klass)->finalize = library_photo_page_finalize; -#line 19699 "PhotoPage.c" +#line 19701 "PhotoPage.c" } @@ -19716,7 +19718,7 @@ static void library_photo_page_instance_init (LibraryPhotoPage * self) { _tmp0_ = library_photo_page_library_photo_page_view_filter_new (); #line 2342 "/home/jens/Source/shotwell/src/PhotoPage.vala" self->priv->filter = _tmp0_; -#line 19715 "PhotoPage.c" +#line 19717 "PhotoPage.c" } @@ -19761,7 +19763,7 @@ static void library_photo_page_finalize (GObject* obj) { _g_object_unref0 (self->priv->context_menu); #line 2332 "/home/jens/Source/shotwell/src/PhotoPage.vala" G_OBJECT_CLASS (library_photo_page_parent_class)->finalize (obj); -#line 19760 "PhotoPage.c" +#line 19762 "PhotoPage.c" } |