diff options
| author | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2018-05-01 14:43:08 +0200 |
|---|---|---|
| committer | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2018-05-01 14:43:08 +0200 |
| commit | 2b3f22361da0c1d8e6ce70d71352821758186db7 (patch) | |
| tree | 5d10633b47369b3aa52a05bf889ede0dbe5ee108 /src/PhotoPage.c | |
| parent | 211da5fc3048ca2b6ccee2166b0aaaade55cb84f (diff) | |
| parent | dc6c76eb04dfe3d4262a1806808f0bc0bf523238 (diff) | |
Merge branch 'feature/upstream' into develop
Diffstat (limited to 'src/PhotoPage.c')
| -rw-r--r-- | src/PhotoPage.c | 2178 |
1 files changed, 1070 insertions, 1108 deletions
diff --git a/src/PhotoPage.c b/src/PhotoPage.c index 65c465c..8693b5d 100644 --- a/src/PhotoPage.c +++ b/src/PhotoPage.c @@ -14,6 +14,7 @@ #include <math.h> #include <gdk/gdk.h> #include <gtk/gtk.h> +#include "shotwell-graphics-processor.h" #include <gio/gio.h> #include <cairo.h> #include <string.h> @@ -171,16 +172,6 @@ typedef struct _BackgroundJobPrivate BackgroundJobPrivate; typedef struct _ZoomBufferIsoSourceFetchJobPrivate ZoomBufferIsoSourceFetchJobPrivate; #define TYPE_DIRECTION (direction_get_type ()) - -#define TYPE_PIXEL_TRANSFORMER (pixel_transformer_get_type ()) -#define PIXEL_TRANSFORMER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_PIXEL_TRANSFORMER, PixelTransformer)) -#define PIXEL_TRANSFORMER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_PIXEL_TRANSFORMER, PixelTransformerClass)) -#define IS_PIXEL_TRANSFORMER(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_PIXEL_TRANSFORMER)) -#define IS_PIXEL_TRANSFORMER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_PIXEL_TRANSFORMER)) -#define PIXEL_TRANSFORMER_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_PIXEL_TRANSFORMER, PixelTransformerClass)) - -typedef struct _PixelTransformer PixelTransformer; -typedef struct _PixelTransformerClass PixelTransformerClass; #define _pixel_transformer_unref0(var) ((var == NULL) ? NULL : (var = (pixel_transformer_unref (var), NULL))) typedef struct _ZoomBufferTransformationJobPrivate ZoomBufferTransformationJobPrivate; @@ -661,16 +652,6 @@ typedef struct _EditingToolsAdjustToolClass EditingToolsAdjustToolClass; typedef struct _EnhanceSingleCommand EnhanceSingleCommand; typedef struct _EnhanceSingleCommandClass EnhanceSingleCommandClass; - -#define TYPE_PIXEL_TRANSFORMATION_BUNDLE (pixel_transformation_bundle_get_type ()) -#define PIXEL_TRANSFORMATION_BUNDLE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_PIXEL_TRANSFORMATION_BUNDLE, PixelTransformationBundle)) -#define PIXEL_TRANSFORMATION_BUNDLE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_PIXEL_TRANSFORMATION_BUNDLE, PixelTransformationBundleClass)) -#define IS_PIXEL_TRANSFORMATION_BUNDLE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_PIXEL_TRANSFORMATION_BUNDLE)) -#define IS_PIXEL_TRANSFORMATION_BUNDLE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_PIXEL_TRANSFORMATION_BUNDLE)) -#define PIXEL_TRANSFORMATION_BUNDLE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_PIXEL_TRANSFORMATION_BUNDLE, PixelTransformationBundleClass)) - -typedef struct _PixelTransformationBundle PixelTransformationBundle; -typedef struct _PixelTransformationBundleClass PixelTransformationBundleClass; #define _pixel_transformation_bundle_unref0(var) ((var == NULL) ? NULL : (var = (pixel_transformation_bundle_unref (var), NULL))) #define TYPE_ADJUST_COLORS_SINGLE_COMMAND (adjust_colors_single_command_get_type ()) @@ -1529,13 +1510,6 @@ static GType zoom_buffer_iso_source_fetch_job_get_type (void) G_GNUC_CONST G_GNU GType background_job_job_priority_get_type (void) G_GNUC_CONST; GType direction_get_type (void) G_GNUC_CONST; void single_photo_page_repaint (SinglePhotoPage* self, Direction* direction); -gpointer pixel_transformer_ref (gpointer instance); -void pixel_transformer_unref (gpointer instance); -GParamSpec* param_spec_pixel_transformer (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_pixel_transformer (GValue* value, gpointer v_object); -void value_take_pixel_transformer (GValue* value, gpointer v_object); -gpointer value_get_pixel_transformer (const GValue* value); -GType pixel_transformer_get_type (void) G_GNUC_CONST; PixelTransformer* photo_get_pixel_transformer (Photo* self); static void zoom_buffer_on_iso_transformation_complete (ZoomBuffer* self, BackgroundJob* job); static void _zoom_buffer_on_iso_transformation_complete_completion_callback (BackgroundJob* job, gpointer self); @@ -1588,7 +1562,6 @@ enum { ZOOM_BUFFER_TRANSFORMATION_JOB_DUMMY_PROPERTY }; static void zoom_buffer_transformation_job_real_execute (BackgroundJob* base); -void pixel_transformer_transform_to_other_pixbuf (PixelTransformer* self, GdkPixbuf* source, GdkPixbuf* dest, GCancellable* cancellable); static void zoom_buffer_transformation_job_finalize (BackgroundJob * obj); static void zoom_buffer_finalize (GObject * obj); GType page_window_get_type (void) G_GNUC_CONST; @@ -2081,18 +2054,9 @@ GType enhance_single_command_get_type (void) G_GNUC_CONST; EnhanceSingleCommand* enhance_single_command_new (Photo* photo); EnhanceSingleCommand* enhance_single_command_construct (GType object_type, Photo* photo); void editing_host_page_on_copy_adjustments (EditingHostPage* self); -gpointer pixel_transformation_bundle_ref (gpointer instance); -void pixel_transformation_bundle_unref (gpointer instance); -GParamSpec* param_spec_pixel_transformation_bundle (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_pixel_transformation_bundle (GValue* value, gpointer v_object); -void value_take_pixel_transformation_bundle (GValue* value, gpointer v_object); -gpointer value_get_pixel_transformation_bundle (const GValue* value); -GType pixel_transformation_bundle_get_type (void) G_GNUC_CONST; -void pixel_transformation_bundle_set_copied_color_adjustments (PixelTransformationBundle* adjustments); PixelTransformationBundle* photo_get_color_adjustments (Photo* self); void page_set_action_sensitive (Page* self, const gchar* name, gboolean sensitive); void editing_host_page_on_paste_adjustments (EditingHostPage* self); -PixelTransformationBundle* pixel_transformation_bundle_get_copied_color_adjustments (void); GType adjust_colors_single_command_get_type (void) G_GNUC_CONST; #define RESOURCES_PASTE_ADJUSTMENTS_LABEL _ ("Paste Color Adjustments") #define RESOURCES_PASTE_ADJUSTMENTS_TOOLTIP _ ("Apply copied color adjustments to the selected photos") @@ -2243,9 +2207,9 @@ InjectionGroup** page_init_collect_injection_groups (Page* self, int* result_len InjectionGroup* injection_group_new (const gchar* path); InjectionGroup* injection_group_construct (GType object_type, const gchar* path); void injection_group_add_menu_item (InjectionGroup* self, const gchar* name, const gchar* action, const gchar* accellerator); -static void _vala_array_add82 (InjectionGroup** * array, int* length, int* size, InjectionGroup* value); -static void _vala_array_add83 (InjectionGroup** * array, int* length, int* size, InjectionGroup* value); -static void _vala_array_add84 (InjectionGroup** * array, int* length, int* size, InjectionGroup* value); +static void _vala_array_add86 (InjectionGroup** * array, int* length, int* size, InjectionGroup* value); +static void _vala_array_add87 (InjectionGroup** * array, int* length, int* size, InjectionGroup* value); +static void _vala_array_add88 (InjectionGroup** * array, int* length, int* size, InjectionGroup* value); static void library_photo_page_set_display_ratings (LibraryPhotoPage* self, gboolean display); void configuration_facade_set_display_photo_ratings (ConfigurationFacade* self, gboolean display); static void library_photo_page_real_update_actions (Page* base, gint selected_count, gint count); @@ -2254,10 +2218,8 @@ gchar* configuration_facade_get_external_photo_app (ConfigurationFacade* self); static void library_photo_page_update_rating_menu_item_sensitivity (LibraryPhotoPage* self); static void library_photo_page_update_development_menu_item_sensitivity (LibraryPhotoPage* self); gboolean photo_has_color_adjustments (Photo* self); -gboolean pixel_transformation_bundle_has_copied_color_adjustments (void); static void library_photo_page_update_flag_action (LibraryPhotoPage* self); gchar* configuration_facade_get_external_raw_app (ConfigurationFacade* self); -void page_set_action_visible (Page* self, const gchar* name, gboolean visible); void library_photo_page_developer_changed (LibraryPhotoPage* self, RawDeveloper rd); static void library_photo_page_real_developer_changed (LibraryPhotoPage* self, RawDeveloper rd); gboolean raw_developer_is_equivalent (RawDeveloper self, RawDeveloper d); @@ -2416,7 +2378,7 @@ static GType zoom_buffer_object_state_get_type (void) { static gpointer _g_object_ref0 (gpointer self) { #line 86 "/home/jens/Source/shotwell/src/PhotoPage.vala" return self ? g_object_ref (self) : NULL; -#line 2420 "PhotoPage.c" +#line 2382 "PhotoPage.c" } @@ -2469,28 +2431,28 @@ ZoomBuffer* zoom_buffer_construct (GType object_type, SinglePhotoPage* parent_pa self->priv->workers = _tmp6_; #line 84 "/home/jens/Source/shotwell/src/PhotoPage.vala" return self; -#line 2473 "PhotoPage.c" +#line 2435 "PhotoPage.c" } ZoomBuffer* zoom_buffer_new (SinglePhotoPage* parent_page, Photo* backing_photo, GdkPixbuf* preview_image) { #line 84 "/home/jens/Source/shotwell/src/PhotoPage.vala" return zoom_buffer_construct (TYPE_ZOOM_BUFFER, parent_page, backing_photo, preview_image); -#line 2480 "PhotoPage.c" +#line 2442 "PhotoPage.c" } static gpointer _background_job_ref0 (gpointer self) { #line 93 "/home/jens/Source/shotwell/src/PhotoPage.vala" return self ? background_job_ref (self) : NULL; -#line 2487 "PhotoPage.c" +#line 2449 "PhotoPage.c" } static void _zoom_buffer_on_iso_transformation_complete_completion_callback (BackgroundJob* job, gpointer self) { #line 109 "/home/jens/Source/shotwell/src/PhotoPage.vala" zoom_buffer_on_iso_transformation_complete ((ZoomBuffer*) self, job); -#line 2494 "PhotoPage.c" +#line 2456 "PhotoPage.c" } @@ -2544,7 +2506,7 @@ static void zoom_buffer_on_iso_source_fetch_complete (ZoomBuffer* self, Backgrou _background_job_unref0 (fetch_job); #line 96 "/home/jens/Source/shotwell/src/PhotoPage.vala" return; -#line 2547 "PhotoPage.c" +#line 2509 "PhotoPage.c" } #line 99 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp4_ = fetch_job; @@ -2570,7 +2532,7 @@ static void zoom_buffer_on_iso_source_fetch_complete (ZoomBuffer* self, Backgrou _tmp12_ = _tmp11_; #line 100 "/home/jens/Source/shotwell/src/PhotoPage.vala" if ((_tmp9_ * _tmp12_) > ZOOM_BUFFER_USE_REDUCED_THRESHOLD) { -#line 2573 "PhotoPage.c" +#line 2535 "PhotoPage.c" GdkPixbuf* _tmp13_; GdkPixbuf* _tmp14_; gint _tmp15_; @@ -2599,7 +2561,7 @@ static void zoom_buffer_on_iso_source_fetch_complete (ZoomBuffer* self, Backgrou _g_object_unref0 (self->priv->reduced_source_image); #line 101 "/home/jens/Source/shotwell/src/PhotoPage.vala" self->priv->reduced_source_image = _tmp20_; -#line 2602 "PhotoPage.c" +#line 2564 "PhotoPage.c" } #line 104 "/home/jens/Source/shotwell/src/PhotoPage.vala" self->priv->object_state = ZOOM_BUFFER_OBJECT_STATE_SOURCE_NOT_TRANSFORMED; @@ -2607,13 +2569,13 @@ static void zoom_buffer_on_iso_source_fetch_complete (ZoomBuffer* self, Backgrou _tmp21_ = self->priv->is_interactive_redraw_in_progress; #line 106 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (!_tmp21_) { -#line 2610 "PhotoPage.c" +#line 2572 "PhotoPage.c" SinglePhotoPage* _tmp22_; #line 107 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp22_ = self->priv->parent_page; #line 107 "/home/jens/Source/shotwell/src/PhotoPage.vala" single_photo_page_repaint (_tmp22_, NULL); -#line 2616 "PhotoPage.c" +#line 2578 "PhotoPage.c" } #line 109 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp23_ = self->priv->iso_source_image; @@ -2647,7 +2609,7 @@ static void zoom_buffer_on_iso_source_fetch_complete (ZoomBuffer* self, Backgrou _background_job_unref0 (transformation_job); #line 92 "/home/jens/Source/shotwell/src/PhotoPage.vala" _background_job_unref0 (fetch_job); -#line 2650 "PhotoPage.c" +#line 2612 "PhotoPage.c" } @@ -2688,7 +2650,7 @@ static void zoom_buffer_on_iso_transformation_complete (ZoomBuffer* self, Backgr _background_job_unref0 (transform_job); #line 120 "/home/jens/Source/shotwell/src/PhotoPage.vala" return; -#line 2691 "PhotoPage.c" +#line 2653 "PhotoPage.c" } #line 123 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp4_ = transform_job; @@ -2714,7 +2676,7 @@ static void zoom_buffer_on_iso_transformation_complete (ZoomBuffer* self, Backgr _tmp12_ = _tmp11_; #line 124 "/home/jens/Source/shotwell/src/PhotoPage.vala" if ((_tmp9_ * _tmp12_) > ZOOM_BUFFER_USE_REDUCED_THRESHOLD) { -#line 2717 "PhotoPage.c" +#line 2679 "PhotoPage.c" GdkPixbuf* _tmp13_; GdkPixbuf* _tmp14_; gint _tmp15_; @@ -2743,13 +2705,13 @@ static void zoom_buffer_on_iso_transformation_complete (ZoomBuffer* self, Backgr _g_object_unref0 (self->priv->reduced_transformed_image); #line 125 "/home/jens/Source/shotwell/src/PhotoPage.vala" self->priv->reduced_transformed_image = _tmp20_; -#line 2746 "PhotoPage.c" +#line 2708 "PhotoPage.c" } #line 129 "/home/jens/Source/shotwell/src/PhotoPage.vala" self->priv->object_state = ZOOM_BUFFER_OBJECT_STATE_TRANSFORMED_READY; #line 115 "/home/jens/Source/shotwell/src/PhotoPage.vala" _background_job_unref0 (transform_job); -#line 2752 "PhotoPage.c" +#line 2714 "PhotoPage.c" } @@ -2785,7 +2747,7 @@ static void zoom_buffer_on_demand_transform_complete (ZoomBuffer* self, Backgrou _background_job_unref0 (transform_job); #line 137 "/home/jens/Source/shotwell/src/PhotoPage.vala" return; -#line 2788 "PhotoPage.c" +#line 2750 "PhotoPage.c" } #line 140 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp4_ = transform_job; @@ -2807,7 +2769,7 @@ static void zoom_buffer_on_demand_transform_complete (ZoomBuffer* self, Backgrou single_photo_page_repaint (_tmp7_, NULL); #line 132 "/home/jens/Source/shotwell/src/PhotoPage.vala" _background_job_unref0 (transform_job); -#line 2810 "PhotoPage.c" +#line 2772 "PhotoPage.c" } @@ -2880,21 +2842,21 @@ static GdkPixbuf* zoom_buffer_get_view_projection_pixbuf (ZoomBuffer* self, Zoom _tmp6_ = reduced_pixbuf; #line 156 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp6_ != NULL) { -#line 2883 "PhotoPage.c" +#line 2845 "PhotoPage.c" gdouble _tmp7_; #line 156 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp7_ = zoom_state_get_zoom_factor (zoom_state); #line 156 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp5_ = _tmp7_ < 0.5; -#line 2889 "PhotoPage.c" +#line 2851 "PhotoPage.c" } else { #line 156 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp5_ = FALSE; -#line 2893 "PhotoPage.c" +#line 2855 "PhotoPage.c" } #line 156 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp5_) { -#line 2897 "PhotoPage.c" +#line 2859 "PhotoPage.c" GdkPixbuf* _tmp8_; GdkPixbuf* _tmp9_; gint _tmp10_; @@ -2925,7 +2887,7 @@ static GdkPixbuf* zoom_buffer_get_view_projection_pixbuf (ZoomBuffer* self, Zoom _tmp13_ = view_rect_proj.height; #line 161 "/home/jens/Source/shotwell/src/PhotoPage.vala" view_rect_proj.height = _tmp13_ / 2; -#line 2928 "PhotoPage.c" +#line 2890 "PhotoPage.c" } #line 167 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp14_ = view_rect_proj; @@ -3003,14 +2965,14 @@ static GdkPixbuf* zoom_buffer_get_view_projection_pixbuf (ZoomBuffer* self, Zoom _g_object_unref0 (sample_source_pixbuf); #line 181 "/home/jens/Source/shotwell/src/PhotoPage.vala" return result; -#line 3006 "PhotoPage.c" +#line 2968 "PhotoPage.c" } static void _zoom_buffer_on_demand_transform_complete_completion_callback (BackgroundJob* job, gpointer self) { #line 252 "/home/jens/Source/shotwell/src/PhotoPage.vala" zoom_buffer_on_demand_transform_complete ((ZoomBuffer*) self, job); -#line 3013 "PhotoPage.c" +#line 2975 "PhotoPage.c" } @@ -3029,7 +2991,7 @@ static GdkPixbuf* zoom_buffer_get_zoomed_image_source_not_transformed (ZoomBuffe _tmp0_ = self->priv->demand_transform_cached_pixbuf; #line 185 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp0_ != NULL) { -#line 3032 "PhotoPage.c" +#line 2994 "PhotoPage.c" ZoomState _tmp1_; gboolean _tmp2_; #line 186 "/home/jens/Source/shotwell/src/PhotoPage.vala" @@ -3038,7 +3000,7 @@ static GdkPixbuf* zoom_buffer_get_zoomed_image_source_not_transformed (ZoomBuffe _tmp2_ = zoom_state_equals (zoom_state, &_tmp1_); #line 186 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp2_) { -#line 3041 "PhotoPage.c" +#line 3003 "PhotoPage.c" GdkPixbuf* _tmp3_; GdkPixbuf* _tmp4_; #line 190 "/home/jens/Source/shotwell/src/PhotoPage.vala" @@ -3049,7 +3011,7 @@ static GdkPixbuf* zoom_buffer_get_zoomed_image_source_not_transformed (ZoomBuffe result = _tmp4_; #line 190 "/home/jens/Source/shotwell/src/PhotoPage.vala" return result; -#line 3052 "PhotoPage.c" +#line 3014 "PhotoPage.c" } else { gdouble _tmp5_; gdouble _tmp6_; @@ -3059,7 +3021,7 @@ static GdkPixbuf* zoom_buffer_get_zoomed_image_source_not_transformed (ZoomBuffe _tmp6_ = zoom_state_get_zoom_factor (&self->priv->demand_transform_zoom_state); #line 191 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp5_ == _tmp6_) { -#line 3062 "PhotoPage.c" +#line 3024 "PhotoPage.c" GdkRectangle curr_rect = {0}; GdkRectangle _tmp7_ = {0}; GdkRectangle pre_rect = {0}; @@ -3379,7 +3341,7 @@ static GdkPixbuf* zoom_buffer_get_zoomed_image_source_not_transformed (ZoomBuffe result = composited_result; #line 231 "/home/jens/Source/shotwell/src/PhotoPage.vala" return result; -#line 3382 "PhotoPage.c" +#line 3344 "PhotoPage.c" } } } @@ -3387,7 +3349,7 @@ static GdkPixbuf* zoom_buffer_get_zoomed_image_source_not_transformed (ZoomBuffe _tmp97_ = self->priv->demand_transform_job; #line 242 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp97_ != NULL) { -#line 3390 "PhotoPage.c" +#line 3352 "PhotoPage.c" ZoomState _tmp98_; gboolean _tmp99_; #line 243 "/home/jens/Source/shotwell/src/PhotoPage.vala" @@ -3396,7 +3358,7 @@ static GdkPixbuf* zoom_buffer_get_zoomed_image_source_not_transformed (ZoomBuffe _tmp99_ = zoom_state_equals (zoom_state, &_tmp98_); #line 243 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp99_) { -#line 3399 "PhotoPage.c" +#line 3361 "PhotoPage.c" ZoomState _tmp100_; GdkPixbuf* _tmp101_; #line 244 "/home/jens/Source/shotwell/src/PhotoPage.vala" @@ -3407,7 +3369,7 @@ static GdkPixbuf* zoom_buffer_get_zoomed_image_source_not_transformed (ZoomBuffe result = _tmp101_; #line 244 "/home/jens/Source/shotwell/src/PhotoPage.vala" return result; -#line 3410 "PhotoPage.c" +#line 3372 "PhotoPage.c" } else { ZoomBufferTransformationJob* _tmp102_; GdkPixbuf* zoomed = NULL; @@ -3487,14 +3449,14 @@ static GdkPixbuf* zoom_buffer_get_zoomed_image_source_not_transformed (ZoomBuffe _g_object_unref0 (zoomed); #line 258 "/home/jens/Source/shotwell/src/PhotoPage.vala" return result; -#line 3490 "PhotoPage.c" +#line 3452 "PhotoPage.c" } } #line 263 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp119_ = self->priv->demand_transform_job; #line 263 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp119_ == NULL) { -#line 3497 "PhotoPage.c" +#line 3459 "PhotoPage.c" GdkPixbuf* zoomed = NULL; ZoomState _tmp120_; GdkPixbuf* _tmp121_; @@ -3564,7 +3526,7 @@ static GdkPixbuf* zoom_buffer_get_zoomed_image_source_not_transformed (ZoomBuffe _g_object_unref0 (zoomed); #line 275 "/home/jens/Source/shotwell/src/PhotoPage.vala" return result; -#line 3567 "PhotoPage.c" +#line 3529 "PhotoPage.c" } #line 283 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_critical ("PhotoPage.vala:283: %s", "ZoomBuffer: get_zoomed_image( ): in SOURCE-NOT-TRANSFORMED but can't t" \ @@ -3577,14 +3539,14 @@ static GdkPixbuf* zoom_buffer_get_zoomed_image_source_not_transformed (ZoomBuffe result = _tmp137_; #line 285 "/home/jens/Source/shotwell/src/PhotoPage.vala" return result; -#line 3579 "PhotoPage.c" +#line 3541 "PhotoPage.c" } static void _zoom_buffer_on_iso_source_fetch_complete_completion_callback (BackgroundJob* job, gpointer self) { #line 290 "/home/jens/Source/shotwell/src/PhotoPage.vala" zoom_buffer_on_iso_source_fetch_complete ((ZoomBuffer*) self, job); -#line 3586 "PhotoPage.c" +#line 3548 "PhotoPage.c" } @@ -3627,7 +3589,7 @@ GdkPixbuf* zoom_buffer_get_zoom_preview_image_internal (ZoomBuffer* self, ZoomSt _tmp0_ = self->priv->object_state; #line 289 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp0_ == ZOOM_BUFFER_OBJECT_STATE_SOURCE_NOT_LOADED) { -#line 3629 "PhotoPage.c" +#line 3591 "PhotoPage.c" BackgroundJob* iso_source_fetch_job = NULL; Photo* _tmp1_; ZoomBufferIsoSourceFetchJob* _tmp2_; @@ -3649,7 +3611,7 @@ GdkPixbuf* zoom_buffer_get_zoom_preview_image_internal (ZoomBuffer* self, ZoomSt self->priv->object_state = ZOOM_BUFFER_OBJECT_STATE_SOURCE_LOAD_IN_PROGRESS; #line 289 "/home/jens/Source/shotwell/src/PhotoPage.vala" _background_job_unref0 (iso_source_fetch_job); -#line 3651 "PhotoPage.c" +#line 3613 "PhotoPage.c" } #line 296 "/home/jens/Source/shotwell/src/PhotoPage.vala" zoom_state_get_viewing_rectangle_wrt_content (zoom_state, &_tmp5_); @@ -3717,7 +3679,7 @@ GdkPixbuf* zoom_buffer_get_zoom_preview_image_internal (ZoomBuffer* self, ZoomSt _g_object_unref0 (proj_subpixbuf); #line 309 "/home/jens/Source/shotwell/src/PhotoPage.vala" return result; -#line 3719 "PhotoPage.c" +#line 3681 "PhotoPage.c" } @@ -3735,7 +3697,7 @@ Photo* zoom_buffer_get_backing_photo (ZoomBuffer* self) { result = _tmp1_; #line 313 "/home/jens/Source/shotwell/src/PhotoPage.vala" return result; -#line 3737 "PhotoPage.c" +#line 3699 "PhotoPage.c" } @@ -3754,7 +3716,7 @@ void zoom_buffer_update_preview_image (ZoomBuffer* self, GdkPixbuf* preview_imag _g_object_unref0 (self->priv->preview_image); #line 317 "/home/jens/Source/shotwell/src/PhotoPage.vala" self->priv->preview_image = _tmp1_; -#line 3756 "PhotoPage.c" +#line 3718 "PhotoPage.c" } @@ -3770,7 +3732,7 @@ void zoom_buffer_flush_demand_cache (ZoomBuffer* self, ZoomState* initial_zoom_s _tmp0_ = initial_zoom_state; #line 324 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp0_ != NULL) { -#line 3772 "PhotoPage.c" +#line 3734 "PhotoPage.c" ZoomState* _tmp1_; ZoomState _tmp2_; GdkPixbuf* _tmp3_; @@ -3785,7 +3747,7 @@ void zoom_buffer_flush_demand_cache (ZoomBuffer* self, ZoomState* initial_zoom_s _tmp4_ = _tmp3_; #line 325 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (_tmp4_); -#line 3787 "PhotoPage.c" +#line 3749 "PhotoPage.c" } } @@ -3804,7 +3766,7 @@ GdkPixbuf* zoom_buffer_get_zoomed_image (ZoomBuffer* self, ZoomState* zoom_state _tmp0_ = zoom_state_get_interpolation_factor (zoom_state); #line 333 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp0_ == 0.0) { -#line 3806 "PhotoPage.c" +#line 3768 "PhotoPage.c" ZoomState _tmp1_; GdkPixbuf* _tmp2_; #line 334 "/home/jens/Source/shotwell/src/PhotoPage.vala" @@ -3815,7 +3777,7 @@ GdkPixbuf* zoom_buffer_get_zoomed_image (ZoomBuffer* self, ZoomState* zoom_state result = _tmp2_; #line 334 "/home/jens/Source/shotwell/src/PhotoPage.vala" return result; -#line 3817 "PhotoPage.c" +#line 3779 "PhotoPage.c" } #line 337 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp3_ = self->priv->object_state; @@ -3825,7 +3787,7 @@ GdkPixbuf* zoom_buffer_get_zoomed_image (ZoomBuffer* self, ZoomState* zoom_state case ZOOM_BUFFER_OBJECT_STATE_SOURCE_NOT_LOADED: #line 337 "/home/jens/Source/shotwell/src/PhotoPage.vala" case ZOOM_BUFFER_OBJECT_STATE_SOURCE_LOAD_IN_PROGRESS: -#line 3827 "PhotoPage.c" +#line 3789 "PhotoPage.c" { ZoomState _tmp4_; GdkPixbuf* _tmp5_; @@ -3837,11 +3799,11 @@ GdkPixbuf* zoom_buffer_get_zoomed_image (ZoomBuffer* self, ZoomState* zoom_state result = _tmp5_; #line 340 "/home/jens/Source/shotwell/src/PhotoPage.vala" return result; -#line 3839 "PhotoPage.c" +#line 3801 "PhotoPage.c" } #line 337 "/home/jens/Source/shotwell/src/PhotoPage.vala" case ZOOM_BUFFER_OBJECT_STATE_SOURCE_NOT_TRANSFORMED: -#line 3843 "PhotoPage.c" +#line 3805 "PhotoPage.c" { ZoomState _tmp6_; GdkPixbuf* _tmp7_; @@ -3853,11 +3815,11 @@ GdkPixbuf* zoom_buffer_get_zoomed_image (ZoomBuffer* self, ZoomState* zoom_state result = _tmp7_; #line 343 "/home/jens/Source/shotwell/src/PhotoPage.vala" return result; -#line 3855 "PhotoPage.c" +#line 3817 "PhotoPage.c" } #line 337 "/home/jens/Source/shotwell/src/PhotoPage.vala" case ZOOM_BUFFER_OBJECT_STATE_TRANSFORMED_READY: -#line 3859 "PhotoPage.c" +#line 3821 "PhotoPage.c" { ZoomState _tmp8_; GdkPixbuf* _tmp9_; @@ -3875,7 +3837,7 @@ GdkPixbuf* zoom_buffer_get_zoomed_image (ZoomBuffer* self, ZoomState* zoom_state result = _tmp11_; #line 348 "/home/jens/Source/shotwell/src/PhotoPage.vala" return result; -#line 3877 "PhotoPage.c" +#line 3839 "PhotoPage.c" } default: { @@ -3892,7 +3854,7 @@ GdkPixbuf* zoom_buffer_get_zoomed_image (ZoomBuffer* self, ZoomState* zoom_state result = _tmp13_; #line 353 "/home/jens/Source/shotwell/src/PhotoPage.vala" return result; -#line 3893 "PhotoPage.c" +#line 3855 "PhotoPage.c" } } } @@ -3916,7 +3878,7 @@ GdkPixbuf* zoom_buffer_get_zoom_preview_image (ZoomBuffer* self, ZoomState* zoom result = _tmp1_; #line 360 "/home/jens/Source/shotwell/src/PhotoPage.vala" return result; -#line 3917 "PhotoPage.c" +#line 3879 "PhotoPage.c" } @@ -3949,14 +3911,14 @@ static ZoomBufferIsoSourceFetchJob* zoom_buffer_iso_source_fetch_job_construct ( self->priv->to_fetch = _tmp3_; #line 20 "/home/jens/Source/shotwell/src/PhotoPage.vala" return self; -#line 3950 "PhotoPage.c" +#line 3912 "PhotoPage.c" } static ZoomBufferIsoSourceFetchJob* zoom_buffer_iso_source_fetch_job_new (ZoomBuffer* owner, Photo* to_fetch, CompletionCallback completion_callback, void* completion_callback_target) { #line 20 "/home/jens/Source/shotwell/src/PhotoPage.vala" return zoom_buffer_iso_source_fetch_job_construct (ZOOM_BUFFER_TYPE_ISO_SOURCE_FETCH_JOB, owner, to_fetch, completion_callback, completion_callback_target); -#line 3957 "PhotoPage.c" +#line 3919 "PhotoPage.c" } @@ -3965,7 +3927,7 @@ static void zoom_buffer_iso_source_fetch_job_real_execute (BackgroundJob* base) GError * _inner_error_ = NULL; #line 27 "/home/jens/Source/shotwell/src/PhotoPage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, ZOOM_BUFFER_TYPE_ISO_SOURCE_FETCH_JOB, ZoomBufferIsoSourceFetchJob); -#line 3966 "PhotoPage.c" +#line 3928 "PhotoPage.c" { GdkPixbuf* _tmp0_ = NULL; Photo* _tmp1_; @@ -3982,8 +3944,8 @@ static void zoom_buffer_iso_source_fetch_job_real_execute (BackgroundJob* base) _tmp0_ = _tmp3_; #line 29 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 3983 "PhotoPage.c" - goto __catch244_g_error; +#line 3945 "PhotoPage.c" + goto __catch255_g_error; } #line 29 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp4_ = _tmp0_; @@ -3995,10 +3957,10 @@ static void zoom_buffer_iso_source_fetch_job_real_execute (BackgroundJob* base) self->fetched = _tmp4_; #line 28 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (_tmp0_); -#line 3996 "PhotoPage.c" +#line 3958 "PhotoPage.c" } - goto __finally244; - __catch244_g_error: + goto __finally255; + __catch255_g_error: { GError* fetch_error = NULL; #line 28 "/home/jens/Source/shotwell/src/PhotoPage.vala" @@ -4010,9 +3972,9 @@ static void zoom_buffer_iso_source_fetch_job_real_execute (BackgroundJob* base) "m backing photo"); #line 28 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_error_free0 (fetch_error); -#line 4010 "PhotoPage.c" +#line 3972 "PhotoPage.c" } - __finally244: + __finally255: #line 28 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 28 "/home/jens/Source/shotwell/src/PhotoPage.vala" @@ -4021,7 +3983,7 @@ static void zoom_buffer_iso_source_fetch_job_real_execute (BackgroundJob* base) g_clear_error (&_inner_error_); #line 28 "/home/jens/Source/shotwell/src/PhotoPage.vala" return; -#line 4021 "PhotoPage.c" +#line 3983 "PhotoPage.c" } } @@ -4035,7 +3997,7 @@ static void zoom_buffer_iso_source_fetch_job_class_init (ZoomBufferIsoSourceFetc g_type_class_add_private (klass, sizeof (ZoomBufferIsoSourceFetchJobPrivate)); #line 15 "/home/jens/Source/shotwell/src/PhotoPage.vala" ((BackgroundJobClass *) klass)->execute = (void (*) (BackgroundJob *)) zoom_buffer_iso_source_fetch_job_real_execute; -#line 4035 "PhotoPage.c" +#line 3997 "PhotoPage.c" } @@ -4044,7 +4006,7 @@ static void zoom_buffer_iso_source_fetch_job_instance_init (ZoomBufferIsoSourceF self->priv = ZOOM_BUFFER_ISO_SOURCE_FETCH_JOB_GET_PRIVATE (self); #line 18 "/home/jens/Source/shotwell/src/PhotoPage.vala" self->fetched = NULL; -#line 4044 "PhotoPage.c" +#line 4006 "PhotoPage.c" } @@ -4058,7 +4020,7 @@ static void zoom_buffer_iso_source_fetch_job_finalize (BackgroundJob * obj) { _g_object_unref0 (self->fetched); #line 15 "/home/jens/Source/shotwell/src/PhotoPage.vala" BACKGROUND_JOB_CLASS (zoom_buffer_iso_source_fetch_job_parent_class)->finalize (obj); -#line 4058 "PhotoPage.c" +#line 4020 "PhotoPage.c" } @@ -4077,7 +4039,7 @@ static GType zoom_buffer_iso_source_fetch_job_get_type (void) { static gpointer _pixel_transformer_ref0 (gpointer self) { #line 55 "/home/jens/Source/shotwell/src/PhotoPage.vala" return self ? pixel_transformer_ref (self) : NULL; -#line 4077 "PhotoPage.c" +#line 4039 "PhotoPage.c" } @@ -4147,14 +4109,14 @@ static ZoomBufferTransformationJob* zoom_buffer_transformation_job_construct (GT self->transformed = _tmp10_; #line 49 "/home/jens/Source/shotwell/src/PhotoPage.vala" return self; -#line 4147 "PhotoPage.c" +#line 4109 "PhotoPage.c" } static ZoomBufferTransformationJob* zoom_buffer_transformation_job_new (ZoomBuffer* owner, GdkPixbuf* to_transform, PixelTransformer* transformer, CompletionCallback completion_callback, void* completion_callback_target, GCancellable* cancellable) { #line 49 "/home/jens/Source/shotwell/src/PhotoPage.vala" return zoom_buffer_transformation_job_construct (ZOOM_BUFFER_TYPE_TRANSFORMATION_JOB, owner, to_transform, transformer, completion_callback, completion_callback_target, cancellable); -#line 4154 "PhotoPage.c" +#line 4116 "PhotoPage.c" } @@ -4167,7 +4129,7 @@ static void zoom_buffer_transformation_job_real_execute (BackgroundJob* base) { _tmp0_ = self->priv->transformer; #line 60 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp0_ != NULL) { -#line 4167 "PhotoPage.c" +#line 4129 "PhotoPage.c" PixelTransformer* _tmp1_; GdkPixbuf* _tmp2_; GdkPixbuf* _tmp3_; @@ -4181,8 +4143,8 @@ static void zoom_buffer_transformation_job_real_execute (BackgroundJob* base) { #line 61 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp4_ = self->priv->cancellable; #line 61 "/home/jens/Source/shotwell/src/PhotoPage.vala" - pixel_transformer_transform_to_other_pixbuf (_tmp1_, _tmp2_, _tmp3_, _tmp4_); -#line 4182 "PhotoPage.c" + pixel_transformer_transform_to_other_pixbuf (_tmp1_, _tmp2_, _tmp3_, _tmp4_, -1); +#line 4144 "PhotoPage.c" } } @@ -4196,7 +4158,7 @@ static void zoom_buffer_transformation_job_class_init (ZoomBufferTransformationJ g_type_class_add_private (klass, sizeof (ZoomBufferTransformationJobPrivate)); #line 42 "/home/jens/Source/shotwell/src/PhotoPage.vala" ((BackgroundJobClass *) klass)->execute = (void (*) (BackgroundJob *)) zoom_buffer_transformation_job_real_execute; -#line 4196 "PhotoPage.c" +#line 4158 "PhotoPage.c" } @@ -4205,7 +4167,7 @@ static void zoom_buffer_transformation_job_instance_init (ZoomBufferTransformati self->priv = ZOOM_BUFFER_TRANSFORMATION_JOB_GET_PRIVATE (self); #line 47 "/home/jens/Source/shotwell/src/PhotoPage.vala" self->transformed = NULL; -#line 4205 "PhotoPage.c" +#line 4167 "PhotoPage.c" } @@ -4223,7 +4185,7 @@ static void zoom_buffer_transformation_job_finalize (BackgroundJob * obj) { _g_object_unref0 (self->transformed); #line 42 "/home/jens/Source/shotwell/src/PhotoPage.vala" BACKGROUND_JOB_CLASS (zoom_buffer_transformation_job_parent_class)->finalize (obj); -#line 4223 "PhotoPage.c" +#line 4185 "PhotoPage.c" } @@ -4246,7 +4208,7 @@ static void zoom_buffer_class_init (ZoomBufferClass * klass) { g_type_class_add_private (klass, sizeof (ZoomBufferPrivate)); #line 7 "/home/jens/Source/shotwell/src/PhotoPage.vala" G_OBJECT_CLASS (klass)->finalize = zoom_buffer_finalize; -#line 4246 "PhotoPage.c" +#line 4208 "PhotoPage.c" } @@ -4275,7 +4237,7 @@ static void zoom_buffer_instance_init (ZoomBuffer * self) { self->priv->workers = NULL; #line 82 "/home/jens/Source/shotwell/src/PhotoPage.vala" self->priv->is_interactive_redraw_in_progress = FALSE; -#line 4275 "PhotoPage.c" +#line 4237 "PhotoPage.c" } @@ -4305,7 +4267,7 @@ static void zoom_buffer_finalize (GObject * obj) { _g_object_unref0 (self->priv->parent_page); #line 7 "/home/jens/Source/shotwell/src/PhotoPage.vala" G_OBJECT_CLASS (zoom_buffer_parent_class)->finalize (obj); -#line 4305 "PhotoPage.c" +#line 4267 "PhotoPage.c" } @@ -4324,77 +4286,77 @@ GType zoom_buffer_get_type (void) { static void _editing_host_page_on_photos_altered_data_collection_items_altered (DataCollection* _sender, GeeMap* items, gpointer self) { #line 551 "/home/jens/Source/shotwell/src/PhotoPage.vala" editing_host_page_on_photos_altered ((EditingHostPage*) self, items); -#line 4324 "PhotoPage.c" +#line 4286 "PhotoPage.c" } static void _editing_host_page_on_view_contents_ordering_altered_data_collection_contents_altered (DataCollection* _sender, GeeIterable* added, GeeIterable* removed, gpointer self) { #line 553 "/home/jens/Source/shotwell/src/PhotoPage.vala" editing_host_page_on_view_contents_ordering_altered ((EditingHostPage*) self); -#line 4331 "PhotoPage.c" +#line 4293 "PhotoPage.c" } static void _editing_host_page_on_view_contents_ordering_altered_data_collection_ordering_changed (DataCollection* _sender, gpointer self) { #line 554 "/home/jens/Source/shotwell/src/PhotoPage.vala" editing_host_page_on_view_contents_ordering_altered ((EditingHostPage*) self); -#line 4338 "PhotoPage.c" +#line 4300 "PhotoPage.c" } static gpointer _data_collection_ref0 (gpointer self) { #line 420 "/home/jens/Source/shotwell/src/PhotoPage.vala" return self ? data_collection_ref (self) : NULL; -#line 4345 "PhotoPage.c" +#line 4307 "PhotoPage.c" } static void _editing_host_page_on_viewport_resized_gtk_widget_size_allocate (GtkWidget* _sender, GtkAllocation* allocation, gpointer self) { #line 431 "/home/jens/Source/shotwell/src/PhotoPage.vala" editing_host_page_on_viewport_resized ((EditingHostPage*) self); -#line 4352 "PhotoPage.c" +#line 4314 "PhotoPage.c" } static void _editing_host_page_on_rotate_clockwise_gtk_tool_button_clicked (GtkToolButton* _sender, gpointer self) { #line 440 "/home/jens/Source/shotwell/src/PhotoPage.vala" editing_host_page_on_rotate_clockwise ((EditingHostPage*) self); -#line 4359 "PhotoPage.c" +#line 4321 "PhotoPage.c" } static void _editing_host_page_on_crop_toggled_gtk_toggle_tool_button_toggled (GtkToggleToolButton* _sender, gpointer self) { #line 452 "/home/jens/Source/shotwell/src/PhotoPage.vala" editing_host_page_on_crop_toggled ((EditingHostPage*) self); -#line 4366 "PhotoPage.c" +#line 4328 "PhotoPage.c" } static void _editing_host_page_on_straighten_toggled_gtk_toggle_tool_button_toggled (GtkToggleToolButton* _sender, gpointer self) { #line 461 "/home/jens/Source/shotwell/src/PhotoPage.vala" editing_host_page_on_straighten_toggled ((EditingHostPage*) self); -#line 4373 "PhotoPage.c" +#line 4335 "PhotoPage.c" } static void _editing_host_page_on_redeye_toggled_gtk_toggle_tool_button_toggled (GtkToggleToolButton* _sender, gpointer self) { #line 470 "/home/jens/Source/shotwell/src/PhotoPage.vala" editing_host_page_on_redeye_toggled ((EditingHostPage*) self); -#line 4380 "PhotoPage.c" +#line 4342 "PhotoPage.c" } static void _editing_host_page_on_adjust_toggled_gtk_toggle_tool_button_toggled (GtkToggleToolButton* _sender, gpointer self) { #line 479 "/home/jens/Source/shotwell/src/PhotoPage.vala" editing_host_page_on_adjust_toggled ((EditingHostPage*) self); -#line 4387 "PhotoPage.c" +#line 4349 "PhotoPage.c" } static void _editing_host_page_on_enhance_gtk_tool_button_clicked (GtkToolButton* _sender, gpointer self) { #line 487 "/home/jens/Source/shotwell/src/PhotoPage.vala" editing_host_page_on_enhance ((EditingHostPage*) self); -#line 4394 "PhotoPage.c" +#line 4356 "PhotoPage.c" } @@ -4403,14 +4365,14 @@ static gboolean _editing_host_page_on_zoom_out_pressed_gtk_widget_button_press_e result = editing_host_page_on_zoom_out_pressed ((EditingHostPage*) self, event); #line 506 "/home/jens/Source/shotwell/src/PhotoPage.vala" return result; -#line 4403 "PhotoPage.c" +#line 4365 "PhotoPage.c" } static void _editing_host_page_on_zoom_slider_value_changed_gtk_range_value_changed (GtkRange* _sender, gpointer self) { #line 514 "/home/jens/Source/shotwell/src/PhotoPage.vala" editing_host_page_on_zoom_slider_value_changed ((EditingHostPage*) self); -#line 4410 "PhotoPage.c" +#line 4372 "PhotoPage.c" } @@ -4419,7 +4381,7 @@ static gboolean _editing_host_page_on_zoom_slider_drag_begin_gtk_widget_button_p result = editing_host_page_on_zoom_slider_drag_begin ((EditingHostPage*) self, event); #line 515 "/home/jens/Source/shotwell/src/PhotoPage.vala" return result; -#line 4419 "PhotoPage.c" +#line 4381 "PhotoPage.c" } @@ -4428,7 +4390,7 @@ static gboolean _editing_host_page_on_zoom_slider_drag_end_gtk_widget_button_rel result = editing_host_page_on_zoom_slider_drag_end ((EditingHostPage*) self, event); #line 516 "/home/jens/Source/shotwell/src/PhotoPage.vala" return result; -#line 4428 "PhotoPage.c" +#line 4390 "PhotoPage.c" } @@ -4437,7 +4399,7 @@ static gboolean _editing_host_page_on_zoom_slider_key_press_gtk_widget_key_press result = editing_host_page_on_zoom_slider_key_press ((EditingHostPage*) self, event); #line 517 "/home/jens/Source/shotwell/src/PhotoPage.vala" return result; -#line 4437 "PhotoPage.c" +#line 4399 "PhotoPage.c" } @@ -4446,21 +4408,21 @@ static gboolean _editing_host_page_on_zoom_in_pressed_gtk_widget_button_press_ev result = editing_host_page_on_zoom_in_pressed ((EditingHostPage*) self, event); #line 528 "/home/jens/Source/shotwell/src/PhotoPage.vala" return result; -#line 4446 "PhotoPage.c" +#line 4408 "PhotoPage.c" } static void _single_photo_page_on_previous_photo_gtk_tool_button_clicked (GtkToolButton* _sender, gpointer self) { #line 540 "/home/jens/Source/shotwell/src/PhotoPage.vala" single_photo_page_on_previous_photo ((SinglePhotoPage*) self); -#line 4453 "PhotoPage.c" +#line 4415 "PhotoPage.c" } static void _single_photo_page_on_next_photo_gtk_tool_button_clicked (GtkToolButton* _sender, gpointer self) { #line 546 "/home/jens/Source/shotwell/src/PhotoPage.vala" single_photo_page_on_next_photo ((SinglePhotoPage*) self); -#line 4460 "PhotoPage.c" +#line 4422 "PhotoPage.c" } @@ -4981,7 +4943,7 @@ EditingHostPage* editing_host_page_construct (GType object_type, SourceCollectio _g_object_unref0 (toolbar); #line 417 "/home/jens/Source/shotwell/src/PhotoPage.vala" return self; -#line 4981 "PhotoPage.c" +#line 4943 "PhotoPage.c" } @@ -5005,7 +4967,7 @@ static void editing_host_page_on_zoom_slider_value_changed (EditingHostPage* sel _tmp3_ = self->priv->enable_interactive_zoom_refresh; #line 560 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp3_) { -#line 5005 "PhotoPage.c" +#line 4967 "PhotoPage.c" ZoomState _tmp4_; gboolean _tmp5_; #line 561 "/home/jens/Source/shotwell/src/PhotoPage.vala" @@ -5016,13 +4978,13 @@ static void editing_host_page_on_zoom_slider_value_changed (EditingHostPage* sel _tmp5_ = zoom_state_is_default (&new_zoom_state); #line 563 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp5_) { -#line 5016 "PhotoPage.c" +#line 4978 "PhotoPage.c" ZoomState _tmp6_; #line 564 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp6_ = new_zoom_state; #line 564 "/home/jens/Source/shotwell/src/PhotoPage.vala" single_photo_page_set_zoom_state (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), &_tmp6_); -#line 5022 "PhotoPage.c" +#line 4984 "PhotoPage.c" } } else { gboolean _tmp7_; @@ -5032,22 +4994,22 @@ static void editing_host_page_on_zoom_slider_value_changed (EditingHostPage* sel if (_tmp7_) { #line 567 "/home/jens/Source/shotwell/src/PhotoPage.vala" single_photo_page_cancel_zoom (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage)); -#line 5032 "PhotoPage.c" +#line 4994 "PhotoPage.c" } else { ZoomState _tmp8_; #line 569 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp8_ = new_zoom_state; #line 569 "/home/jens/Source/shotwell/src/PhotoPage.vala" single_photo_page_set_zoom_state (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), &_tmp8_); -#line 5039 "PhotoPage.c" +#line 5001 "PhotoPage.c" } #line 571 "/home/jens/Source/shotwell/src/PhotoPage.vala" single_photo_page_repaint (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), NULL); -#line 5043 "PhotoPage.c" +#line 5005 "PhotoPage.c" } #line 574 "/home/jens/Source/shotwell/src/PhotoPage.vala" editing_host_page_update_cursor_for_zoom_context (self); -#line 5047 "PhotoPage.c" +#line 5009 "PhotoPage.c" } @@ -5072,7 +5034,7 @@ static gboolean editing_host_page_on_zoom_slider_drag_begin (EditingHostPage* se _g_object_unref0 (_tmp1_); #line 580 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp2_) { -#line 5072 "PhotoPage.c" +#line 5034 "PhotoPage.c" GtkWindow* _tmp3_; FullscreenWindow* _tmp4_; #line 581 "/home/jens/Source/shotwell/src/PhotoPage.vala" @@ -5083,13 +5045,13 @@ static gboolean editing_host_page_on_zoom_slider_drag_begin (EditingHostPage* se fullscreen_window_disable_toolbar_dismissal (_tmp4_); #line 581 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (_tmp4_); -#line 5083 "PhotoPage.c" +#line 5045 "PhotoPage.c" } #line 583 "/home/jens/Source/shotwell/src/PhotoPage.vala" result = FALSE; #line 583 "/home/jens/Source/shotwell/src/PhotoPage.vala" return result; -#line 5089 "PhotoPage.c" +#line 5051 "PhotoPage.c" } @@ -5119,7 +5081,7 @@ static gboolean editing_host_page_on_zoom_slider_drag_end (EditingHostPage* self _g_object_unref0 (_tmp1_); #line 589 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp2_) { -#line 5119 "PhotoPage.c" +#line 5081 "PhotoPage.c" GtkWindow* _tmp3_; FullscreenWindow* _tmp4_; #line 590 "/home/jens/Source/shotwell/src/PhotoPage.vala" @@ -5130,7 +5092,7 @@ static gboolean editing_host_page_on_zoom_slider_drag_end (EditingHostPage* self fullscreen_window_update_toolbar_dismissal (_tmp4_); #line 590 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (_tmp4_); -#line 5130 "PhotoPage.c" +#line 5092 "PhotoPage.c" } #line 592 "/home/jens/Source/shotwell/src/PhotoPage.vala" single_photo_page_get_zoom_state (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), &_tmp5_); @@ -5150,7 +5112,7 @@ static gboolean editing_host_page_on_zoom_slider_drag_end (EditingHostPage* self result = FALSE; #line 597 "/home/jens/Source/shotwell/src/PhotoPage.vala" return result; -#line 5150 "PhotoPage.c" +#line 5112 "PhotoPage.c" } @@ -5166,7 +5128,7 @@ static gboolean editing_host_page_on_zoom_out_pressed (EditingHostPage* self, Gd result = TRUE; #line 602 "/home/jens/Source/shotwell/src/PhotoPage.vala" return result; -#line 5166 "PhotoPage.c" +#line 5128 "PhotoPage.c" } @@ -5182,7 +5144,7 @@ static gboolean editing_host_page_on_zoom_in_pressed (EditingHostPage* self, Gdk result = TRUE; #line 607 "/home/jens/Source/shotwell/src/PhotoPage.vala" return result; -#line 5182 "PhotoPage.c" +#line 5144 "PhotoPage.c" } @@ -5294,7 +5256,7 @@ static void editing_host_page_get_cursor_wrt_viewport (EditingHostPage* self, Gd *result = _result_; #line 622 "/home/jens/Source/shotwell/src/PhotoPage.vala" return; -#line 5294 "PhotoPage.c" +#line 5256 "PhotoPage.c" } @@ -5356,7 +5318,7 @@ static void editing_host_page_get_cursor_wrt_viewport_center (EditingHostPage* s *result = _tmp11_; #line 633 "/home/jens/Source/shotwell/src/PhotoPage.vala" return; -#line 5356 "PhotoPage.c" +#line 5318 "PhotoPage.c" } @@ -5414,7 +5376,7 @@ static void editing_host_page_get_iso_pixel_under_cursor (EditingHostPage* self, *result = _tmp12_; #line 643 "/home/jens/Source/shotwell/src/PhotoPage.vala" return; -#line 5414 "PhotoPage.c" +#line 5376 "PhotoPage.c" } @@ -5430,7 +5392,7 @@ static gdouble editing_host_page_snap_interpolation_factor (EditingHostPage* sel if (_tmp0_ < 0.03) { #line 648 "/home/jens/Source/shotwell/src/PhotoPage.vala" interp = 0.0; -#line 5430 "PhotoPage.c" +#line 5392 "PhotoPage.c" } else { gdouble _tmp1_; #line 649 "/home/jens/Source/shotwell/src/PhotoPage.vala" @@ -5439,7 +5401,7 @@ static gdouble editing_host_page_snap_interpolation_factor (EditingHostPage* sel if (_tmp1_ > 0.97) { #line 650 "/home/jens/Source/shotwell/src/PhotoPage.vala" interp = 1.0; -#line 5439 "PhotoPage.c" +#line 5401 "PhotoPage.c" } } #line 652 "/home/jens/Source/shotwell/src/PhotoPage.vala" @@ -5448,7 +5410,7 @@ static gdouble editing_host_page_snap_interpolation_factor (EditingHostPage* sel result = _tmp2_; #line 652 "/home/jens/Source/shotwell/src/PhotoPage.vala" return result; -#line 5448 "PhotoPage.c" +#line 5410 "PhotoPage.c" } @@ -5472,7 +5434,7 @@ static gdouble editing_host_page_adjust_interpolation_factor (EditingHostPage* s result = _tmp3_; #line 656 "/home/jens/Source/shotwell/src/PhotoPage.vala" return result; -#line 5472 "PhotoPage.c" +#line 5434 "PhotoPage.c" } @@ -5517,7 +5479,7 @@ static void editing_host_page_zoom_about_event_cursor_point (EditingHostPage* se if (_tmp0_) { #line 661 "/home/jens/Source/shotwell/src/PhotoPage.vala" return; -#line 5517 "PhotoPage.c" +#line 5479 "PhotoPage.c" } #line 663 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp1_ = event; @@ -5571,7 +5533,7 @@ static void editing_host_page_zoom_about_event_cursor_point (EditingHostPage* se single_photo_page_repaint (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), NULL); #line 677 "/home/jens/Source/shotwell/src/PhotoPage.vala" return; -#line 5571 "PhotoPage.c" +#line 5533 "PhotoPage.c" } #line 680 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp15_ = iso_pixel_under_cursor; @@ -5603,7 +5565,7 @@ static void editing_host_page_zoom_about_event_cursor_point (EditingHostPage* se single_photo_page_repaint (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), NULL); #line 690 "/home/jens/Source/shotwell/src/PhotoPage.vala" editing_host_page_update_cursor_for_zoom_context (self); -#line 5603 "PhotoPage.c" +#line 5565 "PhotoPage.c" } @@ -5615,7 +5577,7 @@ void editing_host_page_snap_zoom_to_min (EditingHostPage* self) { _tmp0_ = self->priv->zoom_slider; #line 694 "/home/jens/Source/shotwell/src/PhotoPage.vala" gtk_range_set_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_range_get_type (), GtkRange), 0.0); -#line 5615 "PhotoPage.c" +#line 5577 "PhotoPage.c" } @@ -5627,7 +5589,7 @@ void editing_host_page_snap_zoom_to_max (EditingHostPage* self) { _tmp0_ = self->priv->zoom_slider; #line 698 "/home/jens/Source/shotwell/src/PhotoPage.vala" gtk_range_set_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_range_get_type (), GtkRange), 1.0); -#line 5627 "PhotoPage.c" +#line 5589 "PhotoPage.c" } @@ -5648,7 +5610,7 @@ void editing_host_page_snap_zoom_to_isomorphic (EditingHostPage* self) { _tmp2_ = zoom_state_get_interpolation_factor (&iso_state); #line 703 "/home/jens/Source/shotwell/src/PhotoPage.vala" gtk_range_set_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_range_get_type (), GtkRange), _tmp2_); -#line 5648 "PhotoPage.c" +#line 5610 "PhotoPage.c" } @@ -5691,7 +5653,7 @@ static gboolean editing_host_page_real_on_zoom_slider_key_press (EditingHostPage if (((_tmp5_ == ((0 != _tmp4_label0) ? _tmp4_label0 : (_tmp4_label0 = g_quark_from_static_string ("equal")))) || (_tmp5_ == ((0 != _tmp4_label1) ? _tmp4_label1 : (_tmp4_label1 = g_quark_from_static_string ("plus"))))) || (_tmp5_ == ((0 != _tmp4_label2) ? _tmp4_label2 : (_tmp4_label2 = g_quark_from_static_string ("KP_Add"))))) { #line 707 "/home/jens/Source/shotwell/src/PhotoPage.vala" switch (0) { -#line 5691 "PhotoPage.c" +#line 5653 "PhotoPage.c" default: { #line 711 "/home/jens/Source/shotwell/src/PhotoPage.vala" @@ -5700,13 +5662,13 @@ static gboolean editing_host_page_real_on_zoom_slider_key_press (EditingHostPage result = TRUE; #line 712 "/home/jens/Source/shotwell/src/PhotoPage.vala" return result; -#line 5700 "PhotoPage.c" +#line 5662 "PhotoPage.c" } } } else if (((_tmp5_ == ((0 != _tmp4_label3) ? _tmp4_label3 : (_tmp4_label3 = g_quark_from_static_string ("minus")))) || (_tmp5_ == ((0 != _tmp4_label4) ? _tmp4_label4 : (_tmp4_label4 = g_quark_from_static_string ("underscore"))))) || (_tmp5_ == ((0 != _tmp4_label5) ? _tmp4_label5 : (_tmp4_label5 = g_quark_from_static_string ("KP_Subtract"))))) { #line 707 "/home/jens/Source/shotwell/src/PhotoPage.vala" switch (0) { -#line 5706 "PhotoPage.c" +#line 5668 "PhotoPage.c" default: { #line 717 "/home/jens/Source/shotwell/src/PhotoPage.vala" @@ -5715,13 +5677,13 @@ static gboolean editing_host_page_real_on_zoom_slider_key_press (EditingHostPage result = TRUE; #line 718 "/home/jens/Source/shotwell/src/PhotoPage.vala" return result; -#line 5715 "PhotoPage.c" +#line 5677 "PhotoPage.c" } } } else if (_tmp5_ == ((0 != _tmp4_label6) ? _tmp4_label6 : (_tmp4_label6 = g_quark_from_static_string ("KP_Divide")))) { #line 707 "/home/jens/Source/shotwell/src/PhotoPage.vala" switch (0) { -#line 5721 "PhotoPage.c" +#line 5683 "PhotoPage.c" default: { #line 721 "/home/jens/Source/shotwell/src/PhotoPage.vala" @@ -5730,13 +5692,13 @@ static gboolean editing_host_page_real_on_zoom_slider_key_press (EditingHostPage result = TRUE; #line 722 "/home/jens/Source/shotwell/src/PhotoPage.vala" return result; -#line 5730 "PhotoPage.c" +#line 5692 "PhotoPage.c" } } } else if (_tmp5_ == ((0 != _tmp4_label7) ? _tmp4_label7 : (_tmp4_label7 = g_quark_from_static_string ("KP_Multiply")))) { #line 707 "/home/jens/Source/shotwell/src/PhotoPage.vala" switch (0) { -#line 5736 "PhotoPage.c" +#line 5698 "PhotoPage.c" default: { #line 725 "/home/jens/Source/shotwell/src/PhotoPage.vala" @@ -5745,7 +5707,7 @@ static gboolean editing_host_page_real_on_zoom_slider_key_press (EditingHostPage result = TRUE; #line 726 "/home/jens/Source/shotwell/src/PhotoPage.vala" return result; -#line 5745 "PhotoPage.c" +#line 5707 "PhotoPage.c" } } } @@ -5753,7 +5715,7 @@ static gboolean editing_host_page_real_on_zoom_slider_key_press (EditingHostPage result = FALSE; #line 729 "/home/jens/Source/shotwell/src/PhotoPage.vala" return result; -#line 5753 "PhotoPage.c" +#line 5715 "PhotoPage.c" } @@ -5762,7 +5724,7 @@ gboolean editing_host_page_on_zoom_slider_key_press (EditingHostPage* self, GdkE g_return_val_if_fail (IS_EDITING_HOST_PAGE (self), FALSE); #line 706 "/home/jens/Source/shotwell/src/PhotoPage.vala" return EDITING_HOST_PAGE_GET_CLASS (self)->on_zoom_slider_key_press (self, event); -#line 5762 "PhotoPage.c" +#line 5724 "PhotoPage.c" } @@ -5775,7 +5737,7 @@ static void editing_host_page_real_on_increase_size (EditingHostPage* self) { _tmp1_ = editing_host_page_adjust_interpolation_factor (self, EDITING_HOST_PAGE_ZOOM_INCREMENT_SIZE); #line 733 "/home/jens/Source/shotwell/src/PhotoPage.vala" gtk_range_set_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_range_get_type (), GtkRange), _tmp1_); -#line 5775 "PhotoPage.c" +#line 5737 "PhotoPage.c" } @@ -5784,7 +5746,7 @@ void editing_host_page_on_increase_size (EditingHostPage* self) { g_return_if_fail (IS_EDITING_HOST_PAGE (self)); #line 732 "/home/jens/Source/shotwell/src/PhotoPage.vala" EDITING_HOST_PAGE_GET_CLASS (self)->on_increase_size (self); -#line 5784 "PhotoPage.c" +#line 5746 "PhotoPage.c" } @@ -5797,7 +5759,7 @@ static void editing_host_page_real_on_decrease_size (EditingHostPage* self) { _tmp1_ = editing_host_page_adjust_interpolation_factor (self, -EDITING_HOST_PAGE_ZOOM_INCREMENT_SIZE); #line 737 "/home/jens/Source/shotwell/src/PhotoPage.vala" gtk_range_set_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_range_get_type (), GtkRange), _tmp1_); -#line 5797 "PhotoPage.c" +#line 5759 "PhotoPage.c" } @@ -5806,7 +5768,7 @@ void editing_host_page_on_decrease_size (EditingHostPage* self) { g_return_if_fail (IS_EDITING_HOST_PAGE (self)); #line 736 "/home/jens/Source/shotwell/src/PhotoPage.vala" EDITING_HOST_PAGE_GET_CLASS (self)->on_decrease_size (self); -#line 5806 "PhotoPage.c" +#line 5768 "PhotoPage.c" } @@ -5824,7 +5786,7 @@ static void editing_host_page_real_save_zoom_state (SinglePhotoPage* base) { _tmp1_ = gtk_range_get_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_range_get_type (), GtkRange)); #line 742 "/home/jens/Source/shotwell/src/PhotoPage.vala" self->priv->saved_slider_val = _tmp1_; -#line 5824 "PhotoPage.c" +#line 5786 "PhotoPage.c" } @@ -5843,7 +5805,7 @@ static ZoomBuffer* editing_host_page_real_get_zoom_buffer (SinglePhotoPage* base result = _tmp1_; #line 746 "/home/jens/Source/shotwell/src/PhotoPage.vala" return result; -#line 5843 "PhotoPage.c" +#line 5805 "PhotoPage.c" } @@ -5866,7 +5828,7 @@ static gboolean editing_host_page_real_on_mousewheel_up (Page* base, GdkEventScr if (_tmp2_) { #line 750 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp0_ = TRUE; -#line 5866 "PhotoPage.c" +#line 5828 "PhotoPage.c" } else { GtkScale* _tmp3_; gboolean _tmp4_; @@ -5876,7 +5838,7 @@ static gboolean editing_host_page_real_on_mousewheel_up (Page* base, GdkEventScr _tmp4_ = gtk_widget_get_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, gtk_widget_get_type (), GtkWidget)); #line 750 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp0_ = !_tmp4_; -#line 5876 "PhotoPage.c" +#line 5838 "PhotoPage.c" } #line 750 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp0_) { @@ -5884,7 +5846,7 @@ static gboolean editing_host_page_real_on_mousewheel_up (Page* base, GdkEventScr result = FALSE; #line 751 "/home/jens/Source/shotwell/src/PhotoPage.vala" return result; -#line 5884 "PhotoPage.c" +#line 5846 "PhotoPage.c" } #line 753 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp5_ = event; @@ -5894,7 +5856,7 @@ static gboolean editing_host_page_real_on_mousewheel_up (Page* base, GdkEventScr result = FALSE; #line 754 "/home/jens/Source/shotwell/src/PhotoPage.vala" return result; -#line 5894 "PhotoPage.c" +#line 5856 "PhotoPage.c" } @@ -5917,7 +5879,7 @@ static gboolean editing_host_page_real_on_mousewheel_down (Page* base, GdkEventS if (_tmp2_) { #line 758 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp0_ = TRUE; -#line 5917 "PhotoPage.c" +#line 5879 "PhotoPage.c" } else { GtkScale* _tmp3_; gboolean _tmp4_; @@ -5927,7 +5889,7 @@ static gboolean editing_host_page_real_on_mousewheel_down (Page* base, GdkEventS _tmp4_ = gtk_widget_get_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, gtk_widget_get_type (), GtkWidget)); #line 758 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp0_ = !_tmp4_; -#line 5927 "PhotoPage.c" +#line 5889 "PhotoPage.c" } #line 758 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp0_) { @@ -5935,7 +5897,7 @@ static gboolean editing_host_page_real_on_mousewheel_down (Page* base, GdkEventS result = FALSE; #line 759 "/home/jens/Source/shotwell/src/PhotoPage.vala" return result; -#line 5935 "PhotoPage.c" +#line 5897 "PhotoPage.c" } #line 761 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp5_ = event; @@ -5945,7 +5907,7 @@ static gboolean editing_host_page_real_on_mousewheel_down (Page* base, GdkEventS result = FALSE; #line 762 "/home/jens/Source/shotwell/src/PhotoPage.vala" return result; -#line 5945 "PhotoPage.c" +#line 5907 "PhotoPage.c" } @@ -5976,7 +5938,7 @@ static void editing_host_page_real_restore_zoom_state (SinglePhotoPage* base) { _tmp4_ = self->priv->zoom_slider; #line 770 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, gtk_range_get_type (), GtkRange), "value-changed", (GCallback) _editing_host_page_on_zoom_slider_value_changed_gtk_range_value_changed, self, 0); -#line 5976 "PhotoPage.c" +#line 5938 "PhotoPage.c" } @@ -5989,7 +5951,7 @@ static gboolean editing_host_page_real_is_zoom_supported (SinglePhotoPage* base) result = TRUE; #line 774 "/home/jens/Source/shotwell/src/PhotoPage.vala" return result; -#line 5989 "PhotoPage.c" +#line 5951 "PhotoPage.c" } @@ -6009,7 +5971,7 @@ static void editing_host_page_real_set_container (Page* base, GtkWindow* contain _tmp1_ = container; #line 781 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (!G_TYPE_CHECK_INSTANCE_TYPE (_tmp1_, TYPE_FULLSCREEN_WINDOW)) { -#line 6009 "PhotoPage.c" +#line 5971 "PhotoPage.c" DragAndDropHandler* _tmp2_; #line 782 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp2_ = drag_and_drop_handler_new (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); @@ -6017,7 +5979,7 @@ static void editing_host_page_real_set_container (Page* base, GtkWindow* contain _drag_and_drop_handler_unref0 (self->priv->dnd_handler); #line 782 "/home/jens/Source/shotwell/src/PhotoPage.vala" self->priv->dnd_handler = _tmp2_; -#line 6017 "PhotoPage.c" +#line 5979 "PhotoPage.c" } } @@ -6036,7 +5998,7 @@ ViewCollection* editing_host_page_get_parent_view (EditingHostPage* self) { result = _tmp1_; #line 786 "/home/jens/Source/shotwell/src/PhotoPage.vala" return result; -#line 6036 "PhotoPage.c" +#line 5998 "PhotoPage.c" } @@ -6059,7 +6021,7 @@ gboolean editing_host_page_has_photo (EditingHostPage* self) { result = _tmp2_; #line 790 "/home/jens/Source/shotwell/src/PhotoPage.vala" return result; -#line 6059 "PhotoPage.c" +#line 6021 "PhotoPage.c" } @@ -6096,7 +6058,7 @@ Photo* editing_host_page_get_photo (EditingHostPage* self) { result = NULL; #line 796 "/home/jens/Source/shotwell/src/PhotoPage.vala" return result; -#line 6096 "PhotoPage.c" +#line 6058 "PhotoPage.c" } #line 800 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp4_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); @@ -6128,7 +6090,7 @@ Photo* editing_host_page_get_photo (EditingHostPage* self) { result = _tmp12_; #line 801 "/home/jens/Source/shotwell/src/PhotoPage.vala" return result; -#line 6128 "PhotoPage.c" +#line 6090 "PhotoPage.c" } @@ -6146,7 +6108,7 @@ static void editing_host_page_real_photo_changing (EditingHostPage* self, Photo* if (_tmp1_ == PHOTO_FILE_FORMAT_RAW) { #line 809 "/home/jens/Source/shotwell/src/PhotoPage.vala" editing_host_page_set_photo_missing (self, FALSE); -#line 6146 "PhotoPage.c" +#line 6108 "PhotoPage.c" } else { Photo* _tmp2_; GFile* _tmp3_; @@ -6164,13 +6126,13 @@ static void editing_host_page_real_photo_changing (EditingHostPage* self, Photo* editing_host_page_set_photo_missing (self, !_tmp5_); #line 811 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (_tmp4_); -#line 6164 "PhotoPage.c" +#line 6126 "PhotoPage.c" } #line 813 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp6_ = self->priv->photo_missing; #line 813 "/home/jens/Source/shotwell/src/PhotoPage.vala" editing_host_page_update_ui (self, _tmp6_); -#line 6170 "PhotoPage.c" +#line 6132 "PhotoPage.c" } @@ -6179,7 +6141,7 @@ void editing_host_page_photo_changing (EditingHostPage* self, Photo* new_photo) g_return_if_fail (IS_EDITING_HOST_PAGE (self)); #line 805 "/home/jens/Source/shotwell/src/PhotoPage.vala" EDITING_HOST_PAGE_GET_CLASS (self)->photo_changing (self, new_photo); -#line 6179 "PhotoPage.c" +#line 6141 "PhotoPage.c" } @@ -6284,7 +6246,7 @@ static void editing_host_page_set_photo (EditingHostPage* self, Photo* photo) { _tmp21_ = self->priv->parent_view; #line 832 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp21_ != NULL) { -#line 6284 "PhotoPage.c" +#line 6246 "PhotoPage.c" ViewCollection* _tmp22_; DataView* view_in_parent = NULL; ViewCollection* _tmp23_; @@ -6307,7 +6269,7 @@ static void editing_host_page_set_photo (EditingHostPage* self, Photo* photo) { _tmp26_ = view_in_parent; #line 835 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (NULL != _tmp26_) { -#line 6307 "PhotoPage.c" +#line 6269 "PhotoPage.c" ViewCollection* _tmp27_; ViewCollection* _tmp28_; DataView* _tmp29_; @@ -6327,17 +6289,17 @@ static void editing_host_page_set_photo (EditingHostPage* self, Photo* photo) { view_collection_select_marked (_tmp27_, _tmp31_); #line 836 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (_tmp31_); -#line 6327 "PhotoPage.c" +#line 6289 "PhotoPage.c" } #line 832 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (view_in_parent); -#line 6331 "PhotoPage.c" +#line 6293 "PhotoPage.c" } #line 816 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (marker); #line 816 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (view); -#line 6337 "PhotoPage.c" +#line 6299 "PhotoPage.c" } @@ -6349,7 +6311,7 @@ static void editing_host_page_real_realize (GtkWidget* base) { GTK_WIDGET_CLASS (editing_host_page_parent_class)->realize (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), gtk_widget_get_type (), GtkWidget)); #line 843 "/home/jens/Source/shotwell/src/PhotoPage.vala" editing_host_page_rebuild_caches (self, "realize"); -#line 6349 "PhotoPage.c" +#line 6311 "PhotoPage.c" } @@ -6367,21 +6329,21 @@ static void editing_host_page_real_switched_to (Page* base) { _tmp1_ = editing_host_page_has_photo (self); #line 852 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp1_) { -#line 6367 "PhotoPage.c" +#line 6329 "PhotoPage.c" gboolean _tmp2_; #line 852 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp2_ = self->priv->pixbuf_dirty; #line 852 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp0_ = _tmp2_; -#line 6373 "PhotoPage.c" +#line 6335 "PhotoPage.c" } else { #line 852 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp0_ = FALSE; -#line 6377 "PhotoPage.c" +#line 6339 "PhotoPage.c" } #line 852 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp0_) { -#line 6381 "PhotoPage.c" +#line 6343 "PhotoPage.c" Photo* _tmp3_; Photo* _tmp4_; #line 853 "/home/jens/Source/shotwell/src/PhotoPage.vala" @@ -6392,7 +6354,7 @@ static void editing_host_page_real_switched_to (Page* base) { editing_host_page_replace_photo (self, _tmp4_); #line 853 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (_tmp4_); -#line 6392 "PhotoPage.c" +#line 6354 "PhotoPage.c" } } @@ -6420,21 +6382,21 @@ static void editing_host_page_real_switching_from (Page* base) { _tmp2_ = editing_host_page_has_photo (self); #line 869 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp2_) { -#line 6420 "PhotoPage.c" +#line 6382 "PhotoPage.c" ViewCollection* _tmp3_; #line 869 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp3_ = self->priv->parent_view; #line 869 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp1_ = _tmp3_ != NULL; -#line 6426 "PhotoPage.c" +#line 6388 "PhotoPage.c" } else { #line 869 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp1_ = FALSE; -#line 6430 "PhotoPage.c" +#line 6392 "PhotoPage.c" } #line 869 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp1_) { -#line 6434 "PhotoPage.c" +#line 6396 "PhotoPage.c" ViewCollection* _tmp4_; ViewCollection* _tmp5_; ViewCollection* _tmp6_; @@ -6470,7 +6432,7 @@ static void editing_host_page_real_switching_from (Page* base) { _g_object_unref0 (_tmp10_); #line 870 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (_tmp8_); -#line 6470 "PhotoPage.c" +#line 6432 "PhotoPage.c" } #line 873 "/home/jens/Source/shotwell/src/PhotoPage.vala" _data_collection_unref0 (self->priv->parent_view); @@ -6484,14 +6446,14 @@ static void editing_host_page_real_switching_from (Page* base) { data_collection_clear (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, TYPE_DATA_COLLECTION, DataCollection)); #line 874 "/home/jens/Source/shotwell/src/PhotoPage.vala" _data_collection_unref0 (_tmp14_); -#line 6484 "PhotoPage.c" +#line 6446 "PhotoPage.c" } static void _editing_host_page_on_selection_changed_view_collection_items_selected (ViewCollection* _sender, GeeIterable* selected, gpointer self) { #line 887 "/home/jens/Source/shotwell/src/PhotoPage.vala" editing_host_page_on_selection_changed ((EditingHostPage*) self, selected); -#line 6491 "PhotoPage.c" +#line 6453 "PhotoPage.c" } @@ -6529,7 +6491,7 @@ static void editing_host_page_real_switching_to_fullscreen (Page* base, Fullscre _tmp4_ = page; #line 886 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp4_ != NULL) { -#line 6529 "PhotoPage.c" +#line 6491 "PhotoPage.c" Page* _tmp5_; ViewCollection* _tmp6_; ViewCollection* _tmp7_; @@ -6543,11 +6505,11 @@ static void editing_host_page_real_switching_to_fullscreen (Page* base, Fullscre g_signal_connect_object (_tmp7_, "items-selected", (GCallback) _editing_host_page_on_selection_changed_view_collection_items_selected, self, 0); #line 887 "/home/jens/Source/shotwell/src/PhotoPage.vala" _data_collection_unref0 (_tmp7_); -#line 6543 "PhotoPage.c" +#line 6505 "PhotoPage.c" } #line 877 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (page); -#line 6547 "PhotoPage.c" +#line 6509 "PhotoPage.c" } @@ -6578,7 +6540,7 @@ static void editing_host_page_real_returning_from_fullscreen (Page* base, Fullsc _tmp3_ = page; #line 896 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp3_ != NULL) { -#line 6578 "PhotoPage.c" +#line 6540 "PhotoPage.c" Page* _tmp4_; ViewCollection* _tmp5_; ViewCollection* _tmp6_; @@ -6595,11 +6557,11 @@ static void editing_host_page_real_returning_from_fullscreen (Page* base, Fullsc g_signal_handlers_disconnect_matched (_tmp6_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp7_, 0, NULL, (GCallback) _editing_host_page_on_selection_changed_view_collection_items_selected, self); #line 897 "/home/jens/Source/shotwell/src/PhotoPage.vala" _data_collection_unref0 (_tmp6_); -#line 6595 "PhotoPage.c" +#line 6557 "PhotoPage.c" } #line 890 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (page); -#line 6599 "PhotoPage.c" +#line 6561 "PhotoPage.c" } @@ -6608,7 +6570,7 @@ static void editing_host_page_on_selection_changed (EditingHostPage* self, GeeIt g_return_if_fail (IS_EDITING_HOST_PAGE (self)); #line 900 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_if_fail (GEE_IS_ITERABLE (selected)); -#line 6608 "PhotoPage.c" +#line 6570 "PhotoPage.c" { GeeIterator* _view_it = NULL; GeeIterable* _tmp0_; @@ -6621,7 +6583,7 @@ static void editing_host_page_on_selection_changed (EditingHostPage* self, GeeIt _view_it = _tmp1_; #line 901 "/home/jens/Source/shotwell/src/PhotoPage.vala" while (TRUE) { -#line 6621 "PhotoPage.c" +#line 6583 "PhotoPage.c" gboolean _tmp2_; DataView* view = NULL; gpointer _tmp3_; @@ -6634,7 +6596,7 @@ static void editing_host_page_on_selection_changed (EditingHostPage* self, GeeIt if (!_tmp2_) { #line 901 "/home/jens/Source/shotwell/src/PhotoPage.vala" break; -#line 6634 "PhotoPage.c" +#line 6596 "PhotoPage.c" } #line 901 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp3_ = gee_iterator_get (_view_it); @@ -6654,11 +6616,11 @@ static void editing_host_page_on_selection_changed (EditingHostPage* self, GeeIt _g_object_unref0 (view); #line 903 "/home/jens/Source/shotwell/src/PhotoPage.vala" break; -#line 6654 "PhotoPage.c" +#line 6616 "PhotoPage.c" } #line 901 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (_view_it); -#line 6658 "PhotoPage.c" +#line 6620 "PhotoPage.c" } } @@ -6674,14 +6636,14 @@ void editing_host_page_enable_rotate (EditingHostPage* self, gboolean should_ena _tmp1_ = should_enable; #line 908 "/home/jens/Source/shotwell/src/PhotoPage.vala" gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_widget_get_type (), GtkWidget), _tmp1_); -#line 6674 "PhotoPage.c" +#line 6636 "PhotoPage.c" } static void _editing_host_page_on_pixbuf_fetched_pixbuf_cache_fetched (PixbufCache* _sender, Photo* photo, GdkPixbuf* pixbuf, GError* err, gpointer self) { #line 926 "/home/jens/Source/shotwell/src/PhotoPage.vala" editing_host_page_on_pixbuf_fetched ((EditingHostPage*) self, photo, pixbuf, err); -#line 6681 "PhotoPage.c" +#line 6643 "PhotoPage.c" } @@ -6690,7 +6652,7 @@ static gboolean _editing_host_page_master_cache_filter_pixbuf_cache_cache_filter result = editing_host_page_master_cache_filter ((EditingHostPage*) self, photo); #line 933 "/home/jens/Source/shotwell/src/PhotoPage.vala" return result; -#line 6690 "PhotoPage.c" +#line 6652 "PhotoPage.c" } @@ -6723,7 +6685,7 @@ static void editing_host_page_rebuild_caches (EditingHostPage* self, const gchar _tmp2_ = self->priv->cache; #line 918 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp2_ != NULL) { -#line 6723 "PhotoPage.c" +#line 6685 "PhotoPage.c" PixbufCache* _tmp3_; Scaling _tmp4_ = {0}; Scaling _tmp5_; @@ -6738,17 +6700,17 @@ static void editing_host_page_rebuild_caches (EditingHostPage* self, const gchar _tmp6_ = scaling_equals (&_tmp4_, &_tmp5_); #line 918 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp1_ = _tmp6_; -#line 6738 "PhotoPage.c" +#line 6700 "PhotoPage.c" } else { #line 918 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp1_ = FALSE; -#line 6742 "PhotoPage.c" +#line 6704 "PhotoPage.c" } #line 918 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp1_) { #line 919 "/home/jens/Source/shotwell/src/PhotoPage.vala" return; -#line 6748 "PhotoPage.c" +#line 6710 "PhotoPage.c" } #line 921 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp7_ = caller; @@ -6764,7 +6726,7 @@ static void editing_host_page_rebuild_caches (EditingHostPage* self, const gchar _tmp10_ = self->priv->cache; #line 925 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp10_ != NULL) { -#line 6764 "PhotoPage.c" +#line 6726 "PhotoPage.c" PixbufCache* _tmp11_; guint _tmp12_; PixbufCache* _tmp13_; @@ -6778,7 +6740,7 @@ static void editing_host_page_rebuild_caches (EditingHostPage* self, const gchar _tmp13_ = self->priv->cache; #line 927 "/home/jens/Source/shotwell/src/PhotoPage.vala" pixbuf_cache_cancel_all (_tmp13_); -#line 6778 "PhotoPage.c" +#line 6740 "PhotoPage.c" } #line 930 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp14_ = self->priv->sources; @@ -6808,7 +6770,7 @@ static void editing_host_page_rebuild_caches (EditingHostPage* self, const gchar _tmp21_ = caller; #line 936 "/home/jens/Source/shotwell/src/PhotoPage.vala" editing_host_page_refresh_caches (self, _tmp21_); -#line 6808 "PhotoPage.c" +#line 6770 "PhotoPage.c" } @@ -6822,7 +6784,7 @@ static void editing_host_page_refresh_caches (EditingHostPage* self, const gchar _tmp0_ = editing_host_page_has_photo (self); #line 941 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp0_) { -#line 6822 "PhotoPage.c" +#line 6784 "PhotoPage.c" const gchar* _tmp1_; Photo* _tmp2_; Photo* _tmp3_; @@ -6863,14 +6825,14 @@ static void editing_host_page_refresh_caches (EditingHostPage* self, const gchar _g_object_unref0 (_tmp9_); #line 944 "/home/jens/Source/shotwell/src/PhotoPage.vala" _data_collection_unref0 (_tmp7_); -#line 6862 "PhotoPage.c" +#line 6824 "PhotoPage.c" } else { const gchar* _tmp10_; #line 946 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp10_ = caller; #line 946 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_debug ("PhotoPage.vala:946: Refresh pixbuf caches (%s): (no photo)", _tmp10_); -#line 6869 "PhotoPage.c" +#line 6831 "PhotoPage.c" } } @@ -6892,7 +6854,7 @@ static gboolean editing_host_page_master_cache_filter (EditingHostPage* self, Ph if (_tmp2_) { #line 951 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp0_ = TRUE; -#line 6891 "PhotoPage.c" +#line 6853 "PhotoPage.c" } else { Photo* _tmp3_; gboolean _tmp4_; @@ -6902,13 +6864,13 @@ static gboolean editing_host_page_master_cache_filter (EditingHostPage* self, Ph _tmp4_ = photo_has_editable (_tmp3_); #line 951 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp0_ = _tmp4_; -#line 6901 "PhotoPage.c" +#line 6863 "PhotoPage.c" } #line 951 "/home/jens/Source/shotwell/src/PhotoPage.vala" result = _tmp0_; #line 951 "/home/jens/Source/shotwell/src/PhotoPage.vala" return result; -#line 6907 "PhotoPage.c" +#line 6869 "PhotoPage.c" } @@ -6942,13 +6904,13 @@ static void editing_host_page_on_pixbuf_fetched (EditingHostPage* self, Photo* p if (_tmp4_) { #line 957 "/home/jens/Source/shotwell/src/PhotoPage.vala" return; -#line 6941 "PhotoPage.c" +#line 6903 "PhotoPage.c" } #line 959 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp5_ = pixbuf; #line 959 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp5_ != NULL) { -#line 6947 "PhotoPage.c" +#line 6909 "PhotoPage.c" gboolean _tmp6_ = FALSE; ZoomBuffer* _tmp7_; Dimensions max_dim = {0}; @@ -6962,7 +6924,7 @@ static void editing_host_page_on_pixbuf_fetched (EditingHostPage* self, Photo* p _tmp7_ = self->priv->zoom_buffer; #line 961 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp7_ != NULL) { -#line 6961 "PhotoPage.c" +#line 6923 "PhotoPage.c" ZoomBuffer* _tmp8_; Photo* _tmp9_; Photo* _tmp10_; @@ -6979,15 +6941,15 @@ static void editing_host_page_on_pixbuf_fetched (EditingHostPage* self, Photo* p _tmp6_ = _tmp10_ == _tmp11_; #line 961 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (_tmp10_); -#line 6978 "PhotoPage.c" +#line 6940 "PhotoPage.c" } else { #line 961 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp6_ = FALSE; -#line 6982 "PhotoPage.c" +#line 6944 "PhotoPage.c" } #line 961 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp6_) { -#line 6986 "PhotoPage.c" +#line 6948 "PhotoPage.c" Photo* _tmp12_; GdkPixbuf* _tmp13_; ZoomBuffer* _tmp14_; @@ -7001,7 +6963,7 @@ static void editing_host_page_on_pixbuf_fetched (EditingHostPage* self, Photo* p _g_object_unref0 (self->priv->zoom_buffer); #line 962 "/home/jens/Source/shotwell/src/PhotoPage.vala" self->priv->zoom_buffer = _tmp14_; -#line 7000 "PhotoPage.c" +#line 6962 "PhotoPage.c" } #line 966 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp15_ = photo; @@ -7013,7 +6975,7 @@ static void editing_host_page_on_pixbuf_fetched (EditingHostPage* self, Photo* p _tmp17_ = self->priv->current_tool; #line 967 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp17_ != NULL) { -#line 7012 "PhotoPage.c" +#line 6974 "PhotoPage.c" { Dimensions tool_pixbuf_dim = {0}; GdkPixbuf* tool_pixbuf = NULL; @@ -7037,14 +6999,14 @@ static void editing_host_page_on_pixbuf_fetched (EditingHostPage* self, Photo* p tool_pixbuf = _tmp22_; #line 970 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 7036 "PhotoPage.c" - goto __catch245_g_error; +#line 6998 "PhotoPage.c" + goto __catch256_g_error; } #line 973 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp23_ = tool_pixbuf; #line 973 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp23_ != NULL) { -#line 7043 "PhotoPage.c" +#line 7005 "PhotoPage.c" GdkPixbuf* _tmp24_; Dimensions _tmp25_; #line 974 "/home/jens/Source/shotwell/src/PhotoPage.vala" @@ -7055,14 +7017,14 @@ static void editing_host_page_on_pixbuf_fetched (EditingHostPage* self, Photo* p _tmp25_ = tool_pixbuf_dim; #line 975 "/home/jens/Source/shotwell/src/PhotoPage.vala" max_dim = _tmp25_; -#line 7054 "PhotoPage.c" +#line 7016 "PhotoPage.c" } #line 968 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (tool_pixbuf); -#line 7058 "PhotoPage.c" +#line 7020 "PhotoPage.c" } - goto __finally245; - __catch245_g_error: + goto __finally256; + __catch256_g_error: { GError* err = NULL; Photo* _tmp26_; @@ -7094,9 +7056,9 @@ static void editing_host_page_on_pixbuf_fetched (EditingHostPage* self, Photo* p _g_error_free0 (err); #line 981 "/home/jens/Source/shotwell/src/PhotoPage.vala" return; -#line 7093 "PhotoPage.c" +#line 7055 "PhotoPage.c" } - __finally245: + __finally256: #line 968 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 968 "/home/jens/Source/shotwell/src/PhotoPage.vala" @@ -7105,7 +7067,7 @@ static void editing_host_page_on_pixbuf_fetched (EditingHostPage* self, Photo* p g_clear_error (&_inner_error_); #line 968 "/home/jens/Source/shotwell/src/PhotoPage.vala" return; -#line 7104 "PhotoPage.c" +#line 7066 "PhotoPage.c" } } #line 985 "/home/jens/Source/shotwell/src/PhotoPage.vala" @@ -7120,14 +7082,14 @@ static void editing_host_page_on_pixbuf_fetched (EditingHostPage* self, Photo* p _tmp33_ = photo; #line 988 "/home/jens/Source/shotwell/src/PhotoPage.vala" editing_host_page_notify_photo_backing_missing (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp33_, TYPE_PHOTO, Photo), FALSE); -#line 7119 "PhotoPage.c" +#line 7081 "PhotoPage.c" } else { GError* _tmp34_; #line 989 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp34_ = err; #line 989 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp34_ != NULL) { -#line 7126 "PhotoPage.c" +#line 7088 "PhotoPage.c" Photo* _tmp35_; #line 992 "/home/jens/Source/shotwell/src/PhotoPage.vala" editing_host_page_set_photo_missing (self, TRUE); @@ -7135,7 +7097,7 @@ static void editing_host_page_on_pixbuf_fetched (EditingHostPage* self, Photo* p _tmp35_ = photo; #line 995 "/home/jens/Source/shotwell/src/PhotoPage.vala" editing_host_page_notify_photo_backing_missing (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp35_, TYPE_PHOTO, Photo), TRUE); -#line 7134 "PhotoPage.c" +#line 7096 "PhotoPage.c" } } } @@ -7219,7 +7181,7 @@ static void editing_host_page_prefetch_neighbors (EditingHostPage* self, ViewCol _g_object_unref0 (normal_batch); #line 1008 "/home/jens/Source/shotwell/src/PhotoPage.vala" return; -#line 7218 "PhotoPage.c" +#line 7180 "PhotoPage.c" } #line 1010 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp11_ = next_source; @@ -7233,7 +7195,7 @@ static void editing_host_page_prefetch_neighbors (EditingHostPage* self, ViewCol _tmp14_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, TYPE_PHOTO, Photo)); #line 1011 "/home/jens/Source/shotwell/src/PhotoPage.vala" prev = _tmp14_; -#line 7232 "PhotoPage.c" +#line 7194 "PhotoPage.c" { GeeIterator* _neighbor_source_it = NULL; ViewCollection* _tmp15_; @@ -7260,7 +7222,7 @@ static void editing_host_page_prefetch_neighbors (EditingHostPage* self, ViewCol _neighbor_source_it = _tmp20_; #line 1014 "/home/jens/Source/shotwell/src/PhotoPage.vala" while (TRUE) { -#line 7259 "PhotoPage.c" +#line 7221 "PhotoPage.c" GeeIterator* _tmp21_; gboolean _tmp22_; DataSource* neighbor_source = NULL; @@ -7287,7 +7249,7 @@ static void editing_host_page_prefetch_neighbors (EditingHostPage* self, ViewCol if (!_tmp22_) { #line 1014 "/home/jens/Source/shotwell/src/PhotoPage.vala" break; -#line 7286 "PhotoPage.c" +#line 7248 "PhotoPage.c" } #line 1014 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp23_ = _neighbor_source_it; @@ -7313,7 +7275,7 @@ static void editing_host_page_prefetch_neighbors (EditingHostPage* self, ViewCol if (_tmp30_) { #line 1018 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp27_ = TRUE; -#line 7312 "PhotoPage.c" +#line 7274 "PhotoPage.c" } else { Photo* _tmp31_; Photo* _tmp32_; @@ -7326,13 +7288,13 @@ static void editing_host_page_prefetch_neighbors (EditingHostPage* self, ViewCol _tmp33_ = data_source_equals (G_TYPE_CHECK_INSTANCE_CAST (_tmp31_, TYPE_DATA_SOURCE, DataSource), G_TYPE_CHECK_INSTANCE_CAST (_tmp32_, TYPE_DATA_SOURCE, DataSource)); #line 1018 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp27_ = _tmp33_; -#line 7325 "PhotoPage.c" +#line 7287 "PhotoPage.c" } #line 1018 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp27_) { #line 1019 "/home/jens/Source/shotwell/src/PhotoPage.vala" priority = BACKGROUND_JOB_JOB_PRIORITY_HIGH; -#line 7331 "PhotoPage.c" +#line 7293 "PhotoPage.c" } #line 1021 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp34_ = normal_batch; @@ -7352,11 +7314,11 @@ static void editing_host_page_prefetch_neighbors (EditingHostPage* self, ViewCol _g_object_unref0 (neighbor); #line 1014 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (neighbor_source); -#line 7351 "PhotoPage.c" +#line 7313 "PhotoPage.c" } #line 1014 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (_neighbor_source_it); -#line 7355 "PhotoPage.c" +#line 7317 "PhotoPage.c" } #line 1025 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp39_ = self->priv->cache; @@ -7382,7 +7344,7 @@ static void editing_host_page_prefetch_neighbors (EditingHostPage* self, ViewCol _g_object_unref0 (master_batch); #line 999 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (normal_batch); -#line 7381 "PhotoPage.c" +#line 7343 "PhotoPage.c" } @@ -7425,7 +7387,7 @@ static void editing_host_page_cancel_prefetch_neighbors (EditingHostPage* self, _tmp5_ = view_collection_get_extended_neighbors (_tmp3_, G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_DATA_SOURCE, DataSource), PHOTO_TYPENAME); #line 1035 "/home/jens/Source/shotwell/src/PhotoPage.vala" new_neighbors = G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, GEE_TYPE_SET, GeeSet); -#line 7424 "PhotoPage.c" +#line 7386 "PhotoPage.c" { GeeIterator* _old_neighbor_it = NULL; GeeSet* _tmp6_; @@ -7438,7 +7400,7 @@ static void editing_host_page_cancel_prefetch_neighbors (EditingHostPage* self, _old_neighbor_it = _tmp7_; #line 1038 "/home/jens/Source/shotwell/src/PhotoPage.vala" while (TRUE) { -#line 7437 "PhotoPage.c" +#line 7399 "PhotoPage.c" GeeIterator* _tmp8_; gboolean _tmp9_; Photo* old_neighbor = NULL; @@ -7456,7 +7418,7 @@ static void editing_host_page_cancel_prefetch_neighbors (EditingHostPage* self, if (!_tmp9_) { #line 1038 "/home/jens/Source/shotwell/src/PhotoPage.vala" break; -#line 7455 "PhotoPage.c" +#line 7417 "PhotoPage.c" } #line 1038 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp10_ = _old_neighbor_it; @@ -7472,7 +7434,7 @@ static void editing_host_page_cancel_prefetch_neighbors (EditingHostPage* self, _tmp15_ = gee_collection_contains (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, GEE_TYPE_COLLECTION, GeeCollection), _tmp14_); #line 1041 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (!_tmp15_) { -#line 7471 "PhotoPage.c" +#line 7433 "PhotoPage.c" Photo* _tmp16_; Photo* _tmp17_; gboolean _tmp18_; @@ -7484,15 +7446,15 @@ static void editing_host_page_cancel_prefetch_neighbors (EditingHostPage* self, _tmp18_ = data_source_equals (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, TYPE_DATA_SOURCE, DataSource), G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, TYPE_DATA_SOURCE, DataSource)); #line 1041 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp12_ = !_tmp18_; -#line 7483 "PhotoPage.c" +#line 7445 "PhotoPage.c" } else { #line 1041 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp12_ = FALSE; -#line 7487 "PhotoPage.c" +#line 7449 "PhotoPage.c" } #line 1041 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp12_) { -#line 7491 "PhotoPage.c" +#line 7453 "PhotoPage.c" PixbufCache* _tmp19_; Photo* _tmp20_; PixbufCache* _tmp21_; @@ -7509,15 +7471,15 @@ static void editing_host_page_cancel_prefetch_neighbors (EditingHostPage* self, _tmp22_ = old_neighbor; #line 1043 "/home/jens/Source/shotwell/src/PhotoPage.vala" pixbuf_cache_drop (_tmp21_, _tmp22_); -#line 7508 "PhotoPage.c" +#line 7470 "PhotoPage.c" } #line 1038 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (old_neighbor); -#line 7512 "PhotoPage.c" +#line 7474 "PhotoPage.c" } #line 1038 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (_old_neighbor_it); -#line 7516 "PhotoPage.c" +#line 7478 "PhotoPage.c" } #line 1048 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp24_ = new_neighbors; @@ -7527,7 +7489,7 @@ static void editing_host_page_cancel_prefetch_neighbors (EditingHostPage* self, _tmp26_ = gee_collection_contains (G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, GEE_TYPE_COLLECTION, GeeCollection), _tmp25_); #line 1048 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (!_tmp26_) { -#line 7526 "PhotoPage.c" +#line 7488 "PhotoPage.c" Photo* _tmp27_; Photo* _tmp28_; gboolean _tmp29_; @@ -7539,15 +7501,15 @@ static void editing_host_page_cancel_prefetch_neighbors (EditingHostPage* self, _tmp29_ = data_source_equals (G_TYPE_CHECK_INSTANCE_CAST (_tmp27_, TYPE_DATA_SOURCE, DataSource), G_TYPE_CHECK_INSTANCE_CAST (_tmp28_, TYPE_DATA_SOURCE, DataSource)); #line 1048 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp23_ = !_tmp29_; -#line 7538 "PhotoPage.c" +#line 7500 "PhotoPage.c" } else { #line 1048 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp23_ = FALSE; -#line 7542 "PhotoPage.c" +#line 7504 "PhotoPage.c" } #line 1048 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp23_) { -#line 7546 "PhotoPage.c" +#line 7508 "PhotoPage.c" PixbufCache* _tmp30_; Photo* _tmp31_; PixbufCache* _tmp32_; @@ -7564,13 +7526,13 @@ static void editing_host_page_cancel_prefetch_neighbors (EditingHostPage* self, _tmp33_ = old_photo; #line 1050 "/home/jens/Source/shotwell/src/PhotoPage.vala" pixbuf_cache_drop (_tmp32_, _tmp33_); -#line 7563 "PhotoPage.c" +#line 7525 "PhotoPage.c" } #line 1031 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (new_neighbors); #line 1031 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (old_neighbors); -#line 7569 "PhotoPage.c" +#line 7531 "PhotoPage.c" } @@ -7588,7 +7550,7 @@ static DataView* editing_host_page_real_create_photo_view (EditingHostPage* self result = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_DATA_VIEW, DataView); #line 1055 "/home/jens/Source/shotwell/src/PhotoPage.vala" return result; -#line 7587 "PhotoPage.c" +#line 7549 "PhotoPage.c" } @@ -7597,7 +7559,7 @@ DataView* editing_host_page_create_photo_view (EditingHostPage* self, DataSource g_return_val_if_fail (IS_EDITING_HOST_PAGE (self), NULL); #line 1054 "/home/jens/Source/shotwell/src/PhotoPage.vala" return EDITING_HOST_PAGE_GET_CLASS (self)->create_photo_view (self, source); -#line 7596 "PhotoPage.c" +#line 7558 "PhotoPage.c" } @@ -7614,7 +7576,7 @@ static gboolean editing_host_page_is_photo (EditingHostPage* self, DataSource* s result = G_TYPE_CHECK_INSTANCE_TYPE (_tmp0_, TYPE_PHOTO_SOURCE); #line 1059 "/home/jens/Source/shotwell/src/PhotoPage.vala" return result; -#line 7613 "PhotoPage.c" +#line 7575 "PhotoPage.c" } @@ -7623,7 +7585,7 @@ static DataView* _editing_host_page_create_photo_view_create_view (DataSource* s result = editing_host_page_create_photo_view ((EditingHostPage*) self, source); #line 1067 "/home/jens/Source/shotwell/src/PhotoPage.vala" return result; -#line 7622 "PhotoPage.c" +#line 7584 "PhotoPage.c" } @@ -7632,7 +7594,7 @@ static gboolean _editing_host_page_is_photo_create_view_predicate (DataSource* s result = editing_host_page_is_photo ((EditingHostPage*) self, source); #line 1067 "/home/jens/Source/shotwell/src/PhotoPage.vala" return result; -#line 7631 "PhotoPage.c" +#line 7593 "PhotoPage.c" } @@ -7677,7 +7639,7 @@ void editing_host_page_display_copy_of (EditingHostPage* self, ViewCollection* c _data_collection_unref0 (_tmp7_); #line 1065 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp8_) { -#line 7676 "PhotoPage.c" +#line 7638 "PhotoPage.c" ViewCollection* _tmp9_; ViewCollection* _tmp10_; #line 1065 "/home/jens/Source/shotwell/src/PhotoPage.vala" @@ -7686,15 +7648,15 @@ void editing_host_page_display_copy_of (EditingHostPage* self, ViewCollection* c _tmp10_ = self->priv->parent_view; #line 1065 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp4_ = _tmp9_ != _tmp10_; -#line 7685 "PhotoPage.c" +#line 7647 "PhotoPage.c" } else { #line 1065 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp4_ = FALSE; -#line 7689 "PhotoPage.c" +#line 7651 "PhotoPage.c" } #line 1065 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp4_) { -#line 7693 "PhotoPage.c" +#line 7655 "PhotoPage.c" ViewCollection* _tmp11_; ViewCollection* _tmp12_; ViewCollection* _tmp13_; @@ -7728,13 +7690,13 @@ void editing_host_page_display_copy_of (EditingHostPage* self, ViewCollection* c _data_collection_unref0 (self->priv->parent_view); #line 1068 "/home/jens/Source/shotwell/src/PhotoPage.vala" self->priv->parent_view = _tmp17_; -#line 7727 "PhotoPage.c" +#line 7689 "PhotoPage.c" } #line 1071 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp18_ = starting_photo; #line 1071 "/home/jens/Source/shotwell/src/PhotoPage.vala" editing_host_page_replace_photo (self, _tmp18_); -#line 7733 "PhotoPage.c" +#line 7695 "PhotoPage.c" } @@ -7779,7 +7741,7 @@ void editing_host_page_display_mirror_of (EditingHostPage* self, ViewCollection* _data_collection_unref0 (_tmp7_); #line 1077 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp8_) { -#line 7778 "PhotoPage.c" +#line 7740 "PhotoPage.c" ViewCollection* _tmp9_; ViewCollection* _tmp10_; #line 1077 "/home/jens/Source/shotwell/src/PhotoPage.vala" @@ -7788,15 +7750,15 @@ void editing_host_page_display_mirror_of (EditingHostPage* self, ViewCollection* _tmp10_ = self->priv->parent_view; #line 1077 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp4_ = _tmp9_ != _tmp10_; -#line 7787 "PhotoPage.c" +#line 7749 "PhotoPage.c" } else { #line 1077 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp4_ = FALSE; -#line 7791 "PhotoPage.c" +#line 7753 "PhotoPage.c" } #line 1077 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp4_) { -#line 7795 "PhotoPage.c" +#line 7757 "PhotoPage.c" ViewCollection* _tmp11_; ViewCollection* _tmp12_; ViewCollection* _tmp13_; @@ -7830,13 +7792,13 @@ void editing_host_page_display_mirror_of (EditingHostPage* self, ViewCollection* _data_collection_unref0 (self->priv->parent_view); #line 1080 "/home/jens/Source/shotwell/src/PhotoPage.vala" self->priv->parent_view = _tmp17_; -#line 7829 "PhotoPage.c" +#line 7791 "PhotoPage.c" } #line 1083 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp18_ = starting_photo; #line 1083 "/home/jens/Source/shotwell/src/PhotoPage.vala" editing_host_page_replace_photo (self, _tmp18_); -#line 7835 "PhotoPage.c" +#line 7797 "PhotoPage.c" } @@ -7887,7 +7849,7 @@ static void editing_host_page_real_update_ui (EditingHostPage* self, gboolean mi dimensions_init (&_tmp8_, 0, 0); #line 1097 "/home/jens/Source/shotwell/src/PhotoPage.vala" editing_host_page_deactivate_tool (self, NULL, NULL, &_tmp8_, FALSE); -#line 7886 "PhotoPage.c" +#line 7848 "PhotoPage.c" } @@ -7896,14 +7858,14 @@ void editing_host_page_update_ui (EditingHostPage* self, gboolean missing) { g_return_if_fail (IS_EDITING_HOST_PAGE (self)); #line 1086 "/home/jens/Source/shotwell/src/PhotoPage.vala" EDITING_HOST_PAGE_GET_CLASS (self)->update_ui (self, missing); -#line 7895 "PhotoPage.c" +#line 7857 "PhotoPage.c" } static void editing_host_page_real_notify_photo_backing_missing (EditingHostPage* self, Photo* photo, gboolean missing) { #line 1101 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_if_fail (IS_PHOTO (photo)); -#line 7902 "PhotoPage.c" +#line 7864 "PhotoPage.c" } @@ -7912,7 +7874,7 @@ void editing_host_page_notify_photo_backing_missing (EditingHostPage* self, Phot g_return_if_fail (IS_EDITING_HOST_PAGE (self)); #line 1101 "/home/jens/Source/shotwell/src/PhotoPage.vala" EDITING_HOST_PAGE_GET_CLASS (self)->notify_photo_backing_missing (self, photo, missing); -#line 7911 "PhotoPage.c" +#line 7873 "PhotoPage.c" } @@ -7976,17 +7938,17 @@ static void editing_host_page_draw_message (EditingHostPage* self, const gchar* _tmp10_ = x; #line 1114 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp10_ > 0) { -#line 7975 "PhotoPage.c" +#line 7937 "PhotoPage.c" gint _tmp11_; #line 1114 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp11_ = x; #line 1114 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp9_ = _tmp11_ / 2; -#line 7981 "PhotoPage.c" +#line 7943 "PhotoPage.c" } else { #line 1114 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp9_ = 0; -#line 7985 "PhotoPage.c" +#line 7947 "PhotoPage.c" } #line 1114 "/home/jens/Source/shotwell/src/PhotoPage.vala" x = _tmp9_; @@ -8002,17 +7964,17 @@ static void editing_host_page_draw_message (EditingHostPage* self, const gchar* _tmp16_ = y; #line 1117 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp16_ > 0) { -#line 8001 "PhotoPage.c" +#line 7963 "PhotoPage.c" gint _tmp17_; #line 1117 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp17_ = y; #line 1117 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp15_ = _tmp17_ / 2; -#line 8007 "PhotoPage.c" +#line 7969 "PhotoPage.c" } else { #line 1117 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp15_ = 0; -#line 8011 "PhotoPage.c" +#line 7973 "PhotoPage.c" } #line 1117 "/home/jens/Source/shotwell/src/PhotoPage.vala" y = _tmp15_; @@ -8026,7 +7988,7 @@ static void editing_host_page_draw_message (EditingHostPage* self, const gchar* single_photo_page_paint_text (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), _tmp18_, _tmp19_, _tmp20_); #line 1104 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (pango_layout); -#line 8025 "PhotoPage.c" +#line 7987 "PhotoPage.c" } @@ -8050,7 +8012,7 @@ void editing_host_page_set_photo_missing (EditingHostPage* self, gboolean missin if (_tmp0_ == _tmp1_) { #line 1125 "/home/jens/Source/shotwell/src/PhotoPage.vala" return; -#line 8049 "PhotoPage.c" +#line 8011 "PhotoPage.c" } #line 1127 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp2_ = missing; @@ -8068,7 +8030,7 @@ void editing_host_page_set_photo_missing (EditingHostPage* self, gboolean missin _g_object_unref0 (photo); #line 1131 "/home/jens/Source/shotwell/src/PhotoPage.vala" return; -#line 8067 "PhotoPage.c" +#line 8029 "PhotoPage.c" } #line 1133 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp5_ = missing; @@ -8078,7 +8040,7 @@ void editing_host_page_set_photo_missing (EditingHostPage* self, gboolean missin _tmp6_ = self->priv->photo_missing; #line 1135 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp6_) { -#line 8077 "PhotoPage.c" +#line 8039 "PhotoPage.c" { GdkPixbuf* pixbuf = NULL; Photo* _tmp7_; @@ -8103,8 +8065,8 @@ void editing_host_page_set_photo_missing (EditingHostPage* self, gboolean missin pixbuf = _tmp9_; #line 1137 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 8102 "PhotoPage.c" - goto __catch246_g_error; +#line 8064 "PhotoPage.c" + goto __catch257_g_error; } #line 1139 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp10_ = pixbuf; @@ -8132,10 +8094,10 @@ void editing_host_page_set_photo_missing (EditingHostPage* self, gboolean missin single_photo_page_set_pixbuf (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), _tmp16_, &_tmp18_, NULL); #line 1136 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (pixbuf); -#line 8131 "PhotoPage.c" +#line 8093 "PhotoPage.c" } - goto __finally246; - __catch246_g_error: + goto __finally257; + __catch257_g_error: { GError* err = NULL; GdkPixbuf* _tmp19_; @@ -8168,9 +8130,9 @@ void editing_host_page_set_photo_missing (EditingHostPage* self, gboolean missin g_warning ("PhotoPage.vala:1145: %s", _tmp24_); #line 1136 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_error_free0 (err); -#line 8167 "PhotoPage.c" +#line 8129 "PhotoPage.c" } - __finally246: + __finally257: #line 1136 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 1136 "/home/jens/Source/shotwell/src/PhotoPage.vala" @@ -8181,12 +8143,12 @@ void editing_host_page_set_photo_missing (EditingHostPage* self, gboolean missin g_clear_error (&_inner_error_); #line 1136 "/home/jens/Source/shotwell/src/PhotoPage.vala" return; -#line 8180 "PhotoPage.c" +#line 8142 "PhotoPage.c" } } #line 1123 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (photo); -#line 8185 "PhotoPage.c" +#line 8147 "PhotoPage.c" } @@ -8201,7 +8163,7 @@ gboolean editing_host_page_get_photo_missing (EditingHostPage* self) { result = _tmp0_; #line 1151 "/home/jens/Source/shotwell/src/PhotoPage.vala" return result; -#line 8200 "PhotoPage.c" +#line 8162 "PhotoPage.c" } @@ -8215,7 +8177,7 @@ static gboolean editing_host_page_real_confirm_replace_photo (EditingHostPage* s result = TRUE; #line 1155 "/home/jens/Source/shotwell/src/PhotoPage.vala" return result; -#line 8214 "PhotoPage.c" +#line 8176 "PhotoPage.c" } @@ -8224,7 +8186,7 @@ gboolean editing_host_page_confirm_replace_photo (EditingHostPage* self, Photo* g_return_val_if_fail (IS_EDITING_HOST_PAGE (self), FALSE); #line 1154 "/home/jens/Source/shotwell/src/PhotoPage.vala" return EDITING_HOST_PAGE_GET_CLASS (self)->confirm_replace_photo (self, old_photo, new_photo); -#line 8223 "PhotoPage.c" +#line 8185 "PhotoPage.c" } @@ -8253,7 +8215,7 @@ static GdkPixbuf* editing_host_page_get_zoom_pixbuf (EditingHostPage* self, Phot _tmp3_ = pixbuf; #line 1160 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp3_ == NULL) { -#line 8252 "PhotoPage.c" +#line 8214 "PhotoPage.c" { GdkPixbuf* _tmp4_ = NULL; Photo* _tmp5_; @@ -8270,8 +8232,8 @@ static GdkPixbuf* editing_host_page_get_zoom_pixbuf (EditingHostPage* self, Phot _tmp4_ = _tmp7_; #line 1162 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 8269 "PhotoPage.c" - goto __catch247_g_error; +#line 8231 "PhotoPage.c" + goto __catch258_g_error; } #line 1162 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp8_ = _tmp4_; @@ -8283,10 +8245,10 @@ static GdkPixbuf* editing_host_page_get_zoom_pixbuf (EditingHostPage* self, Phot pixbuf = _tmp8_; #line 1161 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (_tmp4_); -#line 8282 "PhotoPage.c" +#line 8244 "PhotoPage.c" } - goto __finally247; - __catch247_g_error: + goto __finally258; + __catch258_g_error: { GError* err = NULL; GError* _tmp9_; @@ -8303,9 +8265,9 @@ static GdkPixbuf* editing_host_page_get_zoom_pixbuf (EditingHostPage* self, Phot g_warning ("PhotoPage.vala:1164: %s", _tmp10_); #line 1161 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_error_free0 (err); -#line 8302 "PhotoPage.c" +#line 8264 "PhotoPage.c" } - __finally247: + __finally258: #line 1161 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 1161 "/home/jens/Source/shotwell/src/PhotoPage.vala" @@ -8316,14 +8278,14 @@ static GdkPixbuf* editing_host_page_get_zoom_pixbuf (EditingHostPage* self, Phot g_clear_error (&_inner_error_); #line 1161 "/home/jens/Source/shotwell/src/PhotoPage.vala" return NULL; -#line 8315 "PhotoPage.c" +#line 8277 "PhotoPage.c" } } #line 1167 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp11_ = pixbuf; #line 1167 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp11_ == NULL) { -#line 8322 "PhotoPage.c" +#line 8284 "PhotoPage.c" GdkPixbuf* _tmp12_; Scaling _tmp13_ = {0}; GdkPixbuf* _tmp14_; @@ -8345,13 +8307,13 @@ static GdkPixbuf* editing_host_page_get_zoom_pixbuf (EditingHostPage* self, Phot _tmp16_ = _tmp15_; #line 1169 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (_tmp16_); -#line 8344 "PhotoPage.c" +#line 8306 "PhotoPage.c" } #line 1171 "/home/jens/Source/shotwell/src/PhotoPage.vala" result = pixbuf; #line 1171 "/home/jens/Source/shotwell/src/PhotoPage.vala" return result; -#line 8350 "PhotoPage.c" +#line 8312 "PhotoPage.c" } @@ -8401,35 +8363,35 @@ static void editing_host_page_replace_photo (EditingHostPage* self, Photo* new_p _g_object_unref0 (_tmp4_); #line 1179 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp6_) { -#line 8400 "PhotoPage.c" +#line 8362 "PhotoPage.c" gboolean _tmp7_; #line 1179 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp7_ = self->priv->pixbuf_dirty; #line 1179 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp1_ = !_tmp7_; -#line 8406 "PhotoPage.c" +#line 8368 "PhotoPage.c" } else { #line 1179 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp1_ = FALSE; -#line 8410 "PhotoPage.c" +#line 8372 "PhotoPage.c" } #line 1179 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp1_) { -#line 8414 "PhotoPage.c" +#line 8376 "PhotoPage.c" gboolean _tmp8_; #line 1179 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp8_ = self->priv->photo_missing; #line 1179 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp0_ = !_tmp8_; -#line 8420 "PhotoPage.c" +#line 8382 "PhotoPage.c" } else { #line 1179 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp0_ = FALSE; -#line 8424 "PhotoPage.c" +#line 8386 "PhotoPage.c" } #line 1179 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp0_) { -#line 8428 "PhotoPage.c" +#line 8390 "PhotoPage.c" Photo* _tmp9_; Photo* _tmp10_; GdkPixbuf* _tmp11_; @@ -8453,13 +8415,13 @@ static void editing_host_page_replace_photo (EditingHostPage* self, Photo* new_p _g_object_unref0 (_tmp12_); #line 1181 "/home/jens/Source/shotwell/src/PhotoPage.vala" return; -#line 8452 "PhotoPage.c" +#line 8414 "PhotoPage.c" } #line 1185 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp16_ = editing_host_page_has_photo (self); #line 1185 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp16_) { -#line 8458 "PhotoPage.c" +#line 8420 "PhotoPage.c" Photo* _tmp17_; Photo* _tmp18_; Photo* _tmp19_; @@ -8476,25 +8438,25 @@ static void editing_host_page_replace_photo (EditingHostPage* self, Photo* new_p _tmp15_ = !_tmp20_; #line 1185 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (_tmp19_); -#line 8475 "PhotoPage.c" +#line 8437 "PhotoPage.c" } else { #line 1185 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp15_ = FALSE; -#line 8479 "PhotoPage.c" +#line 8441 "PhotoPage.c" } #line 1185 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp15_) { #line 1185 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp14_ = editing_host_page_confirm_replace_photo != NULL; -#line 8485 "PhotoPage.c" +#line 8447 "PhotoPage.c" } else { #line 1185 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp14_ = FALSE; -#line 8489 "PhotoPage.c" +#line 8451 "PhotoPage.c" } #line 1185 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp14_) { -#line 8493 "PhotoPage.c" +#line 8455 "PhotoPage.c" Photo* _tmp21_; Photo* _tmp22_; Photo* _tmp23_; @@ -8516,7 +8478,7 @@ static void editing_host_page_replace_photo (EditingHostPage* self, Photo* new_p if (_tmp25_) { #line 1187 "/home/jens/Source/shotwell/src/PhotoPage.vala" return; -#line 8515 "PhotoPage.c" +#line 8477 "PhotoPage.c" } } #line 1190 "/home/jens/Source/shotwell/src/PhotoPage.vala" @@ -8565,7 +8527,7 @@ static void editing_host_page_replace_photo (EditingHostPage* self, Photo* new_p _tmp36_ = old_photo; #line 1208 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp36_ != NULL) { -#line 8564 "PhotoPage.c" +#line 8526 "PhotoPage.c" ViewCollection* _tmp37_; ViewCollection* _tmp38_; Photo* _tmp39_; @@ -8590,7 +8552,7 @@ static void editing_host_page_replace_photo (EditingHostPage* self, Photo* new_p _data_collection_unref0 (_tmp41_); #line 1209 "/home/jens/Source/shotwell/src/PhotoPage.vala" _data_collection_unref0 (_tmp38_); -#line 8589 "PhotoPage.c" +#line 8551 "PhotoPage.c" } #line 1211 "/home/jens/Source/shotwell/src/PhotoPage.vala" single_photo_page_cancel_zoom (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage)); @@ -8616,7 +8578,7 @@ static void editing_host_page_replace_photo (EditingHostPage* self, Photo* new_p editing_host_page_refresh_caches (self, "replace_photo"); #line 1174 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (old_photo); -#line 8615 "PhotoPage.c" +#line 8577 "PhotoPage.c" } @@ -8659,7 +8621,7 @@ static void editing_host_page_real_cancel_zoom (SinglePhotoPage* base) { _g_object_unref0 (_tmp5_); #line 1228 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp6_) { -#line 8658 "PhotoPage.c" +#line 8620 "PhotoPage.c" Photo* _tmp7_; Photo* _tmp8_; Dimensions _tmp9_ = {0}; @@ -8679,13 +8641,13 @@ static void editing_host_page_real_cancel_zoom (SinglePhotoPage* base) { single_photo_page_set_zoom_state (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), &_tmp11_); #line 1229 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (_tmp8_); -#line 8678 "PhotoPage.c" +#line 8640 "PhotoPage.c" } #line 1235 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp13_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage)->canvas; #line 1235 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp13_ != NULL) { -#line 8684 "PhotoPage.c" +#line 8646 "PhotoPage.c" GtkDrawingArea* _tmp14_; GdkWindow* _tmp15_; #line 1235 "/home/jens/Source/shotwell/src/PhotoPage.vala" @@ -8694,21 +8656,21 @@ static void editing_host_page_real_cancel_zoom (SinglePhotoPage* base) { _tmp15_ = gtk_widget_get_window (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, gtk_widget_get_type (), GtkWidget)); #line 1235 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp12_ = _tmp15_ != NULL; -#line 8693 "PhotoPage.c" +#line 8655 "PhotoPage.c" } else { #line 1235 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp12_ = FALSE; -#line 8697 "PhotoPage.c" +#line 8659 "PhotoPage.c" } #line 1235 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp12_) { #line 1236 "/home/jens/Source/shotwell/src/PhotoPage.vala" page_set_page_cursor (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), GDK_LEFT_PTR); -#line 8703 "PhotoPage.c" +#line 8665 "PhotoPage.c" } #line 1238 "/home/jens/Source/shotwell/src/PhotoPage.vala" single_photo_page_repaint (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), NULL); -#line 8707 "PhotoPage.c" +#line 8669 "PhotoPage.c" } @@ -8752,7 +8714,7 @@ static void editing_host_page_quick_update_pixbuf (EditingHostPage* self) { _tmp5_ = pixbuf; #line 1243 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp5_ != NULL) { -#line 8751 "PhotoPage.c" +#line 8713 "PhotoPage.c" GdkPixbuf* _tmp6_; Photo* _tmp7_; Photo* _tmp8_; @@ -8775,7 +8737,7 @@ static void editing_host_page_quick_update_pixbuf (EditingHostPage* self) { _g_object_unref0 (pixbuf); #line 1247 "/home/jens/Source/shotwell/src/PhotoPage.vala" return; -#line 8774 "PhotoPage.c" +#line 8736 "PhotoPage.c" } #line 1250 "/home/jens/Source/shotwell/src/PhotoPage.vala" single_photo_page_get_canvas_scaling (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), &_tmp10_); @@ -8801,7 +8763,7 @@ static void editing_host_page_quick_update_pixbuf (EditingHostPage* self) { _g_free0 (_tmp14_); #line 1252 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (_tmp12_); -#line 8800 "PhotoPage.c" +#line 8762 "PhotoPage.c" { GdkPixbuf* _tmp17_ = NULL; Photo* _tmp18_; @@ -8828,8 +8790,8 @@ static void editing_host_page_quick_update_pixbuf (EditingHostPage* self) { _tmp17_ = _tmp22_; #line 1257 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 8827 "PhotoPage.c" - goto __catch248_g_error; +#line 8789 "PhotoPage.c" + goto __catch259_g_error; } #line 1257 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp23_ = editing_host_page_get_photo (self); @@ -8843,10 +8805,10 @@ static void editing_host_page_quick_update_pixbuf (EditingHostPage* self) { _g_object_unref0 (_tmp24_); #line 1256 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (_tmp17_); -#line 8842 "PhotoPage.c" +#line 8804 "PhotoPage.c" } - goto __finally248; - __catch248_g_error: + goto __finally259; + __catch259_g_error: { GError* err = NULL; GError* _tmp26_; @@ -8863,9 +8825,9 @@ static void editing_host_page_quick_update_pixbuf (EditingHostPage* self) { g_warning ("PhotoPage.vala:1259: %s", _tmp27_); #line 1256 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_error_free0 (err); -#line 8862 "PhotoPage.c" +#line 8824 "PhotoPage.c" } - __finally248: + __finally259: #line 1256 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 1256 "/home/jens/Source/shotwell/src/PhotoPage.vala" @@ -8876,7 +8838,7 @@ static void editing_host_page_quick_update_pixbuf (EditingHostPage* self) { g_clear_error (&_inner_error_); #line 1256 "/home/jens/Source/shotwell/src/PhotoPage.vala" return; -#line 8875 "PhotoPage.c" +#line 8837 "PhotoPage.c" } #line 1262 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp28_ = self->priv->cache; @@ -8892,7 +8854,7 @@ static void editing_host_page_quick_update_pixbuf (EditingHostPage* self) { self->priv->pixbuf_dirty = FALSE; #line 1241 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (pixbuf); -#line 8891 "PhotoPage.c" +#line 8853 "PhotoPage.c" } @@ -8925,7 +8887,7 @@ static gboolean editing_host_page_update_pixbuf (EditingHostPage* self) { _g_object_unref0 (photo); #line 1276 "/home/jens/Source/shotwell/src/PhotoPage.vala" return result; -#line 8924 "PhotoPage.c" +#line 8886 "PhotoPage.c" } #line 1278 "/home/jens/Source/shotwell/src/PhotoPage.vala" pixbuf = NULL; @@ -8935,7 +8897,7 @@ static gboolean editing_host_page_update_pixbuf (EditingHostPage* self) { media_source_get_dimensions (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_MEDIA_SOURCE, MediaSource), PHOTO_EXCEPTION_NONE, &_tmp3_); #line 1279 "/home/jens/Source/shotwell/src/PhotoPage.vala" max_dim = _tmp3_; -#line 8934 "PhotoPage.c" +#line 8896 "PhotoPage.c" { Dimensions tool_pixbuf_dim = {0}; Dimensions _tmp4_ = {0}; @@ -8949,7 +8911,7 @@ static gboolean editing_host_page_update_pixbuf (EditingHostPage* self) { _tmp5_ = self->priv->current_tool; #line 1283 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp5_ != NULL) { -#line 8948 "PhotoPage.c" +#line 8910 "PhotoPage.c" GdkPixbuf* _tmp6_ = NULL; EditingToolsEditingTool* _tmp7_; Scaling _tmp8_ = {0}; @@ -8971,8 +8933,8 @@ static gboolean editing_host_page_update_pixbuf (EditingHostPage* self) { _tmp6_ = _tmp11_; #line 1284 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 8970 "PhotoPage.c" - goto __catch249_g_error; +#line 8932 "PhotoPage.c" + goto __catch260_g_error; } #line 1284 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp12_ = _tmp6_; @@ -8984,23 +8946,23 @@ static gboolean editing_host_page_update_pixbuf (EditingHostPage* self) { pixbuf = _tmp12_; #line 1283 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (_tmp6_); -#line 8983 "PhotoPage.c" +#line 8945 "PhotoPage.c" } #line 1286 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp13_ = pixbuf; #line 1286 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp13_ != NULL) { -#line 8989 "PhotoPage.c" +#line 8951 "PhotoPage.c" Dimensions _tmp14_; #line 1287 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp14_ = tool_pixbuf_dim; #line 1287 "/home/jens/Source/shotwell/src/PhotoPage.vala" max_dim = _tmp14_; -#line 8995 "PhotoPage.c" +#line 8957 "PhotoPage.c" } } - goto __finally249; - __catch249_g_error: + goto __finally260; + __catch260_g_error: { GError* err = NULL; GError* _tmp15_; @@ -9019,12 +8981,12 @@ static gboolean editing_host_page_update_pixbuf (EditingHostPage* self) { editing_host_page_set_photo_missing (self, TRUE); #line 1281 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_error_free0 (err); -#line 9018 "PhotoPage.c" +#line 8980 "PhotoPage.c" } - __finally249: + __finally260: #line 1281 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 9023 "PhotoPage.c" +#line 8985 "PhotoPage.c" gboolean _tmp17_ = FALSE; #line 1281 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (pixbuf); @@ -9036,20 +8998,20 @@ static gboolean editing_host_page_update_pixbuf (EditingHostPage* self) { g_clear_error (&_inner_error_); #line 1281 "/home/jens/Source/shotwell/src/PhotoPage.vala" return _tmp17_; -#line 9035 "PhotoPage.c" +#line 8997 "PhotoPage.c" } #line 1293 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp18_ = self->priv->photo_missing; #line 1293 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (!_tmp18_) { -#line 9041 "PhotoPage.c" +#line 9003 "PhotoPage.c" GdkPixbuf* _tmp19_; GdkPixbuf* _tmp23_; #line 1295 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp19_ = pixbuf; #line 1295 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp19_ == NULL) { -#line 9048 "PhotoPage.c" +#line 9010 "PhotoPage.c" PixbufCache* _tmp20_; Photo* _tmp21_; GdkPixbuf* _tmp22_; @@ -9063,13 +9025,13 @@ static gboolean editing_host_page_update_pixbuf (EditingHostPage* self) { _g_object_unref0 (pixbuf); #line 1296 "/home/jens/Source/shotwell/src/PhotoPage.vala" pixbuf = _tmp22_; -#line 9062 "PhotoPage.c" +#line 9024 "PhotoPage.c" } #line 1299 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp23_ = pixbuf; #line 1299 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp23_ == NULL) { -#line 9068 "PhotoPage.c" +#line 9030 "PhotoPage.c" PixbufCache* _tmp24_; Photo* _tmp25_; #line 1300 "/home/jens/Source/shotwell/src/PhotoPage.vala" @@ -9078,28 +9040,28 @@ static gboolean editing_host_page_update_pixbuf (EditingHostPage* self) { _tmp25_ = photo; #line 1300 "/home/jens/Source/shotwell/src/PhotoPage.vala" pixbuf_cache_prefetch (_tmp24_, _tmp25_, BACKGROUND_JOB_JOB_PRIORITY_NORMAL, FALSE); -#line 9077 "PhotoPage.c" +#line 9039 "PhotoPage.c" } } #line 1303 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp27_ = self->priv->photo_missing; #line 1303 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (!_tmp27_) { -#line 9084 "PhotoPage.c" +#line 9046 "PhotoPage.c" GdkPixbuf* _tmp28_; #line 1303 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp28_ = pixbuf; #line 1303 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp26_ = _tmp28_ != NULL; -#line 9090 "PhotoPage.c" +#line 9052 "PhotoPage.c" } else { #line 1303 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp26_ = FALSE; -#line 9094 "PhotoPage.c" +#line 9056 "PhotoPage.c" } #line 1303 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp26_) { -#line 9098 "PhotoPage.c" +#line 9060 "PhotoPage.c" GdkPixbuf* _tmp29_; Dimensions _tmp30_; #line 1304 "/home/jens/Source/shotwell/src/PhotoPage.vala" @@ -9110,7 +9072,7 @@ static gboolean editing_host_page_update_pixbuf (EditingHostPage* self) { 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 9109 "PhotoPage.c" +#line 9071 "PhotoPage.c" } #line 1312 "/home/jens/Source/shotwell/src/PhotoPage.vala" result = FALSE; @@ -9120,7 +9082,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 9119 "PhotoPage.c" +#line 9081 "PhotoPage.c" } @@ -9137,7 +9099,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 9136 "PhotoPage.c" +#line 9098 "PhotoPage.c" } @@ -9153,7 +9115,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 9152 "PhotoPage.c" +#line 9114 "PhotoPage.c" } @@ -9166,7 +9128,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 9165 "PhotoPage.c" +#line 9127 "PhotoPage.c" } @@ -9250,21 +9212,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 9249 "PhotoPage.c" +#line 9211 "PhotoPage.c" gboolean _tmp14_; #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 9255 "PhotoPage.c" +#line 9217 "PhotoPage.c" } else { #line 1349 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp12_ = FALSE; -#line 9259 "PhotoPage.c" +#line 9221 "PhotoPage.c" } #line 1349 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp12_) { -#line 9263 "PhotoPage.c" +#line 9225 "PhotoPage.c" Photo* _tmp15_; gboolean _tmp16_; #line 1349 "/home/jens/Source/shotwell/src/PhotoPage.vala" @@ -9273,15 +9235,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 9272 "PhotoPage.c" +#line 9234 "PhotoPage.c" } else { #line 1349 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp11_ = FALSE; -#line 9276 "PhotoPage.c" +#line 9238 "PhotoPage.c" } #line 1349 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp11_) { -#line 9280 "PhotoPage.c" +#line 9242 "PhotoPage.c" Photo* _tmp17_; gboolean _tmp18_; #line 1350 "/home/jens/Source/shotwell/src/PhotoPage.vala" @@ -9290,11 +9252,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 9289 "PhotoPage.c" +#line 9251 "PhotoPage.c" } else { #line 1350 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp10_ = FALSE; -#line 9293 "PhotoPage.c" +#line 9255 "PhotoPage.c" } #line 1349 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp19_ = self->priv->rotate_button; @@ -9304,21 +9266,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 9303 "PhotoPage.c" +#line 9265 "PhotoPage.c" gboolean _tmp23_; #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 9309 "PhotoPage.c" +#line 9271 "PhotoPage.c" } else { #line 1351 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp21_ = FALSE; -#line 9313 "PhotoPage.c" +#line 9275 "PhotoPage.c" } #line 1351 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp21_) { -#line 9317 "PhotoPage.c" +#line 9279 "PhotoPage.c" Photo* _tmp24_; Scaling _tmp25_; gboolean _tmp26_; @@ -9330,11 +9292,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 9329 "PhotoPage.c" +#line 9291 "PhotoPage.c" } else { #line 1352 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp20_ = FALSE; -#line 9333 "PhotoPage.c" +#line 9295 "PhotoPage.c" } #line 1351 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp27_ = self->priv->crop_button; @@ -9344,21 +9306,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 9343 "PhotoPage.c" +#line 9305 "PhotoPage.c" gboolean _tmp31_; #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 9349 "PhotoPage.c" +#line 9311 "PhotoPage.c" } else { #line 1353 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp29_ = FALSE; -#line 9353 "PhotoPage.c" +#line 9315 "PhotoPage.c" } #line 1353 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp29_) { -#line 9357 "PhotoPage.c" +#line 9319 "PhotoPage.c" Photo* _tmp32_; Scaling _tmp33_; gboolean _tmp34_; @@ -9370,11 +9332,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 9369 "PhotoPage.c" +#line 9331 "PhotoPage.c" } else { #line 1354 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp28_ = FALSE; -#line 9373 "PhotoPage.c" +#line 9335 "PhotoPage.c" } #line 1353 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp35_ = self->priv->redeye_button; @@ -9384,21 +9346,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 9383 "PhotoPage.c" +#line 9345 "PhotoPage.c" gboolean _tmp39_; #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 9389 "PhotoPage.c" +#line 9351 "PhotoPage.c" } else { #line 1355 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp37_ = FALSE; -#line 9393 "PhotoPage.c" +#line 9355 "PhotoPage.c" } #line 1355 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp37_) { -#line 9397 "PhotoPage.c" +#line 9359 "PhotoPage.c" Photo* _tmp40_; Scaling _tmp41_; gboolean _tmp42_; @@ -9410,11 +9372,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 9409 "PhotoPage.c" +#line 9371 "PhotoPage.c" } else { #line 1356 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp36_ = FALSE; -#line 9413 "PhotoPage.c" +#line 9375 "PhotoPage.c" } #line 1355 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp43_ = self->priv->adjust_button; @@ -9424,21 +9386,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 9423 "PhotoPage.c" +#line 9385 "PhotoPage.c" gboolean _tmp47_; #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 9429 "PhotoPage.c" +#line 9391 "PhotoPage.c" } else { #line 1357 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp45_ = FALSE; -#line 9433 "PhotoPage.c" +#line 9395 "PhotoPage.c" } #line 1357 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp45_) { -#line 9437 "PhotoPage.c" +#line 9399 "PhotoPage.c" Photo* _tmp48_; gboolean _tmp49_; #line 1358 "/home/jens/Source/shotwell/src/PhotoPage.vala" @@ -9447,11 +9409,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 9446 "PhotoPage.c" +#line 9408 "PhotoPage.c" } else { #line 1358 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp44_ = FALSE; -#line 9450 "PhotoPage.c" +#line 9412 "PhotoPage.c" } #line 1357 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp50_ = self->priv->enhance_button; @@ -9461,21 +9423,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 9460 "PhotoPage.c" +#line 9422 "PhotoPage.c" gboolean _tmp54_; #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 9466 "PhotoPage.c" +#line 9428 "PhotoPage.c" } else { #line 1359 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp52_ = FALSE; -#line 9470 "PhotoPage.c" +#line 9432 "PhotoPage.c" } #line 1359 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp52_) { -#line 9474 "PhotoPage.c" +#line 9436 "PhotoPage.c" Photo* _tmp55_; Scaling _tmp56_; gboolean _tmp57_; @@ -9487,11 +9449,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 9486 "PhotoPage.c" +#line 9448 "PhotoPage.c" } else { #line 1360 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp51_ = FALSE; -#line 9490 "PhotoPage.c" +#line 9452 "PhotoPage.c" } #line 1359 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp58_ = self->priv->straighten_button; @@ -9505,7 +9467,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 9504 "PhotoPage.c" +#line 9466 "PhotoPage.c" } @@ -9524,51 +9486,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 9523 "PhotoPage.c" +#line 9485 "PhotoPage.c" gboolean _tmp4_; #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 9529 "PhotoPage.c" +#line 9491 "PhotoPage.c" } else { #line 1367 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp2_ = FALSE; -#line 9533 "PhotoPage.c" +#line 9495 "PhotoPage.c" } #line 1367 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp2_) { -#line 9537 "PhotoPage.c" +#line 9499 "PhotoPage.c" gboolean _tmp5_; #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 9543 "PhotoPage.c" +#line 9505 "PhotoPage.c" } else { #line 1367 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp1_ = FALSE; -#line 9547 "PhotoPage.c" +#line 9509 "PhotoPage.c" } #line 1367 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp1_) { -#line 9551 "PhotoPage.c" +#line 9513 "PhotoPage.c" gboolean _tmp6_; #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 9557 "PhotoPage.c" +#line 9519 "PhotoPage.c" } else { #line 1367 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp0_ = FALSE; -#line 9561 "PhotoPage.c" +#line 9523 "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 9567 "PhotoPage.c" +#line 9529 "PhotoPage.c" } #line 1370 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp7_ = event; @@ -9578,7 +9540,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 9577 "PhotoPage.c" +#line 9539 "PhotoPage.c" } @@ -9596,7 +9558,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 9595 "PhotoPage.c" +#line 9557 "PhotoPage.c" } #line 1377 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp1_ = event; @@ -9606,7 +9568,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 9605 "PhotoPage.c" +#line 9567 "PhotoPage.c" } @@ -9624,7 +9586,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 9623 "PhotoPage.c" +#line 9585 "PhotoPage.c" } #line 1384 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp1_ = event; @@ -9634,7 +9596,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 9633 "PhotoPage.c" +#line 9595 "PhotoPage.c" } @@ -9652,37 +9614,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 9651 "PhotoPage.c" +#line 9613 "PhotoPage.c" gboolean _tmp3_; #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 9657 "PhotoPage.c" +#line 9619 "PhotoPage.c" } else { #line 1388 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp1_ = FALSE; -#line 9661 "PhotoPage.c" +#line 9623 "PhotoPage.c" } #line 1388 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp1_) { -#line 9665 "PhotoPage.c" +#line 9627 "PhotoPage.c" gboolean _tmp4_; #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 9671 "PhotoPage.c" +#line 9633 "PhotoPage.c" } else { #line 1388 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp0_ = FALSE; -#line 9675 "PhotoPage.c" +#line 9637 "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 9681 "PhotoPage.c" +#line 9643 "PhotoPage.c" } #line 1391 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp5_ = event; @@ -9692,7 +9654,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 9691 "PhotoPage.c" +#line 9653 "PhotoPage.c" } @@ -9708,7 +9670,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 9707 "PhotoPage.c" +#line 9669 "PhotoPage.c" { GdkPixbuf* _tmp0_ = NULL; Photo* _tmp1_; @@ -9733,8 +9695,8 @@ 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 9732 "PhotoPage.c" - goto __catch250_g_error; +#line 9694 "PhotoPage.c" + goto __catch261_g_error; } #line 1397 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp5_ = editing_host_page_get_photo (self); @@ -9752,10 +9714,10 @@ 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 9751 "PhotoPage.c" +#line 9713 "PhotoPage.c" } - goto __finally250; - __catch250_g_error: + goto __finally261; + __catch261_g_error: { GError* err = NULL; #line 1396 "/home/jens/Source/shotwell/src/PhotoPage.vala" @@ -9768,9 +9730,9 @@ 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 9767 "PhotoPage.c" +#line 9729 "PhotoPage.c" } - __finally250: + __finally261: #line 1396 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 1396 "/home/jens/Source/shotwell/src/PhotoPage.vala" @@ -9781,7 +9743,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 9780 "PhotoPage.c" +#line 9742 "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)); @@ -9799,7 +9761,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 9798 "PhotoPage.c" +#line 9760 "PhotoPage.c" } #line 1413 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp12_ = original; @@ -9815,7 +9777,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 9814 "PhotoPage.c" +#line 9776 "PhotoPage.c" } @@ -9827,7 +9789,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 9826 "PhotoPage.c" +#line 9788 "PhotoPage.c" GdkPixbuf* _tmp1_; Photo* _tmp2_; Photo* _tmp3_; @@ -9852,7 +9814,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 9851 "PhotoPage.c" +#line 9813 "PhotoPage.c" } } @@ -9860,7 +9822,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 9859 "PhotoPage.c" +#line 9821 "PhotoPage.c" } @@ -9911,7 +9873,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 9910 "PhotoPage.c" +#line 9872 "PhotoPage.c" { Dimensions tool_pixbuf_dim = {0}; Dimensions _tmp6_ = {0}; @@ -9949,8 +9911,8 @@ 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 9948 "PhotoPage.c" - goto __catch251_g_error; +#line 9910 "PhotoPage.c" + goto __catch262_g_error; } #line 1446 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp15_ = _tmp7_; @@ -9964,20 +9926,20 @@ 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 9963 "PhotoPage.c" +#line 9925 "PhotoPage.c" Dimensions _tmp17_; #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 9969 "PhotoPage.c" +#line 9931 "PhotoPage.c" } #line 1444 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (_tmp7_); -#line 9973 "PhotoPage.c" +#line 9935 "PhotoPage.c" } - goto __finally251; - __catch251_g_error: + goto __finally262; + __catch262_g_error: { GError* err = NULL; GError* _tmp18_; @@ -10010,9 +9972,9 @@ 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 10009 "PhotoPage.c" +#line 9971 "PhotoPage.c" } - __finally251: + __finally262: #line 1444 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 1444 "/home/jens/Source/shotwell/src/PhotoPage.vala" @@ -10023,13 +9985,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 10022 "PhotoPage.c" +#line 9984 "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 10028 "PhotoPage.c" +#line 9990 "PhotoPage.c" GdkPixbuf* _tmp23_; Dimensions _tmp24_; #line 1462 "/home/jens/Source/shotwell/src/PhotoPage.vala" @@ -10038,7 +10000,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 10037 "PhotoPage.c" +#line 9999 "PhotoPage.c" } #line 1465 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp25_ = editing_host_page_editing_host_canvas_new (self); @@ -10066,42 +10028,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 10065 "PhotoPage.c" +#line 10027 "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 10072 "PhotoPage.c" +#line 10034 "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 10079 "PhotoPage.c" +#line 10041 "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 10086 "PhotoPage.c" +#line 10048 "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 10093 "PhotoPage.c" +#line 10055 "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 10100 "PhotoPage.c" +#line 10062 "PhotoPage.c" } @@ -10110,7 +10072,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 10109 "PhotoPage.c" +#line 10071 "PhotoPage.c" } @@ -10154,7 +10116,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 10153 "PhotoPage.c" +#line 10115 "PhotoPage.c" } #line 1483 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp1_ = self->priv->current_tool; @@ -10176,7 +10138,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 10175 "PhotoPage.c" +#line 10137 "PhotoPage.c" EditingToolsEditingToolWindow* _tmp7_; gboolean _tmp8_; #line 1488 "/home/jens/Source/shotwell/src/PhotoPage.vala" @@ -10185,15 +10147,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 10184 "PhotoPage.c" +#line 10146 "PhotoPage.c" } else { #line 1488 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp5_ = FALSE; -#line 10188 "PhotoPage.c" +#line 10150 "PhotoPage.c" } #line 1488 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp5_) { -#line 10192 "PhotoPage.c" +#line 10154 "PhotoPage.c" gint last_location_x = 0; gint last_location_y = 0; EditingToolsEditingToolWindow* _tmp9_; @@ -10251,7 +10213,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 10250 "PhotoPage.c" +#line 10212 "PhotoPage.c" } #line 1497 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp24_ = tool; @@ -10301,7 +10263,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 10300 "PhotoPage.c" +#line 10262 "PhotoPage.c" GdkPixbuf* _tmp36_; GdkPixbuf* _tmp37_; #line 1514 "/home/jens/Source/shotwell/src/PhotoPage.vala" @@ -10312,14 +10274,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 10311 "PhotoPage.c" +#line 10273 "PhotoPage.c" } else { GdkPixbuf* _tmp38_; #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 10318 "PhotoPage.c" +#line 10280 "PhotoPage.c" GdkPixbuf* _tmp39_; GdkPixbuf* _tmp40_; GdkPixbuf* _tmp41_; @@ -10340,18 +10302,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 10339 "PhotoPage.c" +#line 10301 "PhotoPage.c" } else { #line 1520 "/home/jens/Source/shotwell/src/PhotoPage.vala" needs_improvement = TRUE; -#line 10343 "PhotoPage.c" +#line 10305 "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 10350 "PhotoPage.c" +#line 10312 "PhotoPage.c" GdkPixbuf* _tmp44_; Dimensions _tmp45_; #line 1524 "/home/jens/Source/shotwell/src/PhotoPage.vala" @@ -10360,7 +10322,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 10359 "PhotoPage.c" +#line 10321 "PhotoPage.c" } #line 1525 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (self->priv->cancel_editing_pixbuf); @@ -10374,13 +10336,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 10373 "PhotoPage.c" +#line 10335 "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 10379 "PhotoPage.c" +#line 10341 "PhotoPage.c" CommandManager* _tmp48_; CommandManager* _tmp49_; Command* _tmp50_; @@ -10394,7 +10356,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 10393 "PhotoPage.c" +#line 10355 "PhotoPage.c" } #line 1478 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (replacement); @@ -10402,7 +10364,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 10401 "PhotoPage.c" +#line 10363 "PhotoPage.c" } @@ -10414,7 +10376,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 10413 "PhotoPage.c" +#line 10375 "PhotoPage.c" } @@ -10423,7 +10385,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 10422 "PhotoPage.c" +#line 10384 "PhotoPage.c" } @@ -10457,14 +10419,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 10456 "PhotoPage.c" +#line 10418 "PhotoPage.c" gboolean _tmp2_ = FALSE; EditingToolsEditingTool* _tmp3_; #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 10463 "PhotoPage.c" +#line 10425 "PhotoPage.c" GdkEventButton* _tmp4_; gboolean _tmp5_; #line 1548 "/home/jens/Source/shotwell/src/PhotoPage.vala" @@ -10473,17 +10435,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 10472 "PhotoPage.c" +#line 10434 "PhotoPage.c" } else { #line 1548 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp2_ = FALSE; -#line 10476 "PhotoPage.c" +#line 10438 "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 10482 "PhotoPage.c" +#line 10444 "PhotoPage.c" } #line 1550 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp6_ = event; @@ -10501,7 +10463,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 10500 "PhotoPage.c" +#line 10462 "PhotoPage.c" GtkScale* _tmp12_; gdouble _tmp13_; #line 1555 "/home/jens/Source/shotwell/src/PhotoPage.vala" @@ -10510,15 +10472,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 10509 "PhotoPage.c" +#line 10471 "PhotoPage.c" } else { #line 1555 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp10_ = FALSE; -#line 10513 "PhotoPage.c" +#line 10475 "PhotoPage.c" } #line 1555 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp10_) { -#line 10517 "PhotoPage.c" +#line 10479 "PhotoPage.c" GdkEventButton* _tmp14_; gdouble _tmp15_; GdkEventButton* _tmp16_; @@ -10543,7 +10505,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 10542 "PhotoPage.c" +#line 10504 "PhotoPage.c" } #line 1565 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp18_ = self->priv->current_tool; @@ -10553,7 +10515,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 10552 "PhotoPage.c" +#line 10514 "PhotoPage.c" } #line 1571 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp19_ = x; @@ -10567,7 +10529,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 10566 "PhotoPage.c" +#line 10528 "PhotoPage.c" } #line 1574 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp22_ = self->priv->current_tool; @@ -10581,7 +10543,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 10580 "PhotoPage.c" +#line 10542 "PhotoPage.c" } @@ -10607,7 +10569,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 10606 "PhotoPage.c" +#line 10568 "PhotoPage.c" GdkPoint viewport_center = {0}; ZoomState _tmp1_ = {0}; GdkPoint _tmp2_ = {0}; @@ -10694,7 +10656,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 10693 "PhotoPage.c" +#line 10655 "PhotoPage.c" } #line 1598 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp21_ = self->priv->current_tool; @@ -10704,7 +10666,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 10703 "PhotoPage.c" +#line 10665 "PhotoPage.c" } #line 1601 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp22_ = self->priv->current_tool; @@ -10730,7 +10692,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 10729 "PhotoPage.c" +#line 10691 "PhotoPage.c" EditingToolsEditingTool* _tmp31_; EditingToolsEditingToolWindow* _tmp32_; EditingToolsEditingToolWindow* _tmp33_; @@ -10744,13 +10706,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 10743 "PhotoPage.c" +#line 10705 "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 10749 "PhotoPage.c" +#line 10711 "PhotoPage.c" } @@ -10771,7 +10733,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 10770 "PhotoPage.c" +#line 10732 "PhotoPage.c" } @@ -10780,7 +10742,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 10779 "PhotoPage.c" +#line 10741 "PhotoPage.c" } @@ -10820,7 +10782,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 10819 "PhotoPage.c" +#line 10781 "PhotoPage.c" } #line 1617 "/home/jens/Source/shotwell/src/PhotoPage.vala" self->priv->pixbuf_dirty = TRUE; @@ -10838,7 +10800,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 10837 "PhotoPage.c" +#line 10799 "PhotoPage.c" } #line 1624 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp9_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); @@ -10858,7 +10820,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 10857 "PhotoPage.c" +#line 10819 "PhotoPage.c" } @@ -10867,7 +10829,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 10866 "PhotoPage.c" +#line 10828 "PhotoPage.c" } @@ -10880,7 +10842,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 10879 "PhotoPage.c" +#line 10841 "PhotoPage.c" PixbufCache* _tmp1_; Photo* _tmp2_; Photo* _tmp3_; @@ -10894,13 +10856,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 10893 "PhotoPage.c" +#line 10855 "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 10899 "PhotoPage.c" +#line 10861 "PhotoPage.c" } @@ -10951,7 +10913,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 10950 "PhotoPage.c" +#line 10912 "PhotoPage.c" Dimensions _tmp11_; gint _tmp12_; Dimensions _tmp13_; @@ -10966,17 +10928,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 10965 "PhotoPage.c" +#line 10927 "PhotoPage.c" } else { #line 1646 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp6_ = FALSE; -#line 10969 "PhotoPage.c" +#line 10931 "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 10975 "PhotoPage.c" +#line 10937 "PhotoPage.c" } @@ -10990,11 +10952,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 10989 "PhotoPage.c" +#line 10951 "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 10993 "PhotoPage.c" +#line 10955 "PhotoPage.c" } } @@ -11017,7 +10979,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 11016 "PhotoPage.c" +#line 10978 "PhotoPage.c" EditingToolsEditingTool* _tmp1_; gint _tmp2_; gint _tmp3_; @@ -11041,7 +11003,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 11040 "PhotoPage.c" +#line 11002 "PhotoPage.c" } #line 1667 "/home/jens/Source/shotwell/src/PhotoPage.vala" editing_host_page_update_cursor_for_zoom_context (self); @@ -11049,7 +11011,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 11048 "PhotoPage.c" +#line 11010 "PhotoPage.c" gint delta_x = 0; GdkEventMotion* _tmp7_; gdouble _tmp8_; @@ -11123,7 +11085,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 11122 "PhotoPage.c" +#line 11084 "PhotoPage.c" } #line 1683 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp24_ = event; @@ -11139,7 +11101,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 11138 "PhotoPage.c" +#line 11100 "PhotoPage.c" } @@ -11154,7 +11116,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 11153 "PhotoPage.c" +#line 11115 "PhotoPage.c" EditingToolsEditingTool* _tmp1_; gboolean _tmp2_; #line 1688 "/home/jens/Source/shotwell/src/PhotoPage.vala" @@ -11165,7 +11127,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 11164 "PhotoPage.c" +#line 11126 "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)); @@ -11173,7 +11135,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 11172 "PhotoPage.c" +#line 11134 "PhotoPage.c" } @@ -11185,7 +11147,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 11184 "PhotoPage.c" +#line 11146 "PhotoPage.c" EditingToolsEditingToolWindow* tool_window = NULL; EditingToolsEditingTool* _tmp1_; EditingToolsEditingToolWindow* _tmp2_; @@ -11201,7 +11163,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 11200 "PhotoPage.c" +#line 11162 "PhotoPage.c" EditingToolsEditingToolWindow* _tmp5_; gboolean _tmp6_; #line 1697 "/home/jens/Source/shotwell/src/PhotoPage.vala" @@ -11210,21 +11172,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 11209 "PhotoPage.c" +#line 11171 "PhotoPage.c" } else { #line 1697 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp3_ = FALSE; -#line 11213 "PhotoPage.c" +#line 11175 "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 11219 "PhotoPage.c" +#line 11181 "PhotoPage.c" } #line 1695 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (tool_window); -#line 11223 "PhotoPage.c" +#line 11185 "PhotoPage.c" } } @@ -11242,7 +11204,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 11241 "PhotoPage.c" +#line 11203 "PhotoPage.c" } @@ -11262,7 +11224,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 11261 "PhotoPage.c" +#line 11223 "PhotoPage.c" } @@ -11301,7 +11263,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 11300 "PhotoPage.c" +#line 11262 "PhotoPage.c" ZoomState new_zoom_state = {0}; ZoomState _tmp12_; GdkPoint _tmp13_; @@ -11332,7 +11294,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 11331 "PhotoPage.c" +#line 11293 "PhotoPage.c" default: { gint _tmp8_; @@ -11342,13 +11304,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 11341 "PhotoPage.c" +#line 11303 "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 11347 "PhotoPage.c" +#line 11309 "PhotoPage.c" default: { gint _tmp9_; @@ -11358,13 +11320,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 11357 "PhotoPage.c" +#line 11319 "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 11363 "PhotoPage.c" +#line 11325 "PhotoPage.c" default: { gint _tmp10_; @@ -11374,13 +11336,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 11373 "PhotoPage.c" +#line 11335 "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 11379 "PhotoPage.c" +#line 11341 "PhotoPage.c" default: { gint _tmp11_; @@ -11390,20 +11352,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 11389 "PhotoPage.c" +#line 11351 "PhotoPage.c" } } } else { #line 1718 "/home/jens/Source/shotwell/src/PhotoPage.vala" switch (0) { -#line 11395 "PhotoPage.c" +#line 11357 "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 11402 "PhotoPage.c" +#line 11364 "PhotoPage.c" } } } @@ -11423,7 +11385,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 11422 "PhotoPage.c" +#line 11384 "PhotoPage.c" } @@ -11456,7 +11418,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 11455 "PhotoPage.c" +#line 11417 "PhotoPage.c" gboolean _tmp15_; gboolean _tmp16_ = FALSE; #line 1754 "/home/jens/Source/shotwell/src/PhotoPage.vala" @@ -11467,7 +11429,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 11466 "PhotoPage.c" +#line 11428 "PhotoPage.c" EditingToolsEditingTool* _tmp1_; GdkEventKey* _tmp2_; gboolean _tmp3_; @@ -11483,14 +11445,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 11482 "PhotoPage.c" +#line 11444 "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 11489 "PhotoPage.c" +#line 11451 "PhotoPage.c" GdkEventKey* _tmp5_; gboolean _tmp6_; #line 1763 "/home/jens/Source/shotwell/src/PhotoPage.vala" @@ -11503,7 +11465,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 11502 "PhotoPage.c" +#line 11464 "PhotoPage.c" } } #line 1770 "/home/jens/Source/shotwell/src/PhotoPage.vala" @@ -11516,7 +11478,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 11515 "PhotoPage.c" +#line 11477 "PhotoPage.c" } #line 1773 "/home/jens/Source/shotwell/src/PhotoPage.vala" handled = TRUE; @@ -11534,51 +11496,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 11533 "PhotoPage.c" +#line 11495 "PhotoPage.c" default: { #line 1780 "/home/jens/Source/shotwell/src/PhotoPage.vala" break; -#line 11538 "PhotoPage.c" +#line 11500 "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 11544 "PhotoPage.c" +#line 11506 "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 11551 "PhotoPage.c" +#line 11513 "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 11557 "PhotoPage.c" +#line 11519 "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 11564 "PhotoPage.c" +#line 11526 "PhotoPage.c" } } } else { #line 1775 "/home/jens/Source/shotwell/src/PhotoPage.vala" switch (0) { -#line 11570 "PhotoPage.c" +#line 11532 "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 11577 "PhotoPage.c" +#line 11539 "PhotoPage.c" } } } @@ -11590,11 +11552,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 11589 "PhotoPage.c" +#line 11551 "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 11593 "PhotoPage.c" +#line 11555 "PhotoPage.c" GdkEventKey* _tmp17_; gboolean _tmp18_; #line 1803 "/home/jens/Source/shotwell/src/PhotoPage.vala" @@ -11603,17 +11565,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 11602 "PhotoPage.c" +#line 11564 "PhotoPage.c" } else { #line 1803 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp16_ = TRUE; -#line 11606 "PhotoPage.c" +#line 11568 "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 11612 "PhotoPage.c" +#line 11574 "PhotoPage.c" } @@ -11630,7 +11592,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 11629 "PhotoPage.c" +#line 11591 "PhotoPage.c" EditingToolsEditingTool* _tmp1_; EditingToolsPhotoCanvas* _tmp2_; cairo_t* _tmp3_; @@ -11645,7 +11607,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 11644 "PhotoPage.c" +#line 11606 "PhotoPage.c" } } @@ -11664,21 +11626,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 11663 "PhotoPage.c" +#line 11625 "PhotoPage.c" SinglePhotoPageUpdateReason _tmp2_; #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 11669 "PhotoPage.c" +#line 11631 "PhotoPage.c" } else { #line 1816 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp0_ = FALSE; -#line 11673 "PhotoPage.c" +#line 11635 "PhotoPage.c" } #line 1816 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp0_) { -#line 11677 "PhotoPage.c" +#line 11639 "PhotoPage.c" EditingToolsEditingTool* _tmp3_; EditingToolsPhotoCanvas* _tmp4_; Dimensions _tmp5_; @@ -11700,7 +11662,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 11699 "PhotoPage.c" +#line 11661 "PhotoPage.c" } } @@ -11711,7 +11673,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 11710 "PhotoPage.c" +#line 11672 "PhotoPage.c" } @@ -11720,7 +11682,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 11719 "PhotoPage.c" +#line 11681 "PhotoPage.c" } @@ -11730,7 +11692,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 11729 "PhotoPage.c" +#line 11691 "PhotoPage.c" } @@ -11739,7 +11701,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 11738 "PhotoPage.c" +#line 11700 "PhotoPage.c" } @@ -11749,7 +11711,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 11748 "PhotoPage.c" +#line 11710 "PhotoPage.c" } @@ -11758,7 +11720,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 11757 "PhotoPage.c" +#line 11719 "PhotoPage.c" } @@ -11768,7 +11730,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 11767 "PhotoPage.c" +#line 11729 "PhotoPage.c" } @@ -11777,7 +11739,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 11776 "PhotoPage.c" +#line 11738 "PhotoPage.c" } @@ -11811,7 +11773,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 11810 "PhotoPage.c" +#line 11772 "PhotoPage.c" EditingToolsEditingTool* _tmp1_; cairo_t* _tmp2_; #line 1840 "/home/jens/Source/shotwell/src/PhotoPage.vala" @@ -11822,27 +11784,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 11821 "PhotoPage.c" +#line 11783 "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 11827 "PhotoPage.c" +#line 11789 "PhotoPage.c" gboolean _tmp5_; #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 11833 "PhotoPage.c" +#line 11795 "PhotoPage.c" } else { #line 1845 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp3_ = FALSE; -#line 11837 "PhotoPage.c" +#line 11799 "PhotoPage.c" } #line 1845 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp3_) { -#line 11841 "PhotoPage.c" +#line 11803 "PhotoPage.c" cairo_t* _tmp6_; cairo_t* _tmp7_; Dimensions _tmp8_ = {0}; @@ -11911,7 +11873,7 @@ static void editing_host_page_real_paint (SinglePhotoPage* base, cairo_t* ctx, D _g_object_unref0 (_tmp15_); #line 1851 "/home/jens/Source/shotwell/src/PhotoPage.vala" return; -#line 11910 "PhotoPage.c" +#line 11872 "PhotoPage.c" } #line 1854 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp22_ = ctx; @@ -11927,7 +11889,7 @@ static void editing_host_page_real_paint (SinglePhotoPage* base, cairo_t* ctx, D if (!_tmp25_) { #line 1857 "/home/jens/Source/shotwell/src/PhotoPage.vala" return; -#line 11926 "PhotoPage.c" +#line 11888 "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), &_tmp26_); @@ -11941,7 +11903,7 @@ static void editing_host_page_real_paint (SinglePhotoPage* base, cairo_t* ctx, D _tmp28_ = trinket; #line 1863 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp28_ != NULL) { -#line 11940 "PhotoPage.c" +#line 11902 "PhotoPage.c" gint x = 0; GdkRectangle _tmp29_; gint _tmp30_; @@ -12023,7 +11985,7 @@ static void editing_host_page_real_paint (SinglePhotoPage* base, cairo_t* ctx, D _tmp51_ = ctx; #line 1868 "/home/jens/Source/shotwell/src/PhotoPage.vala" cairo_fill (_tmp51_); -#line 12022 "PhotoPage.c" +#line 11984 "PhotoPage.c" } #line 1871 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp52_ = editing_host_page_get_top_left_trinket (self, EDITING_HOST_PAGE_TRINKET_SCALE); @@ -12035,7 +11997,7 @@ static void editing_host_page_real_paint (SinglePhotoPage* base, cairo_t* ctx, D _tmp53_ = trinket; #line 1872 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp53_ != NULL) { -#line 12034 "PhotoPage.c" +#line 11996 "PhotoPage.c" gint x = 0; GdkRectangle _tmp54_; gint _tmp55_; @@ -12102,7 +12064,7 @@ static void editing_host_page_real_paint (SinglePhotoPage* base, cairo_t* ctx, D _tmp71_ = ctx; #line 1877 "/home/jens/Source/shotwell/src/PhotoPage.vala" cairo_fill (_tmp71_); -#line 12101 "PhotoPage.c" +#line 12063 "PhotoPage.c" } #line 1880 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp72_ = editing_host_page_get_top_right_trinket (self, EDITING_HOST_PAGE_TRINKET_SCALE); @@ -12114,7 +12076,7 @@ static void editing_host_page_real_paint (SinglePhotoPage* base, cairo_t* ctx, D _tmp73_ = trinket; #line 1881 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp73_ != NULL) { -#line 12113 "PhotoPage.c" +#line 12075 "PhotoPage.c" gint x = 0; GdkRectangle _tmp74_; gint _tmp75_; @@ -12196,7 +12158,7 @@ static void editing_host_page_real_paint (SinglePhotoPage* base, cairo_t* ctx, D _tmp96_ = ctx; #line 1886 "/home/jens/Source/shotwell/src/PhotoPage.vala" cairo_fill (_tmp96_); -#line 12195 "PhotoPage.c" +#line 12157 "PhotoPage.c" } #line 1889 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp97_ = editing_host_page_get_bottom_right_trinket (self, EDITING_HOST_PAGE_TRINKET_SCALE); @@ -12208,7 +12170,7 @@ static void editing_host_page_real_paint (SinglePhotoPage* base, cairo_t* ctx, D _tmp98_ = trinket; #line 1890 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp98_ != NULL) { -#line 12207 "PhotoPage.c" +#line 12169 "PhotoPage.c" gint x = 0; GdkRectangle _tmp99_; gint _tmp100_; @@ -12305,11 +12267,11 @@ static void editing_host_page_real_paint (SinglePhotoPage* base, cairo_t* ctx, D _tmp126_ = ctx; #line 1895 "/home/jens/Source/shotwell/src/PhotoPage.vala" cairo_fill (_tmp126_); -#line 12304 "PhotoPage.c" +#line 12266 "PhotoPage.c" } #line 1838 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (trinket); -#line 12308 "PhotoPage.c" +#line 12270 "PhotoPage.c" } @@ -12326,7 +12288,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 12325 "PhotoPage.c" +#line 12287 "PhotoPage.c" } @@ -12362,7 +12324,7 @@ static void editing_host_page_rotate (EditingHostPage* self, Rotation rotation, if (!_tmp1_) { #line 1909 "/home/jens/Source/shotwell/src/PhotoPage.vala" return; -#line 12361 "PhotoPage.c" +#line 12323 "PhotoPage.c" } #line 1911 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp2_ = editing_host_page_get_photo (self); @@ -12394,7 +12356,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 12393 "PhotoPage.c" +#line 12355 "PhotoPage.c" } @@ -12403,7 +12365,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 12402 "PhotoPage.c" +#line 12364 "PhotoPage.c" } @@ -12412,7 +12374,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 12411 "PhotoPage.c" +#line 12373 "PhotoPage.c" } @@ -12421,7 +12383,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 12420 "PhotoPage.c" +#line 12382 "PhotoPage.c" } @@ -12430,7 +12392,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 12429 "PhotoPage.c" +#line 12391 "PhotoPage.c" } @@ -12458,7 +12420,7 @@ void editing_host_page_on_revert (EditingHostPage* self) { if (_tmp0_) { #line 1934 "/home/jens/Source/shotwell/src/PhotoPage.vala" return; -#line 12457 "PhotoPage.c" +#line 12419 "PhotoPage.c" } #line 1936 "/home/jens/Source/shotwell/src/PhotoPage.vala" dimensions_init (&_tmp1_, 0, 0); @@ -12470,7 +12432,7 @@ void editing_host_page_on_revert (EditingHostPage* self) { if (!_tmp2_) { #line 1939 "/home/jens/Source/shotwell/src/PhotoPage.vala" return; -#line 12469 "PhotoPage.c" +#line 12431 "PhotoPage.c" } #line 1941 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp3_ = editing_host_page_get_photo (self); @@ -12484,7 +12446,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 12483 "PhotoPage.c" +#line 12445 "PhotoPage.c" AppWindow* _tmp7_; AppWindow* _tmp8_; ViewCollection* _tmp9_; @@ -12521,7 +12483,7 @@ void editing_host_page_on_revert (EditingHostPage* self) { if (_tmp14_) { #line 1944 "/home/jens/Source/shotwell/src/PhotoPage.vala" return; -#line 12520 "PhotoPage.c" +#line 12482 "PhotoPage.c" } #line 1947 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp15_ = editing_host_page_get_photo (self); @@ -12531,7 +12493,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 12530 "PhotoPage.c" +#line 12492 "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)); @@ -12561,7 +12523,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 12560 "PhotoPage.c" +#line 12522 "PhotoPage.c" } @@ -12599,7 +12561,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 12598 "PhotoPage.c" +#line 12560 "PhotoPage.c" Photo* _tmp3_; LibraryPhoto* _tmp4_; #line 1961 "/home/jens/Source/shotwell/src/PhotoPage.vala" @@ -12610,19 +12572,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 12609 "PhotoPage.c" +#line 12571 "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 12615 "PhotoPage.c" +#line 12577 "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 12621 "PhotoPage.c" +#line 12583 "PhotoPage.c" } #line 1965 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp5_ = item; @@ -12656,7 +12618,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 12655 "PhotoPage.c" +#line 12617 "PhotoPage.c" } #line 1970 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp13_ = item; @@ -12684,7 +12646,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 12683 "PhotoPage.c" +#line 12645 "PhotoPage.c" } @@ -12722,7 +12684,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 12721 "PhotoPage.c" +#line 12683 "PhotoPage.c" Photo* _tmp3_; LibraryPhoto* _tmp4_; #line 1977 "/home/jens/Source/shotwell/src/PhotoPage.vala" @@ -12733,19 +12695,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 12732 "PhotoPage.c" +#line 12694 "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 12738 "PhotoPage.c" +#line 12700 "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 12744 "PhotoPage.c" +#line 12706 "PhotoPage.c" } #line 1981 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp5_ = item; @@ -12779,7 +12741,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 12778 "PhotoPage.c" +#line 12740 "PhotoPage.c" } #line 1986 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp13_ = item; @@ -12807,7 +12769,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 12806 "PhotoPage.c" +#line 12768 "PhotoPage.c" } @@ -12834,7 +12796,7 @@ void editing_host_page_on_adjust_date_time (EditingHostPage* self) { if (!_tmp0_) { #line 1992 "/home/jens/Source/shotwell/src/PhotoPage.vala" return; -#line 12833 "PhotoPage.c" +#line 12795 "PhotoPage.c" } #line 1994 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp1_ = editing_host_page_get_photo (self); @@ -12862,7 +12824,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 12861 "PhotoPage.c" +#line 12823 "PhotoPage.c" ViewCollection* _tmp10_; ViewCollection* _tmp11_; GeeList* _tmp12_; @@ -12917,11 +12879,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 12916 "PhotoPage.c" +#line 12878 "PhotoPage.c" } #line 1990 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (dialog); -#line 12920 "PhotoPage.c" +#line 12882 "PhotoPage.c" } @@ -12933,7 +12895,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 12932 "PhotoPage.c" +#line 12894 "PhotoPage.c" SetBackgroundPhotoDialog* dialog = NULL; SetBackgroundPhotoDialog* _tmp1_; gboolean desktop = FALSE; @@ -12958,7 +12920,7 @@ void editing_host_page_on_set_background (EditingHostPage* self) { screensaver = _tmp4_; #line 2011 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp5_) { -#line 12957 "PhotoPage.c" +#line 12919 "PhotoPage.c" AppWindow* _tmp6_; AppWindow* _tmp7_; Photo* _tmp8_; @@ -12995,11 +12957,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 12994 "PhotoPage.c" +#line 12956 "PhotoPage.c" } #line 2008 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (dialog); -#line 12998 "PhotoPage.c" +#line 12960 "PhotoPage.c" } } @@ -13007,7 +12969,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 13006 "PhotoPage.c" +#line 12968 "PhotoPage.c" } @@ -13053,7 +13015,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 13052 "PhotoPage.c" +#line 13014 "PhotoPage.c" } #line 2029 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp7_ = event; @@ -13063,7 +13025,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 13062 "PhotoPage.c" +#line 13024 "PhotoPage.c" } @@ -13109,37 +13071,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 13108 "PhotoPage.c" +#line 13070 "PhotoPage.c" gboolean _tmp9_; #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 13114 "PhotoPage.c" +#line 13076 "PhotoPage.c" } else { #line 2039 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp7_ = FALSE; -#line 13118 "PhotoPage.c" +#line 13080 "PhotoPage.c" } #line 2039 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp7_) { -#line 13122 "PhotoPage.c" +#line 13084 "PhotoPage.c" gboolean _tmp10_; #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 13128 "PhotoPage.c" +#line 13090 "PhotoPage.c" } else { #line 2039 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp6_ = FALSE; -#line 13132 "PhotoPage.c" +#line 13094 "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 13138 "PhotoPage.c" +#line 13100 "PhotoPage.c" } #line 2042 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp11_ = event; @@ -13149,7 +13111,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 13148 "PhotoPage.c" +#line 13110 "PhotoPage.c" } @@ -13184,7 +13146,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 13183 "PhotoPage.c" +#line 13145 "PhotoPage.c" GtkToggleToolButton* _tmp4_; GtkToggleToolButton* _tmp5_; #line 2048 "/home/jens/Source/shotwell/src/PhotoPage.vala" @@ -13193,11 +13155,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 13192 "PhotoPage.c" +#line 13154 "PhotoPage.c" } else { #line 2048 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp0_ = FALSE; -#line 13196 "PhotoPage.c" +#line 13158 "PhotoPage.c" } #line 2048 "/home/jens/Source/shotwell/src/PhotoPage.vala" deactivating_only = _tmp0_; @@ -13213,7 +13175,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 13212 "PhotoPage.c" +#line 13174 "PhotoPage.c" } #line 2056 "/home/jens/Source/shotwell/src/PhotoPage.vala" page_suspend_cursor_hiding (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); @@ -13257,7 +13219,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 13256 "PhotoPage.c" +#line 13218 "PhotoPage.c" } @@ -13279,7 +13241,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 13278 "PhotoPage.c" +#line 13240 "PhotoPage.c" } @@ -13301,7 +13263,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 13300 "PhotoPage.c" +#line 13262 "PhotoPage.c" } @@ -13328,7 +13290,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 13327 "PhotoPage.c" +#line 13289 "PhotoPage.c" } @@ -13344,7 +13306,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 13343 "PhotoPage.c" +#line 13305 "PhotoPage.c" } @@ -13358,7 +13320,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 13357 "PhotoPage.c" +#line 13319 "PhotoPage.c" } @@ -13376,7 +13338,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 13375 "PhotoPage.c" +#line 13337 "PhotoPage.c" } @@ -13394,7 +13356,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 13393 "PhotoPage.c" +#line 13355 "PhotoPage.c" } @@ -13412,7 +13374,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 13411 "PhotoPage.c" +#line 13373 "PhotoPage.c" } @@ -13430,7 +13392,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 13429 "PhotoPage.c" +#line 13391 "PhotoPage.c" } @@ -13439,7 +13401,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 13438 "PhotoPage.c" +#line 13400 "PhotoPage.c" } @@ -13451,7 +13413,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 13450 "PhotoPage.c" +#line 13412 "PhotoPage.c" } @@ -13460,7 +13422,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 13459 "PhotoPage.c" +#line 13421 "PhotoPage.c" } @@ -13472,7 +13434,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 13471 "PhotoPage.c" +#line 13433 "PhotoPage.c" } @@ -13481,7 +13443,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 13480 "PhotoPage.c" +#line 13442 "PhotoPage.c" } @@ -13493,7 +13455,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 13492 "PhotoPage.c" +#line 13454 "PhotoPage.c" } @@ -13502,7 +13464,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 13501 "PhotoPage.c" +#line 13463 "PhotoPage.c" } @@ -13514,7 +13476,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 13513 "PhotoPage.c" +#line 13475 "PhotoPage.c" } @@ -13531,7 +13493,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 13530 "PhotoPage.c" +#line 13492 "PhotoPage.c" } @@ -13556,7 +13518,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 13555 "PhotoPage.c" +#line 13517 "PhotoPage.c" Dimensions _tmp1_ = {0}; #line 2141 "/home/jens/Source/shotwell/src/PhotoPage.vala" dimensions_init (&_tmp1_, 0, 0); @@ -13564,7 +13526,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 13563 "PhotoPage.c" +#line 13525 "PhotoPage.c" } #line 2146 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp2_ = editing_host_page_has_photo (self); @@ -13572,7 +13534,7 @@ void editing_host_page_on_enhance (EditingHostPage* self) { if (!_tmp2_) { #line 2147 "/home/jens/Source/shotwell/src/PhotoPage.vala" return; -#line 13571 "PhotoPage.c" +#line 13533 "PhotoPage.c" } #line 2149 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp3_ = self->priv->current_tool; @@ -13584,7 +13546,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 13583 "PhotoPage.c" +#line 13545 "PhotoPage.c" EditingToolsAdjustTool* _tmp6_; #line 2151 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp6_ = adjust_tool; @@ -13594,7 +13556,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 13593 "PhotoPage.c" +#line 13555 "PhotoPage.c" } #line 2156 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp7_ = editing_host_page_get_photo (self); @@ -13622,7 +13584,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 13621 "PhotoPage.c" +#line 13583 "PhotoPage.c" } @@ -13640,7 +13602,7 @@ void editing_host_page_on_copy_adjustments (EditingHostPage* self) { if (!_tmp0_) { #line 2162 "/home/jens/Source/shotwell/src/PhotoPage.vala" return; -#line 13639 "PhotoPage.c" +#line 13601 "PhotoPage.c" } #line 2163 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp1_ = editing_host_page_get_photo (self); @@ -13658,7 +13620,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 13657 "PhotoPage.c" +#line 13619 "PhotoPage.c" } @@ -13688,14 +13650,14 @@ void editing_host_page_on_paste_adjustments (EditingHostPage* self) { if (!_tmp2_) { #line 2169 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp1_ = TRUE; -#line 13687 "PhotoPage.c" +#line 13649 "PhotoPage.c" } else { PixelTransformationBundle* _tmp3_; #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 13694 "PhotoPage.c" +#line 13656 "PhotoPage.c" } #line 2169 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp1_) { @@ -13703,7 +13665,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 13702 "PhotoPage.c" +#line 13664 "PhotoPage.c" } #line 2172 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp4_ = editing_host_page_get_photo (self); @@ -13733,7 +13695,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 13732 "PhotoPage.c" +#line 13694 "PhotoPage.c" } @@ -13791,7 +13753,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 13790 "PhotoPage.c" +#line 13752 "PhotoPage.c" } #line 2181 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp1_ = self->priv->current_tool; @@ -13807,7 +13769,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 13806 "PhotoPage.c" +#line 13768 "PhotoPage.c" } #line 2186 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp4_ = tool_window; @@ -13851,7 +13813,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 13850 "PhotoPage.c" +#line 13812 "PhotoPage.c" GeeHashMap* _tmp18_; EditingToolsEditingTool* _tmp19_; const gchar* _tmp20_; @@ -13896,7 +13858,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 13895 "PhotoPage.c" +#line 13857 "PhotoPage.c" } else { GtkWindow* _tmp30_; GtkWindow* _tmp31_; @@ -13919,7 +13881,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 13918 "PhotoPage.c" +#line 13880 "PhotoPage.c" gint rx = 0; gint ry = 0; GtkWindow* _tmp35_; @@ -13994,7 +13956,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 13993 "PhotoPage.c" +#line 13955 "PhotoPage.c" gint _tmp51_; gint _tmp52_; gint _tmp53_; @@ -14012,7 +13974,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 14011 "PhotoPage.c" +#line 13973 "PhotoPage.c" } else { gint _tmp56_; gint _tmp57_; @@ -14025,7 +13987,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 14024 "PhotoPage.c" +#line 13986 "PhotoPage.c" } #line 2218 "/home/jens/Source/shotwell/src/PhotoPage.vala" x = _tmp50_; @@ -14041,7 +14003,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 14040 "PhotoPage.c" +#line 14002 "PhotoPage.c" } else { GtkWindow* _tmp64_; GtkWindow* _tmp65_; @@ -14120,13 +14082,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 14119 "PhotoPage.c" +#line 14081 "PhotoPage.c" gint _tmp83_; #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 14125 "PhotoPage.c" +#line 14087 "PhotoPage.c" } else { gint _tmp84_; GtkAllocation _tmp85_; @@ -14139,11 +14101,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 14138 "PhotoPage.c" +#line 14100 "PhotoPage.c" } #line 2200 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (screen); -#line 14142 "PhotoPage.c" +#line 14104 "PhotoPage.c" } } #line 2244 "/home/jens/Source/shotwell/src/PhotoPage.vala" @@ -14208,7 +14170,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 14207 "PhotoPage.c" +#line 14169 "PhotoPage.c" } @@ -14242,7 +14204,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 14241 "PhotoPage.c" +#line 14203 "PhotoPage.c" } #line 2259 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp2_ = editing_host_page_get_photo (self); @@ -14280,7 +14242,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 14279 "PhotoPage.c" +#line 14241 "PhotoPage.c" } #line 2267 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp11_ = current; @@ -14288,14 +14250,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 14287 "PhotoPage.c" +#line 14249 "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 14294 "PhotoPage.c" +#line 14256 "PhotoPage.c" ViewCollection* _tmp14_; ViewCollection* _tmp15_; DataView* _tmp16_; @@ -14311,7 +14273,7 @@ static void editing_host_page_real_on_next_photo (SinglePhotoPage* base) { Photo* _tmp25_; #line 2268 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (!_tmp13_) { -#line 14310 "PhotoPage.c" +#line 14272 "PhotoPage.c" } #line 2268 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp13_ = FALSE; @@ -14335,7 +14297,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 14334 "PhotoPage.c" +#line 14296 "PhotoPage.c" } #line 2273 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp19_ = next; @@ -14347,7 +14309,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 14346 "PhotoPage.c" +#line 14308 "PhotoPage.c" } #line 2273 "/home/jens/Source/shotwell/src/PhotoPage.vala" next_photo = _tmp21_; @@ -14359,7 +14321,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 14358 "PhotoPage.c" +#line 14320 "PhotoPage.c" } #line 2277 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp23_ = next_photo; @@ -14371,7 +14333,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 14370 "PhotoPage.c" +#line 14332 "PhotoPage.c" } #line 2280 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp25_ = next_photo; @@ -14381,7 +14343,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 14380 "PhotoPage.c" +#line 14342 "PhotoPage.c" } } #line 2253 "/home/jens/Source/shotwell/src/PhotoPage.vala" @@ -14390,7 +14352,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 14389 "PhotoPage.c" +#line 14351 "PhotoPage.c" } @@ -14424,7 +14386,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 14423 "PhotoPage.c" +#line 14385 "PhotoPage.c" } #line 2292 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp2_ = editing_host_page_get_photo (self); @@ -14462,7 +14424,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 14461 "PhotoPage.c" +#line 14423 "PhotoPage.c" } #line 2300 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp11_ = current; @@ -14470,14 +14432,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 14469 "PhotoPage.c" +#line 14431 "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 14476 "PhotoPage.c" +#line 14438 "PhotoPage.c" ViewCollection* _tmp14_; ViewCollection* _tmp15_; DataView* _tmp16_; @@ -14493,7 +14455,7 @@ static void editing_host_page_real_on_previous_photo (SinglePhotoPage* base) { Photo* _tmp25_; #line 2301 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (!_tmp13_) { -#line 14492 "PhotoPage.c" +#line 14454 "PhotoPage.c" } #line 2301 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp13_ = FALSE; @@ -14517,7 +14479,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 14516 "PhotoPage.c" +#line 14478 "PhotoPage.c" } #line 2306 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp19_ = previous; @@ -14529,7 +14491,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 14528 "PhotoPage.c" +#line 14490 "PhotoPage.c" } #line 2306 "/home/jens/Source/shotwell/src/PhotoPage.vala" previous_photo = _tmp21_; @@ -14541,7 +14503,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 14540 "PhotoPage.c" +#line 14502 "PhotoPage.c" } #line 2310 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp23_ = previous_photo; @@ -14553,7 +14515,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 14552 "PhotoPage.c" +#line 14514 "PhotoPage.c" } #line 2313 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp25_ = previous_photo; @@ -14563,7 +14525,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 14562 "PhotoPage.c" +#line 14524 "PhotoPage.c" } } #line 2286 "/home/jens/Source/shotwell/src/PhotoPage.vala" @@ -14572,7 +14534,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 14571 "PhotoPage.c" +#line 14533 "PhotoPage.c" } @@ -14587,7 +14549,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 14586 "PhotoPage.c" +#line 14548 "PhotoPage.c" } @@ -14598,7 +14560,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 14597 "PhotoPage.c" +#line 14559 "PhotoPage.c" } @@ -14685,14 +14647,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 14684 "PhotoPage.c" +#line 14646 "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 14691 "PhotoPage.c" +#line 14653 "PhotoPage.c" } @@ -14705,7 +14667,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 14704 "PhotoPage.c" +#line 14666 "PhotoPage.c" } @@ -14718,14 +14680,14 @@ static void editing_host_page_editing_host_canvas_class_init (EditingHostPageEdi g_type_class_add_private (klass, sizeof (EditingHostPageEditingHostCanvasPrivate)); #line 374 "/home/jens/Source/shotwell/src/PhotoPage.vala" ((EditingToolsPhotoCanvasClass *) klass)->repaint = (void (*) (EditingToolsPhotoCanvas *)) editing_host_page_editing_host_canvas_real_repaint; -#line 14717 "PhotoPage.c" +#line 14679 "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 14724 "PhotoPage.c" +#line 14686 "PhotoPage.c" } @@ -14737,7 +14699,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 14736 "PhotoPage.c" +#line 14698 "PhotoPage.c" } @@ -14856,7 +14818,7 @@ static void editing_host_page_class_init (EditingHostPageClass * klass) { ((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 14855 "PhotoPage.c" +#line 14817 "PhotoPage.c" } @@ -14924,7 +14886,7 @@ static void editing_host_page_instance_init (EditingHostPage * self) { _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 14923 "PhotoPage.c" +#line 14885 "PhotoPage.c" } @@ -15008,7 +14970,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 15007 "PhotoPage.c" +#line 14969 "PhotoPage.c" } @@ -15027,364 +14989,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 15026 "PhotoPage.c" +#line 14988 "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 15033 "PhotoPage.c" +#line 14995 "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 15040 "PhotoPage.c" +#line 15002 "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 15047 "PhotoPage.c" +#line 15009 "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 15054 "PhotoPage.c" +#line 15016 "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 15061 "PhotoPage.c" +#line 15023 "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 15068 "PhotoPage.c" +#line 15030 "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 15075 "PhotoPage.c" +#line 15037 "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 15082 "PhotoPage.c" +#line 15044 "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 15089 "PhotoPage.c" +#line 15051 "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 15096 "PhotoPage.c" +#line 15058 "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 15103 "PhotoPage.c" +#line 15065 "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 15110 "PhotoPage.c" +#line 15072 "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 15117 "PhotoPage.c" +#line 15079 "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 15124 "PhotoPage.c" +#line 15086 "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 15131 "PhotoPage.c" +#line 15093 "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 15138 "PhotoPage.c" +#line 15100 "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 15145 "PhotoPage.c" +#line 15107 "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 15152 "PhotoPage.c" +#line 15114 "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 15159 "PhotoPage.c" +#line 15121 "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 15166 "PhotoPage.c" +#line 15128 "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 15173 "PhotoPage.c" +#line 15135 "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 15180 "PhotoPage.c" +#line 15142 "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 15187 "PhotoPage.c" +#line 15149 "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 15194 "PhotoPage.c" +#line 15156 "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 15201 "PhotoPage.c" +#line 15163 "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 15208 "PhotoPage.c" +#line 15170 "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 15215 "PhotoPage.c" +#line 15177 "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 15222 "PhotoPage.c" +#line 15184 "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 15229 "PhotoPage.c" +#line 15191 "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 15236 "PhotoPage.c" +#line 15198 "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 15243 "PhotoPage.c" +#line 15205 "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 15250 "PhotoPage.c" +#line 15212 "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 15257 "PhotoPage.c" +#line 15219 "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 15264 "PhotoPage.c" +#line 15226 "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 15271 "PhotoPage.c" +#line 15233 "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 15278 "PhotoPage.c" +#line 15240 "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 15285 "PhotoPage.c" +#line 15247 "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 15292 "PhotoPage.c" +#line 15254 "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 15299 "PhotoPage.c" +#line 15261 "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 15306 "PhotoPage.c" +#line 15268 "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 15313 "PhotoPage.c" +#line 15275 "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 15320 "PhotoPage.c" +#line 15282 "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 15327 "PhotoPage.c" +#line 15289 "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 15334 "PhotoPage.c" +#line 15296 "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 15341 "PhotoPage.c" +#line 15303 "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 15348 "PhotoPage.c" +#line 15310 "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 15355 "PhotoPage.c" +#line 15317 "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 15362 "PhotoPage.c" +#line 15324 "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 15369 "PhotoPage.c" +#line 15331 "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 15376 "PhotoPage.c" +#line 15338 "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 15383 "PhotoPage.c" +#line 15345 "PhotoPage.c" } @@ -15450,14 +15412,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 15449 "PhotoPage.c" +#line 15411 "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 15456 "PhotoPage.c" +#line 15418 "PhotoPage.c" } @@ -15488,7 +15450,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 15487 "PhotoPage.c" +#line 15449 "PhotoPage.c" } @@ -15502,7 +15464,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 15501 "PhotoPage.c" +#line 15463 "PhotoPage.c" } @@ -15516,7 +15478,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 15515 "PhotoPage.c" +#line 15477 "PhotoPage.c" } @@ -15541,28 +15503,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 15540 "PhotoPage.c" +#line 15502 "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 15547 "PhotoPage.c" +#line 15509 "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 15554 "PhotoPage.c" +#line 15516 "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 15561 "PhotoPage.c" +#line 15523 "PhotoPage.c" } @@ -15610,7 +15572,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 15609 "PhotoPage.c" +#line 15571 "PhotoPage.c" } #line 2444 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp4_ = _tmp3_; @@ -15648,11 +15610,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 15647 "PhotoPage.c" +#line 15609 "PhotoPage.c" } else { #line 2447 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp13_ = "Camera"; -#line 15651 "PhotoPage.c" +#line 15613 "PhotoPage.c" } #line 2446 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp15_ = G_VARIANT_TYPE_STRING; @@ -15676,7 +15638,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 15675 "PhotoPage.c" +#line 15637 "PhotoPage.c" } @@ -15691,7 +15653,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 15690 "PhotoPage.c" +#line 15652 "PhotoPage.c" { GActionEntry* entry_collection = NULL; gint entry_collection_length1 = 0; @@ -15703,11 +15665,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 15702 "PhotoPage.c" +#line 15664 "PhotoPage.c" GActionEntry entry = {0}; #line 2455 "/home/jens/Source/shotwell/src/PhotoPage.vala" entry = entry_collection[entry_it]; -#line 15706 "PhotoPage.c" +#line 15668 "PhotoPage.c" { GActionMap* _tmp1_; GActionEntry _tmp2_; @@ -15720,7 +15682,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 15719 "PhotoPage.c" +#line 15681 "PhotoPage.c" } } } @@ -15730,58 +15692,58 @@ 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 15729 "PhotoPage.c" +#line 15691 "PhotoPage.c" } -static void _vala_array_add82 (InjectionGroup** * array, int* length, int* size, InjectionGroup* value) { +static void _vala_array_add86 (InjectionGroup** * array, int* length, int* size, InjectionGroup* value) { #line 2466 "/home/jens/Source/shotwell/src/PhotoPage.vala" if ((*length) == (*size)) { #line 2466 "/home/jens/Source/shotwell/src/PhotoPage.vala" *size = (*size) ? (2 * (*size)) : 4; #line 2466 "/home/jens/Source/shotwell/src/PhotoPage.vala" *array = g_renew (InjectionGroup*, *array, (*size) + 1); -#line 15740 "PhotoPage.c" +#line 15702 "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 15746 "PhotoPage.c" +#line 15708 "PhotoPage.c" } -static void _vala_array_add83 (InjectionGroup** * array, int* length, int* size, InjectionGroup* value) { +static void _vala_array_add87 (InjectionGroup** * array, int* length, int* size, InjectionGroup* value) { #line 2471 "/home/jens/Source/shotwell/src/PhotoPage.vala" if ((*length) == (*size)) { #line 2471 "/home/jens/Source/shotwell/src/PhotoPage.vala" *size = (*size) ? (2 * (*size)) : 4; #line 2471 "/home/jens/Source/shotwell/src/PhotoPage.vala" *array = g_renew (InjectionGroup*, *array, (*size) + 1); -#line 15757 "PhotoPage.c" +#line 15719 "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 15763 "PhotoPage.c" +#line 15725 "PhotoPage.c" } -static void _vala_array_add84 (InjectionGroup** * array, int* length, int* size, InjectionGroup* value) { +static void _vala_array_add88 (InjectionGroup** * array, int* length, int* size, InjectionGroup* value) { #line 2476 "/home/jens/Source/shotwell/src/PhotoPage.vala" if ((*length) == (*size)) { #line 2476 "/home/jens/Source/shotwell/src/PhotoPage.vala" *size = (*size) ? (2 * (*size)) : 4; #line 2476 "/home/jens/Source/shotwell/src/PhotoPage.vala" *array = g_renew (InjectionGroup*, *array, (*size) + 1); -#line 15774 "PhotoPage.c" +#line 15736 "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 15780 "PhotoPage.c" +#line 15742 "PhotoPage.c" } @@ -15833,7 +15795,7 @@ static InjectionGroup** library_photo_page_real_init_collect_injection_groups (P #line 2466 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp4_ = _injection_group_ref0 (print_group); #line 2466 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _vala_array_add82 (&groups, &groups_length1, &_groups_size_, _tmp4_); + _vala_array_add86 (&groups, &groups_length1, &_groups_size_, _tmp4_); #line 2468 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp5_ = injection_group_new ("PublishPlaceholder"); #line 2468 "/home/jens/Source/shotwell/src/PhotoPage.vala" @@ -15847,7 +15809,7 @@ static InjectionGroup** library_photo_page_real_init_collect_injection_groups (P #line 2471 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp7_ = _injection_group_ref0 (publish_group); #line 2471 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _vala_array_add83 (&groups, &groups_length1, &_groups_size_, _tmp7_); + _vala_array_add87 (&groups, &groups_length1, &_groups_size_, _tmp7_); #line 2473 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp8_ = injection_group_new ("SetBackgroundPlaceholder"); #line 2473 "/home/jens/Source/shotwell/src/PhotoPage.vala" @@ -15861,7 +15823,7 @@ static InjectionGroup** library_photo_page_real_init_collect_injection_groups (P #line 2476 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp10_ = _injection_group_ref0 (bg_group); #line 2476 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _vala_array_add84 (&groups, &groups_length1, &_groups_size_, _tmp10_); + _vala_array_add88 (&groups, &groups_length1, &_groups_size_, _tmp10_); #line 2478 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp11_ = groups; #line 2478 "/home/jens/Source/shotwell/src/PhotoPage.vala" @@ -15870,7 +15832,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 = _tmp11__length1; -#line 15869 "PhotoPage.c" +#line 15831 "PhotoPage.c" } #line 2478 "/home/jens/Source/shotwell/src/PhotoPage.vala" result = _tmp11_; @@ -15882,7 +15844,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 15881 "PhotoPage.c" +#line 15843 "PhotoPage.c" } @@ -15920,7 +15882,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 15919 "PhotoPage.c" +#line 15881 "PhotoPage.c" } @@ -15939,7 +15901,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 15938 "PhotoPage.c" +#line 15900 "PhotoPage.c" } #line 2492 "/home/jens/Source/shotwell/src/PhotoPage.vala" action = _tmp1_; @@ -15947,7 +15909,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 15946 "PhotoPage.c" +#line 15908 "PhotoPage.c" GSimpleAction* _tmp3_; gboolean _tmp4_; #line 2494 "/home/jens/Source/shotwell/src/PhotoPage.vala" @@ -15956,11 +15918,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 15955 "PhotoPage.c" +#line 15917 "PhotoPage.c" } #line 2491 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (action); -#line 15959 "PhotoPage.c" +#line 15921 "PhotoPage.c" } @@ -16016,7 +15978,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 16015 "PhotoPage.c" +#line 15977 "PhotoPage.c" Photo* _tmp6_; Photo* _tmp7_; gboolean _tmp8_; @@ -16030,11 +15992,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 16029 "PhotoPage.c" +#line 15991 "PhotoPage.c" } else { #line 2499 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp4_ = FALSE; -#line 16033 "PhotoPage.c" +#line 15995 "PhotoPage.c" } #line 2499 "/home/jens/Source/shotwell/src/PhotoPage.vala" rotate_possible = _tmp4_; @@ -16042,7 +16004,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 16041 "PhotoPage.c" +#line 16003 "PhotoPage.c" Photo* _tmp11_; Photo* _tmp12_; PhotoFileFormat _tmp13_; @@ -16056,11 +16018,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 16055 "PhotoPage.c" +#line 16017 "PhotoPage.c" } else { #line 2500 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp9_ = FALSE; -#line 16059 "PhotoPage.c" +#line 16021 "PhotoPage.c" } #line 2500 "/home/jens/Source/shotwell/src/PhotoPage.vala" is_raw = _tmp9_; @@ -16068,7 +16030,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 16067 "PhotoPage.c" +#line 16029 "PhotoPage.c" ConfigFacade* _tmp16_; ConfigFacade* _tmp17_; gchar* _tmp18_; @@ -16087,11 +16049,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 16086 "PhotoPage.c" +#line 16048 "PhotoPage.c" } else { #line 2503 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp14_ = FALSE; -#line 16090 "PhotoPage.c" +#line 16052 "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_); @@ -16099,7 +16061,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 16098 "PhotoPage.c" +#line 16060 "PhotoPage.c" gboolean _tmp22_ = FALSE; Photo* _tmp23_; Photo* _tmp24_; @@ -16119,7 +16081,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 16118 "PhotoPage.c" +#line 16080 "PhotoPage.c" } else { Photo* _tmp27_; Photo* _tmp28_; @@ -16134,15 +16096,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 16133 "PhotoPage.c" +#line 16095 "PhotoPage.c" } #line 2506 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp20_ = _tmp22_; -#line 16137 "PhotoPage.c" +#line 16099 "PhotoPage.c" } else { #line 2506 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp20_ = FALSE; -#line 16141 "PhotoPage.c" +#line 16103 "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_); @@ -16150,17 +16112,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 16149 "PhotoPage.c" +#line 16111 "PhotoPage.c" gboolean _tmp32_; #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 16155 "PhotoPage.c" +#line 16117 "PhotoPage.c" } else { #line 2508 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp30_ = FALSE; -#line 16159 "PhotoPage.c" +#line 16121 "PhotoPage.c" } #line 2508 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp30_) { @@ -16168,7 +16130,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 16167 "PhotoPage.c" +#line 16129 "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)); @@ -16178,7 +16140,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 16177 "PhotoPage.c" +#line 16139 "PhotoPage.c" Photo* _tmp36_; Photo* _tmp37_; gboolean _tmp38_; @@ -16192,11 +16154,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 16191 "PhotoPage.c" +#line 16153 "PhotoPage.c" } else { #line 2515 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp34_ = FALSE; -#line 16195 "PhotoPage.c" +#line 16157 "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_); @@ -16232,7 +16194,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 16231 "PhotoPage.c" +#line 16193 "PhotoPage.c" Photo* _tmp47_; Photo* _tmp48_; Scaling _tmp49_ = {0}; @@ -16265,7 +16227,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 16264 "PhotoPage.c" +#line 16226 "PhotoPage.c" } #line 2531 "/home/jens/Source/shotwell/src/PhotoPage.vala" library_photo_page_update_flag_action (self); @@ -16273,7 +16235,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 16272 "PhotoPage.c" +#line 16234 "PhotoPage.c" ConfigFacade* _tmp57_; ConfigFacade* _tmp58_; gchar* _tmp59_; @@ -16292,21 +16254,21 @@ 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 16291 "PhotoPage.c" +#line 16253 "PhotoPage.c" } else { #line 2534 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp55_ = FALSE; -#line 16295 "PhotoPage.c" +#line 16257 "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_); + page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "ExternalEditRAW", _tmp55_); #line 2536 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp61_ = selected_count; #line 2536 "/home/jens/Source/shotwell/src/PhotoPage.vala" _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 16305 "PhotoPage.c" +#line 16267 "PhotoPage.c" } @@ -16319,7 +16281,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 16318 "PhotoPage.c" +#line 16280 "PhotoPage.c" gboolean _tmp2_ = FALSE; Photo* _tmp3_; Photo* _tmp4_; @@ -16339,7 +16301,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 16338 "PhotoPage.c" +#line 16300 "PhotoPage.c" } else { Photo* _tmp7_; Photo* _tmp8_; @@ -16354,21 +16316,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 16353 "PhotoPage.c" +#line 16315 "PhotoPage.c" } #line 2541 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp0_ = _tmp2_; -#line 16357 "PhotoPage.c" +#line 16319 "PhotoPage.c" } else { #line 2541 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp0_ = FALSE; -#line 16361 "PhotoPage.c" +#line 16323 "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 16367 "PhotoPage.c" +#line 16329 "PhotoPage.c" } @@ -16382,7 +16344,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 16381 "PhotoPage.c" +#line 16343 "PhotoPage.c" RawDeveloper _tmp5_; GSimpleAction* _tmp6_; GVariant* _tmp7_; @@ -16404,38 +16366,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 16403 "PhotoPage.c" +#line 16365 "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 16410 "PhotoPage.c" +#line 16372 "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 16416 "PhotoPage.c" +#line 16378 "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 16423 "PhotoPage.c" +#line 16385 "PhotoPage.c" } } } else { #line 2549 "/home/jens/Source/shotwell/src/PhotoPage.vala" switch (0) { -#line 16429 "PhotoPage.c" +#line 16391 "PhotoPage.c" default: { #line 2557 "/home/jens/Source/shotwell/src/PhotoPage.vala" break; -#line 16434 "PhotoPage.c" +#line 16396 "PhotoPage.c" } } } @@ -16449,7 +16411,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 16448 "PhotoPage.c" +#line 16410 "PhotoPage.c" } @@ -16487,7 +16449,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 16486 "PhotoPage.c" +#line 16448 "PhotoPage.c" } #line 2569 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp4_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); @@ -16509,7 +16471,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 16508 "PhotoPage.c" +#line 16470 "PhotoPage.c" } #line 2569 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp12_ = _tmp11_; @@ -16527,7 +16489,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 16526 "PhotoPage.c" +#line 16488 "PhotoPage.c" } else { RawDeveloper _tmp15_; Photo* _tmp16_; @@ -16543,7 +16505,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 16542 "PhotoPage.c" +#line 16504 "PhotoPage.c" } #line 2570 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp13_) { @@ -16551,7 +16513,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 16550 "PhotoPage.c" +#line 16512 "PhotoPage.c" } #line 2575 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp20_ = photo; @@ -16561,18 +16523,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 16560 "PhotoPage.c" +#line 16522 "PhotoPage.c" } else { gboolean _tmp22_; #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 16567 "PhotoPage.c" +#line 16529 "PhotoPage.c" } #line 2575 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp19_) { -#line 16571 "PhotoPage.c" +#line 16533 "PhotoPage.c" SetRawDeveloperCommand* command = NULL; ViewCollection* _tmp23_; ViewCollection* _tmp24_; @@ -16618,11 +16580,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 16617 "PhotoPage.c" +#line 16579 "PhotoPage.c" } #line 2565 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (photo); -#line 16621 "PhotoPage.c" +#line 16583 "PhotoPage.c" } @@ -16631,7 +16593,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 16630 "PhotoPage.c" +#line 16592 "PhotoPage.c" } @@ -16643,14 +16605,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 16642 "PhotoPage.c" +#line 16604 "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 16649 "PhotoPage.c" +#line 16611 "PhotoPage.c" } @@ -16685,7 +16647,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 16684 "PhotoPage.c" +#line 16646 "PhotoPage.c" ViewCollection* _tmp5_; ViewCollection* _tmp6_; #line 2597 "/home/jens/Source/shotwell/src/PhotoPage.vala" @@ -16696,7 +16658,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 16695 "PhotoPage.c" +#line 16657 "PhotoPage.c" } else { CollectionPage* _tmp7_; ViewCollection* _tmp8_; @@ -16708,7 +16670,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 16707 "PhotoPage.c" +#line 16669 "PhotoPage.c" } #line 2597 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp9_ = photo; @@ -16716,7 +16678,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 16715 "PhotoPage.c" +#line 16677 "PhotoPage.c" } @@ -16729,7 +16691,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 16728 "PhotoPage.c" +#line 16690 "PhotoPage.c" } @@ -16747,7 +16709,7 @@ CollectionPage* library_photo_page_get_controller_page (LibraryPhotoPage* self) result = _tmp1_; #line 2608 "/home/jens/Source/shotwell/src/PhotoPage.vala" return result; -#line 16746 "PhotoPage.c" +#line 16708 "PhotoPage.c" } @@ -16784,7 +16746,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 16783 "PhotoPage.c" +#line 16745 "PhotoPage.c" } @@ -16794,7 +16756,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 16793 "PhotoPage.c" +#line 16755 "PhotoPage.c" { GActionEntry* entry_collection = NULL; gint entry_collection_length1 = 0; @@ -16806,11 +16768,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 16805 "PhotoPage.c" +#line 16767 "PhotoPage.c" GActionEntry entry = {0}; #line 2628 "/home/jens/Source/shotwell/src/PhotoPage.vala" entry = entry_collection[entry_it]; -#line 16809 "PhotoPage.c" +#line 16771 "PhotoPage.c" { AppWindow* _tmp0_; AppWindow* _tmp1_; @@ -16828,7 +16790,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 16827 "PhotoPage.c" +#line 16789 "PhotoPage.c" } } } @@ -16854,7 +16816,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 16853 "PhotoPage.c" +#line 16815 "PhotoPage.c" } else { ConfigFacade* _tmp2_; ConfigFacade* _tmp3_; @@ -16869,7 +16831,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 16868 "PhotoPage.c" +#line 16830 "PhotoPage.c" } #line 2634 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp0_) { @@ -16877,7 +16839,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 16876 "PhotoPage.c" +#line 16838 "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)); @@ -16897,7 +16859,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 16896 "PhotoPage.c" +#line 16858 "PhotoPage.c" } @@ -16915,7 +16877,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 16914 "PhotoPage.c" +#line 16876 "PhotoPage.c" } else { Photo* _tmp2_; LibraryPhoto* _tmp3_; @@ -16930,7 +16892,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 16929 "PhotoPage.c" +#line 16891 "PhotoPage.c" } #line 2641 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp0_) { @@ -16938,7 +16900,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 16937 "PhotoPage.c" +#line 16899 "PhotoPage.c" } #line 2644 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp5_ = resources_get_icon (RESOURCES_ICON_FLAGGED_TRINKET, RESOURCES_DEFAULT_ICON_SCALE); @@ -16946,7 +16908,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 16945 "PhotoPage.c" +#line 16907 "PhotoPage.c" } @@ -16976,7 +16938,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 16975 "PhotoPage.c" +#line 16937 "PhotoPage.c" } #line 2652 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp2_ = app_window_get_instance (); @@ -17006,7 +16968,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 17005 "PhotoPage.c" +#line 16967 "PhotoPage.c" } @@ -17025,17 +16987,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 17024 "PhotoPage.c" +#line 16986 "PhotoPage.c" gboolean _tmp3_; #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 17030 "PhotoPage.c" +#line 16992 "PhotoPage.c" } else { #line 2657 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp0_ = FALSE; -#line 17034 "PhotoPage.c" +#line 16996 "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_); @@ -17045,21 +17007,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 17044 "PhotoPage.c" +#line 17006 "PhotoPage.c" gboolean _tmp7_; #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 17050 "PhotoPage.c" +#line 17012 "PhotoPage.c" } else { #line 2658 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp4_ = FALSE; -#line 17054 "PhotoPage.c" +#line 17016 "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 17058 "PhotoPage.c" +#line 17020 "PhotoPage.c" } @@ -17071,7 +17033,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 17070 "PhotoPage.c" +#line 17032 "PhotoPage.c" } @@ -17083,7 +17045,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 17082 "PhotoPage.c" +#line 17044 "PhotoPage.c" } @@ -17109,7 +17071,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 17108 "PhotoPage.c" +#line 17070 "PhotoPage.c" } #line 2677 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp2_ = event; @@ -17125,13 +17087,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 17124 "PhotoPage.c" +#line 17086 "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 17130 "PhotoPage.c" +#line 17092 "PhotoPage.c" } } @@ -17211,7 +17173,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 17210 "PhotoPage.c" +#line 17172 "PhotoPage.c" } @@ -17228,20 +17190,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 17227 "PhotoPage.c" +#line 17189 "PhotoPage.c" Photo* _tmp1_; #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 17233 "PhotoPage.c" +#line 17195 "PhotoPage.c" } else { Photo* _tmp2_; #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 17240 "PhotoPage.c" +#line 17202 "PhotoPage.c" } #line 2733 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp3_ = photo; @@ -17249,7 +17211,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 17248 "PhotoPage.c" +#line 17210 "PhotoPage.c" } @@ -17305,7 +17267,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 17304 "PhotoPage.c" +#line 17266 "PhotoPage.c" GdkEventKey* _tmp1_; gboolean _tmp2_; #line 2737 "/home/jens/Source/shotwell/src/PhotoPage.vala" @@ -17314,11 +17276,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 17313 "PhotoPage.c" +#line 17275 "PhotoPage.c" } else { #line 2737 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp0_ = FALSE; -#line 17317 "PhotoPage.c" +#line 17279 "PhotoPage.c" } #line 2737 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp0_) { @@ -17326,7 +17288,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 17325 "PhotoPage.c" +#line 17287 "PhotoPage.c" } #line 2740 "/home/jens/Source/shotwell/src/PhotoPage.vala" handled = TRUE; @@ -17344,7 +17306,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 17343 "PhotoPage.c" +#line 17305 "PhotoPage.c" default: { GtkWindow* _tmp9_; @@ -17362,193 +17324,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 17361 "PhotoPage.c" +#line 17323 "PhotoPage.c" } #line 2747 "/home/jens/Source/shotwell/src/PhotoPage.vala" break; -#line 17365 "PhotoPage.c" +#line 17327 "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 17371 "PhotoPage.c" +#line 17333 "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 17378 "PhotoPage.c" +#line 17340 "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 17384 "PhotoPage.c" +#line 17346 "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 17391 "PhotoPage.c" +#line 17353 "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 17397 "PhotoPage.c" +#line 17359 "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 17404 "PhotoPage.c" +#line 17366 "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 17410 "PhotoPage.c" +#line 17372 "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 17417 "PhotoPage.c" +#line 17379 "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 17423 "PhotoPage.c" +#line 17385 "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 17430 "PhotoPage.c" +#line 17392 "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 17436 "PhotoPage.c" +#line 17398 "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 17443 "PhotoPage.c" +#line 17405 "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 17449 "PhotoPage.c" +#line 17411 "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 17456 "PhotoPage.c" +#line 17418 "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 17462 "PhotoPage.c" +#line 17424 "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 17469 "PhotoPage.c" +#line 17431 "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 17475 "PhotoPage.c" +#line 17437 "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 17482 "PhotoPage.c" +#line 17444 "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 17488 "PhotoPage.c" +#line 17450 "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 17495 "PhotoPage.c" +#line 17457 "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 17501 "PhotoPage.c" +#line 17463 "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 17508 "PhotoPage.c" +#line 17470 "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 17514 "PhotoPage.c" +#line 17476 "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 17521 "PhotoPage.c" +#line 17483 "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 17527 "PhotoPage.c" +#line 17489 "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 17534 "PhotoPage.c" +#line 17496 "PhotoPage.c" } } } else { #line 2741 "/home/jens/Source/shotwell/src/PhotoPage.vala" switch (0) { -#line 17540 "PhotoPage.c" +#line 17502 "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 17547 "PhotoPage.c" +#line 17509 "PhotoPage.c" } } } @@ -17556,7 +17518,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 17555 "PhotoPage.c" +#line 17517 "PhotoPage.c" } @@ -17579,7 +17541,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 17578 "PhotoPage.c" +#line 17540 "PhotoPage.c" } #line 2815 "/home/jens/Source/shotwell/src/PhotoPage.vala" fs = _tmp1_; @@ -17589,14 +17551,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 17588 "PhotoPage.c" +#line 17550 "PhotoPage.c" } else { FullscreenWindow* _tmp3_; #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 17595 "PhotoPage.c" +#line 17557 "PhotoPage.c" } #line 2821 "/home/jens/Source/shotwell/src/PhotoPage.vala" result = TRUE; @@ -17604,7 +17566,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 17603 "PhotoPage.c" +#line 17565 "PhotoPage.c" } @@ -17630,7 +17592,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 17629 "PhotoPage.c" +#line 17591 "PhotoPage.c" } #line 2832 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp1_ = event; @@ -17640,7 +17602,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 17639 "PhotoPage.c" +#line 17601 "PhotoPage.c" } @@ -17655,7 +17617,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 17654 "PhotoPage.c" +#line 17616 "PhotoPage.c" GMenuModel* model = NULL; GtkBuilder* _tmp1_; GObject* _tmp2_; @@ -17687,7 +17649,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 17686 "PhotoPage.c" +#line 17648 "PhotoPage.c" } #line 2845 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp7_ = self->priv->context_menu; @@ -17697,7 +17659,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 17696 "PhotoPage.c" +#line 17658 "PhotoPage.c" } @@ -17725,7 +17687,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 17724 "PhotoPage.c" +#line 17686 "PhotoPage.c" } @@ -17748,7 +17710,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 17747 "PhotoPage.c" +#line 17709 "PhotoPage.c" } @@ -17760,7 +17722,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 17759 "PhotoPage.c" +#line 17721 "PhotoPage.c" LibraryWindow* _tmp1_; LibraryWindow* _tmp2_; CollectionPage* _tmp3_; @@ -17774,7 +17736,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 17773 "PhotoPage.c" +#line 17735 "PhotoPage.c" } else { LibraryWindow* _tmp4_; LibraryWindow* _tmp5_; @@ -17786,7 +17748,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 17785 "PhotoPage.c" +#line 17747 "PhotoPage.c" } } @@ -17814,7 +17776,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 17813 "PhotoPage.c" +#line 17775 "PhotoPage.c" } @@ -17847,13 +17809,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 17846 "PhotoPage.c" +#line 17808 "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 17852 "PhotoPage.c" +#line 17814 "PhotoPage.c" LibraryWindow* _tmp2_; LibraryWindow* _tmp3_; #line 2887 "/home/jens/Source/shotwell/src/PhotoPage.vala" @@ -17864,7 +17826,7 @@ 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 17863 "PhotoPage.c" +#line 17825 "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)); @@ -17896,7 +17858,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 17895 "PhotoPage.c" +#line 17857 "PhotoPage.c" LibraryWindow* _tmp13_; LibraryWindow* _tmp14_; GtkWindow* _tmp15_; @@ -17922,7 +17884,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 17921 "PhotoPage.c" +#line 17883 "PhotoPage.c" GtkWindow* _tmp18_; FullscreenWindow* _tmp19_; #line 2906 "/home/jens/Source/shotwell/src/PhotoPage.vala" @@ -17933,7 +17895,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 17932 "PhotoPage.c" +#line 17894 "PhotoPage.c" } #line 2908 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp20_ = library_window_get_app (); @@ -17943,7 +17905,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 17942 "PhotoPage.c" +#line 17904 "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)); @@ -17973,7 +17935,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 17972 "PhotoPage.c" +#line 17934 "PhotoPage.c" } @@ -17985,7 +17947,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 17984 "PhotoPage.c" +#line 17946 "PhotoPage.c" GeeArrayList* photo_list = NULL; GeeArrayList* _tmp1_; GeeArrayList* _tmp2_; @@ -18039,7 +18001,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 18038 "PhotoPage.c" +#line 18000 "PhotoPage.c" } } @@ -18054,7 +18016,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 18053 "PhotoPage.c" +#line 18015 "PhotoPage.c" } @@ -18086,7 +18048,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 18085 "PhotoPage.c" +#line 18047 "PhotoPage.c" } else { LibraryPhoto* _tmp2_; Photo* _tmp3_; @@ -18104,13 +18066,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 18103 "PhotoPage.c" +#line 18065 "PhotoPage.c" } #line 2930 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp0_) { #line 2931 "/home/jens/Source/shotwell/src/PhotoPage.vala" return; -#line 18109 "PhotoPage.c" +#line 18071 "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)); @@ -18154,7 +18116,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 18153 "PhotoPage.c" +#line 18115 "PhotoPage.c" LibraryWindow* _tmp20_; LibraryWindow* _tmp21_; #line 2941 "/home/jens/Source/shotwell/src/PhotoPage.vala" @@ -18165,11 +18127,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 18164 "PhotoPage.c" +#line 18126 "PhotoPage.c" } #line 2928 "/home/jens/Source/shotwell/src/PhotoPage.vala" _data_collection_unref0 (view); -#line 18168 "PhotoPage.c" +#line 18130 "PhotoPage.c" } @@ -18192,7 +18154,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 18191 "PhotoPage.c" +#line 18153 "PhotoPage.c" PrintManager* _tmp4_; PrintManager* _tmp5_; ViewCollection* _tmp6_; @@ -18219,7 +18181,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 18218 "PhotoPage.c" +#line 18180 "PhotoPage.c" } } @@ -18233,7 +18195,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 18232 "PhotoPage.c" +#line 18194 "PhotoPage.c" ConfigFacade* _tmp2_; ConfigFacade* _tmp3_; gchar* _tmp4_; @@ -18252,15 +18214,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 18251 "PhotoPage.c" +#line 18213 "PhotoPage.c" } else { #line 2953 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp0_ = FALSE; -#line 18255 "PhotoPage.c" +#line 18217 "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 18259 "PhotoPage.c" +#line 18221 "PhotoPage.c" } @@ -18275,7 +18237,7 @@ static void library_photo_page_on_external_edit (LibraryPhotoPage* self) { if (!_tmp0_) { #line 2959 "/home/jens/Source/shotwell/src/PhotoPage.vala" return; -#line 18274 "PhotoPage.c" +#line 18236 "PhotoPage.c" } { AppWindow* _tmp1_; @@ -18302,8 +18264,8 @@ 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 18301 "PhotoPage.c" - goto __catch252_g_error; +#line 18263 "PhotoPage.c" + goto __catch263_g_error; } #line 2964 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp5_ = app_window_get_instance (); @@ -18313,10 +18275,10 @@ 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 18312 "PhotoPage.c" +#line 18274 "PhotoPage.c" } - goto __finally252; - __catch252_g_error: + goto __finally263; + __catch263_g_error: { GError* err = NULL; AppWindow* _tmp7_; @@ -18348,9 +18310,9 @@ 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 18347 "PhotoPage.c" +#line 18309 "PhotoPage.c" } - __finally252: + __finally263: #line 2961 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 2961 "/home/jens/Source/shotwell/src/PhotoPage.vala" @@ -18359,7 +18321,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 18358 "PhotoPage.c" +#line 18320 "PhotoPage.c" } } @@ -18379,7 +18341,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 18378 "PhotoPage.c" +#line 18340 "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)); @@ -18395,7 +18357,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 18394 "PhotoPage.c" +#line 18356 "PhotoPage.c" } { AppWindow* _tmp5_; @@ -18422,8 +18384,8 @@ 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 18421 "PhotoPage.c" - goto __catch253_g_error; +#line 18383 "PhotoPage.c" + goto __catch264_g_error; } #line 2982 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp9_ = app_window_get_instance (); @@ -18433,10 +18395,10 @@ 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 18432 "PhotoPage.c" +#line 18394 "PhotoPage.c" } - goto __finally253; - __catch253_g_error: + goto __finally264; + __catch264_g_error: { GError* err = NULL; AppWindow* _tmp11_; @@ -18468,9 +18430,9 @@ 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 18467 "PhotoPage.c" +#line 18429 "PhotoPage.c" } - __finally253: + __finally264: #line 2979 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 2979 "/home/jens/Source/shotwell/src/PhotoPage.vala" @@ -18479,7 +18441,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 18478 "PhotoPage.c" +#line 18440 "PhotoPage.c" } } @@ -18492,7 +18454,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 18491 "PhotoPage.c" +#line 18453 "PhotoPage.c" ViewCollection* _tmp1_; ViewCollection* _tmp2_; GeeList* _tmp3_; @@ -18511,7 +18473,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 18510 "PhotoPage.c" +#line 18472 "PhotoPage.c" } } @@ -18550,7 +18512,7 @@ static void library_photo_page_on_export (LibraryPhotoPage* self) { if (!_tmp0_) { #line 2996 "/home/jens/Source/shotwell/src/PhotoPage.vala" return; -#line 18549 "PhotoPage.c" +#line 18511 "PhotoPage.c" } #line 2998 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp1_ = export_dialog_new (_ ("Export Photo")); @@ -18576,7 +18538,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 18575 "PhotoPage.c" +#line 18537 "PhotoPage.c" } #line 3006 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp7_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage)); @@ -18608,7 +18570,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 18607 "PhotoPage.c" +#line 18569 "PhotoPage.c" } #line 3011 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp15_ = constraint; @@ -18618,7 +18580,7 @@ static void library_photo_page_on_export (LibraryPhotoPage* self) { scaling_for_constraint (_tmp15_, _tmp16_, FALSE, &_tmp17_); #line 3011 "/home/jens/Source/shotwell/src/PhotoPage.vala" scaling = _tmp17_; -#line 18617 "PhotoPage.c" +#line 18579 "PhotoPage.c" { Photo* _tmp18_; Photo* _tmp19_; @@ -18670,12 +18632,12 @@ static void library_photo_page_on_export (LibraryPhotoPage* self) { _g_object_unref0 (_tmp19_); #line 3014 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 18669 "PhotoPage.c" - goto __catch254_g_error; +#line 18631 "PhotoPage.c" + goto __catch265_g_error; } } - goto __finally254; - __catch254_g_error: + goto __finally265; + __catch265_g_error: { GError* err = NULL; GFile* _tmp32_; @@ -18711,9 +18673,9 @@ static void library_photo_page_on_export (LibraryPhotoPage* self) { _g_free0 (_tmp34_); #line 3013 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_error_free0 (err); -#line 18710 "PhotoPage.c" +#line 18672 "PhotoPage.c" } - __finally254: + __finally265: #line 3013 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 3013 "/home/jens/Source/shotwell/src/PhotoPage.vala" @@ -18726,13 +18688,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 18725 "PhotoPage.c" +#line 18687 "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 18731 "PhotoPage.c" +#line 18693 "PhotoPage.c" } @@ -18755,7 +18717,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 18754 "PhotoPage.c" +#line 18716 "PhotoPage.c" ViewCollection* _tmp4_; ViewCollection* _tmp5_; GeeList* _tmp6_; @@ -18774,7 +18736,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 18773 "PhotoPage.c" +#line 18735 "PhotoPage.c" } } @@ -18798,20 +18760,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 18797 "PhotoPage.c" +#line 18759 "PhotoPage.c" } else { gboolean _tmp2_; #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 18804 "PhotoPage.c" +#line 18766 "PhotoPage.c" } #line 3029 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp0_) { #line 3030 "/home/jens/Source/shotwell/src/PhotoPage.vala" return; -#line 18810 "PhotoPage.c" +#line 18772 "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)); @@ -18839,7 +18801,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 18838 "PhotoPage.c" +#line 18800 "PhotoPage.c" } @@ -18862,20 +18824,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 18861 "PhotoPage.c" +#line 18823 "PhotoPage.c" } else { gboolean _tmp2_; #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 18868 "PhotoPage.c" +#line 18830 "PhotoPage.c" } #line 3039 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp0_) { #line 3040 "/home/jens/Source/shotwell/src/PhotoPage.vala" return; -#line 18874 "PhotoPage.c" +#line 18836 "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)); @@ -18903,7 +18865,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 18902 "PhotoPage.c" +#line 18864 "PhotoPage.c" } @@ -18927,20 +18889,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 18926 "PhotoPage.c" +#line 18888 "PhotoPage.c" } else { gboolean _tmp2_; #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 18933 "PhotoPage.c" +#line 18895 "PhotoPage.c" } #line 3049 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp0_) { #line 3050 "/home/jens/Source/shotwell/src/PhotoPage.vala" return; -#line 18939 "PhotoPage.c" +#line 18901 "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)); @@ -18970,7 +18932,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 18969 "PhotoPage.c" +#line 18931 "PhotoPage.c" } @@ -18979,7 +18941,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 18978 "PhotoPage.c" +#line 18940 "PhotoPage.c" } @@ -18988,7 +18950,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 18987 "PhotoPage.c" +#line 18949 "PhotoPage.c" } @@ -18997,7 +18959,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 18996 "PhotoPage.c" +#line 18958 "PhotoPage.c" } @@ -19006,7 +18968,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 19005 "PhotoPage.c" +#line 18967 "PhotoPage.c" } @@ -19015,7 +18977,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 19014 "PhotoPage.c" +#line 18976 "PhotoPage.c" } @@ -19024,7 +18986,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 19023 "PhotoPage.c" +#line 18985 "PhotoPage.c" } @@ -19033,7 +18995,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 19032 "PhotoPage.c" +#line 18994 "PhotoPage.c" } @@ -19163,21 +19125,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 19162 "PhotoPage.c" +#line 19124 "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 19169 "PhotoPage.c" +#line 19131 "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 19176 "PhotoPage.c" +#line 19138 "PhotoPage.c" } @@ -19211,7 +19173,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 19210 "PhotoPage.c" +#line 19172 "PhotoPage.c" Photo* _tmp6_; Photo* _tmp7_; RawDeveloper _tmp8_; @@ -19230,7 +19192,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 19229 "PhotoPage.c" +#line 19191 "PhotoPage.c" { GAction* _tmp10_; GAction* _tmp11_; @@ -19249,13 +19211,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 19248 "PhotoPage.c" +#line 19210 "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 19254 "PhotoPage.c" +#line 19216 "PhotoPage.c" { GAction* _tmp13_; GAction* _tmp14_; @@ -19274,13 +19236,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 19273 "PhotoPage.c" +#line 19235 "PhotoPage.c" } default: { #line 3116 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_assert_not_reached (); -#line 19279 "PhotoPage.c" +#line 19241 "PhotoPage.c" } } } @@ -19312,7 +19274,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 19311 "PhotoPage.c" +#line 19273 "PhotoPage.c" GeeMap* _tmp6_; Photo* _tmp7_; Photo* _tmp8_; @@ -19337,17 +19299,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 19336 "PhotoPage.c" +#line 19298 "PhotoPage.c" } else { #line 3122 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp0_ = FALSE; -#line 19340 "PhotoPage.c" +#line 19302 "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 19346 "PhotoPage.c" +#line 19308 "PhotoPage.c" } } @@ -19385,7 +19347,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 19384 "PhotoPage.c" +#line 19346 "PhotoPage.c" CommandManager* _tmp5_; CommandManager* _tmp6_; HierarchicalTagIndex* _tmp7_; @@ -19446,13 +19408,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 19445 "PhotoPage.c" +#line 19407 "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 19451 "PhotoPage.c" +#line 19413 "PhotoPage.c" } @@ -19521,7 +19483,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 19520 "PhotoPage.c" +#line 19482 "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)); @@ -19547,7 +19509,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 19546 "PhotoPage.c" +#line 19508 "PhotoPage.c" } @@ -19579,7 +19541,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 19578 "PhotoPage.c" +#line 19540 "PhotoPage.c" } @@ -19589,14 +19551,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 19588 "PhotoPage.c" +#line 19550 "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 19595 "PhotoPage.c" +#line 19557 "PhotoPage.c" } @@ -19605,7 +19567,7 @@ static void library_photo_page_library_photo_page_view_filter_class_init (Librar 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 = (gboolean (*) (ViewFilter *, DataView*)) library_photo_page_library_photo_page_view_filter_real_predicate; -#line 19604 "PhotoPage.c" +#line 19566 "PhotoPage.c" } @@ -19672,7 +19634,7 @@ static void library_photo_page_class_init (LibraryPhotoPageClass * klass) { ((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 19671 "PhotoPage.c" +#line 19633 "PhotoPage.c" } @@ -19688,7 +19650,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 19687 "PhotoPage.c" +#line 19649 "PhotoPage.c" } @@ -19733,7 +19695,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 19732 "PhotoPage.c" +#line 19694 "PhotoPage.c" } |