diff options
| author | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2017-01-02 11:25:40 +0100 |
|---|---|---|
| committer | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2017-01-02 11:25:40 +0100 |
| commit | cd16e7b4a394b6ce885a618d8a96eccd662208bb (patch) | |
| tree | c9bcd713dbea9467783f8d82c63218af91192da1 /src/PhotoPage.c | |
| parent | b1cb72d29fa13b3b6f9f5fe66083dd60930a2b71 (diff) | |
| parent | 66f6a7bd3f7e00022191f16cb0e82a39e7333a76 (diff) | |
Merge tag 'upstream/0.25.2'
Upstream version 0.25.2
Diffstat (limited to 'src/PhotoPage.c')
| -rw-r--r-- | src/PhotoPage.c | 3981 |
1 files changed, 1965 insertions, 2016 deletions
diff --git a/src/PhotoPage.c b/src/PhotoPage.c index 1fe61d0..62e90b8 100644 --- a/src/PhotoPage.c +++ b/src/PhotoPage.c @@ -1,4 +1,4 @@ -/* PhotoPage.c generated by valac 0.34.2, the Vala compiler +/* PhotoPage.c generated by valac 0.32.1, the Vala compiler * generated from PhotoPage.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -602,16 +602,6 @@ typedef struct _DirectPhotoPageClass DirectPhotoPageClass; typedef struct _AdjustDateTimePhotoCommand AdjustDateTimePhotoCommand; typedef struct _AdjustDateTimePhotoCommandClass AdjustDateTimePhotoCommandClass; -#define TYPE_SET_BACKGROUND_DIALOG (set_background_dialog_get_type ()) -#define SET_BACKGROUND_DIALOG(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_SET_BACKGROUND_DIALOG, SetBackgroundDialog)) -#define SET_BACKGROUND_DIALOG_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_SET_BACKGROUND_DIALOG, SetBackgroundDialogClass)) -#define IS_SET_BACKGROUND_DIALOG(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_SET_BACKGROUND_DIALOG)) -#define IS_SET_BACKGROUND_DIALOG_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_SET_BACKGROUND_DIALOG)) -#define SET_BACKGROUND_DIALOG_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_SET_BACKGROUND_DIALOG, SetBackgroundDialogClass)) - -typedef struct _SetBackgroundDialog SetBackgroundDialog; -typedef struct _SetBackgroundDialogClass SetBackgroundDialogClass; - #define TYPE_SET_BACKGROUND_PHOTO_DIALOG (set_background_photo_dialog_get_type ()) #define SET_BACKGROUND_PHOTO_DIALOG(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_SET_BACKGROUND_PHOTO_DIALOG, SetBackgroundPhotoDialog)) #define SET_BACKGROUND_PHOTO_DIALOG_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_SET_BACKGROUND_PHOTO_DIALOG, SetBackgroundPhotoDialogClass)) @@ -621,7 +611,6 @@ typedef struct _SetBackgroundDialogClass SetBackgroundDialogClass; typedef struct _SetBackgroundPhotoDialog SetBackgroundPhotoDialog; typedef struct _SetBackgroundPhotoDialogClass SetBackgroundPhotoDialogClass; -#define _set_background_dialog_unref0(var) ((var == NULL) ? NULL : (var = (set_background_dialog_unref (var), NULL))) #define EDITING_TOOLS_TYPE_STRAIGHTEN_TOOL (editing_tools_straighten_tool_get_type ()) #define EDITING_TOOLS_STRAIGHTEN_TOOL(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), EDITING_TOOLS_TYPE_STRAIGHTEN_TOOL, EditingToolsStraightenTool)) @@ -2055,13 +2044,6 @@ GType adjust_date_time_photo_command_get_type (void) G_GNUC_CONST; AdjustDateTimePhotoCommand* adjust_date_time_photo_command_new (Dateable* dateable, gint64 time_shift, gboolean modify_original); AdjustDateTimePhotoCommand* adjust_date_time_photo_command_construct (GType object_type, Dateable* dateable, gint64 time_shift, gboolean modify_original); void editing_host_page_on_set_background (EditingHostPage* self); -gpointer set_background_dialog_ref (gpointer instance); -void set_background_dialog_unref (gpointer instance); -GParamSpec* param_spec_set_background_dialog (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_set_background_dialog (GValue* value, gpointer v_object); -void value_take_set_background_dialog (GValue* value, gpointer v_object); -gpointer value_get_set_background_dialog (const GValue* value); -GType set_background_dialog_get_type (void) G_GNUC_CONST; GType set_background_photo_dialog_get_type (void) G_GNUC_CONST; SetBackgroundPhotoDialog* set_background_photo_dialog_new (void); SetBackgroundPhotoDialog* set_background_photo_dialog_construct (GType object_type); @@ -2252,9 +2234,9 @@ static void library_photo_page_real_add_actions (Page* base); void page_add_actions (Page* self); GAction* page_get_action (Page* self, const gchar* name); gboolean configuration_facade_get_display_photo_ratings (ConfigurationFacade* self); -static GVariant* _variant_new12 (gboolean value); +static GVariant* _variant_new16 (gboolean value); RawDeveloper configuration_facade_get_default_raw_developer (ConfigurationFacade* self); -static GVariant* _variant_new13 (const gchar* value); +static GVariant* _variant_new17 (const gchar* value); static InjectionGroup** library_photo_page_real_init_collect_injection_groups (Page* base, int* result_length1); InjectionGroup** page_init_collect_injection_groups (Page* self, int* result_length1); InjectionGroup* injection_group_new (const gchar* path); @@ -2378,8 +2360,8 @@ SetRatingSingleCommand* set_rating_single_command_new (DataSource* source, Ratin SetRatingSingleCommand* set_rating_single_command_construct (GType object_type, DataSource* source, Rating rating); gboolean rating_can_increase (Rating self); gboolean rating_can_decrease (Rating self); -static GVariant* _variant_new14 (const gchar* value); -static GVariant* _variant_new15 (const gchar* value); +static GVariant* _variant_new18 (const gchar* value); +static GVariant* _variant_new19 (const gchar* value); gboolean alteration_has_subject (Alteration* self, const gchar* subject); GType tags_dialog_get_type (void) G_GNUC_CONST; GType add_tags_dialog_get_type (void) G_GNUC_CONST; @@ -2432,7 +2414,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 2436 "PhotoPage.c" +#line 2418 "PhotoPage.c" } @@ -2485,28 +2467,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 2489 "PhotoPage.c" +#line 2471 "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 2496 "PhotoPage.c" +#line 2478 "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 2503 "PhotoPage.c" +#line 2485 "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 2510 "PhotoPage.c" +#line 2492 "PhotoPage.c" } @@ -2560,7 +2542,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 2563 "PhotoPage.c" +#line 2545 "PhotoPage.c" } #line 99 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp4_ = fetch_job; @@ -2586,7 +2568,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 2589 "PhotoPage.c" +#line 2571 "PhotoPage.c" GdkPixbuf* _tmp13_ = NULL; GdkPixbuf* _tmp14_ = NULL; gint _tmp15_ = 0; @@ -2615,7 +2597,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 2618 "PhotoPage.c" +#line 2600 "PhotoPage.c" } #line 104 "/home/jens/Source/shotwell/src/PhotoPage.vala" self->priv->object_state = ZOOM_BUFFER_OBJECT_STATE_SOURCE_NOT_TRANSFORMED; @@ -2623,13 +2605,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 2626 "PhotoPage.c" +#line 2608 "PhotoPage.c" SinglePhotoPage* _tmp22_ = NULL; #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 2632 "PhotoPage.c" +#line 2614 "PhotoPage.c" } #line 109 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp23_ = self->priv->iso_source_image; @@ -2663,7 +2645,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 2666 "PhotoPage.c" +#line 2648 "PhotoPage.c" } @@ -2704,7 +2686,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 2707 "PhotoPage.c" +#line 2689 "PhotoPage.c" } #line 123 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp4_ = transform_job; @@ -2730,7 +2712,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 2733 "PhotoPage.c" +#line 2715 "PhotoPage.c" GdkPixbuf* _tmp13_ = NULL; GdkPixbuf* _tmp14_ = NULL; gint _tmp15_ = 0; @@ -2759,13 +2741,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 2762 "PhotoPage.c" +#line 2744 "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 2768 "PhotoPage.c" +#line 2750 "PhotoPage.c" } @@ -2801,7 +2783,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 2804 "PhotoPage.c" +#line 2786 "PhotoPage.c" } #line 140 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp4_ = transform_job; @@ -2823,7 +2805,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 2826 "PhotoPage.c" +#line 2808 "PhotoPage.c" } @@ -2896,21 +2878,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 2899 "PhotoPage.c" +#line 2881 "PhotoPage.c" gdouble _tmp7_ = 0.0; #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 2905 "PhotoPage.c" +#line 2887 "PhotoPage.c" } else { #line 156 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp5_ = FALSE; -#line 2909 "PhotoPage.c" +#line 2891 "PhotoPage.c" } #line 156 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp5_) { -#line 2913 "PhotoPage.c" +#line 2895 "PhotoPage.c" GdkPixbuf* _tmp8_ = NULL; GdkPixbuf* _tmp9_ = NULL; gint _tmp10_ = 0; @@ -2941,7 +2923,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 2944 "PhotoPage.c" +#line 2926 "PhotoPage.c" } #line 167 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp14_ = view_rect_proj; @@ -3019,14 +3001,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 3022 "PhotoPage.c" +#line 3004 "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 3029 "PhotoPage.c" +#line 3011 "PhotoPage.c" } @@ -3045,7 +3027,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 3048 "PhotoPage.c" +#line 3030 "PhotoPage.c" ZoomState _tmp1_ = {0}; gboolean _tmp2_ = FALSE; #line 186 "/home/jens/Source/shotwell/src/PhotoPage.vala" @@ -3054,7 +3036,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 3057 "PhotoPage.c" +#line 3039 "PhotoPage.c" GdkPixbuf* _tmp3_ = NULL; GdkPixbuf* _tmp4_ = NULL; #line 190 "/home/jens/Source/shotwell/src/PhotoPage.vala" @@ -3065,7 +3047,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 3068 "PhotoPage.c" +#line 3050 "PhotoPage.c" } else { gdouble _tmp5_ = 0.0; gdouble _tmp6_ = 0.0; @@ -3075,7 +3057,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 3078 "PhotoPage.c" +#line 3060 "PhotoPage.c" GdkRectangle curr_rect = {0}; GdkRectangle _tmp7_ = {0}; GdkRectangle pre_rect = {0}; @@ -3395,7 +3377,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 3398 "PhotoPage.c" +#line 3380 "PhotoPage.c" } } } @@ -3403,7 +3385,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 3406 "PhotoPage.c" +#line 3388 "PhotoPage.c" ZoomState _tmp98_ = {0}; gboolean _tmp99_ = FALSE; #line 243 "/home/jens/Source/shotwell/src/PhotoPage.vala" @@ -3412,7 +3394,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 3415 "PhotoPage.c" +#line 3397 "PhotoPage.c" ZoomState _tmp100_ = {0}; GdkPixbuf* _tmp101_ = NULL; #line 244 "/home/jens/Source/shotwell/src/PhotoPage.vala" @@ -3423,7 +3405,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 3426 "PhotoPage.c" +#line 3408 "PhotoPage.c" } else { ZoomBufferTransformationJob* _tmp102_ = NULL; GdkPixbuf* zoomed = NULL; @@ -3503,14 +3485,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 3506 "PhotoPage.c" +#line 3488 "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 3513 "PhotoPage.c" +#line 3495 "PhotoPage.c" GdkPixbuf* zoomed = NULL; ZoomState _tmp120_ = {0}; GdkPixbuf* _tmp121_ = NULL; @@ -3580,7 +3562,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 3583 "PhotoPage.c" +#line 3565 "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" \ @@ -3593,14 +3575,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 3595 "PhotoPage.c" +#line 3577 "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 3602 "PhotoPage.c" +#line 3584 "PhotoPage.c" } @@ -3643,7 +3625,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 3645 "PhotoPage.c" +#line 3627 "PhotoPage.c" BackgroundJob* iso_source_fetch_job = NULL; Photo* _tmp1_ = NULL; ZoomBufferIsoSourceFetchJob* _tmp2_ = NULL; @@ -3665,7 +3647,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 3667 "PhotoPage.c" +#line 3649 "PhotoPage.c" } #line 296 "/home/jens/Source/shotwell/src/PhotoPage.vala" zoom_state_get_viewing_rectangle_wrt_content (zoom_state, &_tmp5_); @@ -3733,7 +3715,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 3735 "PhotoPage.c" +#line 3717 "PhotoPage.c" } @@ -3751,7 +3733,7 @@ Photo* zoom_buffer_get_backing_photo (ZoomBuffer* self) { result = _tmp1_; #line 313 "/home/jens/Source/shotwell/src/PhotoPage.vala" return result; -#line 3753 "PhotoPage.c" +#line 3735 "PhotoPage.c" } @@ -3770,7 +3752,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 3772 "PhotoPage.c" +#line 3754 "PhotoPage.c" } @@ -3786,7 +3768,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 3788 "PhotoPage.c" +#line 3770 "PhotoPage.c" ZoomState* _tmp1_ = NULL; ZoomState _tmp2_ = {0}; GdkPixbuf* _tmp3_ = NULL; @@ -3801,7 +3783,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 3803 "PhotoPage.c" +#line 3785 "PhotoPage.c" } } @@ -3820,7 +3802,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 3822 "PhotoPage.c" +#line 3804 "PhotoPage.c" ZoomState _tmp1_ = {0}; GdkPixbuf* _tmp2_ = NULL; #line 334 "/home/jens/Source/shotwell/src/PhotoPage.vala" @@ -3831,7 +3813,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 3833 "PhotoPage.c" +#line 3815 "PhotoPage.c" } #line 337 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp3_ = self->priv->object_state; @@ -3841,7 +3823,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 3843 "PhotoPage.c" +#line 3825 "PhotoPage.c" { ZoomState _tmp4_ = {0}; GdkPixbuf* _tmp5_ = NULL; @@ -3853,11 +3835,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 3855 "PhotoPage.c" +#line 3837 "PhotoPage.c" } #line 337 "/home/jens/Source/shotwell/src/PhotoPage.vala" case ZOOM_BUFFER_OBJECT_STATE_SOURCE_NOT_TRANSFORMED: -#line 3859 "PhotoPage.c" +#line 3841 "PhotoPage.c" { ZoomState _tmp6_ = {0}; GdkPixbuf* _tmp7_ = NULL; @@ -3869,11 +3851,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 3871 "PhotoPage.c" +#line 3853 "PhotoPage.c" } #line 337 "/home/jens/Source/shotwell/src/PhotoPage.vala" case ZOOM_BUFFER_OBJECT_STATE_TRANSFORMED_READY: -#line 3875 "PhotoPage.c" +#line 3857 "PhotoPage.c" { ZoomState _tmp8_ = {0}; GdkPixbuf* _tmp9_ = NULL; @@ -3891,7 +3873,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 3893 "PhotoPage.c" +#line 3875 "PhotoPage.c" } default: { @@ -3908,7 +3890,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 3909 "PhotoPage.c" +#line 3891 "PhotoPage.c" } } } @@ -3932,7 +3914,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 3933 "PhotoPage.c" +#line 3915 "PhotoPage.c" } @@ -3965,14 +3947,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 3966 "PhotoPage.c" +#line 3948 "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 3973 "PhotoPage.c" +#line 3955 "PhotoPage.c" } @@ -3981,7 +3963,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 3982 "PhotoPage.c" +#line 3964 "PhotoPage.c" { GdkPixbuf* _tmp0_ = NULL; Photo* _tmp1_ = NULL; @@ -3998,7 +3980,7 @@ 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 3999 "PhotoPage.c" +#line 3981 "PhotoPage.c" goto __catch240_g_error; } #line 29 "/home/jens/Source/shotwell/src/PhotoPage.vala" @@ -4011,7 +3993,7 @@ 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 4012 "PhotoPage.c" +#line 3994 "PhotoPage.c" } goto __finally240; __catch240_g_error: @@ -4026,7 +4008,7 @@ 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 4026 "PhotoPage.c" +#line 4008 "PhotoPage.c" } __finally240: #line 28 "/home/jens/Source/shotwell/src/PhotoPage.vala" @@ -4037,7 +4019,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 4037 "PhotoPage.c" +#line 4019 "PhotoPage.c" } } @@ -4051,7 +4033,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 = zoom_buffer_iso_source_fetch_job_real_execute; -#line 4051 "PhotoPage.c" +#line 4033 "PhotoPage.c" } @@ -4060,7 +4042,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 4060 "PhotoPage.c" +#line 4042 "PhotoPage.c" } @@ -4074,7 +4056,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 4074 "PhotoPage.c" +#line 4056 "PhotoPage.c" } @@ -4093,7 +4075,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 4093 "PhotoPage.c" +#line 4075 "PhotoPage.c" } @@ -4163,14 +4145,14 @@ static ZoomBufferTransformationJob* zoom_buffer_transformation_job_construct (GT self->transformed = _tmp10_; #line 49 "/home/jens/Source/shotwell/src/PhotoPage.vala" return self; -#line 4163 "PhotoPage.c" +#line 4145 "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 4170 "PhotoPage.c" +#line 4152 "PhotoPage.c" } @@ -4183,7 +4165,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 4183 "PhotoPage.c" +#line 4165 "PhotoPage.c" PixelTransformer* _tmp1_ = NULL; GdkPixbuf* _tmp2_ = NULL; GdkPixbuf* _tmp3_ = NULL; @@ -4198,7 +4180,7 @@ static void zoom_buffer_transformation_job_real_execute (BackgroundJob* base) { _tmp4_ = self->priv->cancellable; #line 61 "/home/jens/Source/shotwell/src/PhotoPage.vala" pixel_transformer_transform_to_other_pixbuf (_tmp1_, _tmp2_, _tmp3_, _tmp4_); -#line 4198 "PhotoPage.c" +#line 4180 "PhotoPage.c" } } @@ -4212,7 +4194,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 = zoom_buffer_transformation_job_real_execute; -#line 4212 "PhotoPage.c" +#line 4194 "PhotoPage.c" } @@ -4221,7 +4203,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 4221 "PhotoPage.c" +#line 4203 "PhotoPage.c" } @@ -4239,7 +4221,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 4239 "PhotoPage.c" +#line 4221 "PhotoPage.c" } @@ -4262,7 +4244,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 4262 "PhotoPage.c" +#line 4244 "PhotoPage.c" } @@ -4291,7 +4273,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 4291 "PhotoPage.c" +#line 4273 "PhotoPage.c" } @@ -4321,7 +4303,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 4321 "PhotoPage.c" +#line 4303 "PhotoPage.c" } @@ -4340,77 +4322,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 548 "/home/jens/Source/shotwell/src/PhotoPage.vala" editing_host_page_on_photos_altered ((EditingHostPage*) self, items); -#line 4340 "PhotoPage.c" +#line 4322 "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 550 "/home/jens/Source/shotwell/src/PhotoPage.vala" editing_host_page_on_view_contents_ordering_altered ((EditingHostPage*) self); -#line 4347 "PhotoPage.c" +#line 4329 "PhotoPage.c" } static void _editing_host_page_on_view_contents_ordering_altered_data_collection_ordering_changed (DataCollection* _sender, gpointer self) { #line 551 "/home/jens/Source/shotwell/src/PhotoPage.vala" editing_host_page_on_view_contents_ordering_altered ((EditingHostPage*) self); -#line 4354 "PhotoPage.c" +#line 4336 "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 4361 "PhotoPage.c" +#line 4343 "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 4368 "PhotoPage.c" +#line 4350 "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 4375 "PhotoPage.c" +#line 4357 "PhotoPage.c" } static void _editing_host_page_on_crop_toggled_gtk_toggle_tool_button_toggled (GtkToggleToolButton* _sender, gpointer self) { #line 449 "/home/jens/Source/shotwell/src/PhotoPage.vala" editing_host_page_on_crop_toggled ((EditingHostPage*) self); -#line 4382 "PhotoPage.c" +#line 4364 "PhotoPage.c" } static void _editing_host_page_on_straighten_toggled_gtk_toggle_tool_button_toggled (GtkToggleToolButton* _sender, gpointer self) { #line 458 "/home/jens/Source/shotwell/src/PhotoPage.vala" editing_host_page_on_straighten_toggled ((EditingHostPage*) self); -#line 4389 "PhotoPage.c" +#line 4371 "PhotoPage.c" } static void _editing_host_page_on_redeye_toggled_gtk_toggle_tool_button_toggled (GtkToggleToolButton* _sender, gpointer self) { #line 467 "/home/jens/Source/shotwell/src/PhotoPage.vala" editing_host_page_on_redeye_toggled ((EditingHostPage*) self); -#line 4396 "PhotoPage.c" +#line 4378 "PhotoPage.c" } static void _editing_host_page_on_adjust_toggled_gtk_toggle_tool_button_toggled (GtkToggleToolButton* _sender, gpointer self) { #line 476 "/home/jens/Source/shotwell/src/PhotoPage.vala" editing_host_page_on_adjust_toggled ((EditingHostPage*) self); -#line 4403 "PhotoPage.c" +#line 4385 "PhotoPage.c" } static void _editing_host_page_on_enhance_gtk_tool_button_clicked (GtkToolButton* _sender, gpointer self) { #line 484 "/home/jens/Source/shotwell/src/PhotoPage.vala" editing_host_page_on_enhance ((EditingHostPage*) self); -#line 4410 "PhotoPage.c" +#line 4392 "PhotoPage.c" } @@ -4419,14 +4401,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 503 "/home/jens/Source/shotwell/src/PhotoPage.vala" return result; -#line 4419 "PhotoPage.c" +#line 4401 "PhotoPage.c" } static void _editing_host_page_on_zoom_slider_value_changed_gtk_range_value_changed (GtkRange* _sender, gpointer self) { #line 511 "/home/jens/Source/shotwell/src/PhotoPage.vala" editing_host_page_on_zoom_slider_value_changed ((EditingHostPage*) self); -#line 4426 "PhotoPage.c" +#line 4408 "PhotoPage.c" } @@ -4435,7 +4417,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 512 "/home/jens/Source/shotwell/src/PhotoPage.vala" return result; -#line 4435 "PhotoPage.c" +#line 4417 "PhotoPage.c" } @@ -4444,7 +4426,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 513 "/home/jens/Source/shotwell/src/PhotoPage.vala" return result; -#line 4444 "PhotoPage.c" +#line 4426 "PhotoPage.c" } @@ -4453,7 +4435,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 514 "/home/jens/Source/shotwell/src/PhotoPage.vala" return result; -#line 4453 "PhotoPage.c" +#line 4435 "PhotoPage.c" } @@ -4462,21 +4444,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 525 "/home/jens/Source/shotwell/src/PhotoPage.vala" return result; -#line 4462 "PhotoPage.c" +#line 4444 "PhotoPage.c" } static void _single_photo_page_on_previous_photo_gtk_tool_button_clicked (GtkToolButton* _sender, gpointer self) { #line 537 "/home/jens/Source/shotwell/src/PhotoPage.vala" single_photo_page_on_previous_photo ((SinglePhotoPage*) self); -#line 4469 "PhotoPage.c" +#line 4451 "PhotoPage.c" } static void _single_photo_page_on_next_photo_gtk_tool_button_clicked (GtkToolButton* _sender, gpointer self) { #line 543 "/home/jens/Source/shotwell/src/PhotoPage.vala" single_photo_page_on_next_photo ((SinglePhotoPage*) self); -#line 4476 "PhotoPage.c" +#line 4458 "PhotoPage.c" } @@ -4987,7 +4969,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 4987 "PhotoPage.c" +#line 4969 "PhotoPage.c" } @@ -5011,7 +4993,7 @@ static void editing_host_page_on_zoom_slider_value_changed (EditingHostPage* sel _tmp3_ = self->priv->enable_interactive_zoom_refresh; #line 557 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp3_) { -#line 5011 "PhotoPage.c" +#line 4993 "PhotoPage.c" ZoomState _tmp4_ = {0}; gboolean _tmp5_ = FALSE; #line 558 "/home/jens/Source/shotwell/src/PhotoPage.vala" @@ -5022,13 +5004,13 @@ static void editing_host_page_on_zoom_slider_value_changed (EditingHostPage* sel _tmp5_ = zoom_state_is_default (&new_zoom_state); #line 560 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp5_) { -#line 5022 "PhotoPage.c" +#line 5004 "PhotoPage.c" ZoomState _tmp6_ = {0}; #line 561 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp6_ = new_zoom_state; #line 561 "/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 5028 "PhotoPage.c" +#line 5010 "PhotoPage.c" } } else { gboolean _tmp7_ = FALSE; @@ -5038,22 +5020,22 @@ static void editing_host_page_on_zoom_slider_value_changed (EditingHostPage* sel if (_tmp7_) { #line 564 "/home/jens/Source/shotwell/src/PhotoPage.vala" single_photo_page_cancel_zoom (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage)); -#line 5038 "PhotoPage.c" +#line 5020 "PhotoPage.c" } else { ZoomState _tmp8_ = {0}; #line 566 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp8_ = new_zoom_state; #line 566 "/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 5045 "PhotoPage.c" +#line 5027 "PhotoPage.c" } #line 568 "/home/jens/Source/shotwell/src/PhotoPage.vala" single_photo_page_repaint (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), NULL); -#line 5049 "PhotoPage.c" +#line 5031 "PhotoPage.c" } #line 571 "/home/jens/Source/shotwell/src/PhotoPage.vala" editing_host_page_update_cursor_for_zoom_context (self); -#line 5053 "PhotoPage.c" +#line 5035 "PhotoPage.c" } @@ -5078,7 +5060,7 @@ static gboolean editing_host_page_on_zoom_slider_drag_begin (EditingHostPage* se _g_object_unref0 (_tmp1_); #line 577 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp2_) { -#line 5078 "PhotoPage.c" +#line 5060 "PhotoPage.c" GtkWindow* _tmp3_ = NULL; FullscreenWindow* _tmp4_ = NULL; #line 578 "/home/jens/Source/shotwell/src/PhotoPage.vala" @@ -5089,13 +5071,13 @@ static gboolean editing_host_page_on_zoom_slider_drag_begin (EditingHostPage* se fullscreen_window_disable_toolbar_dismissal (_tmp4_); #line 578 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (_tmp4_); -#line 5089 "PhotoPage.c" +#line 5071 "PhotoPage.c" } #line 580 "/home/jens/Source/shotwell/src/PhotoPage.vala" result = FALSE; #line 580 "/home/jens/Source/shotwell/src/PhotoPage.vala" return result; -#line 5095 "PhotoPage.c" +#line 5077 "PhotoPage.c" } @@ -5125,7 +5107,7 @@ static gboolean editing_host_page_on_zoom_slider_drag_end (EditingHostPage* self _g_object_unref0 (_tmp1_); #line 586 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp2_) { -#line 5125 "PhotoPage.c" +#line 5107 "PhotoPage.c" GtkWindow* _tmp3_ = NULL; FullscreenWindow* _tmp4_ = NULL; #line 587 "/home/jens/Source/shotwell/src/PhotoPage.vala" @@ -5136,7 +5118,7 @@ static gboolean editing_host_page_on_zoom_slider_drag_end (EditingHostPage* self fullscreen_window_update_toolbar_dismissal (_tmp4_); #line 587 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (_tmp4_); -#line 5136 "PhotoPage.c" +#line 5118 "PhotoPage.c" } #line 589 "/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_); @@ -5156,7 +5138,7 @@ static gboolean editing_host_page_on_zoom_slider_drag_end (EditingHostPage* self result = FALSE; #line 594 "/home/jens/Source/shotwell/src/PhotoPage.vala" return result; -#line 5156 "PhotoPage.c" +#line 5138 "PhotoPage.c" } @@ -5172,7 +5154,7 @@ static gboolean editing_host_page_on_zoom_out_pressed (EditingHostPage* self, Gd result = TRUE; #line 599 "/home/jens/Source/shotwell/src/PhotoPage.vala" return result; -#line 5172 "PhotoPage.c" +#line 5154 "PhotoPage.c" } @@ -5188,7 +5170,7 @@ static gboolean editing_host_page_on_zoom_in_pressed (EditingHostPage* self, Gdk result = TRUE; #line 604 "/home/jens/Source/shotwell/src/PhotoPage.vala" return result; -#line 5188 "PhotoPage.c" +#line 5170 "PhotoPage.c" } @@ -5300,7 +5282,7 @@ static void editing_host_page_get_cursor_wrt_viewport (EditingHostPage* self, Gd *result = _result_; #line 619 "/home/jens/Source/shotwell/src/PhotoPage.vala" return; -#line 5300 "PhotoPage.c" +#line 5282 "PhotoPage.c" } @@ -5362,7 +5344,7 @@ static void editing_host_page_get_cursor_wrt_viewport_center (EditingHostPage* s *result = _tmp11_; #line 630 "/home/jens/Source/shotwell/src/PhotoPage.vala" return; -#line 5362 "PhotoPage.c" +#line 5344 "PhotoPage.c" } @@ -5420,7 +5402,7 @@ static void editing_host_page_get_iso_pixel_under_cursor (EditingHostPage* self, *result = _tmp12_; #line 640 "/home/jens/Source/shotwell/src/PhotoPage.vala" return; -#line 5420 "PhotoPage.c" +#line 5402 "PhotoPage.c" } @@ -5436,7 +5418,7 @@ static gdouble editing_host_page_snap_interpolation_factor (EditingHostPage* sel if (_tmp0_ < 0.03) { #line 645 "/home/jens/Source/shotwell/src/PhotoPage.vala" interp = 0.0; -#line 5436 "PhotoPage.c" +#line 5418 "PhotoPage.c" } else { gdouble _tmp1_ = 0.0; #line 646 "/home/jens/Source/shotwell/src/PhotoPage.vala" @@ -5445,7 +5427,7 @@ static gdouble editing_host_page_snap_interpolation_factor (EditingHostPage* sel if (_tmp1_ > 0.97) { #line 647 "/home/jens/Source/shotwell/src/PhotoPage.vala" interp = 1.0; -#line 5445 "PhotoPage.c" +#line 5427 "PhotoPage.c" } } #line 649 "/home/jens/Source/shotwell/src/PhotoPage.vala" @@ -5454,7 +5436,7 @@ static gdouble editing_host_page_snap_interpolation_factor (EditingHostPage* sel result = _tmp2_; #line 649 "/home/jens/Source/shotwell/src/PhotoPage.vala" return result; -#line 5454 "PhotoPage.c" +#line 5436 "PhotoPage.c" } @@ -5478,7 +5460,7 @@ static gdouble editing_host_page_adjust_interpolation_factor (EditingHostPage* s result = _tmp3_; #line 653 "/home/jens/Source/shotwell/src/PhotoPage.vala" return result; -#line 5478 "PhotoPage.c" +#line 5460 "PhotoPage.c" } @@ -5523,7 +5505,7 @@ static void editing_host_page_zoom_about_event_cursor_point (EditingHostPage* se if (_tmp0_) { #line 658 "/home/jens/Source/shotwell/src/PhotoPage.vala" return; -#line 5523 "PhotoPage.c" +#line 5505 "PhotoPage.c" } #line 660 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp1_ = event; @@ -5577,7 +5559,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 674 "/home/jens/Source/shotwell/src/PhotoPage.vala" return; -#line 5577 "PhotoPage.c" +#line 5559 "PhotoPage.c" } #line 677 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp15_ = iso_pixel_under_cursor; @@ -5609,7 +5591,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 687 "/home/jens/Source/shotwell/src/PhotoPage.vala" editing_host_page_update_cursor_for_zoom_context (self); -#line 5609 "PhotoPage.c" +#line 5591 "PhotoPage.c" } @@ -5621,7 +5603,7 @@ void editing_host_page_snap_zoom_to_min (EditingHostPage* self) { _tmp0_ = self->priv->zoom_slider; #line 691 "/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 5621 "PhotoPage.c" +#line 5603 "PhotoPage.c" } @@ -5633,7 +5615,7 @@ void editing_host_page_snap_zoom_to_max (EditingHostPage* self) { _tmp0_ = self->priv->zoom_slider; #line 695 "/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 5633 "PhotoPage.c" +#line 5615 "PhotoPage.c" } @@ -5654,7 +5636,7 @@ void editing_host_page_snap_zoom_to_isomorphic (EditingHostPage* self) { _tmp2_ = zoom_state_get_interpolation_factor (&iso_state); #line 700 "/home/jens/Source/shotwell/src/PhotoPage.vala" gtk_range_set_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_range_get_type (), GtkRange), _tmp2_); -#line 5654 "PhotoPage.c" +#line 5636 "PhotoPage.c" } @@ -5697,7 +5679,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 704 "/home/jens/Source/shotwell/src/PhotoPage.vala" switch (0) { -#line 5697 "PhotoPage.c" +#line 5679 "PhotoPage.c" default: { #line 708 "/home/jens/Source/shotwell/src/PhotoPage.vala" @@ -5706,13 +5688,13 @@ static gboolean editing_host_page_real_on_zoom_slider_key_press (EditingHostPage result = TRUE; #line 709 "/home/jens/Source/shotwell/src/PhotoPage.vala" return result; -#line 5706 "PhotoPage.c" +#line 5688 "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 704 "/home/jens/Source/shotwell/src/PhotoPage.vala" switch (0) { -#line 5712 "PhotoPage.c" +#line 5694 "PhotoPage.c" default: { #line 714 "/home/jens/Source/shotwell/src/PhotoPage.vala" @@ -5721,13 +5703,13 @@ static gboolean editing_host_page_real_on_zoom_slider_key_press (EditingHostPage result = TRUE; #line 715 "/home/jens/Source/shotwell/src/PhotoPage.vala" return result; -#line 5721 "PhotoPage.c" +#line 5703 "PhotoPage.c" } } } else if (_tmp5_ == ((0 != _tmp4_label6) ? _tmp4_label6 : (_tmp4_label6 = g_quark_from_static_string ("KP_Divide")))) { #line 704 "/home/jens/Source/shotwell/src/PhotoPage.vala" switch (0) { -#line 5727 "PhotoPage.c" +#line 5709 "PhotoPage.c" default: { #line 718 "/home/jens/Source/shotwell/src/PhotoPage.vala" @@ -5736,13 +5718,13 @@ static gboolean editing_host_page_real_on_zoom_slider_key_press (EditingHostPage result = TRUE; #line 719 "/home/jens/Source/shotwell/src/PhotoPage.vala" return result; -#line 5736 "PhotoPage.c" +#line 5718 "PhotoPage.c" } } } else if (_tmp5_ == ((0 != _tmp4_label7) ? _tmp4_label7 : (_tmp4_label7 = g_quark_from_static_string ("KP_Multiply")))) { #line 704 "/home/jens/Source/shotwell/src/PhotoPage.vala" switch (0) { -#line 5742 "PhotoPage.c" +#line 5724 "PhotoPage.c" default: { #line 722 "/home/jens/Source/shotwell/src/PhotoPage.vala" @@ -5751,7 +5733,7 @@ static gboolean editing_host_page_real_on_zoom_slider_key_press (EditingHostPage result = TRUE; #line 723 "/home/jens/Source/shotwell/src/PhotoPage.vala" return result; -#line 5751 "PhotoPage.c" +#line 5733 "PhotoPage.c" } } } @@ -5759,7 +5741,7 @@ static gboolean editing_host_page_real_on_zoom_slider_key_press (EditingHostPage result = FALSE; #line 726 "/home/jens/Source/shotwell/src/PhotoPage.vala" return result; -#line 5759 "PhotoPage.c" +#line 5741 "PhotoPage.c" } @@ -5768,7 +5750,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 703 "/home/jens/Source/shotwell/src/PhotoPage.vala" return EDITING_HOST_PAGE_GET_CLASS (self)->on_zoom_slider_key_press (self, event); -#line 5768 "PhotoPage.c" +#line 5750 "PhotoPage.c" } @@ -5781,7 +5763,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 730 "/home/jens/Source/shotwell/src/PhotoPage.vala" gtk_range_set_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_range_get_type (), GtkRange), _tmp1_); -#line 5781 "PhotoPage.c" +#line 5763 "PhotoPage.c" } @@ -5790,7 +5772,7 @@ void editing_host_page_on_increase_size (EditingHostPage* self) { g_return_if_fail (IS_EDITING_HOST_PAGE (self)); #line 729 "/home/jens/Source/shotwell/src/PhotoPage.vala" EDITING_HOST_PAGE_GET_CLASS (self)->on_increase_size (self); -#line 5790 "PhotoPage.c" +#line 5772 "PhotoPage.c" } @@ -5803,7 +5785,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 734 "/home/jens/Source/shotwell/src/PhotoPage.vala" gtk_range_set_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_range_get_type (), GtkRange), _tmp1_); -#line 5803 "PhotoPage.c" +#line 5785 "PhotoPage.c" } @@ -5812,7 +5794,7 @@ void editing_host_page_on_decrease_size (EditingHostPage* self) { g_return_if_fail (IS_EDITING_HOST_PAGE (self)); #line 733 "/home/jens/Source/shotwell/src/PhotoPage.vala" EDITING_HOST_PAGE_GET_CLASS (self)->on_decrease_size (self); -#line 5812 "PhotoPage.c" +#line 5794 "PhotoPage.c" } @@ -5830,7 +5812,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 739 "/home/jens/Source/shotwell/src/PhotoPage.vala" self->priv->saved_slider_val = _tmp1_; -#line 5830 "PhotoPage.c" +#line 5812 "PhotoPage.c" } @@ -5849,7 +5831,7 @@ static ZoomBuffer* editing_host_page_real_get_zoom_buffer (SinglePhotoPage* base result = _tmp1_; #line 743 "/home/jens/Source/shotwell/src/PhotoPage.vala" return result; -#line 5849 "PhotoPage.c" +#line 5831 "PhotoPage.c" } @@ -5872,7 +5854,7 @@ static gboolean editing_host_page_real_on_mousewheel_up (Page* base, GdkEventScr if (_tmp2_) { #line 747 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp0_ = TRUE; -#line 5872 "PhotoPage.c" +#line 5854 "PhotoPage.c" } else { GtkScale* _tmp3_ = NULL; gboolean _tmp4_ = FALSE; @@ -5882,7 +5864,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 747 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp0_ = !_tmp4_; -#line 5882 "PhotoPage.c" +#line 5864 "PhotoPage.c" } #line 747 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp0_) { @@ -5890,7 +5872,7 @@ static gboolean editing_host_page_real_on_mousewheel_up (Page* base, GdkEventScr result = FALSE; #line 748 "/home/jens/Source/shotwell/src/PhotoPage.vala" return result; -#line 5890 "PhotoPage.c" +#line 5872 "PhotoPage.c" } #line 750 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp5_ = event; @@ -5900,7 +5882,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 5900 "PhotoPage.c" +#line 5882 "PhotoPage.c" } @@ -5923,7 +5905,7 @@ static gboolean editing_host_page_real_on_mousewheel_down (Page* base, GdkEventS if (_tmp2_) { #line 755 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp0_ = TRUE; -#line 5923 "PhotoPage.c" +#line 5905 "PhotoPage.c" } else { GtkScale* _tmp3_ = NULL; gboolean _tmp4_ = FALSE; @@ -5933,7 +5915,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 755 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp0_ = !_tmp4_; -#line 5933 "PhotoPage.c" +#line 5915 "PhotoPage.c" } #line 755 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp0_) { @@ -5941,7 +5923,7 @@ static gboolean editing_host_page_real_on_mousewheel_down (Page* base, GdkEventS result = FALSE; #line 756 "/home/jens/Source/shotwell/src/PhotoPage.vala" return result; -#line 5941 "PhotoPage.c" +#line 5923 "PhotoPage.c" } #line 758 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp5_ = event; @@ -5951,7 +5933,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 5951 "PhotoPage.c" +#line 5933 "PhotoPage.c" } @@ -5982,7 +5964,7 @@ static void editing_host_page_real_restore_zoom_state (SinglePhotoPage* base) { _tmp4_ = self->priv->zoom_slider; #line 767 "/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 5982 "PhotoPage.c" +#line 5964 "PhotoPage.c" } @@ -5995,7 +5977,7 @@ static gboolean editing_host_page_real_is_zoom_supported (SinglePhotoPage* base) result = TRUE; #line 771 "/home/jens/Source/shotwell/src/PhotoPage.vala" return result; -#line 5995 "PhotoPage.c" +#line 5977 "PhotoPage.c" } @@ -6015,7 +5997,7 @@ static void editing_host_page_real_set_container (Page* base, GtkWindow* contain _tmp1_ = container; #line 778 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (!G_TYPE_CHECK_INSTANCE_TYPE (_tmp1_, TYPE_FULLSCREEN_WINDOW)) { -#line 6015 "PhotoPage.c" +#line 5997 "PhotoPage.c" DragAndDropHandler* _tmp2_ = NULL; #line 779 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp2_ = drag_and_drop_handler_new (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); @@ -6023,7 +6005,7 @@ static void editing_host_page_real_set_container (Page* base, GtkWindow* contain _drag_and_drop_handler_unref0 (self->priv->dnd_handler); #line 779 "/home/jens/Source/shotwell/src/PhotoPage.vala" self->priv->dnd_handler = _tmp2_; -#line 6023 "PhotoPage.c" +#line 6005 "PhotoPage.c" } } @@ -6042,7 +6024,7 @@ ViewCollection* editing_host_page_get_parent_view (EditingHostPage* self) { result = _tmp1_; #line 783 "/home/jens/Source/shotwell/src/PhotoPage.vala" return result; -#line 6042 "PhotoPage.c" +#line 6024 "PhotoPage.c" } @@ -6065,7 +6047,7 @@ gboolean editing_host_page_has_photo (EditingHostPage* self) { result = _tmp2_; #line 787 "/home/jens/Source/shotwell/src/PhotoPage.vala" return result; -#line 6065 "PhotoPage.c" +#line 6047 "PhotoPage.c" } @@ -6102,7 +6084,7 @@ Photo* editing_host_page_get_photo (EditingHostPage* self) { result = NULL; #line 793 "/home/jens/Source/shotwell/src/PhotoPage.vala" return result; -#line 6102 "PhotoPage.c" +#line 6084 "PhotoPage.c" } #line 797 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp4_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); @@ -6134,7 +6116,7 @@ Photo* editing_host_page_get_photo (EditingHostPage* self) { result = _tmp12_; #line 798 "/home/jens/Source/shotwell/src/PhotoPage.vala" return result; -#line 6134 "PhotoPage.c" +#line 6116 "PhotoPage.c" } @@ -6152,7 +6134,7 @@ static void editing_host_page_real_photo_changing (EditingHostPage* self, Photo* if (_tmp1_ == PHOTO_FILE_FORMAT_RAW) { #line 806 "/home/jens/Source/shotwell/src/PhotoPage.vala" editing_host_page_set_photo_missing (self, FALSE); -#line 6152 "PhotoPage.c" +#line 6134 "PhotoPage.c" } else { Photo* _tmp2_ = NULL; GFile* _tmp3_ = NULL; @@ -6170,13 +6152,13 @@ static void editing_host_page_real_photo_changing (EditingHostPage* self, Photo* editing_host_page_set_photo_missing (self, !_tmp5_); #line 808 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (_tmp4_); -#line 6170 "PhotoPage.c" +#line 6152 "PhotoPage.c" } #line 810 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp6_ = self->priv->photo_missing; #line 810 "/home/jens/Source/shotwell/src/PhotoPage.vala" editing_host_page_update_ui (self, _tmp6_); -#line 6176 "PhotoPage.c" +#line 6158 "PhotoPage.c" } @@ -6185,7 +6167,7 @@ void editing_host_page_photo_changing (EditingHostPage* self, Photo* new_photo) g_return_if_fail (IS_EDITING_HOST_PAGE (self)); #line 802 "/home/jens/Source/shotwell/src/PhotoPage.vala" EDITING_HOST_PAGE_GET_CLASS (self)->photo_changing (self, new_photo); -#line 6185 "PhotoPage.c" +#line 6167 "PhotoPage.c" } @@ -6290,7 +6272,7 @@ static void editing_host_page_set_photo (EditingHostPage* self, Photo* photo) { _tmp21_ = self->priv->parent_view; #line 829 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp21_ != NULL) { -#line 6290 "PhotoPage.c" +#line 6272 "PhotoPage.c" ViewCollection* _tmp22_ = NULL; DataView* view_in_parent = NULL; ViewCollection* _tmp23_ = NULL; @@ -6313,7 +6295,7 @@ static void editing_host_page_set_photo (EditingHostPage* self, Photo* photo) { _tmp26_ = view_in_parent; #line 832 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (NULL != _tmp26_) { -#line 6313 "PhotoPage.c" +#line 6295 "PhotoPage.c" ViewCollection* _tmp27_ = NULL; ViewCollection* _tmp28_ = NULL; DataView* _tmp29_ = NULL; @@ -6333,17 +6315,17 @@ static void editing_host_page_set_photo (EditingHostPage* self, Photo* photo) { view_collection_select_marked (_tmp27_, _tmp31_); #line 833 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (_tmp31_); -#line 6333 "PhotoPage.c" +#line 6315 "PhotoPage.c" } #line 829 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (view_in_parent); -#line 6337 "PhotoPage.c" +#line 6319 "PhotoPage.c" } #line 813 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (marker); #line 813 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (view); -#line 6343 "PhotoPage.c" +#line 6325 "PhotoPage.c" } @@ -6355,7 +6337,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 840 "/home/jens/Source/shotwell/src/PhotoPage.vala" editing_host_page_rebuild_caches (self, "realize"); -#line 6355 "PhotoPage.c" +#line 6337 "PhotoPage.c" } @@ -6373,21 +6355,21 @@ static void editing_host_page_real_switched_to (Page* base) { _tmp1_ = editing_host_page_has_photo (self); #line 849 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp1_) { -#line 6373 "PhotoPage.c" +#line 6355 "PhotoPage.c" gboolean _tmp2_ = FALSE; #line 849 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp2_ = self->priv->pixbuf_dirty; #line 849 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp0_ = _tmp2_; -#line 6379 "PhotoPage.c" +#line 6361 "PhotoPage.c" } else { #line 849 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp0_ = FALSE; -#line 6383 "PhotoPage.c" +#line 6365 "PhotoPage.c" } #line 849 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp0_) { -#line 6387 "PhotoPage.c" +#line 6369 "PhotoPage.c" Photo* _tmp3_ = NULL; Photo* _tmp4_ = NULL; #line 850 "/home/jens/Source/shotwell/src/PhotoPage.vala" @@ -6398,7 +6380,7 @@ static void editing_host_page_real_switched_to (Page* base) { editing_host_page_replace_photo (self, _tmp4_); #line 850 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (_tmp4_); -#line 6398 "PhotoPage.c" +#line 6380 "PhotoPage.c" } } @@ -6426,21 +6408,21 @@ static void editing_host_page_real_switching_from (Page* base) { _tmp2_ = editing_host_page_has_photo (self); #line 866 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp2_) { -#line 6426 "PhotoPage.c" +#line 6408 "PhotoPage.c" ViewCollection* _tmp3_ = NULL; #line 866 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp3_ = self->priv->parent_view; #line 866 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp1_ = _tmp3_ != NULL; -#line 6432 "PhotoPage.c" +#line 6414 "PhotoPage.c" } else { #line 866 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp1_ = FALSE; -#line 6436 "PhotoPage.c" +#line 6418 "PhotoPage.c" } #line 866 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp1_) { -#line 6440 "PhotoPage.c" +#line 6422 "PhotoPage.c" ViewCollection* _tmp4_ = NULL; ViewCollection* _tmp5_ = NULL; ViewCollection* _tmp6_ = NULL; @@ -6476,7 +6458,7 @@ static void editing_host_page_real_switching_from (Page* base) { _g_object_unref0 (_tmp10_); #line 867 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (_tmp8_); -#line 6476 "PhotoPage.c" +#line 6458 "PhotoPage.c" } #line 870 "/home/jens/Source/shotwell/src/PhotoPage.vala" _data_collection_unref0 (self->priv->parent_view); @@ -6490,14 +6472,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 871 "/home/jens/Source/shotwell/src/PhotoPage.vala" _data_collection_unref0 (_tmp14_); -#line 6490 "PhotoPage.c" +#line 6472 "PhotoPage.c" } static void _editing_host_page_on_selection_changed_view_collection_items_selected (ViewCollection* _sender, GeeIterable* selected, gpointer self) { #line 884 "/home/jens/Source/shotwell/src/PhotoPage.vala" editing_host_page_on_selection_changed ((EditingHostPage*) self, selected); -#line 6497 "PhotoPage.c" +#line 6479 "PhotoPage.c" } @@ -6535,7 +6517,7 @@ static void editing_host_page_real_switching_to_fullscreen (Page* base, Fullscre _tmp4_ = page; #line 883 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp4_ != NULL) { -#line 6535 "PhotoPage.c" +#line 6517 "PhotoPage.c" Page* _tmp5_ = NULL; ViewCollection* _tmp6_ = NULL; ViewCollection* _tmp7_ = NULL; @@ -6549,11 +6531,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 884 "/home/jens/Source/shotwell/src/PhotoPage.vala" _data_collection_unref0 (_tmp7_); -#line 6549 "PhotoPage.c" +#line 6531 "PhotoPage.c" } #line 874 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (page); -#line 6553 "PhotoPage.c" +#line 6535 "PhotoPage.c" } @@ -6584,7 +6566,7 @@ static void editing_host_page_real_returning_from_fullscreen (Page* base, Fullsc _tmp3_ = page; #line 893 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp3_ != NULL) { -#line 6584 "PhotoPage.c" +#line 6566 "PhotoPage.c" Page* _tmp4_ = NULL; ViewCollection* _tmp5_ = NULL; ViewCollection* _tmp6_ = NULL; @@ -6601,11 +6583,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 894 "/home/jens/Source/shotwell/src/PhotoPage.vala" _data_collection_unref0 (_tmp6_); -#line 6601 "PhotoPage.c" +#line 6583 "PhotoPage.c" } #line 887 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (page); -#line 6605 "PhotoPage.c" +#line 6587 "PhotoPage.c" } @@ -6614,7 +6596,7 @@ static void editing_host_page_on_selection_changed (EditingHostPage* self, GeeIt g_return_if_fail (IS_EDITING_HOST_PAGE (self)); #line 897 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_if_fail (GEE_IS_ITERABLE (selected)); -#line 6614 "PhotoPage.c" +#line 6596 "PhotoPage.c" { GeeIterator* _view_it = NULL; GeeIterable* _tmp0_ = NULL; @@ -6627,7 +6609,7 @@ static void editing_host_page_on_selection_changed (EditingHostPage* self, GeeIt _view_it = _tmp1_; #line 898 "/home/jens/Source/shotwell/src/PhotoPage.vala" while (TRUE) { -#line 6627 "PhotoPage.c" +#line 6609 "PhotoPage.c" gboolean _tmp2_ = FALSE; DataView* view = NULL; gpointer _tmp3_ = NULL; @@ -6640,7 +6622,7 @@ static void editing_host_page_on_selection_changed (EditingHostPage* self, GeeIt if (!_tmp2_) { #line 898 "/home/jens/Source/shotwell/src/PhotoPage.vala" break; -#line 6640 "PhotoPage.c" +#line 6622 "PhotoPage.c" } #line 898 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp3_ = gee_iterator_get (_view_it); @@ -6660,11 +6642,11 @@ static void editing_host_page_on_selection_changed (EditingHostPage* self, GeeIt _g_object_unref0 (view); #line 900 "/home/jens/Source/shotwell/src/PhotoPage.vala" break; -#line 6660 "PhotoPage.c" +#line 6642 "PhotoPage.c" } #line 898 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (_view_it); -#line 6664 "PhotoPage.c" +#line 6646 "PhotoPage.c" } } @@ -6680,14 +6662,14 @@ void editing_host_page_enable_rotate (EditingHostPage* self, gboolean should_ena _tmp1_ = should_enable; #line 905 "/home/jens/Source/shotwell/src/PhotoPage.vala" gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_widget_get_type (), GtkWidget), _tmp1_); -#line 6680 "PhotoPage.c" +#line 6662 "PhotoPage.c" } static void _editing_host_page_on_pixbuf_fetched_pixbuf_cache_fetched (PixbufCache* _sender, Photo* photo, GdkPixbuf* pixbuf, GError* err, gpointer self) { #line 923 "/home/jens/Source/shotwell/src/PhotoPage.vala" editing_host_page_on_pixbuf_fetched ((EditingHostPage*) self, photo, pixbuf, err); -#line 6687 "PhotoPage.c" +#line 6669 "PhotoPage.c" } @@ -6696,7 +6678,7 @@ static gboolean _editing_host_page_master_cache_filter_pixbuf_cache_cache_filter result = editing_host_page_master_cache_filter ((EditingHostPage*) self, photo); #line 930 "/home/jens/Source/shotwell/src/PhotoPage.vala" return result; -#line 6696 "PhotoPage.c" +#line 6678 "PhotoPage.c" } @@ -6729,7 +6711,7 @@ static void editing_host_page_rebuild_caches (EditingHostPage* self, const gchar _tmp2_ = self->priv->cache; #line 915 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp2_ != NULL) { -#line 6729 "PhotoPage.c" +#line 6711 "PhotoPage.c" PixbufCache* _tmp3_ = NULL; Scaling _tmp4_ = {0}; Scaling _tmp5_ = {0}; @@ -6744,17 +6726,17 @@ static void editing_host_page_rebuild_caches (EditingHostPage* self, const gchar _tmp6_ = scaling_equals (&_tmp4_, &_tmp5_); #line 915 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp1_ = _tmp6_; -#line 6744 "PhotoPage.c" +#line 6726 "PhotoPage.c" } else { #line 915 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp1_ = FALSE; -#line 6748 "PhotoPage.c" +#line 6730 "PhotoPage.c" } #line 915 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp1_) { #line 916 "/home/jens/Source/shotwell/src/PhotoPage.vala" return; -#line 6754 "PhotoPage.c" +#line 6736 "PhotoPage.c" } #line 918 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp7_ = caller; @@ -6770,7 +6752,7 @@ static void editing_host_page_rebuild_caches (EditingHostPage* self, const gchar _tmp10_ = self->priv->cache; #line 922 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp10_ != NULL) { -#line 6770 "PhotoPage.c" +#line 6752 "PhotoPage.c" PixbufCache* _tmp11_ = NULL; guint _tmp12_ = 0U; PixbufCache* _tmp13_ = NULL; @@ -6784,7 +6766,7 @@ static void editing_host_page_rebuild_caches (EditingHostPage* self, const gchar _tmp13_ = self->priv->cache; #line 924 "/home/jens/Source/shotwell/src/PhotoPage.vala" pixbuf_cache_cancel_all (_tmp13_); -#line 6784 "PhotoPage.c" +#line 6766 "PhotoPage.c" } #line 927 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp14_ = self->priv->sources; @@ -6814,7 +6796,7 @@ static void editing_host_page_rebuild_caches (EditingHostPage* self, const gchar _tmp21_ = caller; #line 933 "/home/jens/Source/shotwell/src/PhotoPage.vala" editing_host_page_refresh_caches (self, _tmp21_); -#line 6814 "PhotoPage.c" +#line 6796 "PhotoPage.c" } @@ -6828,7 +6810,7 @@ static void editing_host_page_refresh_caches (EditingHostPage* self, const gchar _tmp0_ = editing_host_page_has_photo (self); #line 938 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp0_) { -#line 6828 "PhotoPage.c" +#line 6810 "PhotoPage.c" const gchar* _tmp1_ = NULL; Photo* _tmp2_ = NULL; Photo* _tmp3_ = NULL; @@ -6869,14 +6851,14 @@ static void editing_host_page_refresh_caches (EditingHostPage* self, const gchar _g_object_unref0 (_tmp9_); #line 941 "/home/jens/Source/shotwell/src/PhotoPage.vala" _data_collection_unref0 (_tmp7_); -#line 6868 "PhotoPage.c" +#line 6850 "PhotoPage.c" } else { const gchar* _tmp10_ = NULL; #line 943 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp10_ = caller; #line 943 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_debug ("PhotoPage.vala:943: Refresh pixbuf caches (%s): (no photo)", _tmp10_); -#line 6875 "PhotoPage.c" +#line 6857 "PhotoPage.c" } } @@ -6898,7 +6880,7 @@ static gboolean editing_host_page_master_cache_filter (EditingHostPage* self, Ph if (_tmp2_) { #line 948 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp0_ = TRUE; -#line 6897 "PhotoPage.c" +#line 6879 "PhotoPage.c" } else { Photo* _tmp3_ = NULL; gboolean _tmp4_ = FALSE; @@ -6908,13 +6890,13 @@ static gboolean editing_host_page_master_cache_filter (EditingHostPage* self, Ph _tmp4_ = photo_has_editable (_tmp3_); #line 948 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp0_ = _tmp4_; -#line 6907 "PhotoPage.c" +#line 6889 "PhotoPage.c" } #line 948 "/home/jens/Source/shotwell/src/PhotoPage.vala" result = _tmp0_; #line 948 "/home/jens/Source/shotwell/src/PhotoPage.vala" return result; -#line 6913 "PhotoPage.c" +#line 6895 "PhotoPage.c" } @@ -6948,13 +6930,13 @@ static void editing_host_page_on_pixbuf_fetched (EditingHostPage* self, Photo* p if (_tmp4_) { #line 954 "/home/jens/Source/shotwell/src/PhotoPage.vala" return; -#line 6947 "PhotoPage.c" +#line 6929 "PhotoPage.c" } #line 956 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp5_ = pixbuf; #line 956 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp5_ != NULL) { -#line 6953 "PhotoPage.c" +#line 6935 "PhotoPage.c" gboolean _tmp6_ = FALSE; ZoomBuffer* _tmp7_ = NULL; Dimensions max_dim = {0}; @@ -6968,7 +6950,7 @@ static void editing_host_page_on_pixbuf_fetched (EditingHostPage* self, Photo* p _tmp7_ = self->priv->zoom_buffer; #line 958 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp7_ != NULL) { -#line 6967 "PhotoPage.c" +#line 6949 "PhotoPage.c" ZoomBuffer* _tmp8_ = NULL; Photo* _tmp9_ = NULL; Photo* _tmp10_ = NULL; @@ -6985,15 +6967,15 @@ static void editing_host_page_on_pixbuf_fetched (EditingHostPage* self, Photo* p _tmp6_ = _tmp10_ == _tmp11_; #line 958 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (_tmp10_); -#line 6984 "PhotoPage.c" +#line 6966 "PhotoPage.c" } else { #line 958 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp6_ = FALSE; -#line 6988 "PhotoPage.c" +#line 6970 "PhotoPage.c" } #line 958 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp6_) { -#line 6992 "PhotoPage.c" +#line 6974 "PhotoPage.c" Photo* _tmp12_ = NULL; GdkPixbuf* _tmp13_ = NULL; ZoomBuffer* _tmp14_ = NULL; @@ -7007,7 +6989,7 @@ static void editing_host_page_on_pixbuf_fetched (EditingHostPage* self, Photo* p _g_object_unref0 (self->priv->zoom_buffer); #line 959 "/home/jens/Source/shotwell/src/PhotoPage.vala" self->priv->zoom_buffer = _tmp14_; -#line 7006 "PhotoPage.c" +#line 6988 "PhotoPage.c" } #line 963 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp15_ = photo; @@ -7019,7 +7001,7 @@ static void editing_host_page_on_pixbuf_fetched (EditingHostPage* self, Photo* p _tmp17_ = self->priv->current_tool; #line 964 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp17_ != NULL) { -#line 7018 "PhotoPage.c" +#line 7000 "PhotoPage.c" { Dimensions tool_pixbuf_dim = {0}; GdkPixbuf* tool_pixbuf = NULL; @@ -7043,14 +7025,14 @@ static void editing_host_page_on_pixbuf_fetched (EditingHostPage* self, Photo* p tool_pixbuf = _tmp22_; #line 967 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 7042 "PhotoPage.c" +#line 7024 "PhotoPage.c" goto __catch241_g_error; } #line 970 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp23_ = tool_pixbuf; #line 970 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp23_ != NULL) { -#line 7049 "PhotoPage.c" +#line 7031 "PhotoPage.c" GdkPixbuf* _tmp24_ = NULL; Dimensions _tmp25_ = {0}; #line 971 "/home/jens/Source/shotwell/src/PhotoPage.vala" @@ -7061,11 +7043,11 @@ static void editing_host_page_on_pixbuf_fetched (EditingHostPage* self, Photo* p _tmp25_ = tool_pixbuf_dim; #line 972 "/home/jens/Source/shotwell/src/PhotoPage.vala" max_dim = _tmp25_; -#line 7060 "PhotoPage.c" +#line 7042 "PhotoPage.c" } #line 965 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (tool_pixbuf); -#line 7064 "PhotoPage.c" +#line 7046 "PhotoPage.c" } goto __finally241; __catch241_g_error: @@ -7100,7 +7082,7 @@ static void editing_host_page_on_pixbuf_fetched (EditingHostPage* self, Photo* p _g_error_free0 (err); #line 978 "/home/jens/Source/shotwell/src/PhotoPage.vala" return; -#line 7099 "PhotoPage.c" +#line 7081 "PhotoPage.c" } __finally241: #line 965 "/home/jens/Source/shotwell/src/PhotoPage.vala" @@ -7111,7 +7093,7 @@ static void editing_host_page_on_pixbuf_fetched (EditingHostPage* self, Photo* p g_clear_error (&_inner_error_); #line 965 "/home/jens/Source/shotwell/src/PhotoPage.vala" return; -#line 7110 "PhotoPage.c" +#line 7092 "PhotoPage.c" } } #line 982 "/home/jens/Source/shotwell/src/PhotoPage.vala" @@ -7126,14 +7108,14 @@ static void editing_host_page_on_pixbuf_fetched (EditingHostPage* self, Photo* p _tmp33_ = photo; #line 985 "/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 7125 "PhotoPage.c" +#line 7107 "PhotoPage.c" } else { GError* _tmp34_ = NULL; #line 986 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp34_ = err; #line 986 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp34_ != NULL) { -#line 7132 "PhotoPage.c" +#line 7114 "PhotoPage.c" Photo* _tmp35_ = NULL; #line 989 "/home/jens/Source/shotwell/src/PhotoPage.vala" editing_host_page_set_photo_missing (self, TRUE); @@ -7141,7 +7123,7 @@ static void editing_host_page_on_pixbuf_fetched (EditingHostPage* self, Photo* p _tmp35_ = photo; #line 992 "/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 7140 "PhotoPage.c" +#line 7122 "PhotoPage.c" } } } @@ -7225,7 +7207,7 @@ static void editing_host_page_prefetch_neighbors (EditingHostPage* self, ViewCol _g_object_unref0 (normal_batch); #line 1005 "/home/jens/Source/shotwell/src/PhotoPage.vala" return; -#line 7224 "PhotoPage.c" +#line 7206 "PhotoPage.c" } #line 1007 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp11_ = next_source; @@ -7239,7 +7221,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 1008 "/home/jens/Source/shotwell/src/PhotoPage.vala" prev = _tmp14_; -#line 7238 "PhotoPage.c" +#line 7220 "PhotoPage.c" { GeeIterator* _neighbor_source_it = NULL; ViewCollection* _tmp15_ = NULL; @@ -7266,7 +7248,7 @@ static void editing_host_page_prefetch_neighbors (EditingHostPage* self, ViewCol _neighbor_source_it = _tmp20_; #line 1011 "/home/jens/Source/shotwell/src/PhotoPage.vala" while (TRUE) { -#line 7265 "PhotoPage.c" +#line 7247 "PhotoPage.c" GeeIterator* _tmp21_ = NULL; gboolean _tmp22_ = FALSE; DataSource* neighbor_source = NULL; @@ -7293,7 +7275,7 @@ static void editing_host_page_prefetch_neighbors (EditingHostPage* self, ViewCol if (!_tmp22_) { #line 1011 "/home/jens/Source/shotwell/src/PhotoPage.vala" break; -#line 7292 "PhotoPage.c" +#line 7274 "PhotoPage.c" } #line 1011 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp23_ = _neighbor_source_it; @@ -7319,7 +7301,7 @@ static void editing_host_page_prefetch_neighbors (EditingHostPage* self, ViewCol if (_tmp30_) { #line 1015 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp27_ = TRUE; -#line 7318 "PhotoPage.c" +#line 7300 "PhotoPage.c" } else { Photo* _tmp31_ = NULL; Photo* _tmp32_ = NULL; @@ -7332,13 +7314,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 1015 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp27_ = _tmp33_; -#line 7331 "PhotoPage.c" +#line 7313 "PhotoPage.c" } #line 1015 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp27_) { #line 1016 "/home/jens/Source/shotwell/src/PhotoPage.vala" priority = BACKGROUND_JOB_JOB_PRIORITY_HIGH; -#line 7337 "PhotoPage.c" +#line 7319 "PhotoPage.c" } #line 1018 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp34_ = normal_batch; @@ -7358,11 +7340,11 @@ static void editing_host_page_prefetch_neighbors (EditingHostPage* self, ViewCol _g_object_unref0 (neighbor); #line 1011 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (neighbor_source); -#line 7357 "PhotoPage.c" +#line 7339 "PhotoPage.c" } #line 1011 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (_neighbor_source_it); -#line 7361 "PhotoPage.c" +#line 7343 "PhotoPage.c" } #line 1022 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp39_ = self->priv->cache; @@ -7388,7 +7370,7 @@ static void editing_host_page_prefetch_neighbors (EditingHostPage* self, ViewCol _g_object_unref0 (master_batch); #line 996 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (normal_batch); -#line 7387 "PhotoPage.c" +#line 7369 "PhotoPage.c" } @@ -7431,7 +7413,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 1032 "/home/jens/Source/shotwell/src/PhotoPage.vala" new_neighbors = G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, GEE_TYPE_SET, GeeSet); -#line 7430 "PhotoPage.c" +#line 7412 "PhotoPage.c" { GeeIterator* _old_neighbor_it = NULL; GeeSet* _tmp6_ = NULL; @@ -7444,7 +7426,7 @@ static void editing_host_page_cancel_prefetch_neighbors (EditingHostPage* self, _old_neighbor_it = _tmp7_; #line 1035 "/home/jens/Source/shotwell/src/PhotoPage.vala" while (TRUE) { -#line 7443 "PhotoPage.c" +#line 7425 "PhotoPage.c" GeeIterator* _tmp8_ = NULL; gboolean _tmp9_ = FALSE; Photo* old_neighbor = NULL; @@ -7462,7 +7444,7 @@ static void editing_host_page_cancel_prefetch_neighbors (EditingHostPage* self, if (!_tmp9_) { #line 1035 "/home/jens/Source/shotwell/src/PhotoPage.vala" break; -#line 7461 "PhotoPage.c" +#line 7443 "PhotoPage.c" } #line 1035 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp10_ = _old_neighbor_it; @@ -7478,7 +7460,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 1038 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (!_tmp15_) { -#line 7477 "PhotoPage.c" +#line 7459 "PhotoPage.c" Photo* _tmp16_ = NULL; Photo* _tmp17_ = NULL; gboolean _tmp18_ = FALSE; @@ -7490,15 +7472,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 1038 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp12_ = !_tmp18_; -#line 7489 "PhotoPage.c" +#line 7471 "PhotoPage.c" } else { #line 1038 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp12_ = FALSE; -#line 7493 "PhotoPage.c" +#line 7475 "PhotoPage.c" } #line 1038 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp12_) { -#line 7497 "PhotoPage.c" +#line 7479 "PhotoPage.c" PixbufCache* _tmp19_ = NULL; Photo* _tmp20_ = NULL; PixbufCache* _tmp21_ = NULL; @@ -7515,15 +7497,15 @@ static void editing_host_page_cancel_prefetch_neighbors (EditingHostPage* self, _tmp22_ = old_neighbor; #line 1040 "/home/jens/Source/shotwell/src/PhotoPage.vala" pixbuf_cache_drop (_tmp21_, _tmp22_); -#line 7514 "PhotoPage.c" +#line 7496 "PhotoPage.c" } #line 1035 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (old_neighbor); -#line 7518 "PhotoPage.c" +#line 7500 "PhotoPage.c" } #line 1035 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (_old_neighbor_it); -#line 7522 "PhotoPage.c" +#line 7504 "PhotoPage.c" } #line 1045 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp24_ = new_neighbors; @@ -7533,7 +7515,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 1045 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (!_tmp26_) { -#line 7532 "PhotoPage.c" +#line 7514 "PhotoPage.c" Photo* _tmp27_ = NULL; Photo* _tmp28_ = NULL; gboolean _tmp29_ = FALSE; @@ -7545,15 +7527,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 1045 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp23_ = !_tmp29_; -#line 7544 "PhotoPage.c" +#line 7526 "PhotoPage.c" } else { #line 1045 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp23_ = FALSE; -#line 7548 "PhotoPage.c" +#line 7530 "PhotoPage.c" } #line 1045 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp23_) { -#line 7552 "PhotoPage.c" +#line 7534 "PhotoPage.c" PixbufCache* _tmp30_ = NULL; Photo* _tmp31_ = NULL; PixbufCache* _tmp32_ = NULL; @@ -7570,13 +7552,13 @@ static void editing_host_page_cancel_prefetch_neighbors (EditingHostPage* self, _tmp33_ = old_photo; #line 1047 "/home/jens/Source/shotwell/src/PhotoPage.vala" pixbuf_cache_drop (_tmp32_, _tmp33_); -#line 7569 "PhotoPage.c" +#line 7551 "PhotoPage.c" } #line 1028 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (new_neighbors); #line 1028 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (old_neighbors); -#line 7575 "PhotoPage.c" +#line 7557 "PhotoPage.c" } @@ -7594,7 +7576,7 @@ static DataView* editing_host_page_real_create_photo_view (EditingHostPage* self result = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_DATA_VIEW, DataView); #line 1052 "/home/jens/Source/shotwell/src/PhotoPage.vala" return result; -#line 7593 "PhotoPage.c" +#line 7575 "PhotoPage.c" } @@ -7603,7 +7585,7 @@ DataView* editing_host_page_create_photo_view (EditingHostPage* self, DataSource g_return_val_if_fail (IS_EDITING_HOST_PAGE (self), NULL); #line 1051 "/home/jens/Source/shotwell/src/PhotoPage.vala" return EDITING_HOST_PAGE_GET_CLASS (self)->create_photo_view (self, source); -#line 7602 "PhotoPage.c" +#line 7584 "PhotoPage.c" } @@ -7620,7 +7602,7 @@ static gboolean editing_host_page_is_photo (EditingHostPage* self, DataSource* s result = G_TYPE_CHECK_INSTANCE_TYPE (_tmp0_, TYPE_PHOTO_SOURCE); #line 1056 "/home/jens/Source/shotwell/src/PhotoPage.vala" return result; -#line 7619 "PhotoPage.c" +#line 7601 "PhotoPage.c" } @@ -7629,7 +7611,7 @@ static DataView* _editing_host_page_create_photo_view_create_view (DataSource* s result = editing_host_page_create_photo_view ((EditingHostPage*) self, source); #line 1064 "/home/jens/Source/shotwell/src/PhotoPage.vala" return result; -#line 7628 "PhotoPage.c" +#line 7610 "PhotoPage.c" } @@ -7638,7 +7620,7 @@ static gboolean _editing_host_page_is_photo_create_view_predicate (DataSource* s result = editing_host_page_is_photo ((EditingHostPage*) self, source); #line 1064 "/home/jens/Source/shotwell/src/PhotoPage.vala" return result; -#line 7637 "PhotoPage.c" +#line 7619 "PhotoPage.c" } @@ -7683,7 +7665,7 @@ void editing_host_page_display_copy_of (EditingHostPage* self, ViewCollection* c _data_collection_unref0 (_tmp7_); #line 1062 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp8_) { -#line 7682 "PhotoPage.c" +#line 7664 "PhotoPage.c" ViewCollection* _tmp9_ = NULL; ViewCollection* _tmp10_ = NULL; #line 1062 "/home/jens/Source/shotwell/src/PhotoPage.vala" @@ -7692,15 +7674,15 @@ void editing_host_page_display_copy_of (EditingHostPage* self, ViewCollection* c _tmp10_ = self->priv->parent_view; #line 1062 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp4_ = _tmp9_ != _tmp10_; -#line 7691 "PhotoPage.c" +#line 7673 "PhotoPage.c" } else { #line 1062 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp4_ = FALSE; -#line 7695 "PhotoPage.c" +#line 7677 "PhotoPage.c" } #line 1062 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp4_) { -#line 7699 "PhotoPage.c" +#line 7681 "PhotoPage.c" ViewCollection* _tmp11_ = NULL; ViewCollection* _tmp12_ = NULL; ViewCollection* _tmp13_ = NULL; @@ -7734,13 +7716,13 @@ void editing_host_page_display_copy_of (EditingHostPage* self, ViewCollection* c _data_collection_unref0 (self->priv->parent_view); #line 1065 "/home/jens/Source/shotwell/src/PhotoPage.vala" self->priv->parent_view = _tmp17_; -#line 7733 "PhotoPage.c" +#line 7715 "PhotoPage.c" } #line 1068 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp18_ = starting_photo; #line 1068 "/home/jens/Source/shotwell/src/PhotoPage.vala" editing_host_page_replace_photo (self, _tmp18_); -#line 7739 "PhotoPage.c" +#line 7721 "PhotoPage.c" } @@ -7785,7 +7767,7 @@ void editing_host_page_display_mirror_of (EditingHostPage* self, ViewCollection* _data_collection_unref0 (_tmp7_); #line 1074 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp8_) { -#line 7784 "PhotoPage.c" +#line 7766 "PhotoPage.c" ViewCollection* _tmp9_ = NULL; ViewCollection* _tmp10_ = NULL; #line 1074 "/home/jens/Source/shotwell/src/PhotoPage.vala" @@ -7794,15 +7776,15 @@ void editing_host_page_display_mirror_of (EditingHostPage* self, ViewCollection* _tmp10_ = self->priv->parent_view; #line 1074 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp4_ = _tmp9_ != _tmp10_; -#line 7793 "PhotoPage.c" +#line 7775 "PhotoPage.c" } else { #line 1074 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp4_ = FALSE; -#line 7797 "PhotoPage.c" +#line 7779 "PhotoPage.c" } #line 1074 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp4_) { -#line 7801 "PhotoPage.c" +#line 7783 "PhotoPage.c" ViewCollection* _tmp11_ = NULL; ViewCollection* _tmp12_ = NULL; ViewCollection* _tmp13_ = NULL; @@ -7836,13 +7818,13 @@ void editing_host_page_display_mirror_of (EditingHostPage* self, ViewCollection* _data_collection_unref0 (self->priv->parent_view); #line 1077 "/home/jens/Source/shotwell/src/PhotoPage.vala" self->priv->parent_view = _tmp17_; -#line 7835 "PhotoPage.c" +#line 7817 "PhotoPage.c" } #line 1080 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp18_ = starting_photo; #line 1080 "/home/jens/Source/shotwell/src/PhotoPage.vala" editing_host_page_replace_photo (self, _tmp18_); -#line 7841 "PhotoPage.c" +#line 7823 "PhotoPage.c" } @@ -7893,7 +7875,7 @@ static void editing_host_page_real_update_ui (EditingHostPage* self, gboolean mi dimensions_init (&_tmp8_, 0, 0); #line 1094 "/home/jens/Source/shotwell/src/PhotoPage.vala" editing_host_page_deactivate_tool (self, NULL, NULL, &_tmp8_, FALSE); -#line 7892 "PhotoPage.c" +#line 7874 "PhotoPage.c" } @@ -7902,14 +7884,14 @@ void editing_host_page_update_ui (EditingHostPage* self, gboolean missing) { g_return_if_fail (IS_EDITING_HOST_PAGE (self)); #line 1083 "/home/jens/Source/shotwell/src/PhotoPage.vala" EDITING_HOST_PAGE_GET_CLASS (self)->update_ui (self, missing); -#line 7901 "PhotoPage.c" +#line 7883 "PhotoPage.c" } static void editing_host_page_real_notify_photo_backing_missing (EditingHostPage* self, Photo* photo, gboolean missing) { #line 1098 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_if_fail (IS_PHOTO (photo)); -#line 7908 "PhotoPage.c" +#line 7890 "PhotoPage.c" } @@ -7918,7 +7900,7 @@ void editing_host_page_notify_photo_backing_missing (EditingHostPage* self, Phot g_return_if_fail (IS_EDITING_HOST_PAGE (self)); #line 1098 "/home/jens/Source/shotwell/src/PhotoPage.vala" EDITING_HOST_PAGE_GET_CLASS (self)->notify_photo_backing_missing (self, photo, missing); -#line 7917 "PhotoPage.c" +#line 7899 "PhotoPage.c" } @@ -7982,17 +7964,17 @@ static void editing_host_page_draw_message (EditingHostPage* self, const gchar* _tmp10_ = x; #line 1111 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp10_ > 0) { -#line 7981 "PhotoPage.c" +#line 7963 "PhotoPage.c" gint _tmp11_ = 0; #line 1111 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp11_ = x; #line 1111 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp9_ = _tmp11_ / 2; -#line 7987 "PhotoPage.c" +#line 7969 "PhotoPage.c" } else { #line 1111 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp9_ = 0; -#line 7991 "PhotoPage.c" +#line 7973 "PhotoPage.c" } #line 1111 "/home/jens/Source/shotwell/src/PhotoPage.vala" x = _tmp9_; @@ -8008,17 +7990,17 @@ static void editing_host_page_draw_message (EditingHostPage* self, const gchar* _tmp16_ = y; #line 1114 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp16_ > 0) { -#line 8007 "PhotoPage.c" +#line 7989 "PhotoPage.c" gint _tmp17_ = 0; #line 1114 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp17_ = y; #line 1114 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp15_ = _tmp17_ / 2; -#line 8013 "PhotoPage.c" +#line 7995 "PhotoPage.c" } else { #line 1114 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp15_ = 0; -#line 8017 "PhotoPage.c" +#line 7999 "PhotoPage.c" } #line 1114 "/home/jens/Source/shotwell/src/PhotoPage.vala" y = _tmp15_; @@ -8032,7 +8014,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 1101 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (pango_layout); -#line 8031 "PhotoPage.c" +#line 8013 "PhotoPage.c" } @@ -8056,7 +8038,7 @@ void editing_host_page_set_photo_missing (EditingHostPage* self, gboolean missin if (_tmp0_ == _tmp1_) { #line 1122 "/home/jens/Source/shotwell/src/PhotoPage.vala" return; -#line 8055 "PhotoPage.c" +#line 8037 "PhotoPage.c" } #line 1124 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp2_ = missing; @@ -8074,7 +8056,7 @@ void editing_host_page_set_photo_missing (EditingHostPage* self, gboolean missin _g_object_unref0 (photo); #line 1128 "/home/jens/Source/shotwell/src/PhotoPage.vala" return; -#line 8073 "PhotoPage.c" +#line 8055 "PhotoPage.c" } #line 1130 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp5_ = missing; @@ -8084,7 +8066,7 @@ void editing_host_page_set_photo_missing (EditingHostPage* self, gboolean missin _tmp6_ = self->priv->photo_missing; #line 1132 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp6_) { -#line 8083 "PhotoPage.c" +#line 8065 "PhotoPage.c" { GdkPixbuf* pixbuf = NULL; Photo* _tmp7_ = NULL; @@ -8109,7 +8091,7 @@ void editing_host_page_set_photo_missing (EditingHostPage* self, gboolean missin pixbuf = _tmp9_; #line 1134 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 8108 "PhotoPage.c" +#line 8090 "PhotoPage.c" goto __catch242_g_error; } #line 1136 "/home/jens/Source/shotwell/src/PhotoPage.vala" @@ -8138,7 +8120,7 @@ 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 1133 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (pixbuf); -#line 8137 "PhotoPage.c" +#line 8119 "PhotoPage.c" } goto __finally242; __catch242_g_error: @@ -8174,7 +8156,7 @@ void editing_host_page_set_photo_missing (EditingHostPage* self, gboolean missin g_warning ("PhotoPage.vala:1142: %s", _tmp24_); #line 1133 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_error_free0 (err); -#line 8173 "PhotoPage.c" +#line 8155 "PhotoPage.c" } __finally242: #line 1133 "/home/jens/Source/shotwell/src/PhotoPage.vala" @@ -8187,12 +8169,12 @@ void editing_host_page_set_photo_missing (EditingHostPage* self, gboolean missin g_clear_error (&_inner_error_); #line 1133 "/home/jens/Source/shotwell/src/PhotoPage.vala" return; -#line 8186 "PhotoPage.c" +#line 8168 "PhotoPage.c" } } #line 1120 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (photo); -#line 8191 "PhotoPage.c" +#line 8173 "PhotoPage.c" } @@ -8207,7 +8189,7 @@ gboolean editing_host_page_get_photo_missing (EditingHostPage* self) { result = _tmp0_; #line 1148 "/home/jens/Source/shotwell/src/PhotoPage.vala" return result; -#line 8206 "PhotoPage.c" +#line 8188 "PhotoPage.c" } @@ -8221,7 +8203,7 @@ static gboolean editing_host_page_real_confirm_replace_photo (EditingHostPage* s result = TRUE; #line 1152 "/home/jens/Source/shotwell/src/PhotoPage.vala" return result; -#line 8220 "PhotoPage.c" +#line 8202 "PhotoPage.c" } @@ -8230,7 +8212,7 @@ gboolean editing_host_page_confirm_replace_photo (EditingHostPage* self, Photo* g_return_val_if_fail (IS_EDITING_HOST_PAGE (self), FALSE); #line 1151 "/home/jens/Source/shotwell/src/PhotoPage.vala" return EDITING_HOST_PAGE_GET_CLASS (self)->confirm_replace_photo (self, old_photo, new_photo); -#line 8229 "PhotoPage.c" +#line 8211 "PhotoPage.c" } @@ -8259,7 +8241,7 @@ static GdkPixbuf* editing_host_page_get_zoom_pixbuf (EditingHostPage* self, Phot _tmp3_ = pixbuf; #line 1157 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp3_ == NULL) { -#line 8258 "PhotoPage.c" +#line 8240 "PhotoPage.c" { GdkPixbuf* _tmp4_ = NULL; Photo* _tmp5_ = NULL; @@ -8276,7 +8258,7 @@ static GdkPixbuf* editing_host_page_get_zoom_pixbuf (EditingHostPage* self, Phot _tmp4_ = _tmp7_; #line 1159 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 8275 "PhotoPage.c" +#line 8257 "PhotoPage.c" goto __catch243_g_error; } #line 1159 "/home/jens/Source/shotwell/src/PhotoPage.vala" @@ -8289,7 +8271,7 @@ static GdkPixbuf* editing_host_page_get_zoom_pixbuf (EditingHostPage* self, Phot pixbuf = _tmp8_; #line 1158 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (_tmp4_); -#line 8288 "PhotoPage.c" +#line 8270 "PhotoPage.c" } goto __finally243; __catch243_g_error: @@ -8309,7 +8291,7 @@ static GdkPixbuf* editing_host_page_get_zoom_pixbuf (EditingHostPage* self, Phot g_warning ("PhotoPage.vala:1161: %s", _tmp10_); #line 1158 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_error_free0 (err); -#line 8308 "PhotoPage.c" +#line 8290 "PhotoPage.c" } __finally243: #line 1158 "/home/jens/Source/shotwell/src/PhotoPage.vala" @@ -8322,14 +8304,14 @@ static GdkPixbuf* editing_host_page_get_zoom_pixbuf (EditingHostPage* self, Phot g_clear_error (&_inner_error_); #line 1158 "/home/jens/Source/shotwell/src/PhotoPage.vala" return NULL; -#line 8321 "PhotoPage.c" +#line 8303 "PhotoPage.c" } } #line 1164 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp11_ = pixbuf; #line 1164 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp11_ == NULL) { -#line 8328 "PhotoPage.c" +#line 8310 "PhotoPage.c" GdkPixbuf* _tmp12_ = NULL; Scaling _tmp13_ = {0}; GdkPixbuf* _tmp14_ = NULL; @@ -8351,13 +8333,13 @@ static GdkPixbuf* editing_host_page_get_zoom_pixbuf (EditingHostPage* self, Phot _tmp16_ = _tmp15_; #line 1166 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (_tmp16_); -#line 8350 "PhotoPage.c" +#line 8332 "PhotoPage.c" } #line 1168 "/home/jens/Source/shotwell/src/PhotoPage.vala" result = pixbuf; #line 1168 "/home/jens/Source/shotwell/src/PhotoPage.vala" return result; -#line 8356 "PhotoPage.c" +#line 8338 "PhotoPage.c" } @@ -8407,35 +8389,35 @@ static void editing_host_page_replace_photo (EditingHostPage* self, Photo* new_p _g_object_unref0 (_tmp4_); #line 1176 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp6_) { -#line 8406 "PhotoPage.c" +#line 8388 "PhotoPage.c" gboolean _tmp7_ = FALSE; #line 1176 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp7_ = self->priv->pixbuf_dirty; #line 1176 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp1_ = !_tmp7_; -#line 8412 "PhotoPage.c" +#line 8394 "PhotoPage.c" } else { #line 1176 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp1_ = FALSE; -#line 8416 "PhotoPage.c" +#line 8398 "PhotoPage.c" } #line 1176 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp1_) { -#line 8420 "PhotoPage.c" +#line 8402 "PhotoPage.c" gboolean _tmp8_ = FALSE; #line 1176 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp8_ = self->priv->photo_missing; #line 1176 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp0_ = !_tmp8_; -#line 8426 "PhotoPage.c" +#line 8408 "PhotoPage.c" } else { #line 1176 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp0_ = FALSE; -#line 8430 "PhotoPage.c" +#line 8412 "PhotoPage.c" } #line 1176 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp0_) { -#line 8434 "PhotoPage.c" +#line 8416 "PhotoPage.c" Photo* _tmp9_ = NULL; Photo* _tmp10_ = NULL; GdkPixbuf* _tmp11_ = NULL; @@ -8459,13 +8441,13 @@ static void editing_host_page_replace_photo (EditingHostPage* self, Photo* new_p _g_object_unref0 (_tmp12_); #line 1178 "/home/jens/Source/shotwell/src/PhotoPage.vala" return; -#line 8458 "PhotoPage.c" +#line 8440 "PhotoPage.c" } #line 1182 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp16_ = editing_host_page_has_photo (self); #line 1182 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp16_) { -#line 8464 "PhotoPage.c" +#line 8446 "PhotoPage.c" Photo* _tmp17_ = NULL; Photo* _tmp18_ = NULL; Photo* _tmp19_ = NULL; @@ -8482,25 +8464,25 @@ static void editing_host_page_replace_photo (EditingHostPage* self, Photo* new_p _tmp15_ = !_tmp20_; #line 1182 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (_tmp19_); -#line 8481 "PhotoPage.c" +#line 8463 "PhotoPage.c" } else { #line 1182 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp15_ = FALSE; -#line 8485 "PhotoPage.c" +#line 8467 "PhotoPage.c" } #line 1182 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp15_) { #line 1182 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp14_ = editing_host_page_confirm_replace_photo != NULL; -#line 8491 "PhotoPage.c" +#line 8473 "PhotoPage.c" } else { #line 1182 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp14_ = FALSE; -#line 8495 "PhotoPage.c" +#line 8477 "PhotoPage.c" } #line 1182 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp14_) { -#line 8499 "PhotoPage.c" +#line 8481 "PhotoPage.c" Photo* _tmp21_ = NULL; Photo* _tmp22_ = NULL; Photo* _tmp23_ = NULL; @@ -8522,7 +8504,7 @@ static void editing_host_page_replace_photo (EditingHostPage* self, Photo* new_p if (_tmp25_) { #line 1184 "/home/jens/Source/shotwell/src/PhotoPage.vala" return; -#line 8521 "PhotoPage.c" +#line 8503 "PhotoPage.c" } } #line 1187 "/home/jens/Source/shotwell/src/PhotoPage.vala" @@ -8571,7 +8553,7 @@ static void editing_host_page_replace_photo (EditingHostPage* self, Photo* new_p _tmp36_ = old_photo; #line 1205 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp36_ != NULL) { -#line 8570 "PhotoPage.c" +#line 8552 "PhotoPage.c" ViewCollection* _tmp37_ = NULL; ViewCollection* _tmp38_ = NULL; Photo* _tmp39_ = NULL; @@ -8596,7 +8578,7 @@ static void editing_host_page_replace_photo (EditingHostPage* self, Photo* new_p _data_collection_unref0 (_tmp41_); #line 1206 "/home/jens/Source/shotwell/src/PhotoPage.vala" _data_collection_unref0 (_tmp38_); -#line 8595 "PhotoPage.c" +#line 8577 "PhotoPage.c" } #line 1208 "/home/jens/Source/shotwell/src/PhotoPage.vala" single_photo_page_cancel_zoom (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage)); @@ -8622,7 +8604,7 @@ static void editing_host_page_replace_photo (EditingHostPage* self, Photo* new_p editing_host_page_refresh_caches (self, "replace_photo"); #line 1171 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (old_photo); -#line 8621 "PhotoPage.c" +#line 8603 "PhotoPage.c" } @@ -8665,7 +8647,7 @@ static void editing_host_page_real_cancel_zoom (SinglePhotoPage* base) { _g_object_unref0 (_tmp5_); #line 1225 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp6_) { -#line 8664 "PhotoPage.c" +#line 8646 "PhotoPage.c" Photo* _tmp7_ = NULL; Photo* _tmp8_ = NULL; Dimensions _tmp9_ = {0}; @@ -8685,13 +8667,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 1226 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (_tmp8_); -#line 8684 "PhotoPage.c" +#line 8666 "PhotoPage.c" } #line 1232 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp13_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage)->canvas; #line 1232 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp13_ != NULL) { -#line 8690 "PhotoPage.c" +#line 8672 "PhotoPage.c" GtkDrawingArea* _tmp14_ = NULL; GdkWindow* _tmp15_ = NULL; #line 1232 "/home/jens/Source/shotwell/src/PhotoPage.vala" @@ -8700,21 +8682,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 1232 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp12_ = _tmp15_ != NULL; -#line 8699 "PhotoPage.c" +#line 8681 "PhotoPage.c" } else { #line 1232 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp12_ = FALSE; -#line 8703 "PhotoPage.c" +#line 8685 "PhotoPage.c" } #line 1232 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp12_) { #line 1233 "/home/jens/Source/shotwell/src/PhotoPage.vala" page_set_page_cursor (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), GDK_LEFT_PTR); -#line 8709 "PhotoPage.c" +#line 8691 "PhotoPage.c" } #line 1235 "/home/jens/Source/shotwell/src/PhotoPage.vala" single_photo_page_repaint (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), NULL); -#line 8713 "PhotoPage.c" +#line 8695 "PhotoPage.c" } @@ -8758,7 +8740,7 @@ static void editing_host_page_quick_update_pixbuf (EditingHostPage* self) { _tmp5_ = pixbuf; #line 1240 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp5_ != NULL) { -#line 8757 "PhotoPage.c" +#line 8739 "PhotoPage.c" GdkPixbuf* _tmp6_ = NULL; Photo* _tmp7_ = NULL; Photo* _tmp8_ = NULL; @@ -8781,7 +8763,7 @@ static void editing_host_page_quick_update_pixbuf (EditingHostPage* self) { _g_object_unref0 (pixbuf); #line 1244 "/home/jens/Source/shotwell/src/PhotoPage.vala" return; -#line 8780 "PhotoPage.c" +#line 8762 "PhotoPage.c" } #line 1247 "/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_); @@ -8807,7 +8789,7 @@ static void editing_host_page_quick_update_pixbuf (EditingHostPage* self) { _g_free0 (_tmp14_); #line 1249 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (_tmp12_); -#line 8806 "PhotoPage.c" +#line 8788 "PhotoPage.c" { GdkPixbuf* _tmp17_ = NULL; Photo* _tmp18_ = NULL; @@ -8834,7 +8816,7 @@ static void editing_host_page_quick_update_pixbuf (EditingHostPage* self) { _tmp17_ = _tmp22_; #line 1254 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 8833 "PhotoPage.c" +#line 8815 "PhotoPage.c" goto __catch244_g_error; } #line 1254 "/home/jens/Source/shotwell/src/PhotoPage.vala" @@ -8849,7 +8831,7 @@ static void editing_host_page_quick_update_pixbuf (EditingHostPage* self) { _g_object_unref0 (_tmp24_); #line 1253 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (_tmp17_); -#line 8848 "PhotoPage.c" +#line 8830 "PhotoPage.c" } goto __finally244; __catch244_g_error: @@ -8869,7 +8851,7 @@ static void editing_host_page_quick_update_pixbuf (EditingHostPage* self) { g_warning ("PhotoPage.vala:1256: %s", _tmp27_); #line 1253 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_error_free0 (err); -#line 8868 "PhotoPage.c" +#line 8850 "PhotoPage.c" } __finally244: #line 1253 "/home/jens/Source/shotwell/src/PhotoPage.vala" @@ -8882,7 +8864,7 @@ static void editing_host_page_quick_update_pixbuf (EditingHostPage* self) { g_clear_error (&_inner_error_); #line 1253 "/home/jens/Source/shotwell/src/PhotoPage.vala" return; -#line 8881 "PhotoPage.c" +#line 8863 "PhotoPage.c" } #line 1259 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp28_ = self->priv->cache; @@ -8898,7 +8880,7 @@ static void editing_host_page_quick_update_pixbuf (EditingHostPage* self) { self->priv->pixbuf_dirty = FALSE; #line 1238 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (pixbuf); -#line 8897 "PhotoPage.c" +#line 8879 "PhotoPage.c" } @@ -8931,7 +8913,7 @@ static gboolean editing_host_page_update_pixbuf (EditingHostPage* self) { _g_object_unref0 (photo); #line 1273 "/home/jens/Source/shotwell/src/PhotoPage.vala" return result; -#line 8930 "PhotoPage.c" +#line 8912 "PhotoPage.c" } #line 1275 "/home/jens/Source/shotwell/src/PhotoPage.vala" pixbuf = NULL; @@ -8941,7 +8923,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 1276 "/home/jens/Source/shotwell/src/PhotoPage.vala" max_dim = _tmp3_; -#line 8940 "PhotoPage.c" +#line 8922 "PhotoPage.c" { Dimensions tool_pixbuf_dim = {0}; Dimensions _tmp4_ = {0}; @@ -8955,7 +8937,7 @@ static gboolean editing_host_page_update_pixbuf (EditingHostPage* self) { _tmp5_ = self->priv->current_tool; #line 1280 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp5_ != NULL) { -#line 8954 "PhotoPage.c" +#line 8936 "PhotoPage.c" GdkPixbuf* _tmp6_ = NULL; EditingToolsEditingTool* _tmp7_ = NULL; Scaling _tmp8_ = {0}; @@ -8977,7 +8959,7 @@ static gboolean editing_host_page_update_pixbuf (EditingHostPage* self) { _tmp6_ = _tmp11_; #line 1281 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 8976 "PhotoPage.c" +#line 8958 "PhotoPage.c" goto __catch245_g_error; } #line 1281 "/home/jens/Source/shotwell/src/PhotoPage.vala" @@ -8990,19 +8972,19 @@ static gboolean editing_host_page_update_pixbuf (EditingHostPage* self) { pixbuf = _tmp12_; #line 1280 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (_tmp6_); -#line 8989 "PhotoPage.c" +#line 8971 "PhotoPage.c" } #line 1283 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp13_ = pixbuf; #line 1283 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp13_ != NULL) { -#line 8995 "PhotoPage.c" +#line 8977 "PhotoPage.c" Dimensions _tmp14_ = {0}; #line 1284 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp14_ = tool_pixbuf_dim; #line 1284 "/home/jens/Source/shotwell/src/PhotoPage.vala" max_dim = _tmp14_; -#line 9001 "PhotoPage.c" +#line 8983 "PhotoPage.c" } } goto __finally245; @@ -9025,7 +9007,7 @@ static gboolean editing_host_page_update_pixbuf (EditingHostPage* self) { editing_host_page_set_photo_missing (self, TRUE); #line 1278 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_error_free0 (err); -#line 9024 "PhotoPage.c" +#line 9006 "PhotoPage.c" } __finally245: #line 1278 "/home/jens/Source/shotwell/src/PhotoPage.vala" @@ -9040,20 +9022,20 @@ static gboolean editing_host_page_update_pixbuf (EditingHostPage* self) { g_clear_error (&_inner_error_); #line 1278 "/home/jens/Source/shotwell/src/PhotoPage.vala" return FALSE; -#line 9039 "PhotoPage.c" +#line 9021 "PhotoPage.c" } #line 1290 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp17_ = self->priv->photo_missing; #line 1290 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (!_tmp17_) { -#line 9045 "PhotoPage.c" +#line 9027 "PhotoPage.c" GdkPixbuf* _tmp18_ = NULL; GdkPixbuf* _tmp22_ = NULL; #line 1292 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp18_ = pixbuf; #line 1292 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp18_ == NULL) { -#line 9052 "PhotoPage.c" +#line 9034 "PhotoPage.c" PixbufCache* _tmp19_ = NULL; Photo* _tmp20_ = NULL; GdkPixbuf* _tmp21_ = NULL; @@ -9067,13 +9049,13 @@ static gboolean editing_host_page_update_pixbuf (EditingHostPage* self) { _g_object_unref0 (pixbuf); #line 1293 "/home/jens/Source/shotwell/src/PhotoPage.vala" pixbuf = _tmp21_; -#line 9066 "PhotoPage.c" +#line 9048 "PhotoPage.c" } #line 1296 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp22_ = pixbuf; #line 1296 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp22_ == NULL) { -#line 9072 "PhotoPage.c" +#line 9054 "PhotoPage.c" PixbufCache* _tmp23_ = NULL; Photo* _tmp24_ = NULL; #line 1297 "/home/jens/Source/shotwell/src/PhotoPage.vala" @@ -9082,28 +9064,28 @@ static gboolean editing_host_page_update_pixbuf (EditingHostPage* self) { _tmp24_ = photo; #line 1297 "/home/jens/Source/shotwell/src/PhotoPage.vala" pixbuf_cache_prefetch (_tmp23_, _tmp24_, BACKGROUND_JOB_JOB_PRIORITY_NORMAL, FALSE); -#line 9081 "PhotoPage.c" +#line 9063 "PhotoPage.c" } } #line 1300 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp26_ = self->priv->photo_missing; #line 1300 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (!_tmp26_) { -#line 9088 "PhotoPage.c" +#line 9070 "PhotoPage.c" GdkPixbuf* _tmp27_ = NULL; #line 1300 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp27_ = pixbuf; #line 1300 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp25_ = _tmp27_ != NULL; -#line 9094 "PhotoPage.c" +#line 9076 "PhotoPage.c" } else { #line 1300 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp25_ = FALSE; -#line 9098 "PhotoPage.c" +#line 9080 "PhotoPage.c" } #line 1300 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp25_) { -#line 9102 "PhotoPage.c" +#line 9084 "PhotoPage.c" GdkPixbuf* _tmp28_ = NULL; Dimensions _tmp29_ = {0}; #line 1301 "/home/jens/Source/shotwell/src/PhotoPage.vala" @@ -9114,7 +9096,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), _tmp28_, &_tmp29_, NULL); #line 1302 "/home/jens/Source/shotwell/src/PhotoPage.vala" self->priv->pixbuf_dirty = FALSE; -#line 9113 "PhotoPage.c" +#line 9095 "PhotoPage.c" } #line 1309 "/home/jens/Source/shotwell/src/PhotoPage.vala" result = FALSE; @@ -9124,7 +9106,7 @@ static gboolean editing_host_page_update_pixbuf (EditingHostPage* self) { _g_object_unref0 (photo); #line 1309 "/home/jens/Source/shotwell/src/PhotoPage.vala" return result; -#line 9123 "PhotoPage.c" +#line 9105 "PhotoPage.c" } @@ -9141,7 +9123,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 1315 "/home/jens/Source/shotwell/src/PhotoPage.vala" editing_host_page_track_tool_window (self); -#line 9140 "PhotoPage.c" +#line 9122 "PhotoPage.c" } @@ -9157,7 +9139,7 @@ static void editing_host_page_real_on_resize_finished (Page* base, GdkRectangle* self->priv->pixbuf_dirty = TRUE; #line 1325 "/home/jens/Source/shotwell/src/PhotoPage.vala" editing_host_page_update_pixbuf (self); -#line 9156 "PhotoPage.c" +#line 9138 "PhotoPage.c" } @@ -9170,7 +9152,7 @@ static void editing_host_page_on_viewport_resized (EditingHostPage* self) { self->priv->pixbuf_dirty = TRUE; #line 1334 "/home/jens/Source/shotwell/src/PhotoPage.vala" editing_host_page_update_pixbuf (self); -#line 9169 "PhotoPage.c" +#line 9151 "PhotoPage.c" } @@ -9254,21 +9236,21 @@ static void editing_host_page_real_update_actions (Page* base, gint selected_cou _tmp13_ = photo; #line 1346 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp13_ != NULL) { -#line 9253 "PhotoPage.c" +#line 9235 "PhotoPage.c" gboolean _tmp14_ = FALSE; #line 1346 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp14_ = self->priv->photo_missing; #line 1346 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp12_ = !_tmp14_; -#line 9259 "PhotoPage.c" +#line 9241 "PhotoPage.c" } else { #line 1346 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp12_ = FALSE; -#line 9263 "PhotoPage.c" +#line 9245 "PhotoPage.c" } #line 1346 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp12_) { -#line 9267 "PhotoPage.c" +#line 9249 "PhotoPage.c" Photo* _tmp15_ = NULL; gboolean _tmp16_ = FALSE; #line 1346 "/home/jens/Source/shotwell/src/PhotoPage.vala" @@ -9277,15 +9259,15 @@ static void editing_host_page_real_update_actions (Page* base, gint selected_cou _tmp16_ = photo_check_can_rotate (_tmp15_); #line 1346 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp11_ = _tmp16_; -#line 9276 "PhotoPage.c" +#line 9258 "PhotoPage.c" } else { #line 1346 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp11_ = FALSE; -#line 9280 "PhotoPage.c" +#line 9262 "PhotoPage.c" } #line 1346 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp11_) { -#line 9284 "PhotoPage.c" +#line 9266 "PhotoPage.c" Photo* _tmp17_ = NULL; gboolean _tmp18_ = FALSE; #line 1347 "/home/jens/Source/shotwell/src/PhotoPage.vala" @@ -9294,11 +9276,11 @@ static void editing_host_page_real_update_actions (Page* base, gint selected_cou _tmp18_ = editing_host_page_is_rotate_available (self, _tmp17_); #line 1347 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp10_ = _tmp18_; -#line 9293 "PhotoPage.c" +#line 9275 "PhotoPage.c" } else { #line 1347 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp10_ = FALSE; -#line 9297 "PhotoPage.c" +#line 9279 "PhotoPage.c" } #line 1346 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp19_ = self->priv->rotate_button; @@ -9308,21 +9290,21 @@ static void editing_host_page_real_update_actions (Page* base, gint selected_cou _tmp22_ = photo; #line 1348 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp22_ != NULL) { -#line 9307 "PhotoPage.c" +#line 9289 "PhotoPage.c" gboolean _tmp23_ = FALSE; #line 1348 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp23_ = self->priv->photo_missing; #line 1348 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp21_ = !_tmp23_; -#line 9313 "PhotoPage.c" +#line 9295 "PhotoPage.c" } else { #line 1348 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp21_ = FALSE; -#line 9317 "PhotoPage.c" +#line 9299 "PhotoPage.c" } #line 1348 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp21_) { -#line 9321 "PhotoPage.c" +#line 9303 "PhotoPage.c" Photo* _tmp24_ = NULL; Scaling _tmp25_ = {0}; gboolean _tmp26_ = FALSE; @@ -9334,11 +9316,11 @@ static void editing_host_page_real_update_actions (Page* base, gint selected_cou _tmp26_ = editing_tools_crop_tool_is_available (_tmp24_, &_tmp25_); #line 1349 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp20_ = _tmp26_; -#line 9333 "PhotoPage.c" +#line 9315 "PhotoPage.c" } else { #line 1349 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp20_ = FALSE; -#line 9337 "PhotoPage.c" +#line 9319 "PhotoPage.c" } #line 1348 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp27_ = self->priv->crop_button; @@ -9348,21 +9330,21 @@ static void editing_host_page_real_update_actions (Page* base, gint selected_cou _tmp30_ = photo; #line 1350 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp30_ != NULL) { -#line 9347 "PhotoPage.c" +#line 9329 "PhotoPage.c" gboolean _tmp31_ = FALSE; #line 1350 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp31_ = self->priv->photo_missing; #line 1350 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp29_ = !_tmp31_; -#line 9353 "PhotoPage.c" +#line 9335 "PhotoPage.c" } else { #line 1350 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp29_ = FALSE; -#line 9357 "PhotoPage.c" +#line 9339 "PhotoPage.c" } #line 1350 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp29_) { -#line 9361 "PhotoPage.c" +#line 9343 "PhotoPage.c" Photo* _tmp32_ = NULL; Scaling _tmp33_ = {0}; gboolean _tmp34_ = FALSE; @@ -9374,11 +9356,11 @@ static void editing_host_page_real_update_actions (Page* base, gint selected_cou _tmp34_ = editing_tools_redeye_tool_is_available (_tmp32_, &_tmp33_); #line 1351 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp28_ = _tmp34_; -#line 9373 "PhotoPage.c" +#line 9355 "PhotoPage.c" } else { #line 1351 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp28_ = FALSE; -#line 9377 "PhotoPage.c" +#line 9359 "PhotoPage.c" } #line 1350 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp35_ = self->priv->redeye_button; @@ -9388,21 +9370,21 @@ static void editing_host_page_real_update_actions (Page* base, gint selected_cou _tmp38_ = photo; #line 1352 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp38_ != NULL) { -#line 9387 "PhotoPage.c" +#line 9369 "PhotoPage.c" gboolean _tmp39_ = FALSE; #line 1352 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp39_ = self->priv->photo_missing; #line 1352 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp37_ = !_tmp39_; -#line 9393 "PhotoPage.c" +#line 9375 "PhotoPage.c" } else { #line 1352 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp37_ = FALSE; -#line 9397 "PhotoPage.c" +#line 9379 "PhotoPage.c" } #line 1352 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp37_) { -#line 9401 "PhotoPage.c" +#line 9383 "PhotoPage.c" Photo* _tmp40_ = NULL; Scaling _tmp41_ = {0}; gboolean _tmp42_ = FALSE; @@ -9414,11 +9396,11 @@ static void editing_host_page_real_update_actions (Page* base, gint selected_cou _tmp42_ = editing_tools_adjust_tool_is_available (_tmp40_, &_tmp41_); #line 1353 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp36_ = _tmp42_; -#line 9413 "PhotoPage.c" +#line 9395 "PhotoPage.c" } else { #line 1353 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp36_ = FALSE; -#line 9417 "PhotoPage.c" +#line 9399 "PhotoPage.c" } #line 1352 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp43_ = self->priv->adjust_button; @@ -9428,21 +9410,21 @@ static void editing_host_page_real_update_actions (Page* base, gint selected_cou _tmp46_ = photo; #line 1354 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp46_ != NULL) { -#line 9427 "PhotoPage.c" +#line 9409 "PhotoPage.c" gboolean _tmp47_ = FALSE; #line 1354 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp47_ = self->priv->photo_missing; #line 1354 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp45_ = !_tmp47_; -#line 9433 "PhotoPage.c" +#line 9415 "PhotoPage.c" } else { #line 1354 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp45_ = FALSE; -#line 9437 "PhotoPage.c" +#line 9419 "PhotoPage.c" } #line 1354 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp45_) { -#line 9441 "PhotoPage.c" +#line 9423 "PhotoPage.c" Photo* _tmp48_ = NULL; gboolean _tmp49_ = FALSE; #line 1355 "/home/jens/Source/shotwell/src/PhotoPage.vala" @@ -9451,11 +9433,11 @@ static void editing_host_page_real_update_actions (Page* base, gint selected_cou _tmp49_ = editing_host_page_is_enhance_available (self, _tmp48_); #line 1355 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp44_ = _tmp49_; -#line 9450 "PhotoPage.c" +#line 9432 "PhotoPage.c" } else { #line 1355 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp44_ = FALSE; -#line 9454 "PhotoPage.c" +#line 9436 "PhotoPage.c" } #line 1354 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp50_ = self->priv->enhance_button; @@ -9465,21 +9447,21 @@ static void editing_host_page_real_update_actions (Page* base, gint selected_cou _tmp53_ = photo; #line 1356 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp53_ != NULL) { -#line 9464 "PhotoPage.c" +#line 9446 "PhotoPage.c" gboolean _tmp54_ = FALSE; #line 1356 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp54_ = self->priv->photo_missing; #line 1356 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp52_ = !_tmp54_; -#line 9470 "PhotoPage.c" +#line 9452 "PhotoPage.c" } else { #line 1356 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp52_ = FALSE; -#line 9474 "PhotoPage.c" +#line 9456 "PhotoPage.c" } #line 1356 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp52_) { -#line 9478 "PhotoPage.c" +#line 9460 "PhotoPage.c" Photo* _tmp55_ = NULL; Scaling _tmp56_ = {0}; gboolean _tmp57_ = FALSE; @@ -9491,11 +9473,11 @@ static void editing_host_page_real_update_actions (Page* base, gint selected_cou _tmp57_ = editing_tools_straighten_tool_is_available (_tmp55_, &_tmp56_); #line 1357 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp51_ = _tmp57_; -#line 9490 "PhotoPage.c" +#line 9472 "PhotoPage.c" } else { #line 1357 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp51_ = FALSE; -#line 9494 "PhotoPage.c" +#line 9476 "PhotoPage.c" } #line 1356 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp58_ = self->priv->straighten_button; @@ -9509,7 +9491,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 1337 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (photo); -#line 9508 "PhotoPage.c" +#line 9490 "PhotoPage.c" } @@ -9528,51 +9510,51 @@ static gboolean editing_host_page_real_on_shift_pressed (Page* base, GdkEventKey _tmp3_ = self->priv->current_tool; #line 1364 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp3_ == NULL) { -#line 9527 "PhotoPage.c" +#line 9509 "PhotoPage.c" gboolean _tmp4_ = FALSE; #line 1364 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp4_ = page_get_ctrl_pressed (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); #line 1364 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp2_ = !_tmp4_; -#line 9533 "PhotoPage.c" +#line 9515 "PhotoPage.c" } else { #line 1364 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp2_ = FALSE; -#line 9537 "PhotoPage.c" +#line 9519 "PhotoPage.c" } #line 1364 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp2_) { -#line 9541 "PhotoPage.c" +#line 9523 "PhotoPage.c" gboolean _tmp5_ = FALSE; #line 1364 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp5_ = page_get_alt_pressed (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); #line 1364 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp1_ = !_tmp5_; -#line 9547 "PhotoPage.c" +#line 9529 "PhotoPage.c" } else { #line 1364 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp1_ = FALSE; -#line 9551 "PhotoPage.c" +#line 9533 "PhotoPage.c" } #line 1364 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp1_) { -#line 9555 "PhotoPage.c" +#line 9537 "PhotoPage.c" gboolean _tmp6_ = FALSE; #line 1364 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp6_ = editing_host_page_has_photo (self); #line 1364 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp0_ = _tmp6_; -#line 9561 "PhotoPage.c" +#line 9543 "PhotoPage.c" } else { #line 1364 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp0_ = FALSE; -#line 9565 "PhotoPage.c" +#line 9547 "PhotoPage.c" } #line 1364 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp0_) { #line 1365 "/home/jens/Source/shotwell/src/PhotoPage.vala" editing_host_page_swap_in_original (self); -#line 9571 "PhotoPage.c" +#line 9553 "PhotoPage.c" } #line 1367 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp7_ = event; @@ -9582,7 +9564,7 @@ static gboolean editing_host_page_real_on_shift_pressed (Page* base, GdkEventKey result = _tmp8_; #line 1367 "/home/jens/Source/shotwell/src/PhotoPage.vala" return result; -#line 9581 "PhotoPage.c" +#line 9563 "PhotoPage.c" } @@ -9600,7 +9582,7 @@ static gboolean editing_host_page_real_on_shift_released (Page* base, GdkEventKe if (_tmp0_ == NULL) { #line 1372 "/home/jens/Source/shotwell/src/PhotoPage.vala" editing_host_page_swap_out_original (self); -#line 9599 "PhotoPage.c" +#line 9581 "PhotoPage.c" } #line 1374 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp1_ = event; @@ -9610,7 +9592,7 @@ static gboolean editing_host_page_real_on_shift_released (Page* base, GdkEventKe result = _tmp2_; #line 1374 "/home/jens/Source/shotwell/src/PhotoPage.vala" return result; -#line 9609 "PhotoPage.c" +#line 9591 "PhotoPage.c" } @@ -9628,7 +9610,7 @@ static gboolean editing_host_page_real_on_alt_pressed (Page* base, GdkEventKey* if (_tmp0_ == NULL) { #line 1379 "/home/jens/Source/shotwell/src/PhotoPage.vala" editing_host_page_swap_out_original (self); -#line 9627 "PhotoPage.c" +#line 9609 "PhotoPage.c" } #line 1381 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp1_ = event; @@ -9638,7 +9620,7 @@ static gboolean editing_host_page_real_on_alt_pressed (Page* base, GdkEventKey* result = _tmp2_; #line 1381 "/home/jens/Source/shotwell/src/PhotoPage.vala" return result; -#line 9637 "PhotoPage.c" +#line 9619 "PhotoPage.c" } @@ -9656,37 +9638,37 @@ static gboolean editing_host_page_real_on_alt_released (Page* base, GdkEventKey* _tmp2_ = self->priv->current_tool; #line 1385 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp2_ == NULL) { -#line 9655 "PhotoPage.c" +#line 9637 "PhotoPage.c" gboolean _tmp3_ = FALSE; #line 1385 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp3_ = page_get_shift_pressed (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); #line 1385 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp1_ = _tmp3_; -#line 9661 "PhotoPage.c" +#line 9643 "PhotoPage.c" } else { #line 1385 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp1_ = FALSE; -#line 9665 "PhotoPage.c" +#line 9647 "PhotoPage.c" } #line 1385 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp1_) { -#line 9669 "PhotoPage.c" +#line 9651 "PhotoPage.c" gboolean _tmp4_ = FALSE; #line 1385 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp4_ = page_get_ctrl_pressed (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); #line 1385 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp0_ = !_tmp4_; -#line 9675 "PhotoPage.c" +#line 9657 "PhotoPage.c" } else { #line 1385 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp0_ = FALSE; -#line 9679 "PhotoPage.c" +#line 9661 "PhotoPage.c" } #line 1385 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp0_) { #line 1386 "/home/jens/Source/shotwell/src/PhotoPage.vala" editing_host_page_swap_in_original (self); -#line 9685 "PhotoPage.c" +#line 9667 "PhotoPage.c" } #line 1388 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp5_ = event; @@ -9696,7 +9678,7 @@ static gboolean editing_host_page_real_on_alt_released (Page* base, GdkEventKey* result = _tmp6_; #line 1388 "/home/jens/Source/shotwell/src/PhotoPage.vala" return result; -#line 9695 "PhotoPage.c" +#line 9677 "PhotoPage.c" } @@ -9712,7 +9694,7 @@ static void editing_host_page_swap_in_original (EditingHostPage* self) { GError * _inner_error_ = NULL; #line 1391 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_if_fail (IS_EDITING_HOST_PAGE (self)); -#line 9711 "PhotoPage.c" +#line 9693 "PhotoPage.c" { GdkPixbuf* _tmp0_ = NULL; Photo* _tmp1_ = NULL; @@ -9737,7 +9719,7 @@ static void editing_host_page_swap_in_original (EditingHostPage* self) { _tmp0_ = _tmp4_; #line 1395 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 9736 "PhotoPage.c" +#line 9718 "PhotoPage.c" goto __catch246_g_error; } #line 1394 "/home/jens/Source/shotwell/src/PhotoPage.vala" @@ -9756,7 +9738,7 @@ static void editing_host_page_swap_in_original (EditingHostPage* self) { _g_object_unref0 (_tmp6_); #line 1393 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (_tmp0_); -#line 9755 "PhotoPage.c" +#line 9737 "PhotoPage.c" } goto __finally246; __catch246_g_error: @@ -9772,7 +9754,7 @@ static void editing_host_page_swap_in_original (EditingHostPage* self) { _g_object_unref0 (original); #line 1397 "/home/jens/Source/shotwell/src/PhotoPage.vala" return; -#line 9771 "PhotoPage.c" +#line 9753 "PhotoPage.c" } __finally246: #line 1393 "/home/jens/Source/shotwell/src/PhotoPage.vala" @@ -9785,7 +9767,7 @@ static void editing_host_page_swap_in_original (EditingHostPage* self) { g_clear_error (&_inner_error_); #line 1393 "/home/jens/Source/shotwell/src/PhotoPage.vala" return; -#line 9784 "PhotoPage.c" +#line 9766 "PhotoPage.c" } #line 1401 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp9_ = single_photo_page_get_unscaled_pixbuf (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage)); @@ -9803,7 +9785,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 1407 "/home/jens/Source/shotwell/src/PhotoPage.vala" single_photo_page_cancel_zoom (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage)); -#line 9802 "PhotoPage.c" +#line 9784 "PhotoPage.c" } #line 1410 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp12_ = original; @@ -9819,7 +9801,7 @@ static void editing_host_page_swap_in_original (EditingHostPage* self) { _g_object_unref0 (_tmp14_); #line 1391 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (original); -#line 9818 "PhotoPage.c" +#line 9800 "PhotoPage.c" } @@ -9831,7 +9813,7 @@ static void editing_host_page_swap_out_original (EditingHostPage* self) { _tmp0_ = self->priv->swapped; #line 1414 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp0_ != NULL) { -#line 9830 "PhotoPage.c" +#line 9812 "PhotoPage.c" GdkPixbuf* _tmp1_ = NULL; Photo* _tmp2_ = NULL; Photo* _tmp3_ = NULL; @@ -9856,7 +9838,7 @@ static void editing_host_page_swap_out_original (EditingHostPage* self) { _g_object_unref0 (self->priv->swapped); #line 1421 "/home/jens/Source/shotwell/src/PhotoPage.vala" self->priv->swapped = NULL; -#line 9855 "PhotoPage.c" +#line 9837 "PhotoPage.c" } } @@ -9864,7 +9846,7 @@ static void editing_host_page_swap_out_original (EditingHostPage* self) { static gpointer _editing_tools_editing_tool_ref0 (gpointer self) { #line 1465 "/home/jens/Source/shotwell/src/PhotoPage.vala" return self ? editing_tools_editing_tool_ref (self) : NULL; -#line 9863 "PhotoPage.c" +#line 9845 "PhotoPage.c" } @@ -9915,7 +9897,7 @@ static void editing_host_page_activate_tool (EditingHostPage* self, EditingTools _g_object_unref0 (_tmp3_); #line 1440 "/home/jens/Source/shotwell/src/PhotoPage.vala" max_dim = _tmp5_; -#line 9914 "PhotoPage.c" +#line 9896 "PhotoPage.c" { Dimensions tool_pixbuf_dim = {0}; Dimensions _tmp6_ = {0}; @@ -9953,7 +9935,7 @@ static void editing_host_page_activate_tool (EditingHostPage* self, EditingTools _tmp7_ = _tmp14_; #line 1443 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 9952 "PhotoPage.c" +#line 9934 "PhotoPage.c" goto __catch247_g_error; } #line 1443 "/home/jens/Source/shotwell/src/PhotoPage.vala" @@ -9968,17 +9950,17 @@ static void editing_host_page_activate_tool (EditingHostPage* self, EditingTools _tmp16_ = unscaled; #line 1445 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp16_ != NULL) { -#line 9967 "PhotoPage.c" +#line 9949 "PhotoPage.c" Dimensions _tmp17_ = {0}; #line 1446 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp17_ = tool_pixbuf_dim; #line 1446 "/home/jens/Source/shotwell/src/PhotoPage.vala" max_dim = _tmp17_; -#line 9973 "PhotoPage.c" +#line 9955 "PhotoPage.c" } #line 1441 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (_tmp7_); -#line 9977 "PhotoPage.c" +#line 9959 "PhotoPage.c" } goto __finally247; __catch247_g_error: @@ -10014,7 +9996,7 @@ static void editing_host_page_activate_tool (EditingHostPage* self, EditingTools _g_object_unref0 (unscaled); #line 1455 "/home/jens/Source/shotwell/src/PhotoPage.vala" return; -#line 10013 "PhotoPage.c" +#line 9995 "PhotoPage.c" } __finally247: #line 1441 "/home/jens/Source/shotwell/src/PhotoPage.vala" @@ -10027,13 +10009,13 @@ static void editing_host_page_activate_tool (EditingHostPage* self, EditingTools g_clear_error (&_inner_error_); #line 1441 "/home/jens/Source/shotwell/src/PhotoPage.vala" return; -#line 10026 "PhotoPage.c" +#line 10008 "PhotoPage.c" } #line 1458 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp22_ = unscaled; #line 1458 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp22_ != NULL) { -#line 10032 "PhotoPage.c" +#line 10014 "PhotoPage.c" GdkPixbuf* _tmp23_ = NULL; Dimensions _tmp24_ = {0}; #line 1459 "/home/jens/Source/shotwell/src/PhotoPage.vala" @@ -10042,7 +10024,7 @@ static void editing_host_page_activate_tool (EditingHostPage* self, EditingTools _tmp24_ = max_dim; #line 1459 "/home/jens/Source/shotwell/src/PhotoPage.vala" single_photo_page_set_pixbuf (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), _tmp23_, &_tmp24_, NULL); -#line 10041 "PhotoPage.c" +#line 10023 "PhotoPage.c" } #line 1462 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp25_ = editing_host_page_editing_host_canvas_new (self); @@ -10070,42 +10052,42 @@ static void editing_host_page_activate_tool (EditingHostPage* self, EditingTools _editing_tools_photo_canvas_unref0 (photo_canvas); #line 1425 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (unscaled); -#line 10069 "PhotoPage.c" +#line 10051 "PhotoPage.c" } static void _editing_host_page_on_tool_activated_editing_tools_editing_tool_activated (EditingToolsEditingTool* _sender, gpointer self) { #line 1496 "/home/jens/Source/shotwell/src/PhotoPage.vala" editing_host_page_on_tool_activated ((EditingHostPage*) self); -#line 10076 "PhotoPage.c" +#line 10058 "PhotoPage.c" } static void _editing_host_page_on_tool_deactivated_editing_tools_editing_tool_deactivated (EditingToolsEditingTool* _sender, gpointer self) { #line 1497 "/home/jens/Source/shotwell/src/PhotoPage.vala" editing_host_page_on_tool_deactivated ((EditingHostPage*) self); -#line 10083 "PhotoPage.c" +#line 10065 "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 1498 "/home/jens/Source/shotwell/src/PhotoPage.vala" editing_host_page_on_tool_applied ((EditingHostPage*) self, command, new_pixbuf, new_max_dim, needs_improvement); -#line 10090 "PhotoPage.c" +#line 10072 "PhotoPage.c" } static void _editing_host_page_on_tool_cancelled_editing_tools_editing_tool_cancelled (EditingToolsEditingTool* _sender, gpointer self) { #line 1499 "/home/jens/Source/shotwell/src/PhotoPage.vala" editing_host_page_on_tool_cancelled ((EditingHostPage*) self); -#line 10097 "PhotoPage.c" +#line 10079 "PhotoPage.c" } static void _editing_host_page_on_tool_aborted_editing_tools_editing_tool_aborted (EditingToolsEditingTool* _sender, gpointer self) { #line 1500 "/home/jens/Source/shotwell/src/PhotoPage.vala" editing_host_page_on_tool_aborted ((EditingHostPage*) self); -#line 10104 "PhotoPage.c" +#line 10086 "PhotoPage.c" } @@ -10114,7 +10096,7 @@ static gboolean _editing_host_page_update_pixbuf_gsource_func (gpointer self) { result = editing_host_page_update_pixbuf ((EditingHostPage*) self); #line 1527 "/home/jens/Source/shotwell/src/PhotoPage.vala" return result; -#line 10113 "PhotoPage.c" +#line 10095 "PhotoPage.c" } @@ -10158,7 +10140,7 @@ static void editing_host_page_deactivate_tool (EditingHostPage* self, Command* c if (_tmp0_ == NULL) { #line 1478 "/home/jens/Source/shotwell/src/PhotoPage.vala" return; -#line 10157 "PhotoPage.c" +#line 10139 "PhotoPage.c" } #line 1480 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp1_ = self->priv->current_tool; @@ -10180,7 +10162,7 @@ static void editing_host_page_deactivate_tool (EditingHostPage* self, Command* c _tmp6_ = tool_window; #line 1485 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp6_ != NULL) { -#line 10179 "PhotoPage.c" +#line 10161 "PhotoPage.c" EditingToolsEditingToolWindow* _tmp7_ = NULL; gboolean _tmp8_ = FALSE; #line 1485 "/home/jens/Source/shotwell/src/PhotoPage.vala" @@ -10189,15 +10171,15 @@ static void editing_host_page_deactivate_tool (EditingHostPage* self, Command* c _tmp8_ = editing_tools_editing_tool_window_has_user_moved (_tmp7_); #line 1485 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp5_ = _tmp8_; -#line 10188 "PhotoPage.c" +#line 10170 "PhotoPage.c" } else { #line 1485 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp5_ = FALSE; -#line 10192 "PhotoPage.c" +#line 10174 "PhotoPage.c" } #line 1485 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp5_) { -#line 10196 "PhotoPage.c" +#line 10178 "PhotoPage.c" gint last_location_x = 0; gint last_location_y = 0; EditingToolsEditingToolWindow* _tmp9_ = NULL; @@ -10255,7 +10237,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 1489 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_free0 (_tmp22_); -#line 10254 "PhotoPage.c" +#line 10236 "PhotoPage.c" } #line 1494 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp24_ = tool; @@ -10305,7 +10287,7 @@ static void editing_host_page_deactivate_tool (EditingHostPage* self, Command* c _tmp35_ = new_pixbuf; #line 1510 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp35_ != NULL) { -#line 10304 "PhotoPage.c" +#line 10286 "PhotoPage.c" GdkPixbuf* _tmp36_ = NULL; GdkPixbuf* _tmp37_ = NULL; #line 1511 "/home/jens/Source/shotwell/src/PhotoPage.vala" @@ -10316,14 +10298,14 @@ static void editing_host_page_deactivate_tool (EditingHostPage* self, Command* c _g_object_unref0 (replacement); #line 1511 "/home/jens/Source/shotwell/src/PhotoPage.vala" replacement = _tmp37_; -#line 10315 "PhotoPage.c" +#line 10297 "PhotoPage.c" } else { GdkPixbuf* _tmp38_ = NULL; #line 1512 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp38_ = self->priv->cancel_editing_pixbuf; #line 1512 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp38_ != NULL) { -#line 10322 "PhotoPage.c" +#line 10304 "PhotoPage.c" GdkPixbuf* _tmp39_ = NULL; GdkPixbuf* _tmp40_ = NULL; GdkPixbuf* _tmp41_ = NULL; @@ -10344,18 +10326,18 @@ static void editing_host_page_deactivate_tool (EditingHostPage* self, Command* c *new_max_dim = _tmp42_; #line 1515 "/home/jens/Source/shotwell/src/PhotoPage.vala" needs_improvement = FALSE; -#line 10343 "PhotoPage.c" +#line 10325 "PhotoPage.c" } else { #line 1517 "/home/jens/Source/shotwell/src/PhotoPage.vala" needs_improvement = TRUE; -#line 10347 "PhotoPage.c" +#line 10329 "PhotoPage.c" } } #line 1520 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp43_ = replacement; #line 1520 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp43_ != NULL) { -#line 10354 "PhotoPage.c" +#line 10336 "PhotoPage.c" GdkPixbuf* _tmp44_ = NULL; Dimensions _tmp45_ = {0}; #line 1521 "/home/jens/Source/shotwell/src/PhotoPage.vala" @@ -10364,7 +10346,7 @@ static void editing_host_page_deactivate_tool (EditingHostPage* self, Command* c _tmp45_ = *new_max_dim; #line 1521 "/home/jens/Source/shotwell/src/PhotoPage.vala" single_photo_page_set_pixbuf (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), _tmp44_, &_tmp45_, NULL); -#line 10363 "PhotoPage.c" +#line 10345 "PhotoPage.c" } #line 1522 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (self->priv->cancel_editing_pixbuf); @@ -10378,13 +10360,13 @@ static void editing_host_page_deactivate_tool (EditingHostPage* self, Command* c self->priv->pixbuf_dirty = TRUE; #line 1527 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_idle_add_full (G_PRIORITY_DEFAULT_IDLE, _editing_host_page_update_pixbuf_gsource_func, g_object_ref (self), g_object_unref); -#line 10377 "PhotoPage.c" +#line 10359 "PhotoPage.c" } #line 1531 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp47_ = command; #line 1531 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp47_ != NULL) { -#line 10383 "PhotoPage.c" +#line 10365 "PhotoPage.c" CommandManager* _tmp48_ = NULL; CommandManager* _tmp49_ = NULL; Command* _tmp50_ = NULL; @@ -10398,7 +10380,7 @@ static void editing_host_page_deactivate_tool (EditingHostPage* self, Command* c command_manager_execute (_tmp49_, _tmp50_); #line 1532 "/home/jens/Source/shotwell/src/PhotoPage.vala" _command_manager_unref0 (_tmp49_); -#line 10397 "PhotoPage.c" +#line 10379 "PhotoPage.c" } #line 1475 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (replacement); @@ -10406,7 +10388,7 @@ static void editing_host_page_deactivate_tool (EditingHostPage* self, Command* c _g_object_unref0 (tool_window); #line 1475 "/home/jens/Source/shotwell/src/PhotoPage.vala" _editing_tools_editing_tool_unref0 (tool); -#line 10405 "PhotoPage.c" +#line 10387 "PhotoPage.c" } @@ -10418,7 +10400,7 @@ static gboolean editing_host_page_real_on_double_click (EditingHostPage* self, G result = FALSE; #line 1538 "/home/jens/Source/shotwell/src/PhotoPage.vala" return result; -#line 10417 "PhotoPage.c" +#line 10399 "PhotoPage.c" } @@ -10427,7 +10409,7 @@ gboolean editing_host_page_on_double_click (EditingHostPage* self, GdkEventButto g_return_val_if_fail (IS_EDITING_HOST_PAGE (self), FALSE); #line 1537 "/home/jens/Source/shotwell/src/PhotoPage.vala" return EDITING_HOST_PAGE_GET_CLASS (self)->on_double_click (self, event); -#line 10426 "PhotoPage.c" +#line 10408 "PhotoPage.c" } @@ -10461,14 +10443,14 @@ static gboolean editing_host_page_real_on_left_click (Page* base, GdkEventButton _tmp1_ = _tmp0_->type; #line 1544 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp1_ == GDK_2BUTTON_PRESS) { -#line 10460 "PhotoPage.c" +#line 10442 "PhotoPage.c" gboolean _tmp2_ = FALSE; EditingToolsEditingTool* _tmp3_ = NULL; #line 1545 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp3_ = self->priv->current_tool; #line 1545 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp3_ == NULL) { -#line 10467 "PhotoPage.c" +#line 10449 "PhotoPage.c" GdkEventButton* _tmp4_ = NULL; gboolean _tmp5_ = FALSE; #line 1545 "/home/jens/Source/shotwell/src/PhotoPage.vala" @@ -10477,17 +10459,17 @@ static gboolean editing_host_page_real_on_left_click (Page* base, GdkEventButton _tmp5_ = editing_host_page_on_double_click (self, _tmp4_); #line 1545 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp2_ = _tmp5_; -#line 10476 "PhotoPage.c" +#line 10458 "PhotoPage.c" } else { #line 1545 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp2_ = FALSE; -#line 10480 "PhotoPage.c" +#line 10462 "PhotoPage.c" } #line 1545 "/home/jens/Source/shotwell/src/PhotoPage.vala" result = _tmp2_; #line 1545 "/home/jens/Source/shotwell/src/PhotoPage.vala" return result; -#line 10486 "PhotoPage.c" +#line 10468 "PhotoPage.c" } #line 1547 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp6_ = event; @@ -10505,7 +10487,7 @@ static gboolean editing_host_page_real_on_left_click (Page* base, GdkEventButton _tmp11_ = self->priv->current_tool; #line 1552 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp11_ == NULL) { -#line 10504 "PhotoPage.c" +#line 10486 "PhotoPage.c" GtkScale* _tmp12_ = NULL; gdouble _tmp13_ = 0.0; #line 1552 "/home/jens/Source/shotwell/src/PhotoPage.vala" @@ -10514,15 +10496,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 1552 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp10_ = _tmp13_ != 0.0; -#line 10513 "PhotoPage.c" +#line 10495 "PhotoPage.c" } else { #line 1552 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp10_ = FALSE; -#line 10517 "PhotoPage.c" +#line 10499 "PhotoPage.c" } #line 1552 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp10_) { -#line 10521 "PhotoPage.c" +#line 10503 "PhotoPage.c" GdkEventButton* _tmp14_ = NULL; gdouble _tmp15_ = 0.0; GdkEventButton* _tmp16_ = NULL; @@ -10547,7 +10529,7 @@ static gboolean editing_host_page_real_on_left_click (Page* base, GdkEventButton result = TRUE; #line 1558 "/home/jens/Source/shotwell/src/PhotoPage.vala" return result; -#line 10546 "PhotoPage.c" +#line 10528 "PhotoPage.c" } #line 1562 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp18_ = self->priv->current_tool; @@ -10557,7 +10539,7 @@ static gboolean editing_host_page_real_on_left_click (Page* base, GdkEventButton result = FALSE; #line 1563 "/home/jens/Source/shotwell/src/PhotoPage.vala" return result; -#line 10556 "PhotoPage.c" +#line 10538 "PhotoPage.c" } #line 1568 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp19_ = x; @@ -10571,7 +10553,7 @@ static gboolean editing_host_page_real_on_left_click (Page* base, GdkEventButton result = TRUE; #line 1569 "/home/jens/Source/shotwell/src/PhotoPage.vala" return result; -#line 10570 "PhotoPage.c" +#line 10552 "PhotoPage.c" } #line 1571 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp22_ = self->priv->current_tool; @@ -10585,7 +10567,7 @@ static gboolean editing_host_page_real_on_left_click (Page* base, GdkEventButton result = TRUE; #line 1574 "/home/jens/Source/shotwell/src/PhotoPage.vala" return result; -#line 10584 "PhotoPage.c" +#line 10566 "PhotoPage.c" } @@ -10611,7 +10593,7 @@ static gboolean editing_host_page_real_on_left_released (Page* base, GdkEventBut _tmp0_ = self->priv->is_pan_in_progress; #line 1578 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp0_) { -#line 10610 "PhotoPage.c" +#line 10592 "PhotoPage.c" GdkPoint viewport_center = {0}; ZoomState _tmp1_ = {0}; GdkPoint _tmp2_ = {0}; @@ -10698,7 +10680,7 @@ static gboolean editing_host_page_real_on_left_released (Page* base, GdkEventBut self->priv->is_pan_in_progress = FALSE; #line 1590 "/home/jens/Source/shotwell/src/PhotoPage.vala" page_restore_cursor_hiding (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); -#line 10697 "PhotoPage.c" +#line 10679 "PhotoPage.c" } #line 1595 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp21_ = self->priv->current_tool; @@ -10708,7 +10690,7 @@ static gboolean editing_host_page_real_on_left_released (Page* base, GdkEventBut result = FALSE; #line 1596 "/home/jens/Source/shotwell/src/PhotoPage.vala" return result; -#line 10707 "PhotoPage.c" +#line 10689 "PhotoPage.c" } #line 1598 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp22_ = self->priv->current_tool; @@ -10734,7 +10716,7 @@ static gboolean editing_host_page_real_on_left_released (Page* base, GdkEventBut _g_object_unref0 (_tmp29_); #line 1600 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp30_) { -#line 10733 "PhotoPage.c" +#line 10715 "PhotoPage.c" EditingToolsEditingTool* _tmp31_ = NULL; EditingToolsEditingToolWindow* _tmp32_ = NULL; EditingToolsEditingToolWindow* _tmp33_ = NULL; @@ -10748,13 +10730,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 1601 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (_tmp33_); -#line 10747 "PhotoPage.c" +#line 10729 "PhotoPage.c" } #line 1603 "/home/jens/Source/shotwell/src/PhotoPage.vala" result = FALSE; #line 1603 "/home/jens/Source/shotwell/src/PhotoPage.vala" return result; -#line 10753 "PhotoPage.c" +#line 10735 "PhotoPage.c" } @@ -10775,7 +10757,7 @@ static gboolean editing_host_page_real_on_right_click (Page* base, GdkEventButto result = _tmp1_; #line 1607 "/home/jens/Source/shotwell/src/PhotoPage.vala" return result; -#line 10774 "PhotoPage.c" +#line 10756 "PhotoPage.c" } @@ -10784,7 +10766,7 @@ static gboolean _editing_host_page_on_fetch_original_gsource_func (gpointer self result = editing_host_page_on_fetch_original ((EditingHostPage*) self); #line 1619 "/home/jens/Source/shotwell/src/PhotoPage.vala" return result; -#line 10783 "PhotoPage.c" +#line 10765 "PhotoPage.c" } @@ -10824,7 +10806,7 @@ static void editing_host_page_on_photos_altered (EditingHostPage* self, GeeMap* if (_tmp4_) { #line 1612 "/home/jens/Source/shotwell/src/PhotoPage.vala" return; -#line 10823 "PhotoPage.c" +#line 10805 "PhotoPage.c" } #line 1614 "/home/jens/Source/shotwell/src/PhotoPage.vala" self->priv->pixbuf_dirty = TRUE; @@ -10842,7 +10824,7 @@ static void editing_host_page_on_photos_altered (EditingHostPage* self, GeeMap* if (_tmp8_) { #line 1619 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_idle_add_full (G_PRIORITY_DEFAULT_IDLE, _editing_host_page_on_fetch_original_gsource_func, g_object_ref (self), g_object_unref); -#line 10841 "PhotoPage.c" +#line 10823 "PhotoPage.c" } #line 1621 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp9_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); @@ -10862,7 +10844,7 @@ static void editing_host_page_on_photos_altered (EditingHostPage* self, GeeMap* _data_collection_unref0 (_tmp13_); #line 1621 "/home/jens/Source/shotwell/src/PhotoPage.vala" _data_collection_unref0 (_tmp10_); -#line 10861 "PhotoPage.c" +#line 10843 "PhotoPage.c" } @@ -10871,7 +10853,7 @@ static void editing_host_page_on_view_contents_ordering_altered (EditingHostPage g_return_if_fail (IS_EDITING_HOST_PAGE (self)); #line 1625 "/home/jens/Source/shotwell/src/PhotoPage.vala" editing_host_page_refresh_caches (self, "on_view_contents_ordering_altered"); -#line 10870 "PhotoPage.c" +#line 10852 "PhotoPage.c" } @@ -10884,7 +10866,7 @@ static gboolean editing_host_page_on_fetch_original (EditingHostPage* self) { _tmp0_ = editing_host_page_has_photo (self); #line 1629 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp0_) { -#line 10883 "PhotoPage.c" +#line 10865 "PhotoPage.c" PixbufCache* _tmp1_ = NULL; Photo* _tmp2_ = NULL; Photo* _tmp3_ = NULL; @@ -10898,13 +10880,13 @@ static gboolean editing_host_page_on_fetch_original (EditingHostPage* self) { pixbuf_cache_prefetch (_tmp1_, _tmp3_, BACKGROUND_JOB_JOB_PRIORITY_LOW, FALSE); #line 1630 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (_tmp3_); -#line 10897 "PhotoPage.c" +#line 10879 "PhotoPage.c" } #line 1632 "/home/jens/Source/shotwell/src/PhotoPage.vala" result = FALSE; #line 1632 "/home/jens/Source/shotwell/src/PhotoPage.vala" return result; -#line 10903 "PhotoPage.c" +#line 10885 "PhotoPage.c" } @@ -10955,7 +10937,7 @@ static gboolean editing_host_page_is_panning_possible (EditingHostPage* self) { _tmp10_ = _tmp9_.width; #line 1643 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp8_ >= _tmp10_) { -#line 10954 "PhotoPage.c" +#line 10936 "PhotoPage.c" Dimensions _tmp11_ = {0}; gint _tmp12_ = 0; Dimensions _tmp13_ = {0}; @@ -10970,17 +10952,17 @@ static gboolean editing_host_page_is_panning_possible (EditingHostPage* self) { _tmp14_ = _tmp13_.height; #line 1643 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp6_ = _tmp12_ >= _tmp14_; -#line 10969 "PhotoPage.c" +#line 10951 "PhotoPage.c" } else { #line 1643 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp6_ = FALSE; -#line 10973 "PhotoPage.c" +#line 10955 "PhotoPage.c" } #line 1643 "/home/jens/Source/shotwell/src/PhotoPage.vala" result = !_tmp6_; #line 1643 "/home/jens/Source/shotwell/src/PhotoPage.vala" return result; -#line 10979 "PhotoPage.c" +#line 10961 "PhotoPage.c" } @@ -10994,11 +10976,11 @@ static void editing_host_page_update_cursor_for_zoom_context (EditingHostPage* s if (_tmp0_) { #line 1648 "/home/jens/Source/shotwell/src/PhotoPage.vala" page_set_page_cursor (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), GDK_FLEUR); -#line 10993 "PhotoPage.c" +#line 10975 "PhotoPage.c" } else { #line 1650 "/home/jens/Source/shotwell/src/PhotoPage.vala" page_set_page_cursor (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), GDK_LEFT_PTR); -#line 10997 "PhotoPage.c" +#line 10979 "PhotoPage.c" } } @@ -11021,7 +11003,7 @@ static gboolean editing_host_page_real_on_motion (Page* base, GdkEventMotion* ev _tmp0_ = self->priv->current_tool; #line 1655 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp0_ != NULL) { -#line 11020 "PhotoPage.c" +#line 11002 "PhotoPage.c" EditingToolsEditingTool* _tmp1_ = NULL; gint _tmp2_ = 0; gint _tmp3_ = 0; @@ -11045,7 +11027,7 @@ static gboolean editing_host_page_real_on_motion (Page* base, GdkEventMotion* ev result = TRUE; #line 1661 "/home/jens/Source/shotwell/src/PhotoPage.vala" return result; -#line 11044 "PhotoPage.c" +#line 11026 "PhotoPage.c" } #line 1664 "/home/jens/Source/shotwell/src/PhotoPage.vala" editing_host_page_update_cursor_for_zoom_context (self); @@ -11053,7 +11035,7 @@ static gboolean editing_host_page_real_on_motion (Page* base, GdkEventMotion* ev _tmp6_ = self->priv->is_pan_in_progress; #line 1666 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp6_) { -#line 11052 "PhotoPage.c" +#line 11034 "PhotoPage.c" gint delta_x = 0; GdkEventMotion* _tmp7_ = NULL; gdouble _tmp8_ = 0.0; @@ -11127,7 +11109,7 @@ static gboolean editing_host_page_real_on_motion (Page* base, GdkEventMotion* ev result = TRUE; #line 1677 "/home/jens/Source/shotwell/src/PhotoPage.vala" return result; -#line 11126 "PhotoPage.c" +#line 11108 "PhotoPage.c" } #line 1680 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp24_ = event; @@ -11143,7 +11125,7 @@ static gboolean editing_host_page_real_on_motion (Page* base, GdkEventMotion* ev result = _tmp28_; #line 1680 "/home/jens/Source/shotwell/src/PhotoPage.vala" return result; -#line 11142 "PhotoPage.c" +#line 11124 "PhotoPage.c" } @@ -11158,7 +11140,7 @@ static gboolean editing_host_page_real_on_leave_notify_event (Page* base) { _tmp0_ = self->priv->current_tool; #line 1684 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp0_ != NULL) { -#line 11157 "PhotoPage.c" +#line 11139 "PhotoPage.c" EditingToolsEditingTool* _tmp1_ = NULL; gboolean _tmp2_ = FALSE; #line 1685 "/home/jens/Source/shotwell/src/PhotoPage.vala" @@ -11169,7 +11151,7 @@ static gboolean editing_host_page_real_on_leave_notify_event (Page* base) { result = _tmp2_; #line 1685 "/home/jens/Source/shotwell/src/PhotoPage.vala" return result; -#line 11168 "PhotoPage.c" +#line 11150 "PhotoPage.c" } #line 1687 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp3_ = PAGE_CLASS (editing_host_page_parent_class)->on_leave_notify_event (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), TYPE_PAGE, Page)); @@ -11177,7 +11159,7 @@ static gboolean editing_host_page_real_on_leave_notify_event (Page* base) { result = _tmp3_; #line 1687 "/home/jens/Source/shotwell/src/PhotoPage.vala" return result; -#line 11176 "PhotoPage.c" +#line 11158 "PhotoPage.c" } @@ -11189,7 +11171,7 @@ static void editing_host_page_track_tool_window (EditingHostPage* self) { _tmp0_ = self->priv->current_tool; #line 1692 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp0_ != NULL) { -#line 11188 "PhotoPage.c" +#line 11170 "PhotoPage.c" EditingToolsEditingToolWindow* tool_window = NULL; EditingToolsEditingTool* _tmp1_ = NULL; EditingToolsEditingToolWindow* _tmp2_ = NULL; @@ -11205,7 +11187,7 @@ static void editing_host_page_track_tool_window (EditingHostPage* self) { _tmp4_ = tool_window; #line 1694 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp4_ != NULL) { -#line 11204 "PhotoPage.c" +#line 11186 "PhotoPage.c" EditingToolsEditingToolWindow* _tmp5_ = NULL; gboolean _tmp6_ = FALSE; #line 1694 "/home/jens/Source/shotwell/src/PhotoPage.vala" @@ -11214,21 +11196,21 @@ static void editing_host_page_track_tool_window (EditingHostPage* self) { _tmp6_ = editing_tools_editing_tool_window_has_user_moved (_tmp5_); #line 1694 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp3_ = !_tmp6_; -#line 11213 "PhotoPage.c" +#line 11195 "PhotoPage.c" } else { #line 1694 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp3_ = FALSE; -#line 11217 "PhotoPage.c" +#line 11199 "PhotoPage.c" } #line 1694 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp3_) { #line 1695 "/home/jens/Source/shotwell/src/PhotoPage.vala" editing_host_page_place_tool_window (self); -#line 11223 "PhotoPage.c" +#line 11205 "PhotoPage.c" } #line 1692 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (tool_window); -#line 11227 "PhotoPage.c" +#line 11209 "PhotoPage.c" } } @@ -11246,7 +11228,7 @@ static void editing_host_page_real_on_move (Page* base, GdkRectangle* rect) { _tmp0_ = *rect; #line 1702 "/home/jens/Source/shotwell/src/PhotoPage.vala" PAGE_CLASS (editing_host_page_parent_class)->on_move (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), TYPE_PAGE, Page), &_tmp0_); -#line 11245 "PhotoPage.c" +#line 11227 "PhotoPage.c" } @@ -11266,7 +11248,7 @@ static void editing_host_page_real_on_move_finished (Page* base, GdkRectangle* r _tmp1_ = *rect; #line 1708 "/home/jens/Source/shotwell/src/PhotoPage.vala" PAGE_CLASS (editing_host_page_parent_class)->on_move_finished (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), TYPE_PAGE, Page), &_tmp1_); -#line 11265 "PhotoPage.c" +#line 11247 "PhotoPage.c" } @@ -11305,7 +11287,7 @@ static gboolean editing_host_page_on_keyboard_pan_event (EditingHostPage* self, static GQuark _tmp6_label10 = 0; #line 1715 "/home/jens/Source/shotwell/src/PhotoPage.vala" static GQuark _tmp6_label11 = 0; -#line 11304 "PhotoPage.c" +#line 11286 "PhotoPage.c" ZoomState new_zoom_state = {0}; ZoomState _tmp12_ = {0}; GdkPoint _tmp13_ = {0}; @@ -11336,7 +11318,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 1715 "/home/jens/Source/shotwell/src/PhotoPage.vala" switch (0) { -#line 11335 "PhotoPage.c" +#line 11317 "PhotoPage.c" default: { gint _tmp8_ = 0; @@ -11346,13 +11328,13 @@ static gboolean editing_host_page_on_keyboard_pan_event (EditingHostPage* self, viewport_center.x = _tmp8_ - EDITING_HOST_PAGE_PAN_INCREMENT_SIZE; #line 1720 "/home/jens/Source/shotwell/src/PhotoPage.vala" break; -#line 11345 "PhotoPage.c" +#line 11327 "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 1715 "/home/jens/Source/shotwell/src/PhotoPage.vala" switch (0) { -#line 11351 "PhotoPage.c" +#line 11333 "PhotoPage.c" default: { gint _tmp9_ = 0; @@ -11362,13 +11344,13 @@ static gboolean editing_host_page_on_keyboard_pan_event (EditingHostPage* self, viewport_center.x = _tmp9_ + EDITING_HOST_PAGE_PAN_INCREMENT_SIZE; #line 1726 "/home/jens/Source/shotwell/src/PhotoPage.vala" break; -#line 11361 "PhotoPage.c" +#line 11343 "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 1715 "/home/jens/Source/shotwell/src/PhotoPage.vala" switch (0) { -#line 11367 "PhotoPage.c" +#line 11349 "PhotoPage.c" default: { gint _tmp10_ = 0; @@ -11378,13 +11360,13 @@ static gboolean editing_host_page_on_keyboard_pan_event (EditingHostPage* self, viewport_center.y = _tmp10_ + EDITING_HOST_PAGE_PAN_INCREMENT_SIZE; #line 1732 "/home/jens/Source/shotwell/src/PhotoPage.vala" break; -#line 11377 "PhotoPage.c" +#line 11359 "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 1715 "/home/jens/Source/shotwell/src/PhotoPage.vala" switch (0) { -#line 11383 "PhotoPage.c" +#line 11365 "PhotoPage.c" default: { gint _tmp11_ = 0; @@ -11394,20 +11376,20 @@ static gboolean editing_host_page_on_keyboard_pan_event (EditingHostPage* self, viewport_center.y = _tmp11_ - EDITING_HOST_PAGE_PAN_INCREMENT_SIZE; #line 1738 "/home/jens/Source/shotwell/src/PhotoPage.vala" break; -#line 11393 "PhotoPage.c" +#line 11375 "PhotoPage.c" } } } else { #line 1715 "/home/jens/Source/shotwell/src/PhotoPage.vala" switch (0) { -#line 11399 "PhotoPage.c" +#line 11381 "PhotoPage.c" default: { #line 1741 "/home/jens/Source/shotwell/src/PhotoPage.vala" result = FALSE; #line 1741 "/home/jens/Source/shotwell/src/PhotoPage.vala" return result; -#line 11406 "PhotoPage.c" +#line 11388 "PhotoPage.c" } } } @@ -11427,7 +11409,7 @@ static gboolean editing_host_page_on_keyboard_pan_event (EditingHostPage* self, result = TRUE; #line 1748 "/home/jens/Source/shotwell/src/PhotoPage.vala" return result; -#line 11426 "PhotoPage.c" +#line 11408 "PhotoPage.c" } @@ -11460,7 +11442,7 @@ static gboolean editing_host_page_real_key_press_event (GtkWidget* base, GdkEven static GQuark _tmp13_label6 = 0; #line 1772 "/home/jens/Source/shotwell/src/PhotoPage.vala" static GQuark _tmp13_label7 = 0; -#line 11459 "PhotoPage.c" +#line 11441 "PhotoPage.c" gboolean _tmp15_ = FALSE; gboolean _tmp16_ = FALSE; #line 1751 "/home/jens/Source/shotwell/src/PhotoPage.vala" @@ -11471,7 +11453,7 @@ static gboolean editing_host_page_real_key_press_event (GtkWidget* base, GdkEven _tmp0_ = self->priv->current_tool; #line 1753 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp0_ != NULL) { -#line 11470 "PhotoPage.c" +#line 11452 "PhotoPage.c" EditingToolsEditingTool* _tmp1_ = NULL; GdkEventKey* _tmp2_ = NULL; gboolean _tmp3_ = FALSE; @@ -11487,14 +11469,14 @@ static gboolean editing_host_page_real_key_press_event (GtkWidget* base, GdkEven result = TRUE; #line 1755 "/home/jens/Source/shotwell/src/PhotoPage.vala" return result; -#line 11486 "PhotoPage.c" +#line 11468 "PhotoPage.c" } } #line 1759 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp4_ = editing_host_page_is_panning_possible (self); #line 1759 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp4_) { -#line 11493 "PhotoPage.c" +#line 11475 "PhotoPage.c" GdkEventKey* _tmp5_ = NULL; gboolean _tmp6_ = FALSE; #line 1760 "/home/jens/Source/shotwell/src/PhotoPage.vala" @@ -11507,7 +11489,7 @@ static gboolean editing_host_page_real_key_press_event (GtkWidget* base, GdkEven result = TRUE; #line 1761 "/home/jens/Source/shotwell/src/PhotoPage.vala" return result; -#line 11506 "PhotoPage.c" +#line 11488 "PhotoPage.c" } } #line 1767 "/home/jens/Source/shotwell/src/PhotoPage.vala" @@ -11520,7 +11502,7 @@ static gboolean editing_host_page_real_key_press_event (GtkWidget* base, GdkEven result = TRUE; #line 1768 "/home/jens/Source/shotwell/src/PhotoPage.vala" return result; -#line 11519 "PhotoPage.c" +#line 11501 "PhotoPage.c" } #line 1770 "/home/jens/Source/shotwell/src/PhotoPage.vala" handled = TRUE; @@ -11538,51 +11520,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 1772 "/home/jens/Source/shotwell/src/PhotoPage.vala" switch (0) { -#line 11537 "PhotoPage.c" +#line 11519 "PhotoPage.c" default: { #line 1777 "/home/jens/Source/shotwell/src/PhotoPage.vala" break; -#line 11542 "PhotoPage.c" +#line 11524 "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 1772 "/home/jens/Source/shotwell/src/PhotoPage.vala" switch (0) { -#line 11548 "PhotoPage.c" +#line 11530 "PhotoPage.c" default: { #line 1782 "/home/jens/Source/shotwell/src/PhotoPage.vala" page_activate_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "IncreaseSize"); #line 1783 "/home/jens/Source/shotwell/src/PhotoPage.vala" break; -#line 11555 "PhotoPage.c" +#line 11537 "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 1772 "/home/jens/Source/shotwell/src/PhotoPage.vala" switch (0) { -#line 11561 "PhotoPage.c" +#line 11543 "PhotoPage.c" default: { #line 1789 "/home/jens/Source/shotwell/src/PhotoPage.vala" page_activate_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "DecreaseSize"); #line 1790 "/home/jens/Source/shotwell/src/PhotoPage.vala" break; -#line 11568 "PhotoPage.c" +#line 11550 "PhotoPage.c" } } } else { #line 1772 "/home/jens/Source/shotwell/src/PhotoPage.vala" switch (0) { -#line 11574 "PhotoPage.c" +#line 11556 "PhotoPage.c" default: { #line 1793 "/home/jens/Source/shotwell/src/PhotoPage.vala" handled = FALSE; #line 1794 "/home/jens/Source/shotwell/src/PhotoPage.vala" break; -#line 11581 "PhotoPage.c" +#line 11563 "PhotoPage.c" } } } @@ -11594,11 +11576,11 @@ static gboolean editing_host_page_real_key_press_event (GtkWidget* base, GdkEven result = TRUE; #line 1798 "/home/jens/Source/shotwell/src/PhotoPage.vala" return result; -#line 11593 "PhotoPage.c" +#line 11575 "PhotoPage.c" } #line 1800 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (GTK_WIDGET_CLASS (editing_host_page_parent_class)->key_press_event != NULL) { -#line 11597 "PhotoPage.c" +#line 11579 "PhotoPage.c" GdkEventKey* _tmp17_ = NULL; gboolean _tmp18_ = FALSE; #line 1800 "/home/jens/Source/shotwell/src/PhotoPage.vala" @@ -11607,17 +11589,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 1800 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp16_ = _tmp18_; -#line 11606 "PhotoPage.c" +#line 11588 "PhotoPage.c" } else { #line 1800 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp16_ = TRUE; -#line 11610 "PhotoPage.c" +#line 11592 "PhotoPage.c" } #line 1800 "/home/jens/Source/shotwell/src/PhotoPage.vala" result = _tmp16_; #line 1800 "/home/jens/Source/shotwell/src/PhotoPage.vala" return result; -#line 11616 "PhotoPage.c" +#line 11598 "PhotoPage.c" } @@ -11634,7 +11616,7 @@ static void editing_host_page_real_new_surface (SinglePhotoPage* base, cairo_t* _tmp0_ = self->priv->current_tool; #line 1805 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp0_ != NULL) { -#line 11633 "PhotoPage.c" +#line 11615 "PhotoPage.c" EditingToolsEditingTool* _tmp1_ = NULL; EditingToolsPhotoCanvas* _tmp2_ = NULL; cairo_t* _tmp3_ = NULL; @@ -11649,7 +11631,7 @@ static void editing_host_page_real_new_surface (SinglePhotoPage* base, cairo_t* _tmp4_ = *dim; #line 1806 "/home/jens/Source/shotwell/src/PhotoPage.vala" editing_tools_photo_canvas_set_surface (_tmp2_, _tmp3_, &_tmp4_); -#line 11648 "PhotoPage.c" +#line 11630 "PhotoPage.c" } } @@ -11668,21 +11650,21 @@ static void editing_host_page_real_updated_pixbuf (SinglePhotoPage* base, GdkPix _tmp1_ = self->priv->current_tool; #line 1813 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp1_ != NULL) { -#line 11667 "PhotoPage.c" +#line 11649 "PhotoPage.c" SinglePhotoPageUpdateReason _tmp2_ = 0; #line 1813 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp2_ = reason; #line 1813 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp0_ = _tmp2_ != SINGLE_PHOTO_PAGE_UPDATE_REASON_QUALITY_IMPROVEMENT; -#line 11673 "PhotoPage.c" +#line 11655 "PhotoPage.c" } else { #line 1813 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp0_ = FALSE; -#line 11677 "PhotoPage.c" +#line 11659 "PhotoPage.c" } #line 1813 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp0_) { -#line 11681 "PhotoPage.c" +#line 11663 "PhotoPage.c" EditingToolsEditingTool* _tmp3_ = NULL; EditingToolsPhotoCanvas* _tmp4_ = NULL; Dimensions _tmp5_ = {0}; @@ -11704,7 +11686,7 @@ static void editing_host_page_real_updated_pixbuf (SinglePhotoPage* base, GdkPix _g_object_unref0 (self->priv->cancel_editing_pixbuf); #line 1815 "/home/jens/Source/shotwell/src/PhotoPage.vala" self->priv->cancel_editing_pixbuf = NULL; -#line 11703 "PhotoPage.c" +#line 11685 "PhotoPage.c" } } @@ -11715,7 +11697,7 @@ static GdkPixbuf* editing_host_page_real_get_bottom_left_trinket (EditingHostPag result = NULL; #line 1820 "/home/jens/Source/shotwell/src/PhotoPage.vala" return result; -#line 11714 "PhotoPage.c" +#line 11696 "PhotoPage.c" } @@ -11724,7 +11706,7 @@ GdkPixbuf* editing_host_page_get_bottom_left_trinket (EditingHostPage* self, gin g_return_val_if_fail (IS_EDITING_HOST_PAGE (self), NULL); #line 1819 "/home/jens/Source/shotwell/src/PhotoPage.vala" return EDITING_HOST_PAGE_GET_CLASS (self)->get_bottom_left_trinket (self, scale); -#line 11723 "PhotoPage.c" +#line 11705 "PhotoPage.c" } @@ -11734,7 +11716,7 @@ static GdkPixbuf* editing_host_page_real_get_top_left_trinket (EditingHostPage* result = NULL; #line 1824 "/home/jens/Source/shotwell/src/PhotoPage.vala" return result; -#line 11733 "PhotoPage.c" +#line 11715 "PhotoPage.c" } @@ -11743,7 +11725,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 1823 "/home/jens/Source/shotwell/src/PhotoPage.vala" return EDITING_HOST_PAGE_GET_CLASS (self)->get_top_left_trinket (self, scale); -#line 11742 "PhotoPage.c" +#line 11724 "PhotoPage.c" } @@ -11753,7 +11735,7 @@ static GdkPixbuf* editing_host_page_real_get_top_right_trinket (EditingHostPage* result = NULL; #line 1828 "/home/jens/Source/shotwell/src/PhotoPage.vala" return result; -#line 11752 "PhotoPage.c" +#line 11734 "PhotoPage.c" } @@ -11762,7 +11744,7 @@ GdkPixbuf* editing_host_page_get_top_right_trinket (EditingHostPage* self, gint g_return_val_if_fail (IS_EDITING_HOST_PAGE (self), NULL); #line 1827 "/home/jens/Source/shotwell/src/PhotoPage.vala" return EDITING_HOST_PAGE_GET_CLASS (self)->get_top_right_trinket (self, scale); -#line 11761 "PhotoPage.c" +#line 11743 "PhotoPage.c" } @@ -11772,7 +11754,7 @@ static GdkPixbuf* editing_host_page_real_get_bottom_right_trinket (EditingHostPa result = NULL; #line 1832 "/home/jens/Source/shotwell/src/PhotoPage.vala" return result; -#line 11771 "PhotoPage.c" +#line 11753 "PhotoPage.c" } @@ -11781,7 +11763,7 @@ GdkPixbuf* editing_host_page_get_bottom_right_trinket (EditingHostPage* self, gi g_return_val_if_fail (IS_EDITING_HOST_PAGE (self), NULL); #line 1831 "/home/jens/Source/shotwell/src/PhotoPage.vala" return EDITING_HOST_PAGE_GET_CLASS (self)->get_bottom_right_trinket (self, scale); -#line 11780 "PhotoPage.c" +#line 11762 "PhotoPage.c" } @@ -11815,7 +11797,7 @@ static void editing_host_page_real_paint (SinglePhotoPage* base, cairo_t* ctx, D _tmp0_ = self->priv->current_tool; #line 1836 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp0_ != NULL) { -#line 11814 "PhotoPage.c" +#line 11796 "PhotoPage.c" EditingToolsEditingTool* _tmp1_ = NULL; cairo_t* _tmp2_ = NULL; #line 1837 "/home/jens/Source/shotwell/src/PhotoPage.vala" @@ -11826,27 +11808,27 @@ static void editing_host_page_real_paint (SinglePhotoPage* base, cairo_t* ctx, D editing_tools_editing_tool_paint (_tmp1_, _tmp2_); #line 1839 "/home/jens/Source/shotwell/src/PhotoPage.vala" return; -#line 11825 "PhotoPage.c" +#line 11807 "PhotoPage.c" } #line 1842 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp4_ = self->priv->photo_missing; #line 1842 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp4_) { -#line 11831 "PhotoPage.c" +#line 11813 "PhotoPage.c" gboolean _tmp5_ = FALSE; #line 1842 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp5_ = editing_host_page_has_photo (self); #line 1842 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp3_ = _tmp5_; -#line 11837 "PhotoPage.c" +#line 11819 "PhotoPage.c" } else { #line 1842 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp3_ = FALSE; -#line 11841 "PhotoPage.c" +#line 11823 "PhotoPage.c" } #line 1842 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp3_) { -#line 11845 "PhotoPage.c" +#line 11827 "PhotoPage.c" cairo_t* _tmp6_ = NULL; cairo_t* _tmp7_ = NULL; Dimensions _tmp8_ = {0}; @@ -11918,7 +11900,7 @@ static void editing_host_page_real_paint (SinglePhotoPage* base, cairo_t* ctx, D _g_object_unref0 (_tmp16_); #line 1848 "/home/jens/Source/shotwell/src/PhotoPage.vala" return; -#line 11917 "PhotoPage.c" +#line 11899 "PhotoPage.c" } #line 1851 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp23_ = ctx; @@ -11934,7 +11916,7 @@ static void editing_host_page_real_paint (SinglePhotoPage* base, cairo_t* ctx, D if (!_tmp26_) { #line 1854 "/home/jens/Source/shotwell/src/PhotoPage.vala" return; -#line 11933 "PhotoPage.c" +#line 11915 "PhotoPage.c" } #line 1857 "/home/jens/Source/shotwell/src/PhotoPage.vala" single_photo_page_get_scaled_pixbuf_position (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), &_tmp27_); @@ -11948,7 +11930,7 @@ static void editing_host_page_real_paint (SinglePhotoPage* base, cairo_t* ctx, D _tmp29_ = trinket; #line 1860 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp29_ != NULL) { -#line 11947 "PhotoPage.c" +#line 11929 "PhotoPage.c" gint x = 0; GdkRectangle _tmp30_ = {0}; gint _tmp31_ = 0; @@ -12030,7 +12012,7 @@ static void editing_host_page_real_paint (SinglePhotoPage* base, cairo_t* ctx, D _tmp52_ = ctx; #line 1865 "/home/jens/Source/shotwell/src/PhotoPage.vala" cairo_fill (_tmp52_); -#line 12029 "PhotoPage.c" +#line 12011 "PhotoPage.c" } #line 1868 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp53_ = editing_host_page_get_top_left_trinket (self, EDITING_HOST_PAGE_TRINKET_SCALE); @@ -12042,7 +12024,7 @@ static void editing_host_page_real_paint (SinglePhotoPage* base, cairo_t* ctx, D _tmp54_ = trinket; #line 1869 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp54_ != NULL) { -#line 12041 "PhotoPage.c" +#line 12023 "PhotoPage.c" gint x = 0; GdkRectangle _tmp55_ = {0}; gint _tmp56_ = 0; @@ -12109,7 +12091,7 @@ static void editing_host_page_real_paint (SinglePhotoPage* base, cairo_t* ctx, D _tmp72_ = ctx; #line 1874 "/home/jens/Source/shotwell/src/PhotoPage.vala" cairo_fill (_tmp72_); -#line 12108 "PhotoPage.c" +#line 12090 "PhotoPage.c" } #line 1877 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp73_ = editing_host_page_get_top_right_trinket (self, EDITING_HOST_PAGE_TRINKET_SCALE); @@ -12121,7 +12103,7 @@ static void editing_host_page_real_paint (SinglePhotoPage* base, cairo_t* ctx, D _tmp74_ = trinket; #line 1878 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp74_ != NULL) { -#line 12120 "PhotoPage.c" +#line 12102 "PhotoPage.c" gint x = 0; GdkRectangle _tmp75_ = {0}; gint _tmp76_ = 0; @@ -12203,7 +12185,7 @@ static void editing_host_page_real_paint (SinglePhotoPage* base, cairo_t* ctx, D _tmp97_ = ctx; #line 1883 "/home/jens/Source/shotwell/src/PhotoPage.vala" cairo_fill (_tmp97_); -#line 12202 "PhotoPage.c" +#line 12184 "PhotoPage.c" } #line 1886 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp98_ = editing_host_page_get_bottom_right_trinket (self, EDITING_HOST_PAGE_TRINKET_SCALE); @@ -12215,7 +12197,7 @@ static void editing_host_page_real_paint (SinglePhotoPage* base, cairo_t* ctx, D _tmp99_ = trinket; #line 1887 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp99_ != NULL) { -#line 12214 "PhotoPage.c" +#line 12196 "PhotoPage.c" gint x = 0; GdkRectangle _tmp100_ = {0}; gint _tmp101_ = 0; @@ -12312,11 +12294,11 @@ static void editing_host_page_real_paint (SinglePhotoPage* base, cairo_t* ctx, D _tmp127_ = ctx; #line 1892 "/home/jens/Source/shotwell/src/PhotoPage.vala" cairo_fill (_tmp127_); -#line 12311 "PhotoPage.c" +#line 12293 "PhotoPage.c" } #line 1835 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (trinket); -#line 12315 "PhotoPage.c" +#line 12297 "PhotoPage.c" } @@ -12333,7 +12315,7 @@ gboolean editing_host_page_is_rotate_available (EditingHostPage* self, Photo* ph result = !_tmp0_; #line 1897 "/home/jens/Source/shotwell/src/PhotoPage.vala" return result; -#line 12332 "PhotoPage.c" +#line 12314 "PhotoPage.c" } @@ -12369,7 +12351,7 @@ static void editing_host_page_rotate (EditingHostPage* self, Rotation rotation, if (!_tmp1_) { #line 1906 "/home/jens/Source/shotwell/src/PhotoPage.vala" return; -#line 12368 "PhotoPage.c" +#line 12350 "PhotoPage.c" } #line 1908 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp2_ = editing_host_page_get_photo (self); @@ -12401,7 +12383,7 @@ static void editing_host_page_rotate (EditingHostPage* self, Rotation rotation, _command_manager_unref0 (_tmp10_); #line 1900 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (command); -#line 12400 "PhotoPage.c" +#line 12382 "PhotoPage.c" } @@ -12410,7 +12392,7 @@ void editing_host_page_on_rotate_clockwise (EditingHostPage* self) { g_return_if_fail (IS_EDITING_HOST_PAGE (self)); #line 1914 "/home/jens/Source/shotwell/src/PhotoPage.vala" editing_host_page_rotate (self, ROTATION_CLOCKWISE, RESOURCES_ROTATE_CW_FULL_LABEL, RESOURCES_ROTATE_CW_TOOLTIP); -#line 12409 "PhotoPage.c" +#line 12391 "PhotoPage.c" } @@ -12419,7 +12401,7 @@ void editing_host_page_on_rotate_counterclockwise (EditingHostPage* self) { g_return_if_fail (IS_EDITING_HOST_PAGE (self)); #line 1918 "/home/jens/Source/shotwell/src/PhotoPage.vala" editing_host_page_rotate (self, ROTATION_COUNTERCLOCKWISE, RESOURCES_ROTATE_CCW_FULL_LABEL, RESOURCES_ROTATE_CCW_TOOLTIP); -#line 12418 "PhotoPage.c" +#line 12400 "PhotoPage.c" } @@ -12428,7 +12410,7 @@ void editing_host_page_on_flip_horizontally (EditingHostPage* self) { g_return_if_fail (IS_EDITING_HOST_PAGE (self)); #line 1922 "/home/jens/Source/shotwell/src/PhotoPage.vala" editing_host_page_rotate (self, ROTATION_MIRROR, RESOURCES_HFLIP_LABEL, ""); -#line 12427 "PhotoPage.c" +#line 12409 "PhotoPage.c" } @@ -12437,7 +12419,7 @@ void editing_host_page_on_flip_vertically (EditingHostPage* self) { g_return_if_fail (IS_EDITING_HOST_PAGE (self)); #line 1926 "/home/jens/Source/shotwell/src/PhotoPage.vala" editing_host_page_rotate (self, ROTATION_UPSIDE_DOWN, RESOURCES_VFLIP_LABEL, ""); -#line 12436 "PhotoPage.c" +#line 12418 "PhotoPage.c" } @@ -12465,7 +12447,7 @@ void editing_host_page_on_revert (EditingHostPage* self) { if (_tmp0_) { #line 1931 "/home/jens/Source/shotwell/src/PhotoPage.vala" return; -#line 12464 "PhotoPage.c" +#line 12446 "PhotoPage.c" } #line 1933 "/home/jens/Source/shotwell/src/PhotoPage.vala" dimensions_init (&_tmp1_, 0, 0); @@ -12477,7 +12459,7 @@ void editing_host_page_on_revert (EditingHostPage* self) { if (!_tmp2_) { #line 1936 "/home/jens/Source/shotwell/src/PhotoPage.vala" return; -#line 12476 "PhotoPage.c" +#line 12458 "PhotoPage.c" } #line 1938 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp3_ = editing_host_page_get_photo (self); @@ -12491,7 +12473,7 @@ void editing_host_page_on_revert (EditingHostPage* self) { _g_object_unref0 (_tmp4_); #line 1938 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp6_) { -#line 12490 "PhotoPage.c" +#line 12472 "PhotoPage.c" AppWindow* _tmp7_ = NULL; AppWindow* _tmp8_ = NULL; ViewCollection* _tmp9_ = NULL; @@ -12528,7 +12510,7 @@ void editing_host_page_on_revert (EditingHostPage* self) { if (_tmp14_) { #line 1941 "/home/jens/Source/shotwell/src/PhotoPage.vala" return; -#line 12527 "PhotoPage.c" +#line 12509 "PhotoPage.c" } #line 1944 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp15_ = editing_host_page_get_photo (self); @@ -12538,7 +12520,7 @@ void editing_host_page_on_revert (EditingHostPage* self) { photo_revert_to_master (_tmp16_, TRUE); #line 1944 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (_tmp16_); -#line 12537 "PhotoPage.c" +#line 12519 "PhotoPage.c" } #line 1947 "/home/jens/Source/shotwell/src/PhotoPage.vala" single_photo_page_cancel_zoom (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage)); @@ -12568,7 +12550,7 @@ void editing_host_page_on_revert (EditingHostPage* self) { _command_manager_unref0 (_tmp22_); #line 1929 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (command); -#line 12567 "PhotoPage.c" +#line 12549 "PhotoPage.c" } @@ -12606,7 +12588,7 @@ void editing_host_page_on_edit_title (EditingHostPage* self) { _g_object_unref0 (_tmp1_); #line 1957 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp2_) { -#line 12605 "PhotoPage.c" +#line 12587 "PhotoPage.c" Photo* _tmp3_ = NULL; LibraryPhoto* _tmp4_ = NULL; #line 1958 "/home/jens/Source/shotwell/src/PhotoPage.vala" @@ -12617,19 +12599,19 @@ void editing_host_page_on_edit_title (EditingHostPage* self) { if (_tmp4_ == NULL) { #line 1958 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (_tmp3_); -#line 12616 "PhotoPage.c" +#line 12598 "PhotoPage.c" } #line 1958 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (item); #line 1958 "/home/jens/Source/shotwell/src/PhotoPage.vala" item = _tmp4_; -#line 12622 "PhotoPage.c" +#line 12604 "PhotoPage.c" } else { #line 1960 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (item); #line 1960 "/home/jens/Source/shotwell/src/PhotoPage.vala" return; -#line 12628 "PhotoPage.c" +#line 12610 "PhotoPage.c" } #line 1962 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp5_ = item; @@ -12663,7 +12645,7 @@ void editing_host_page_on_edit_title (EditingHostPage* self) { _g_object_unref0 (item); #line 1965 "/home/jens/Source/shotwell/src/PhotoPage.vala" return; -#line 12662 "PhotoPage.c" +#line 12644 "PhotoPage.c" } #line 1967 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp13_ = item; @@ -12691,7 +12673,7 @@ void editing_host_page_on_edit_title (EditingHostPage* self) { _text_entry_dialog_mediator_unref0 (edit_title_dialog); #line 1955 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (item); -#line 12690 "PhotoPage.c" +#line 12672 "PhotoPage.c" } @@ -12729,7 +12711,7 @@ void editing_host_page_on_edit_comment (EditingHostPage* self) { _g_object_unref0 (_tmp1_); #line 1973 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp2_) { -#line 12728 "PhotoPage.c" +#line 12710 "PhotoPage.c" Photo* _tmp3_ = NULL; LibraryPhoto* _tmp4_ = NULL; #line 1974 "/home/jens/Source/shotwell/src/PhotoPage.vala" @@ -12740,19 +12722,19 @@ void editing_host_page_on_edit_comment (EditingHostPage* self) { if (_tmp4_ == NULL) { #line 1974 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (_tmp3_); -#line 12739 "PhotoPage.c" +#line 12721 "PhotoPage.c" } #line 1974 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (item); #line 1974 "/home/jens/Source/shotwell/src/PhotoPage.vala" item = _tmp4_; -#line 12745 "PhotoPage.c" +#line 12727 "PhotoPage.c" } else { #line 1976 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (item); #line 1976 "/home/jens/Source/shotwell/src/PhotoPage.vala" return; -#line 12751 "PhotoPage.c" +#line 12733 "PhotoPage.c" } #line 1978 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp5_ = item; @@ -12786,7 +12768,7 @@ void editing_host_page_on_edit_comment (EditingHostPage* self) { _g_object_unref0 (item); #line 1981 "/home/jens/Source/shotwell/src/PhotoPage.vala" return; -#line 12785 "PhotoPage.c" +#line 12767 "PhotoPage.c" } #line 1983 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp13_ = item; @@ -12814,7 +12796,7 @@ void editing_host_page_on_edit_comment (EditingHostPage* self) { _multi_text_entry_dialog_mediator_unref0 (edit_comment_dialog); #line 1971 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (item); -#line 12813 "PhotoPage.c" +#line 12795 "PhotoPage.c" } @@ -12841,7 +12823,7 @@ void editing_host_page_on_adjust_date_time (EditingHostPage* self) { if (!_tmp0_) { #line 1989 "/home/jens/Source/shotwell/src/PhotoPage.vala" return; -#line 12840 "PhotoPage.c" +#line 12822 "PhotoPage.c" } #line 1991 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp1_ = editing_host_page_get_photo (self); @@ -12869,7 +12851,7 @@ void editing_host_page_on_adjust_date_time (EditingHostPage* self) { modify_originals = _tmp8_; #line 1995 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp9_) { -#line 12868 "PhotoPage.c" +#line 12850 "PhotoPage.c" ViewCollection* _tmp10_ = NULL; ViewCollection* _tmp11_ = NULL; GeeList* _tmp12_ = NULL; @@ -12924,11 +12906,11 @@ void editing_host_page_on_adjust_date_time (EditingHostPage* self) { _command_manager_unref0 (_tmp21_); #line 1995 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (command); -#line 12923 "PhotoPage.c" +#line 12905 "PhotoPage.c" } #line 1987 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (dialog); -#line 12927 "PhotoPage.c" +#line 12909 "PhotoPage.c" } @@ -12940,7 +12922,7 @@ void editing_host_page_on_set_background (EditingHostPage* self) { _tmp0_ = editing_host_page_has_photo (self); #line 2005 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp0_) { -#line 12939 "PhotoPage.c" +#line 12921 "PhotoPage.c" SetBackgroundPhotoDialog* dialog = NULL; SetBackgroundPhotoDialog* _tmp1_ = NULL; gboolean desktop = FALSE; @@ -12952,6 +12934,8 @@ void editing_host_page_on_set_background (EditingHostPage* self) { #line 2006 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp1_ = set_background_photo_dialog_new (); #line 2006 "/home/jens/Source/shotwell/src/PhotoPage.vala" + g_object_ref_sink (_tmp1_); +#line 2006 "/home/jens/Source/shotwell/src/PhotoPage.vala" dialog = _tmp1_; #line 2008 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp2_ = dialog; @@ -12963,7 +12947,7 @@ void editing_host_page_on_set_background (EditingHostPage* self) { screensaver = _tmp4_; #line 2008 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp5_) { -#line 12962 "PhotoPage.c" +#line 12946 "PhotoPage.c" AppWindow* _tmp6_ = NULL; AppWindow* _tmp7_ = NULL; Photo* _tmp8_ = NULL; @@ -13000,11 +12984,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 2011 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (_tmp13_); -#line 12999 "PhotoPage.c" +#line 12983 "PhotoPage.c" } #line 2005 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _set_background_dialog_unref0 (dialog); -#line 13003 "PhotoPage.c" + _g_object_unref0 (dialog); +#line 12987 "PhotoPage.c" } } @@ -13012,7 +12996,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 2021 "/home/jens/Source/shotwell/src/PhotoPage.vala" editing_host_page_on_rotate_counterclockwise ((EditingHostPage*) self); -#line 13011 "PhotoPage.c" +#line 12995 "PhotoPage.c" } @@ -13058,7 +13042,7 @@ static gboolean editing_host_page_real_on_ctrl_pressed (Page* base, GdkEventKey* if (_tmp6_ == NULL) { #line 2024 "/home/jens/Source/shotwell/src/PhotoPage.vala" editing_host_page_swap_out_original (self); -#line 13057 "PhotoPage.c" +#line 13041 "PhotoPage.c" } #line 2026 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp7_ = event; @@ -13068,7 +13052,7 @@ static gboolean editing_host_page_real_on_ctrl_pressed (Page* base, GdkEventKey* result = _tmp8_; #line 2026 "/home/jens/Source/shotwell/src/PhotoPage.vala" return result; -#line 13067 "PhotoPage.c" +#line 13051 "PhotoPage.c" } @@ -13114,37 +13098,37 @@ static gboolean editing_host_page_real_on_ctrl_released (Page* base, GdkEventKey _tmp8_ = self->priv->current_tool; #line 2036 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp8_ == NULL) { -#line 13113 "PhotoPage.c" +#line 13097 "PhotoPage.c" gboolean _tmp9_ = FALSE; #line 2036 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp9_ = page_get_shift_pressed (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); #line 2036 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp7_ = _tmp9_; -#line 13119 "PhotoPage.c" +#line 13103 "PhotoPage.c" } else { #line 2036 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp7_ = FALSE; -#line 13123 "PhotoPage.c" +#line 13107 "PhotoPage.c" } #line 2036 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp7_) { -#line 13127 "PhotoPage.c" +#line 13111 "PhotoPage.c" gboolean _tmp10_ = FALSE; #line 2036 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp10_ = page_get_alt_pressed (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); #line 2036 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp6_ = !_tmp10_; -#line 13133 "PhotoPage.c" +#line 13117 "PhotoPage.c" } else { #line 2036 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp6_ = FALSE; -#line 13137 "PhotoPage.c" +#line 13121 "PhotoPage.c" } #line 2036 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp6_) { #line 2037 "/home/jens/Source/shotwell/src/PhotoPage.vala" editing_host_page_swap_in_original (self); -#line 13143 "PhotoPage.c" +#line 13127 "PhotoPage.c" } #line 2039 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp11_ = event; @@ -13154,7 +13138,7 @@ static gboolean editing_host_page_real_on_ctrl_released (Page* base, GdkEventKey result = _tmp12_; #line 2039 "/home/jens/Source/shotwell/src/PhotoPage.vala" return result; -#line 13153 "PhotoPage.c" +#line 13137 "PhotoPage.c" } @@ -13189,7 +13173,7 @@ void editing_host_page_on_tool_button_toggled (EditingHostPage* self, GtkToggleT _tmp3_ = _tmp2_; #line 2045 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (!_tmp3_) { -#line 13188 "PhotoPage.c" +#line 13172 "PhotoPage.c" GtkToggleToolButton* _tmp4_ = NULL; GtkToggleToolButton* _tmp5_ = NULL; #line 2045 "/home/jens/Source/shotwell/src/PhotoPage.vala" @@ -13198,11 +13182,11 @@ void editing_host_page_on_tool_button_toggled (EditingHostPage* self, GtkToggleT _tmp5_ = toggle; #line 2045 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp0_ = _tmp4_ == _tmp5_; -#line 13197 "PhotoPage.c" +#line 13181 "PhotoPage.c" } else { #line 2045 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp0_ = FALSE; -#line 13201 "PhotoPage.c" +#line 13185 "PhotoPage.c" } #line 2045 "/home/jens/Source/shotwell/src/PhotoPage.vala" deactivating_only = _tmp0_; @@ -13218,7 +13202,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 2050 "/home/jens/Source/shotwell/src/PhotoPage.vala" return; -#line 13217 "PhotoPage.c" +#line 13201 "PhotoPage.c" } #line 2053 "/home/jens/Source/shotwell/src/PhotoPage.vala" page_suspend_cursor_hiding (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); @@ -13262,7 +13246,7 @@ void editing_host_page_on_tool_button_toggled (EditingHostPage* self, GtkToggleT editing_host_page_activate_tool (self, _tmp17_); #line 2042 "/home/jens/Source/shotwell/src/PhotoPage.vala" _editing_tools_editing_tool_unref0 (tool); -#line 13261 "PhotoPage.c" +#line 13245 "PhotoPage.c" } @@ -13284,7 +13268,7 @@ static void editing_host_page_on_tool_activated (EditingHostPage* self) { _tmp2_ = self->priv->current_editing_toggle; #line 2071 "/home/jens/Source/shotwell/src/PhotoPage.vala" gtk_toggle_tool_button_set_active (_tmp2_, TRUE); -#line 13283 "PhotoPage.c" +#line 13267 "PhotoPage.c" } @@ -13306,7 +13290,7 @@ static void editing_host_page_on_tool_deactivated (EditingHostPage* self) { _tmp2_ = self->priv->current_editing_toggle; #line 2077 "/home/jens/Source/shotwell/src/PhotoPage.vala" gtk_toggle_tool_button_set_active (_tmp2_, FALSE); -#line 13305 "PhotoPage.c" +#line 13289 "PhotoPage.c" } @@ -13333,7 +13317,7 @@ static void editing_host_page_on_tool_applied (EditingHostPage* self, Command* c _tmp3_ = needs_improvement; #line 2082 "/home/jens/Source/shotwell/src/PhotoPage.vala" editing_host_page_deactivate_tool (self, _tmp0_, _tmp1_, &_tmp2_, _tmp3_); -#line 13332 "PhotoPage.c" +#line 13316 "PhotoPage.c" } @@ -13349,7 +13333,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 2089 "/home/jens/Source/shotwell/src/PhotoPage.vala" single_photo_page_repaint (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), NULL); -#line 13348 "PhotoPage.c" +#line 13332 "PhotoPage.c" } @@ -13363,7 +13347,7 @@ static void editing_host_page_on_tool_aborted (EditingHostPage* self) { editing_host_page_deactivate_tool (self, NULL, NULL, &_tmp0_, FALSE); #line 2094 "/home/jens/Source/shotwell/src/PhotoPage.vala" editing_host_page_set_photo_missing (self, TRUE); -#line 13362 "PhotoPage.c" +#line 13346 "PhotoPage.c" } @@ -13381,7 +13365,7 @@ void editing_host_page_toggle_crop (EditingHostPage* self) { _tmp2_ = gtk_toggle_tool_button_get_active (_tmp1_); #line 2098 "/home/jens/Source/shotwell/src/PhotoPage.vala" gtk_toggle_tool_button_set_active (_tmp0_, !_tmp2_); -#line 13380 "PhotoPage.c" +#line 13364 "PhotoPage.c" } @@ -13399,7 +13383,7 @@ void editing_host_page_toggle_straighten (EditingHostPage* self) { _tmp2_ = gtk_toggle_tool_button_get_active (_tmp1_); #line 2102 "/home/jens/Source/shotwell/src/PhotoPage.vala" gtk_toggle_tool_button_set_active (_tmp0_, !_tmp2_); -#line 13398 "PhotoPage.c" +#line 13382 "PhotoPage.c" } @@ -13417,7 +13401,7 @@ void editing_host_page_toggle_redeye (EditingHostPage* self) { _tmp2_ = gtk_toggle_tool_button_get_active (_tmp1_); #line 2106 "/home/jens/Source/shotwell/src/PhotoPage.vala" gtk_toggle_tool_button_set_active (_tmp0_, !_tmp2_); -#line 13416 "PhotoPage.c" +#line 13400 "PhotoPage.c" } @@ -13435,7 +13419,7 @@ void editing_host_page_toggle_adjust (EditingHostPage* self) { _tmp2_ = gtk_toggle_tool_button_get_active (_tmp1_); #line 2110 "/home/jens/Source/shotwell/src/PhotoPage.vala" gtk_toggle_tool_button_set_active (_tmp0_, !_tmp2_); -#line 13434 "PhotoPage.c" +#line 13418 "PhotoPage.c" } @@ -13444,7 +13428,7 @@ static EditingToolsEditingTool* _editing_tools_straighten_tool_factory_editing_t result = editing_tools_straighten_tool_factory (); #line 2114 "/home/jens/Source/shotwell/src/PhotoPage.vala" return result; -#line 13443 "PhotoPage.c" +#line 13427 "PhotoPage.c" } @@ -13456,7 +13440,7 @@ static void editing_host_page_on_straighten_toggled (EditingHostPage* self) { _tmp0_ = self->priv->straighten_button; #line 2114 "/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 13455 "PhotoPage.c" +#line 13439 "PhotoPage.c" } @@ -13465,7 +13449,7 @@ static EditingToolsEditingTool* _editing_tools_crop_tool_factory_editing_tools_e result = editing_tools_crop_tool_factory (); #line 2118 "/home/jens/Source/shotwell/src/PhotoPage.vala" return result; -#line 13464 "PhotoPage.c" +#line 13448 "PhotoPage.c" } @@ -13477,7 +13461,7 @@ static void editing_host_page_on_crop_toggled (EditingHostPage* self) { _tmp0_ = self->priv->crop_button; #line 2118 "/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 13476 "PhotoPage.c" +#line 13460 "PhotoPage.c" } @@ -13486,7 +13470,7 @@ static EditingToolsEditingTool* _editing_tools_redeye_tool_factory_editing_tools result = editing_tools_redeye_tool_factory (); #line 2122 "/home/jens/Source/shotwell/src/PhotoPage.vala" return result; -#line 13485 "PhotoPage.c" +#line 13469 "PhotoPage.c" } @@ -13498,7 +13482,7 @@ static void editing_host_page_on_redeye_toggled (EditingHostPage* self) { _tmp0_ = self->priv->redeye_button; #line 2122 "/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 13497 "PhotoPage.c" +#line 13481 "PhotoPage.c" } @@ -13507,7 +13491,7 @@ static EditingToolsEditingTool* _editing_tools_adjust_tool_factory_editing_tools result = editing_tools_adjust_tool_factory (); #line 2126 "/home/jens/Source/shotwell/src/PhotoPage.vala" return result; -#line 13506 "PhotoPage.c" +#line 13490 "PhotoPage.c" } @@ -13519,7 +13503,7 @@ static void editing_host_page_on_adjust_toggled (EditingHostPage* self) { _tmp0_ = self->priv->adjust_button; #line 2126 "/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 13518 "PhotoPage.c" +#line 13502 "PhotoPage.c" } @@ -13536,7 +13520,7 @@ gboolean editing_host_page_is_enhance_available (EditingHostPage* self, Photo* p result = !_tmp0_; #line 2130 "/home/jens/Source/shotwell/src/PhotoPage.vala" return result; -#line 13535 "PhotoPage.c" +#line 13519 "PhotoPage.c" } @@ -13561,7 +13545,7 @@ void editing_host_page_on_enhance (EditingHostPage* self) { _tmp0_ = self->priv->current_tool; #line 2137 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (!G_TYPE_CHECK_INSTANCE_TYPE (_tmp0_, EDITING_TOOLS_TYPE_ADJUST_TOOL)) { -#line 13560 "PhotoPage.c" +#line 13544 "PhotoPage.c" Dimensions _tmp1_ = {0}; #line 2138 "/home/jens/Source/shotwell/src/PhotoPage.vala" dimensions_init (&_tmp1_, 0, 0); @@ -13569,7 +13553,7 @@ void editing_host_page_on_enhance (EditingHostPage* self) { editing_host_page_deactivate_tool (self, NULL, NULL, &_tmp1_, FALSE); #line 2140 "/home/jens/Source/shotwell/src/PhotoPage.vala" single_photo_page_cancel_zoom (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage)); -#line 13568 "PhotoPage.c" +#line 13552 "PhotoPage.c" } #line 2143 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp2_ = editing_host_page_has_photo (self); @@ -13577,7 +13561,7 @@ void editing_host_page_on_enhance (EditingHostPage* self) { if (!_tmp2_) { #line 2144 "/home/jens/Source/shotwell/src/PhotoPage.vala" return; -#line 13576 "PhotoPage.c" +#line 13560 "PhotoPage.c" } #line 2146 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp3_ = self->priv->current_tool; @@ -13589,7 +13573,7 @@ void editing_host_page_on_enhance (EditingHostPage* self) { _tmp5_ = adjust_tool; #line 2147 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp5_ != NULL) { -#line 13588 "PhotoPage.c" +#line 13572 "PhotoPage.c" EditingToolsAdjustTool* _tmp6_ = NULL; #line 2148 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp6_ = adjust_tool; @@ -13599,7 +13583,7 @@ void editing_host_page_on_enhance (EditingHostPage* self) { _editing_tools_editing_tool_unref0 (adjust_tool); #line 2150 "/home/jens/Source/shotwell/src/PhotoPage.vala" return; -#line 13598 "PhotoPage.c" +#line 13582 "PhotoPage.c" } #line 2153 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp7_ = editing_host_page_get_photo (self); @@ -13627,7 +13611,7 @@ void editing_host_page_on_enhance (EditingHostPage* self) { _g_object_unref0 (command); #line 2133 "/home/jens/Source/shotwell/src/PhotoPage.vala" _editing_tools_editing_tool_unref0 (adjust_tool); -#line 13626 "PhotoPage.c" +#line 13610 "PhotoPage.c" } @@ -13645,7 +13629,7 @@ void editing_host_page_on_copy_adjustments (EditingHostPage* self) { if (!_tmp0_) { #line 2159 "/home/jens/Source/shotwell/src/PhotoPage.vala" return; -#line 13644 "PhotoPage.c" +#line 13628 "PhotoPage.c" } #line 2160 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp1_ = editing_host_page_get_photo (self); @@ -13663,7 +13647,7 @@ void editing_host_page_on_copy_adjustments (EditingHostPage* self) { _g_object_unref0 (_tmp2_); #line 2161 "/home/jens/Source/shotwell/src/PhotoPage.vala" page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "PasteColorAdjustments", TRUE); -#line 13662 "PhotoPage.c" +#line 13646 "PhotoPage.c" } @@ -13693,14 +13677,14 @@ void editing_host_page_on_paste_adjustments (EditingHostPage* self) { if (!_tmp2_) { #line 2166 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp1_ = TRUE; -#line 13692 "PhotoPage.c" +#line 13676 "PhotoPage.c" } else { PixelTransformationBundle* _tmp3_ = NULL; #line 2166 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp3_ = copied_adjustments; #line 2166 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp1_ = _tmp3_ == NULL; -#line 13699 "PhotoPage.c" +#line 13683 "PhotoPage.c" } #line 2166 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp1_) { @@ -13708,7 +13692,7 @@ void editing_host_page_on_paste_adjustments (EditingHostPage* self) { _pixel_transformation_bundle_unref0 (copied_adjustments); #line 2167 "/home/jens/Source/shotwell/src/PhotoPage.vala" return; -#line 13707 "PhotoPage.c" +#line 13691 "PhotoPage.c" } #line 2169 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp4_ = editing_host_page_get_photo (self); @@ -13738,7 +13722,7 @@ void editing_host_page_on_paste_adjustments (EditingHostPage* self) { _g_object_unref0 (command); #line 2164 "/home/jens/Source/shotwell/src/PhotoPage.vala" _pixel_transformation_bundle_unref0 (copied_adjustments); -#line 13737 "PhotoPage.c" +#line 13721 "PhotoPage.c" } @@ -13793,7 +13777,7 @@ static void editing_host_page_place_tool_window (EditingHostPage* self) { if (_tmp0_ == NULL) { #line 2176 "/home/jens/Source/shotwell/src/PhotoPage.vala" return; -#line 13792 "PhotoPage.c" +#line 13776 "PhotoPage.c" } #line 2178 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp1_ = self->priv->current_tool; @@ -13809,7 +13793,7 @@ static void editing_host_page_place_tool_window (EditingHostPage* self) { _g_object_unref0 (tool_window); #line 2180 "/home/jens/Source/shotwell/src/PhotoPage.vala" return; -#line 13808 "PhotoPage.c" +#line 13792 "PhotoPage.c" } #line 2183 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp4_ = tool_window; @@ -13843,7 +13827,7 @@ static void editing_host_page_place_tool_window (EditingHostPage* self) { _g_free0 (_tmp12_); #line 2191 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp14_) { -#line 13842 "PhotoPage.c" +#line 13826 "PhotoPage.c" GeeHashMap* _tmp15_ = NULL; EditingToolsEditingTool* _tmp16_ = NULL; const gchar* _tmp17_ = NULL; @@ -13888,7 +13872,7 @@ static void editing_host_page_place_tool_window (EditingHostPage* self) { y = (gint) ((gintptr) _tmp26_); #line 2193 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_free0 (_tmp25_); -#line 13887 "PhotoPage.c" +#line 13871 "PhotoPage.c" } else { GtkWindow* _tmp27_ = NULL; GtkWindow* _tmp28_ = NULL; @@ -13911,7 +13895,7 @@ static void editing_host_page_place_tool_window (EditingHostPage* self) { _g_object_unref0 (_tmp28_); #line 2196 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp31_) { -#line 13910 "PhotoPage.c" +#line 13894 "PhotoPage.c" gint rx = 0; gint ry = 0; GtkWindow* _tmp32_ = NULL; @@ -13986,7 +13970,7 @@ static void editing_host_page_place_tool_window (EditingHostPage* self) { cheight = _tmp46_; #line 2214 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (G_TYPE_CHECK_INSTANCE_TYPE (self, TYPE_DIRECT_PHOTO_PAGE)) { -#line 13985 "PhotoPage.c" +#line 13969 "PhotoPage.c" gint _tmp48_ = 0; gint _tmp49_ = 0; gint _tmp50_ = 0; @@ -14004,7 +13988,7 @@ static void editing_host_page_place_tool_window (EditingHostPage* self) { _tmp52_ = _tmp51_.width; #line 2214 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp47_ = ((_tmp48_ + _tmp49_) + (_tmp50_ / 2)) - (_tmp52_ / 2); -#line 14003 "PhotoPage.c" +#line 13987 "PhotoPage.c" } else { gint _tmp53_ = 0; gint _tmp54_ = 0; @@ -14017,7 +14001,7 @@ static void editing_host_page_place_tool_window (EditingHostPage* self) { _tmp55_ = cwidth; #line 2215 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp47_ = (_tmp53_ + _tmp54_) + (_tmp55_ / 2); -#line 14016 "PhotoPage.c" +#line 14000 "PhotoPage.c" } #line 2214 "/home/jens/Source/shotwell/src/PhotoPage.vala" x = _tmp47_; @@ -14033,7 +14017,7 @@ static void editing_host_page_place_tool_window (EditingHostPage* self) { _tmp60_ = _tmp59_.height; #line 2216 "/home/jens/Source/shotwell/src/PhotoPage.vala" y = ((_tmp56_ + _tmp57_) + _tmp58_) - ((_tmp60_ / 4) * 3); -#line 14032 "PhotoPage.c" +#line 14016 "PhotoPage.c" } else { GtkWindow* _tmp61_ = NULL; GtkWindow* _tmp62_ = NULL; @@ -14112,13 +14096,13 @@ static void editing_host_page_place_tool_window (EditingHostPage* self) { _tmp79_ = self->priv->current_tool; #line 2231 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp79_, EDITING_TOOLS_TYPE_ADJUST_TOOL)) { -#line 14111 "PhotoPage.c" +#line 14095 "PhotoPage.c" gint _tmp80_ = 0; #line 2232 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp80_ = x; #line 2232 "/home/jens/Source/shotwell/src/PhotoPage.vala" x = (_tmp80_ * 3) / 4; -#line 14117 "PhotoPage.c" +#line 14101 "PhotoPage.c" } else { gint _tmp81_ = 0; GtkAllocation _tmp82_ = {0}; @@ -14131,11 +14115,11 @@ static void editing_host_page_place_tool_window (EditingHostPage* self) { _tmp83_ = _tmp82_.width; #line 2234 "/home/jens/Source/shotwell/src/PhotoPage.vala" x = (_tmp81_ - _tmp83_) / 2; -#line 14130 "PhotoPage.c" +#line 14114 "PhotoPage.c" } #line 2196 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (screen); -#line 14134 "PhotoPage.c" +#line 14118 "PhotoPage.c" } } #line 2240 "/home/jens/Source/shotwell/src/PhotoPage.vala" @@ -14200,7 +14184,7 @@ static void editing_host_page_place_tool_window (EditingHostPage* self) { _g_object_unref0 (screen); #line 2174 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (tool_window); -#line 14199 "PhotoPage.c" +#line 14183 "PhotoPage.c" } @@ -14234,7 +14218,7 @@ static void editing_host_page_real_on_next_photo (SinglePhotoPage* base) { if (!_tmp1_) { #line 2253 "/home/jens/Source/shotwell/src/PhotoPage.vala" return; -#line 14233 "PhotoPage.c" +#line 14217 "PhotoPage.c" } #line 2255 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp2_ = editing_host_page_get_photo (self); @@ -14272,7 +14256,7 @@ static void editing_host_page_real_on_next_photo (SinglePhotoPage* base) { _g_object_unref0 (current_photo); #line 2260 "/home/jens/Source/shotwell/src/PhotoPage.vala" return; -#line 14271 "PhotoPage.c" +#line 14255 "PhotoPage.c" } #line 2263 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp11_ = current; @@ -14280,14 +14264,14 @@ static void editing_host_page_real_on_next_photo (SinglePhotoPage* base) { _tmp12_ = _g_object_ref0 (_tmp11_); #line 2263 "/home/jens/Source/shotwell/src/PhotoPage.vala" next = _tmp12_; -#line 14279 "PhotoPage.c" +#line 14263 "PhotoPage.c" { gboolean _tmp13_ = FALSE; #line 2264 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp13_ = TRUE; #line 2264 "/home/jens/Source/shotwell/src/PhotoPage.vala" while (TRUE) { -#line 14286 "PhotoPage.c" +#line 14270 "PhotoPage.c" ViewCollection* _tmp14_ = NULL; ViewCollection* _tmp15_ = NULL; DataView* _tmp16_ = NULL; @@ -14303,7 +14287,7 @@ static void editing_host_page_real_on_next_photo (SinglePhotoPage* base) { Photo* _tmp25_ = NULL; #line 2264 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (!_tmp13_) { -#line 14302 "PhotoPage.c" +#line 14286 "PhotoPage.c" } #line 2264 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp13_ = FALSE; @@ -14327,7 +14311,7 @@ static void editing_host_page_real_on_next_photo (SinglePhotoPage* base) { if (_tmp18_ == NULL) { #line 2267 "/home/jens/Source/shotwell/src/PhotoPage.vala" break; -#line 14326 "PhotoPage.c" +#line 14310 "PhotoPage.c" } #line 2269 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp19_ = next; @@ -14339,7 +14323,7 @@ static void editing_host_page_real_on_next_photo (SinglePhotoPage* base) { if (_tmp21_ == NULL) { #line 2269 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (_tmp20_); -#line 14338 "PhotoPage.c" +#line 14322 "PhotoPage.c" } #line 2269 "/home/jens/Source/shotwell/src/PhotoPage.vala" next_photo = _tmp21_; @@ -14351,7 +14335,7 @@ static void editing_host_page_real_on_next_photo (SinglePhotoPage* base) { _g_object_unref0 (next_photo); #line 2271 "/home/jens/Source/shotwell/src/PhotoPage.vala" continue; -#line 14350 "PhotoPage.c" +#line 14334 "PhotoPage.c" } #line 2273 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp23_ = next_photo; @@ -14363,7 +14347,7 @@ static void editing_host_page_real_on_next_photo (SinglePhotoPage* base) { _g_object_unref0 (next_photo); #line 2274 "/home/jens/Source/shotwell/src/PhotoPage.vala" break; -#line 14362 "PhotoPage.c" +#line 14346 "PhotoPage.c" } #line 2276 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp25_ = next_photo; @@ -14373,7 +14357,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 14372 "PhotoPage.c" +#line 14356 "PhotoPage.c" } } #line 2249 "/home/jens/Source/shotwell/src/PhotoPage.vala" @@ -14382,7 +14366,7 @@ static void editing_host_page_real_on_next_photo (SinglePhotoPage* base) { _g_object_unref0 (current); #line 2249 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (current_photo); -#line 14381 "PhotoPage.c" +#line 14365 "PhotoPage.c" } @@ -14416,7 +14400,7 @@ static void editing_host_page_real_on_previous_photo (SinglePhotoPage* base) { if (!_tmp1_) { #line 2286 "/home/jens/Source/shotwell/src/PhotoPage.vala" return; -#line 14415 "PhotoPage.c" +#line 14399 "PhotoPage.c" } #line 2288 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp2_ = editing_host_page_get_photo (self); @@ -14454,7 +14438,7 @@ static void editing_host_page_real_on_previous_photo (SinglePhotoPage* base) { _g_object_unref0 (current_photo); #line 2293 "/home/jens/Source/shotwell/src/PhotoPage.vala" return; -#line 14453 "PhotoPage.c" +#line 14437 "PhotoPage.c" } #line 2296 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp11_ = current; @@ -14462,14 +14446,14 @@ static void editing_host_page_real_on_previous_photo (SinglePhotoPage* base) { _tmp12_ = _g_object_ref0 (_tmp11_); #line 2296 "/home/jens/Source/shotwell/src/PhotoPage.vala" previous = _tmp12_; -#line 14461 "PhotoPage.c" +#line 14445 "PhotoPage.c" { gboolean _tmp13_ = FALSE; #line 2297 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp13_ = TRUE; #line 2297 "/home/jens/Source/shotwell/src/PhotoPage.vala" while (TRUE) { -#line 14468 "PhotoPage.c" +#line 14452 "PhotoPage.c" ViewCollection* _tmp14_ = NULL; ViewCollection* _tmp15_ = NULL; DataView* _tmp16_ = NULL; @@ -14485,7 +14469,7 @@ static void editing_host_page_real_on_previous_photo (SinglePhotoPage* base) { Photo* _tmp25_ = NULL; #line 2297 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (!_tmp13_) { -#line 14484 "PhotoPage.c" +#line 14468 "PhotoPage.c" } #line 2297 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp13_ = FALSE; @@ -14509,7 +14493,7 @@ static void editing_host_page_real_on_previous_photo (SinglePhotoPage* base) { if (_tmp18_ == NULL) { #line 2300 "/home/jens/Source/shotwell/src/PhotoPage.vala" break; -#line 14508 "PhotoPage.c" +#line 14492 "PhotoPage.c" } #line 2302 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp19_ = previous; @@ -14521,7 +14505,7 @@ static void editing_host_page_real_on_previous_photo (SinglePhotoPage* base) { if (_tmp21_ == NULL) { #line 2302 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (_tmp20_); -#line 14520 "PhotoPage.c" +#line 14504 "PhotoPage.c" } #line 2302 "/home/jens/Source/shotwell/src/PhotoPage.vala" previous_photo = _tmp21_; @@ -14533,7 +14517,7 @@ static void editing_host_page_real_on_previous_photo (SinglePhotoPage* base) { _g_object_unref0 (previous_photo); #line 2304 "/home/jens/Source/shotwell/src/PhotoPage.vala" continue; -#line 14532 "PhotoPage.c" +#line 14516 "PhotoPage.c" } #line 2306 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp23_ = previous_photo; @@ -14545,7 +14529,7 @@ static void editing_host_page_real_on_previous_photo (SinglePhotoPage* base) { _g_object_unref0 (previous_photo); #line 2307 "/home/jens/Source/shotwell/src/PhotoPage.vala" break; -#line 14544 "PhotoPage.c" +#line 14528 "PhotoPage.c" } #line 2309 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp25_ = previous_photo; @@ -14555,7 +14539,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 14554 "PhotoPage.c" +#line 14538 "PhotoPage.c" } } #line 2282 "/home/jens/Source/shotwell/src/PhotoPage.vala" @@ -14564,7 +14548,7 @@ static void editing_host_page_real_on_previous_photo (SinglePhotoPage* base) { _g_object_unref0 (current); #line 2282 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (current_photo); -#line 14563 "PhotoPage.c" +#line 14547 "PhotoPage.c" } @@ -14579,7 +14563,7 @@ gboolean editing_host_page_has_current_tool (EditingHostPage* self) { result = _tmp0_ != NULL; #line 2316 "/home/jens/Source/shotwell/src/PhotoPage.vala" return result; -#line 14578 "PhotoPage.c" +#line 14562 "PhotoPage.c" } @@ -14590,7 +14574,7 @@ void editing_host_page_unset_view_collection (EditingHostPage* self) { _data_collection_unref0 (self->priv->parent_view); #line 2320 "/home/jens/Source/shotwell/src/PhotoPage.vala" self->priv->parent_view = NULL; -#line 14589 "PhotoPage.c" +#line 14573 "PhotoPage.c" } @@ -14677,14 +14661,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 14676 "PhotoPage.c" +#line 14660 "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 14683 "PhotoPage.c" +#line 14667 "PhotoPage.c" } @@ -14697,7 +14681,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 14696 "PhotoPage.c" +#line 14680 "PhotoPage.c" } @@ -14710,14 +14694,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 = editing_host_page_editing_host_canvas_real_repaint; -#line 14709 "PhotoPage.c" +#line 14693 "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 14716 "PhotoPage.c" +#line 14700 "PhotoPage.c" } @@ -14729,7 +14713,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 14728 "PhotoPage.c" +#line 14712 "PhotoPage.c" } @@ -14848,7 +14832,7 @@ static void editing_host_page_class_init (EditingHostPageClass * klass) { ((SinglePhotoPageClass *) klass)->on_previous_photo = 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 14847 "PhotoPage.c" +#line 14831 "PhotoPage.c" } @@ -14916,7 +14900,7 @@ static void editing_host_page_instance_init (EditingHostPage * self) { _tmp2_ = gee_hash_map_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, g_free, G_TYPE_INT, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); #line 415 "/home/jens/Source/shotwell/src/PhotoPage.vala" self->priv->last_locations = _tmp2_; -#line 14915 "PhotoPage.c" +#line 14899 "PhotoPage.c" } @@ -15000,7 +14984,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 14999 "PhotoPage.c" +#line 14983 "PhotoPage.c" } @@ -15019,378 +15003,378 @@ 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 2360 "/home/jens/Source/shotwell/src/PhotoPage.vala" library_photo_page_on_photo_destroyed ((LibraryPhotoPage*) self, source); -#line 15018 "PhotoPage.c" +#line 15002 "PhotoPage.c" } static void _library_photo_page_on_metadata_altered_data_collection_items_altered (DataCollection* _sender, GeeMap* items, gpointer self) { #line 2361 "/home/jens/Source/shotwell/src/PhotoPage.vala" library_photo_page_on_metadata_altered ((LibraryPhotoPage*) self, items); -#line 15025 "PhotoPage.c" +#line 15009 "PhotoPage.c" } static void _library_photo_page_on_external_app_changed_configuration_facade_external_app_changed (ConfigurationFacade* _sender, gpointer self) { #line 2362 "/home/jens/Source/shotwell/src/PhotoPage.vala" library_photo_page_on_external_app_changed ((LibraryPhotoPage*) self); -#line 15032 "PhotoPage.c" +#line 15016 "PhotoPage.c" } static void _library_photo_page_on_export_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) { #line 2384 "/home/jens/Source/shotwell/src/PhotoPage.vala" library_photo_page_on_export ((LibraryPhotoPage*) self); -#line 15039 "PhotoPage.c" +#line 15023 "PhotoPage.c" } static void _library_photo_page_on_print_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) { #line 2384 "/home/jens/Source/shotwell/src/PhotoPage.vala" library_photo_page_on_print ((LibraryPhotoPage*) self); -#line 15046 "PhotoPage.c" +#line 15030 "PhotoPage.c" } static void _library_photo_page_on_publish_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) { #line 2384 "/home/jens/Source/shotwell/src/PhotoPage.vala" library_photo_page_on_publish ((LibraryPhotoPage*) self); -#line 15053 "PhotoPage.c" +#line 15037 "PhotoPage.c" } static void _library_photo_page_on_remove_from_library_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) { #line 2384 "/home/jens/Source/shotwell/src/PhotoPage.vala" library_photo_page_on_remove_from_library ((LibraryPhotoPage*) self); -#line 15060 "PhotoPage.c" +#line 15044 "PhotoPage.c" } static void _library_photo_page_on_move_to_trash_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) { #line 2384 "/home/jens/Source/shotwell/src/PhotoPage.vala" library_photo_page_on_move_to_trash ((LibraryPhotoPage*) self); -#line 15067 "PhotoPage.c" +#line 15051 "PhotoPage.c" } static void _single_photo_page_on_previous_photo_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) { #line 2384 "/home/jens/Source/shotwell/src/PhotoPage.vala" single_photo_page_on_previous_photo ((SinglePhotoPage*) self); -#line 15074 "PhotoPage.c" +#line 15058 "PhotoPage.c" } static void _single_photo_page_on_next_photo_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) { #line 2384 "/home/jens/Source/shotwell/src/PhotoPage.vala" single_photo_page_on_next_photo ((SinglePhotoPage*) self); -#line 15081 "PhotoPage.c" +#line 15065 "PhotoPage.c" } static void _editing_host_page_on_rotate_clockwise_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) { #line 2384 "/home/jens/Source/shotwell/src/PhotoPage.vala" editing_host_page_on_rotate_clockwise ((EditingHostPage*) self); -#line 15088 "PhotoPage.c" +#line 15072 "PhotoPage.c" } static void _editing_host_page_on_rotate_counterclockwise_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) { #line 2384 "/home/jens/Source/shotwell/src/PhotoPage.vala" editing_host_page_on_rotate_counterclockwise ((EditingHostPage*) self); -#line 15095 "PhotoPage.c" +#line 15079 "PhotoPage.c" } static void _editing_host_page_on_flip_horizontally_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) { #line 2384 "/home/jens/Source/shotwell/src/PhotoPage.vala" editing_host_page_on_flip_horizontally ((EditingHostPage*) self); -#line 15102 "PhotoPage.c" +#line 15086 "PhotoPage.c" } static void _editing_host_page_on_flip_vertically_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) { #line 2384 "/home/jens/Source/shotwell/src/PhotoPage.vala" editing_host_page_on_flip_vertically ((EditingHostPage*) self); -#line 15109 "PhotoPage.c" +#line 15093 "PhotoPage.c" } static void _editing_host_page_on_enhance_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) { #line 2384 "/home/jens/Source/shotwell/src/PhotoPage.vala" editing_host_page_on_enhance ((EditingHostPage*) self); -#line 15116 "PhotoPage.c" +#line 15100 "PhotoPage.c" } static void _editing_host_page_on_copy_adjustments_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) { #line 2384 "/home/jens/Source/shotwell/src/PhotoPage.vala" editing_host_page_on_copy_adjustments ((EditingHostPage*) self); -#line 15123 "PhotoPage.c" +#line 15107 "PhotoPage.c" } static void _editing_host_page_on_paste_adjustments_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) { #line 2384 "/home/jens/Source/shotwell/src/PhotoPage.vala" editing_host_page_on_paste_adjustments ((EditingHostPage*) self); -#line 15130 "PhotoPage.c" +#line 15114 "PhotoPage.c" } static void _editing_host_page_toggle_crop_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) { #line 2384 "/home/jens/Source/shotwell/src/PhotoPage.vala" editing_host_page_toggle_crop ((EditingHostPage*) self); -#line 15137 "PhotoPage.c" +#line 15121 "PhotoPage.c" } static void _editing_host_page_toggle_straighten_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) { #line 2384 "/home/jens/Source/shotwell/src/PhotoPage.vala" editing_host_page_toggle_straighten ((EditingHostPage*) self); -#line 15144 "PhotoPage.c" +#line 15128 "PhotoPage.c" } static void _editing_host_page_toggle_redeye_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) { #line 2384 "/home/jens/Source/shotwell/src/PhotoPage.vala" editing_host_page_toggle_redeye ((EditingHostPage*) self); -#line 15151 "PhotoPage.c" +#line 15135 "PhotoPage.c" } static void _editing_host_page_toggle_adjust_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) { #line 2384 "/home/jens/Source/shotwell/src/PhotoPage.vala" editing_host_page_toggle_adjust ((EditingHostPage*) self); -#line 15158 "PhotoPage.c" +#line 15142 "PhotoPage.c" } static void _editing_host_page_on_revert_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) { #line 2384 "/home/jens/Source/shotwell/src/PhotoPage.vala" editing_host_page_on_revert ((EditingHostPage*) self); -#line 15165 "PhotoPage.c" +#line 15149 "PhotoPage.c" } static void _editing_host_page_on_edit_title_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) { #line 2384 "/home/jens/Source/shotwell/src/PhotoPage.vala" editing_host_page_on_edit_title ((EditingHostPage*) self); -#line 15172 "PhotoPage.c" +#line 15156 "PhotoPage.c" } static void _editing_host_page_on_edit_comment_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) { #line 2384 "/home/jens/Source/shotwell/src/PhotoPage.vala" editing_host_page_on_edit_comment ((EditingHostPage*) self); -#line 15179 "PhotoPage.c" +#line 15163 "PhotoPage.c" } static void _editing_host_page_on_adjust_date_time_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) { #line 2384 "/home/jens/Source/shotwell/src/PhotoPage.vala" editing_host_page_on_adjust_date_time ((EditingHostPage*) self); -#line 15186 "PhotoPage.c" +#line 15170 "PhotoPage.c" } static void _library_photo_page_on_external_edit_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) { #line 2384 "/home/jens/Source/shotwell/src/PhotoPage.vala" library_photo_page_on_external_edit ((LibraryPhotoPage*) self); -#line 15193 "PhotoPage.c" +#line 15177 "PhotoPage.c" } static void _library_photo_page_on_external_edit_raw_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) { #line 2384 "/home/jens/Source/shotwell/src/PhotoPage.vala" library_photo_page_on_external_edit_raw ((LibraryPhotoPage*) self); -#line 15200 "PhotoPage.c" +#line 15184 "PhotoPage.c" } static void _library_photo_page_on_send_to_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) { #line 2384 "/home/jens/Source/shotwell/src/PhotoPage.vala" library_photo_page_on_send_to ((LibraryPhotoPage*) self); -#line 15207 "PhotoPage.c" +#line 15191 "PhotoPage.c" } static void _editing_host_page_on_set_background_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) { #line 2384 "/home/jens/Source/shotwell/src/PhotoPage.vala" editing_host_page_on_set_background ((EditingHostPage*) self); -#line 15214 "PhotoPage.c" +#line 15198 "PhotoPage.c" } static void _library_photo_page_on_flag_unflag_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) { #line 2384 "/home/jens/Source/shotwell/src/PhotoPage.vala" library_photo_page_on_flag_unflag ((LibraryPhotoPage*) self); -#line 15221 "PhotoPage.c" +#line 15205 "PhotoPage.c" } static void _library_photo_page_on_increase_rating_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) { #line 2384 "/home/jens/Source/shotwell/src/PhotoPage.vala" library_photo_page_on_increase_rating ((LibraryPhotoPage*) self); -#line 15228 "PhotoPage.c" +#line 15212 "PhotoPage.c" } static void _library_photo_page_on_decrease_rating_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) { #line 2384 "/home/jens/Source/shotwell/src/PhotoPage.vala" library_photo_page_on_decrease_rating ((LibraryPhotoPage*) self); -#line 15235 "PhotoPage.c" +#line 15219 "PhotoPage.c" } static void _library_photo_page_on_rate_rejected_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) { #line 2384 "/home/jens/Source/shotwell/src/PhotoPage.vala" library_photo_page_on_rate_rejected ((LibraryPhotoPage*) self); -#line 15242 "PhotoPage.c" +#line 15226 "PhotoPage.c" } static void _library_photo_page_on_rate_unrated_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) { #line 2384 "/home/jens/Source/shotwell/src/PhotoPage.vala" library_photo_page_on_rate_unrated ((LibraryPhotoPage*) self); -#line 15249 "PhotoPage.c" +#line 15233 "PhotoPage.c" } static void _library_photo_page_on_rate_one_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) { #line 2384 "/home/jens/Source/shotwell/src/PhotoPage.vala" library_photo_page_on_rate_one ((LibraryPhotoPage*) self); -#line 15256 "PhotoPage.c" +#line 15240 "PhotoPage.c" } static void _library_photo_page_on_rate_two_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) { #line 2384 "/home/jens/Source/shotwell/src/PhotoPage.vala" library_photo_page_on_rate_two ((LibraryPhotoPage*) self); -#line 15263 "PhotoPage.c" +#line 15247 "PhotoPage.c" } static void _library_photo_page_on_rate_three_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) { #line 2384 "/home/jens/Source/shotwell/src/PhotoPage.vala" library_photo_page_on_rate_three ((LibraryPhotoPage*) self); -#line 15270 "PhotoPage.c" +#line 15254 "PhotoPage.c" } static void _library_photo_page_on_rate_four_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) { #line 2384 "/home/jens/Source/shotwell/src/PhotoPage.vala" library_photo_page_on_rate_four ((LibraryPhotoPage*) self); -#line 15277 "PhotoPage.c" +#line 15261 "PhotoPage.c" } static void _library_photo_page_on_rate_five_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) { #line 2384 "/home/jens/Source/shotwell/src/PhotoPage.vala" library_photo_page_on_rate_five ((LibraryPhotoPage*) self); -#line 15284 "PhotoPage.c" +#line 15268 "PhotoPage.c" } static void _editing_host_page_on_increase_size_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) { #line 2384 "/home/jens/Source/shotwell/src/PhotoPage.vala" editing_host_page_on_increase_size ((EditingHostPage*) self); -#line 15291 "PhotoPage.c" +#line 15275 "PhotoPage.c" } static void _editing_host_page_on_decrease_size_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) { #line 2384 "/home/jens/Source/shotwell/src/PhotoPage.vala" editing_host_page_on_decrease_size ((EditingHostPage*) self); -#line 15298 "PhotoPage.c" +#line 15282 "PhotoPage.c" } static void _editing_host_page_snap_zoom_to_min_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) { #line 2384 "/home/jens/Source/shotwell/src/PhotoPage.vala" editing_host_page_snap_zoom_to_min ((EditingHostPage*) self); -#line 15305 "PhotoPage.c" +#line 15289 "PhotoPage.c" } static void _editing_host_page_snap_zoom_to_isomorphic_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) { #line 2384 "/home/jens/Source/shotwell/src/PhotoPage.vala" editing_host_page_snap_zoom_to_isomorphic ((EditingHostPage*) self); -#line 15312 "PhotoPage.c" +#line 15296 "PhotoPage.c" } static void _editing_host_page_snap_zoom_to_max_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) { #line 2384 "/home/jens/Source/shotwell/src/PhotoPage.vala" editing_host_page_snap_zoom_to_max ((EditingHostPage*) self); -#line 15319 "PhotoPage.c" +#line 15303 "PhotoPage.c" } static void _library_photo_page_on_add_tags_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) { #line 2384 "/home/jens/Source/shotwell/src/PhotoPage.vala" library_photo_page_on_add_tags ((LibraryPhotoPage*) self); -#line 15326 "PhotoPage.c" +#line 15310 "PhotoPage.c" } static void _library_photo_page_on_modify_tags_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) { #line 2384 "/home/jens/Source/shotwell/src/PhotoPage.vala" library_photo_page_on_modify_tags ((LibraryPhotoPage*) self); -#line 15333 "PhotoPage.c" +#line 15317 "PhotoPage.c" } static void _library_photo_page_on_slideshow_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) { #line 2384 "/home/jens/Source/shotwell/src/PhotoPage.vala" library_photo_page_on_slideshow ((LibraryPhotoPage*) self); -#line 15340 "PhotoPage.c" +#line 15324 "PhotoPage.c" } static void _page_on_action_toggle_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) { #line 2384 "/home/jens/Source/shotwell/src/PhotoPage.vala" page_on_action_toggle ((Page*) self, action, parameter); -#line 15347 "PhotoPage.c" +#line 15331 "PhotoPage.c" } static void _library_photo_page_on_display_ratings_gsimple_action_change_state_callback (GSimpleAction* action, GVariant* value, gpointer self) { #line 2384 "/home/jens/Source/shotwell/src/PhotoPage.vala" library_photo_page_on_display_ratings ((LibraryPhotoPage*) self, action, value); -#line 15354 "PhotoPage.c" +#line 15338 "PhotoPage.c" } static void _page_on_action_radio_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) { #line 2384 "/home/jens/Source/shotwell/src/PhotoPage.vala" page_on_action_radio ((Page*) self, action, parameter); -#line 15361 "PhotoPage.c" +#line 15345 "PhotoPage.c" } static void _library_photo_page_on_raw_developer_changed_gsimple_action_change_state_callback (GSimpleAction* action, GVariant* value, gpointer self) { #line 2384 "/home/jens/Source/shotwell/src/PhotoPage.vala" library_photo_page_on_raw_developer_changed ((LibraryPhotoPage*) self, action, value); -#line 15368 "PhotoPage.c" +#line 15352 "PhotoPage.c" } static void _library_photo_page_on_photos_altered_data_collection_items_altered (DataCollection* _sender, GeeMap* items, gpointer self) { #line 2344 "/home/jens/Source/shotwell/src/PhotoPage.vala" library_photo_page_on_photos_altered ((LibraryPhotoPage*) self); -#line 15375 "PhotoPage.c" +#line 15359 "PhotoPage.c" } static void _library_photo_page_on_photo_unlinking_source_collection_items_unlinking (SourceCollection* _sender, GeeCollection* unlinking, gpointer self) { #line 2355 "/home/jens/Source/shotwell/src/PhotoPage.vala" library_photo_page_on_photo_unlinking ((LibraryPhotoPage*) self, unlinking); -#line 15382 "PhotoPage.c" +#line 15366 "PhotoPage.c" } static void _library_photo_page_on_photo_relinked_source_collection_items_relinked (SourceCollection* _sender, GeeCollection* relinked, gpointer self) { #line 2356 "/home/jens/Source/shotwell/src/PhotoPage.vala" library_photo_page_on_photo_relinked ((LibraryPhotoPage*) self, relinked); -#line 15389 "PhotoPage.c" +#line 15373 "PhotoPage.c" } @@ -15456,14 +15440,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 2340 "/home/jens/Source/shotwell/src/PhotoPage.vala" return self; -#line 15455 "PhotoPage.c" +#line 15439 "PhotoPage.c" } LibraryPhotoPage* library_photo_page_new (void) { #line 2340 "/home/jens/Source/shotwell/src/PhotoPage.vala" return library_photo_page_construct (TYPE_LIBRARY_PHOTO_PAGE); -#line 15462 "PhotoPage.c" +#line 15446 "PhotoPage.c" } @@ -15494,7 +15478,7 @@ gboolean library_photo_page_not_trashed_view_filter (LibraryPhotoPage* self, Dat result = _tmp4_; #line 2366 "/home/jens/Source/shotwell/src/PhotoPage.vala" return result; -#line 15493 "PhotoPage.c" +#line 15477 "PhotoPage.c" } @@ -15508,7 +15492,7 @@ static void library_photo_page_on_photo_unlinking (LibraryPhotoPage* self, GeeCo _tmp0_ = self->priv->filter; #line 2370 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_signal_emit_by_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_VIEW_FILTER, ViewFilter), "refresh"); -#line 15507 "PhotoPage.c" +#line 15491 "PhotoPage.c" } @@ -15522,7 +15506,7 @@ static void library_photo_page_on_photo_relinked (LibraryPhotoPage* self, GeeCol _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 15521 "PhotoPage.c" +#line 15505 "PhotoPage.c" } @@ -15547,21 +15531,21 @@ static void library_photo_page_real_init_collect_ui_filenames (Page* base, GeeLi _tmp2_ = ui_filenames; #line 2381 "/home/jens/Source/shotwell/src/PhotoPage.vala" gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_COLLECTION, GeeCollection), "photo.ui"); -#line 15546 "PhotoPage.c" +#line 15530 "PhotoPage.c" } -static GVariant* _variant_new12 (gboolean value) { +static GVariant* _variant_new16 (gboolean value) { #line 2441 "/home/jens/Source/shotwell/src/PhotoPage.vala" return g_variant_ref_sink (g_variant_new_boolean (value)); -#line 15553 "PhotoPage.c" +#line 15537 "PhotoPage.c" } -static GVariant* _variant_new13 (const gchar* value) { +static GVariant* _variant_new17 (const gchar* value) { #line 2444 "/home/jens/Source/shotwell/src/PhotoPage.vala" return g_variant_ref_sink (g_variant_new_string (value)); -#line 15560 "PhotoPage.c" +#line 15544 "PhotoPage.c" } @@ -15608,7 +15592,7 @@ static void library_photo_page_real_add_actions (Page* base) { if (_tmp3_ == NULL) { #line 2441 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (_tmp2_); -#line 15607 "PhotoPage.c" +#line 15591 "PhotoPage.c" } #line 2441 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp4_ = _tmp3_; @@ -15619,9 +15603,9 @@ static void library_photo_page_real_add_actions (Page* base) { #line 2441 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp7_ = configuration_facade_get_display_photo_ratings (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade)); #line 2441 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp8_ = _variant_new12 (_tmp7_); + _tmp8_ = _variant_new16 (_tmp7_); #line 2441 "/home/jens/Source/shotwell/src/PhotoPage.vala" - g_simple_action_set_state (_tmp4_, _tmp8_); + g_signal_emit_by_name (_tmp4_, "change-state", _tmp8_); #line 2441 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_variant_unref0 (_tmp8_); #line 2441 "/home/jens/Source/shotwell/src/PhotoPage.vala" @@ -15648,7 +15632,7 @@ static void library_photo_page_real_add_actions (Page* base) { if (_tmp14_ == NULL) { #line 2443 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (_tmp13_); -#line 15647 "PhotoPage.c" +#line 15631 "PhotoPage.c" } #line 2443 "/home/jens/Source/shotwell/src/PhotoPage.vala" action = _tmp14_; @@ -15657,31 +15641,31 @@ static void library_photo_page_real_add_actions (Page* base) { #line 2444 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp16_ == RAW_DEVELOPER_SHOTWELL) { #line 2444 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp15_ = "'Shotwell'"; -#line 15657 "PhotoPage.c" + _tmp15_ = "Shotwell"; +#line 15641 "PhotoPage.c" } else { #line 2444 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp15_ = "'Camera'"; -#line 15661 "PhotoPage.c" + _tmp15_ = "Camera"; +#line 15645 "PhotoPage.c" } #line 2444 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp17_ = action; #line 2444 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp18_ = _variant_new13 (_tmp15_); + _tmp18_ = _variant_new17 (_tmp15_); #line 2444 "/home/jens/Source/shotwell/src/PhotoPage.vala" - g_simple_action_set_state (_tmp17_, _tmp18_); + g_signal_emit_by_name (_tmp17_, "change-state", _tmp18_); #line 2444 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_variant_unref0 (_tmp18_); #line 2437 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (action); -#line 15673 "PhotoPage.c" +#line 15657 "PhotoPage.c" } static gpointer _injection_group_ref0 (gpointer self) { #line 2453 "/home/jens/Source/shotwell/src/PhotoPage.vala" return self ? injection_group_ref (self) : NULL; -#line 15680 "PhotoPage.c" +#line 15664 "PhotoPage.c" } @@ -15692,13 +15676,13 @@ static void _vala_array_add82 (InjectionGroup*** array, int* length, int* size, *size = (*size) ? (2 * (*size)) : 4; #line 2453 "/home/jens/Source/shotwell/src/PhotoPage.vala" *array = g_renew (InjectionGroup*, *array, (*size) + 1); -#line 15691 "PhotoPage.c" +#line 15675 "PhotoPage.c" } #line 2453 "/home/jens/Source/shotwell/src/PhotoPage.vala" (*array)[(*length)++] = value; #line 2453 "/home/jens/Source/shotwell/src/PhotoPage.vala" (*array)[*length] = NULL; -#line 15697 "PhotoPage.c" +#line 15681 "PhotoPage.c" } @@ -15709,13 +15693,13 @@ static void _vala_array_add83 (InjectionGroup*** array, int* length, int* size, *size = (*size) ? (2 * (*size)) : 4; #line 2458 "/home/jens/Source/shotwell/src/PhotoPage.vala" *array = g_renew (InjectionGroup*, *array, (*size) + 1); -#line 15708 "PhotoPage.c" +#line 15692 "PhotoPage.c" } #line 2458 "/home/jens/Source/shotwell/src/PhotoPage.vala" (*array)[(*length)++] = value; #line 2458 "/home/jens/Source/shotwell/src/PhotoPage.vala" (*array)[*length] = NULL; -#line 15714 "PhotoPage.c" +#line 15698 "PhotoPage.c" } @@ -15726,13 +15710,13 @@ static void _vala_array_add84 (InjectionGroup*** array, int* length, int* size, *size = (*size) ? (2 * (*size)) : 4; #line 2463 "/home/jens/Source/shotwell/src/PhotoPage.vala" *array = g_renew (InjectionGroup*, *array, (*size) + 1); -#line 15725 "PhotoPage.c" +#line 15709 "PhotoPage.c" } #line 2463 "/home/jens/Source/shotwell/src/PhotoPage.vala" (*array)[(*length)++] = value; #line 2463 "/home/jens/Source/shotwell/src/PhotoPage.vala" (*array)[*length] = NULL; -#line 15731 "PhotoPage.c" +#line 15715 "PhotoPage.c" } @@ -15813,7 +15797,7 @@ static InjectionGroup** library_photo_page_real_init_collect_injection_groups (P #line 2461 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp11_ = _ ("Set as _Desktop Background"); #line 2461 "/home/jens/Source/shotwell/src/PhotoPage.vala" - injection_group_add_menu_item (bg_group, _tmp11_, "SetBackground", NULL); + injection_group_add_menu_item (bg_group, _tmp11_, "SetBackground", "<Primary>b"); #line 2463 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp12_ = groups; #line 2463 "/home/jens/Source/shotwell/src/PhotoPage.vala" @@ -15830,7 +15814,7 @@ static InjectionGroup** library_photo_page_real_init_collect_injection_groups (P if (result_length1) { #line 2465 "/home/jens/Source/shotwell/src/PhotoPage.vala" *result_length1 = _tmp14__length1; -#line 15829 "PhotoPage.c" +#line 15813 "PhotoPage.c" } #line 2465 "/home/jens/Source/shotwell/src/PhotoPage.vala" result = _tmp14_; @@ -15842,7 +15826,7 @@ static InjectionGroup** library_photo_page_real_init_collect_injection_groups (P _injection_group_unref0 (print_group); #line 2465 "/home/jens/Source/shotwell/src/PhotoPage.vala" return result; -#line 15841 "PhotoPage.c" +#line 15825 "PhotoPage.c" } @@ -15880,7 +15864,7 @@ static void library_photo_page_on_display_ratings (LibraryPhotoPage* self, GSimp _tmp5_ = value; #line 2474 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_simple_action_set_state (_tmp4_, _tmp5_); -#line 15879 "PhotoPage.c" +#line 15863 "PhotoPage.c" } @@ -15899,7 +15883,7 @@ static void library_photo_page_set_display_ratings (LibraryPhotoPage* self, gboo if (_tmp1_ == NULL) { #line 2479 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (_tmp0_); -#line 15898 "PhotoPage.c" +#line 15882 "PhotoPage.c" } #line 2479 "/home/jens/Source/shotwell/src/PhotoPage.vala" action = _tmp1_; @@ -15907,7 +15891,7 @@ static void library_photo_page_set_display_ratings (LibraryPhotoPage* self, gboo _tmp2_ = action; #line 2480 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp2_ != NULL) { -#line 15906 "PhotoPage.c" +#line 15890 "PhotoPage.c" GSimpleAction* _tmp3_ = NULL; gboolean _tmp4_ = FALSE; #line 2481 "/home/jens/Source/shotwell/src/PhotoPage.vala" @@ -15916,11 +15900,11 @@ static void library_photo_page_set_display_ratings (LibraryPhotoPage* self, gboo _tmp4_ = display; #line 2481 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_simple_action_set_enabled (_tmp3_, _tmp4_); -#line 15915 "PhotoPage.c" +#line 15899 "PhotoPage.c" } #line 2478 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (action); -#line 15919 "PhotoPage.c" +#line 15903 "PhotoPage.c" } @@ -15976,7 +15960,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 2486 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp5_) { -#line 15975 "PhotoPage.c" +#line 15959 "PhotoPage.c" Photo* _tmp6_ = NULL; Photo* _tmp7_ = NULL; gboolean _tmp8_ = FALSE; @@ -15990,11 +15974,11 @@ static void library_photo_page_real_update_actions (Page* base, gint selected_co _tmp4_ = _tmp8_; #line 2486 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (_tmp7_); -#line 15989 "PhotoPage.c" +#line 15973 "PhotoPage.c" } else { #line 2486 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp4_ = FALSE; -#line 15993 "PhotoPage.c" +#line 15977 "PhotoPage.c" } #line 2486 "/home/jens/Source/shotwell/src/PhotoPage.vala" rotate_possible = _tmp4_; @@ -16002,7 +15986,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 2487 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp10_) { -#line 16001 "PhotoPage.c" +#line 15985 "PhotoPage.c" Photo* _tmp11_ = NULL; Photo* _tmp12_ = NULL; PhotoFileFormat _tmp13_ = 0; @@ -16016,11 +16000,11 @@ static void library_photo_page_real_update_actions (Page* base, gint selected_co _tmp9_ = _tmp13_ == PHOTO_FILE_FORMAT_RAW; #line 2487 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (_tmp12_); -#line 16015 "PhotoPage.c" +#line 15999 "PhotoPage.c" } else { #line 2487 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp9_ = FALSE; -#line 16019 "PhotoPage.c" +#line 16003 "PhotoPage.c" } #line 2487 "/home/jens/Source/shotwell/src/PhotoPage.vala" is_raw = _tmp9_; @@ -16028,7 +16012,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 2490 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp15_) { -#line 16027 "PhotoPage.c" +#line 16011 "PhotoPage.c" ConfigFacade* _tmp16_ = NULL; ConfigFacade* _tmp17_ = NULL; gchar* _tmp18_ = NULL; @@ -16047,11 +16031,11 @@ static void library_photo_page_real_update_actions (Page* base, gint selected_co _g_free0 (_tmp19_); #line 2490 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (_tmp17_); -#line 16046 "PhotoPage.c" +#line 16030 "PhotoPage.c" } else { #line 2490 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp14_ = FALSE; -#line 16050 "PhotoPage.c" +#line 16034 "PhotoPage.c" } #line 2489 "/home/jens/Source/shotwell/src/PhotoPage.vala" page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "ExternalEdit", _tmp14_); @@ -16059,7 +16043,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 2492 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp21_) { -#line 16058 "PhotoPage.c" +#line 16042 "PhotoPage.c" gboolean _tmp22_ = FALSE; Photo* _tmp23_ = NULL; Photo* _tmp24_ = NULL; @@ -16079,7 +16063,7 @@ static void library_photo_page_real_update_actions (Page* base, gint selected_co if (_tmp26_) { #line 2493 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp22_ = TRUE; -#line 16078 "PhotoPage.c" +#line 16062 "PhotoPage.c" } else { Photo* _tmp27_ = NULL; Photo* _tmp28_ = NULL; @@ -16094,15 +16078,15 @@ static void library_photo_page_real_update_actions (Page* base, gint selected_co _tmp22_ = _tmp29_; #line 2493 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (_tmp28_); -#line 16093 "PhotoPage.c" +#line 16077 "PhotoPage.c" } #line 2493 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp20_ = _tmp22_; -#line 16097 "PhotoPage.c" +#line 16081 "PhotoPage.c" } else { #line 2493 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp20_ = FALSE; -#line 16101 "PhotoPage.c" +#line 16085 "PhotoPage.c" } #line 2492 "/home/jens/Source/shotwell/src/PhotoPage.vala" page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Revert", _tmp20_); @@ -16110,17 +16094,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 2495 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp31_) { -#line 16109 "PhotoPage.c" +#line 16093 "PhotoPage.c" gboolean _tmp32_ = FALSE; #line 2495 "/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 2495 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp30_ = !_tmp32_; -#line 16115 "PhotoPage.c" +#line 16099 "PhotoPage.c" } else { #line 2495 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp30_ = FALSE; -#line 16119 "PhotoPage.c" +#line 16103 "PhotoPage.c" } #line 2495 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp30_) { @@ -16128,7 +16112,7 @@ static void library_photo_page_real_update_actions (Page* base, gint selected_co library_photo_page_update_rating_menu_item_sensitivity (self); #line 2497 "/home/jens/Source/shotwell/src/PhotoPage.vala" library_photo_page_update_development_menu_item_sensitivity (self); -#line 16127 "PhotoPage.c" +#line 16111 "PhotoPage.c" } #line 2500 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp33_ = editing_host_page_has_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage)); @@ -16138,7 +16122,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 2502 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp35_) { -#line 16137 "PhotoPage.c" +#line 16121 "PhotoPage.c" Photo* _tmp36_ = NULL; Photo* _tmp37_ = NULL; gboolean _tmp38_ = FALSE; @@ -16152,11 +16136,11 @@ static void library_photo_page_real_update_actions (Page* base, gint selected_co _tmp34_ = _tmp38_; #line 2502 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (_tmp37_); -#line 16151 "PhotoPage.c" +#line 16135 "PhotoPage.c" } else { #line 2502 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp34_ = FALSE; -#line 16155 "PhotoPage.c" +#line 16139 "PhotoPage.c" } #line 2502 "/home/jens/Source/shotwell/src/PhotoPage.vala" page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "CopyColorAdjustments", _tmp34_); @@ -16192,7 +16176,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 2512 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp46_) { -#line 16191 "PhotoPage.c" +#line 16175 "PhotoPage.c" Photo* _tmp47_ = NULL; Photo* _tmp48_ = NULL; Scaling _tmp49_ = {0}; @@ -16225,7 +16209,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 2514 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (_tmp52_); -#line 16224 "PhotoPage.c" +#line 16208 "PhotoPage.c" } #line 2518 "/home/jens/Source/shotwell/src/PhotoPage.vala" library_photo_page_update_flag_action (self); @@ -16233,7 +16217,7 @@ static void library_photo_page_real_update_actions (Page* base, gint selected_co _tmp56_ = is_raw; #line 2521 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp56_) { -#line 16232 "PhotoPage.c" +#line 16216 "PhotoPage.c" ConfigFacade* _tmp57_ = NULL; ConfigFacade* _tmp58_ = NULL; gchar* _tmp59_ = NULL; @@ -16252,11 +16236,11 @@ static void library_photo_page_real_update_actions (Page* base, gint selected_co _g_free0 (_tmp60_); #line 2521 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (_tmp58_); -#line 16251 "PhotoPage.c" +#line 16235 "PhotoPage.c" } else { #line 2521 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp55_ = FALSE; -#line 16255 "PhotoPage.c" +#line 16239 "PhotoPage.c" } #line 2520 "/home/jens/Source/shotwell/src/PhotoPage.vala" page_set_action_visible (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "ExternalEditRAW", _tmp55_); @@ -16266,7 +16250,7 @@ static void library_photo_page_real_update_actions (Page* base, gint selected_co _tmp62_ = count; #line 2523 "/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 16265 "PhotoPage.c" +#line 16249 "PhotoPage.c" } @@ -16279,7 +16263,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 2527 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp1_) { -#line 16278 "PhotoPage.c" +#line 16262 "PhotoPage.c" gboolean _tmp2_ = FALSE; Photo* _tmp3_ = NULL; Photo* _tmp4_ = NULL; @@ -16299,7 +16283,7 @@ static void library_photo_page_on_photos_altered (LibraryPhotoPage* self) { if (_tmp6_) { #line 2528 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp2_ = TRUE; -#line 16298 "PhotoPage.c" +#line 16282 "PhotoPage.c" } else { Photo* _tmp7_ = NULL; Photo* _tmp8_ = NULL; @@ -16314,21 +16298,21 @@ static void library_photo_page_on_photos_altered (LibraryPhotoPage* self) { _tmp2_ = _tmp9_; #line 2528 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (_tmp8_); -#line 16313 "PhotoPage.c" +#line 16297 "PhotoPage.c" } #line 2528 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp0_ = _tmp2_; -#line 16317 "PhotoPage.c" +#line 16301 "PhotoPage.c" } else { #line 2528 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp0_ = FALSE; -#line 16321 "PhotoPage.c" +#line 16305 "PhotoPage.c" } #line 2527 "/home/jens/Source/shotwell/src/PhotoPage.vala" page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Revert", _tmp0_); #line 2529 "/home/jens/Source/shotwell/src/PhotoPage.vala" library_photo_page_update_flag_action (self); -#line 16327 "PhotoPage.c" +#line 16311 "PhotoPage.c" } @@ -16342,7 +16326,7 @@ static void library_photo_page_on_raw_developer_changed (LibraryPhotoPage* self, static GQuark _tmp3_label0 = 0; #line 2536 "/home/jens/Source/shotwell/src/PhotoPage.vala" static GQuark _tmp3_label1 = 0; -#line 16341 "PhotoPage.c" +#line 16325 "PhotoPage.c" RawDeveloper _tmp5_ = 0; GSimpleAction* _tmp6_ = NULL; GVariant* _tmp7_ = NULL; @@ -16364,38 +16348,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 2536 "/home/jens/Source/shotwell/src/PhotoPage.vala" switch (0) { -#line 16363 "PhotoPage.c" +#line 16347 "PhotoPage.c" default: { #line 2538 "/home/jens/Source/shotwell/src/PhotoPage.vala" developer = RAW_DEVELOPER_SHOTWELL; #line 2539 "/home/jens/Source/shotwell/src/PhotoPage.vala" break; -#line 16370 "PhotoPage.c" +#line 16354 "PhotoPage.c" } } } else if (_tmp4_ == ((0 != _tmp3_label1) ? _tmp3_label1 : (_tmp3_label1 = g_quark_from_static_string ("Camera")))) { #line 2536 "/home/jens/Source/shotwell/src/PhotoPage.vala" switch (0) { -#line 16376 "PhotoPage.c" +#line 16360 "PhotoPage.c" default: { #line 2541 "/home/jens/Source/shotwell/src/PhotoPage.vala" developer = RAW_DEVELOPER_CAMERA; #line 2542 "/home/jens/Source/shotwell/src/PhotoPage.vala" break; -#line 16383 "PhotoPage.c" +#line 16367 "PhotoPage.c" } } } else { #line 2536 "/home/jens/Source/shotwell/src/PhotoPage.vala" switch (0) { -#line 16389 "PhotoPage.c" +#line 16373 "PhotoPage.c" default: { #line 2544 "/home/jens/Source/shotwell/src/PhotoPage.vala" break; -#line 16394 "PhotoPage.c" +#line 16378 "PhotoPage.c" } } } @@ -16409,7 +16393,7 @@ static void library_photo_page_on_raw_developer_changed (LibraryPhotoPage* self, _tmp7_ = value; #line 2549 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_simple_action_set_state (_tmp6_, _tmp7_); -#line 16408 "PhotoPage.c" +#line 16392 "PhotoPage.c" } @@ -16447,7 +16431,7 @@ static void library_photo_page_real_developer_changed (LibraryPhotoPage* self, R if (_tmp3_) { #line 2554 "/home/jens/Source/shotwell/src/PhotoPage.vala" return; -#line 16446 "PhotoPage.c" +#line 16430 "PhotoPage.c" } #line 2556 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp4_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); @@ -16469,7 +16453,7 @@ static void library_photo_page_real_developer_changed (LibraryPhotoPage* self, R if (_tmp11_ == NULL) { #line 2556 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (_tmp10_); -#line 16468 "PhotoPage.c" +#line 16452 "PhotoPage.c" } #line 2556 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp12_ = _tmp11_; @@ -16487,7 +16471,7 @@ static void library_photo_page_real_developer_changed (LibraryPhotoPage* self, R if (_tmp14_ == NULL) { #line 2557 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp13_ = TRUE; -#line 16486 "PhotoPage.c" +#line 16470 "PhotoPage.c" } else { RawDeveloper _tmp15_ = 0; Photo* _tmp16_ = NULL; @@ -16503,7 +16487,7 @@ static void library_photo_page_real_developer_changed (LibraryPhotoPage* self, R _tmp18_ = raw_developer_is_equivalent (_tmp15_, _tmp17_); #line 2557 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp13_ = _tmp18_; -#line 16502 "PhotoPage.c" +#line 16486 "PhotoPage.c" } #line 2557 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp13_) { @@ -16511,7 +16495,7 @@ static void library_photo_page_real_developer_changed (LibraryPhotoPage* self, R _g_object_unref0 (photo); #line 2558 "/home/jens/Source/shotwell/src/PhotoPage.vala" return; -#line 16510 "PhotoPage.c" +#line 16494 "PhotoPage.c" } #line 2562 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp20_ = photo; @@ -16521,18 +16505,18 @@ static void library_photo_page_real_developer_changed (LibraryPhotoPage* self, R if (!_tmp21_) { #line 2562 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp19_ = TRUE; -#line 16520 "PhotoPage.c" +#line 16504 "PhotoPage.c" } else { gboolean _tmp22_ = FALSE; #line 2562 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp22_ = dialogs_confirm_warn_developer_changed (1); #line 2562 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp19_ = _tmp22_; -#line 16527 "PhotoPage.c" +#line 16511 "PhotoPage.c" } #line 2562 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp19_) { -#line 16531 "PhotoPage.c" +#line 16515 "PhotoPage.c" SetRawDeveloperCommand* command = NULL; ViewCollection* _tmp23_ = NULL; ViewCollection* _tmp24_ = NULL; @@ -16578,11 +16562,11 @@ static void library_photo_page_real_developer_changed (LibraryPhotoPage* self, R library_photo_page_update_development_menu_item_sensitivity (self); #line 2562 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (command); -#line 16577 "PhotoPage.c" +#line 16561 "PhotoPage.c" } #line 2552 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (photo); -#line 16581 "PhotoPage.c" +#line 16565 "PhotoPage.c" } @@ -16591,7 +16575,7 @@ void library_photo_page_developer_changed (LibraryPhotoPage* self, RawDeveloper g_return_if_fail (IS_LIBRARY_PHOTO_PAGE (self)); #line 2552 "/home/jens/Source/shotwell/src/PhotoPage.vala" LIBRARY_PHOTO_PAGE_GET_CLASS (self)->developer_changed (self, rd); -#line 16590 "PhotoPage.c" +#line 16574 "PhotoPage.c" } @@ -16602,50 +16586,15 @@ static void library_photo_page_update_flag_action (LibraryPhotoPage* self) { #line 2572 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp0_ = editing_host_page_has_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage)); #line 2572 "/home/jens/Source/shotwell/src/PhotoPage.vala" - if (_tmp0_) { -#line 16602 "PhotoPage.c" - GSimpleAction* action = NULL; - GAction* _tmp1_ = NULL; - GSimpleAction* _tmp2_ = NULL; - GSimpleAction* _tmp3_ = NULL; - GSimpleAction* _tmp4_ = NULL; -#line 2573 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp1_ = page_get_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Flag"); -#line 2573 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp2_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp1_, g_simple_action_get_type ()) ? ((GSimpleAction*) _tmp1_) : NULL; -#line 2573 "/home/jens/Source/shotwell/src/PhotoPage.vala" - if (_tmp2_ == NULL) { -#line 2573 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _g_object_unref0 (_tmp1_); -#line 16616 "PhotoPage.c" - } -#line 2573 "/home/jens/Source/shotwell/src/PhotoPage.vala" - action = _tmp2_; -#line 2574 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp3_ = action; -#line 2574 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _vala_assert (_tmp3_ != NULL, "action != null"); -#line 2578 "/home/jens/Source/shotwell/src/PhotoPage.vala" - g_debug ("PhotoPage.vala:2578: Setting label of action flagged"); -#line 2580 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp4_ = action; -#line 2580 "/home/jens/Source/shotwell/src/PhotoPage.vala" - g_simple_action_set_enabled (_tmp4_, TRUE); -#line 2572 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _g_object_unref0 (action); -#line 16632 "PhotoPage.c" - } else { -#line 2582 "/home/jens/Source/shotwell/src/PhotoPage.vala" - page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Flag", FALSE); -#line 16636 "PhotoPage.c" - } + page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Flag", _tmp0_); +#line 16586 "PhotoPage.c" } static void _library_photo_page_on_page_destroyed_gtk_widget_destroy (GtkWidget* _sender, gpointer self) { -#line 2593 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2582 "/home/jens/Source/shotwell/src/PhotoPage.vala" library_photo_page_on_page_destroyed ((LibraryPhotoPage*) self); -#line 16644 "PhotoPage.c" +#line 16593 "PhotoPage.c" } @@ -16656,75 +16605,75 @@ void library_photo_page_display_for_collection (LibraryPhotoPage* self, Collecti ViewCollection* _tmp3_ = NULL; ViewCollection* _tmp4_ = NULL; Photo* _tmp9_ = NULL; -#line 2590 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2579 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_if_fail (IS_LIBRARY_PHOTO_PAGE (self)); -#line 2590 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2579 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_if_fail (IS_COLLECTION_PAGE (return_page)); -#line 2590 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2579 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_if_fail (IS_PHOTO (photo)); -#line 2590 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2579 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_if_fail ((view == NULL) || IS_VIEW_COLLECTION (view)); -#line 2592 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2581 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp0_ = return_page; -#line 2592 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2581 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp1_ = _g_object_ref0 (_tmp0_); -#line 2592 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2581 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (self->priv->return_page); -#line 2592 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2581 "/home/jens/Source/shotwell/src/PhotoPage.vala" self->priv->return_page = _tmp1_; -#line 2593 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2582 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp2_ = return_page; -#line 2593 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2582 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_widget_get_type (), GtkWidget), "destroy", (GCallback) _library_photo_page_on_page_destroyed_gtk_widget_destroy, self, 0); -#line 2595 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2584 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp4_ = view; -#line 2595 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2584 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp4_ != NULL) { -#line 16679 "PhotoPage.c" +#line 16628 "PhotoPage.c" ViewCollection* _tmp5_ = NULL; ViewCollection* _tmp6_ = NULL; -#line 2595 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2584 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp5_ = view; -#line 2595 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2584 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp6_ = _data_collection_ref0 (_tmp5_); -#line 2595 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2584 "/home/jens/Source/shotwell/src/PhotoPage.vala" _data_collection_unref0 (_tmp3_); -#line 2595 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2584 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp3_ = _tmp6_; -#line 16690 "PhotoPage.c" +#line 16639 "PhotoPage.c" } else { CollectionPage* _tmp7_ = NULL; ViewCollection* _tmp8_ = NULL; -#line 2595 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2584 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp7_ = return_page; -#line 2595 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2584 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp8_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_PAGE, Page)); -#line 2595 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2584 "/home/jens/Source/shotwell/src/PhotoPage.vala" _data_collection_unref0 (_tmp3_); -#line 2595 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2584 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp3_ = _tmp8_; -#line 16702 "PhotoPage.c" +#line 16651 "PhotoPage.c" } -#line 2595 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2584 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp9_ = photo; -#line 2595 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2584 "/home/jens/Source/shotwell/src/PhotoPage.vala" editing_host_page_display_copy_of (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage), _tmp3_, _tmp9_); -#line 2590 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2579 "/home/jens/Source/shotwell/src/PhotoPage.vala" _data_collection_unref0 (_tmp3_); -#line 16710 "PhotoPage.c" +#line 16659 "PhotoPage.c" } void library_photo_page_on_page_destroyed (LibraryPhotoPage* self) { -#line 2598 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2587 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_if_fail (IS_LIBRARY_PHOTO_PAGE (self)); -#line 2601 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2590 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (self->priv->return_page); -#line 2601 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2590 "/home/jens/Source/shotwell/src/PhotoPage.vala" self->priv->return_page = NULL; -#line 2602 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2591 "/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 16723 "PhotoPage.c" +#line 16672 "PhotoPage.c" } @@ -16732,17 +16681,17 @@ CollectionPage* library_photo_page_get_controller_page (LibraryPhotoPage* self) CollectionPage* result = NULL; CollectionPage* _tmp0_ = NULL; CollectionPage* _tmp1_ = NULL; -#line 2605 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2594 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_val_if_fail (IS_LIBRARY_PHOTO_PAGE (self), NULL); -#line 2606 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2595 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp0_ = self->priv->return_page; -#line 2606 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2595 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp1_ = _g_object_ref0 (_tmp0_); -#line 2606 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2595 "/home/jens/Source/shotwell/src/PhotoPage.vala" result = _tmp1_; -#line 2606 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2595 "/home/jens/Source/shotwell/src/PhotoPage.vala" return result; -#line 16741 "PhotoPage.c" +#line 16690 "PhotoPage.c" } @@ -16753,33 +16702,33 @@ static void library_photo_page_real_switched_to (Page* base) { ConfigFacade* _tmp2_ = NULL; ConfigFacade* _tmp3_ = NULL; gboolean _tmp4_ = FALSE; -#line 2609 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2598 "/home/jens/Source/shotwell/src/PhotoPage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO_PAGE, LibraryPhotoPage); -#line 2613 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2602 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp0_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage)); -#line 2613 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2602 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp1_ = _tmp0_; -#line 2613 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2602 "/home/jens/Source/shotwell/src/PhotoPage.vala" _vala_assert (_tmp1_ != NULL, "get_photo() != null"); -#line 2613 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2602 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (_tmp1_); -#line 2615 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2604 "/home/jens/Source/shotwell/src/PhotoPage.vala" PAGE_CLASS (library_photo_page_parent_class)->switched_to (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage), TYPE_PAGE, Page)); -#line 2617 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2606 "/home/jens/Source/shotwell/src/PhotoPage.vala" library_photo_page_update_zoom_menu_item_sensitivity (self); -#line 2618 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2607 "/home/jens/Source/shotwell/src/PhotoPage.vala" library_photo_page_update_rating_menu_item_sensitivity (self); -#line 2620 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2609 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp2_ = config_facade_get_instance (); -#line 2620 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2609 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp3_ = _tmp2_; -#line 2620 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2609 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp4_ = configuration_facade_get_display_photo_ratings (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade)); -#line 2620 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2609 "/home/jens/Source/shotwell/src/PhotoPage.vala" library_photo_page_set_display_ratings (self, _tmp4_); -#line 2620 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2609 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (_tmp3_); -#line 16778 "PhotoPage.c" +#line 16727 "PhotoPage.c" } @@ -16794,58 +16743,58 @@ static GdkPixbuf* library_photo_page_real_get_bottom_left_trinket (EditingHostPa gint _tmp8_ = 0; GdkPixbuf* _tmp9_ = NULL; GdkPixbuf* _tmp10_ = NULL; -#line 2623 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2612 "/home/jens/Source/shotwell/src/PhotoPage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO_PAGE, LibraryPhotoPage); -#line 2624 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2613 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp1_ = editing_host_page_has_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage)); -#line 2624 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2613 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (!_tmp1_) { -#line 2624 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2613 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp0_ = TRUE; -#line 16801 "PhotoPage.c" +#line 16750 "PhotoPage.c" } else { ConfigFacade* _tmp2_ = NULL; ConfigFacade* _tmp3_ = NULL; gboolean _tmp4_ = FALSE; -#line 2624 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2613 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp2_ = config_facade_get_instance (); -#line 2624 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2613 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp3_ = _tmp2_; -#line 2624 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2613 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp4_ = configuration_facade_get_display_photo_ratings (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade)); -#line 2624 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2613 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp0_ = !_tmp4_; -#line 2624 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2613 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (_tmp3_); -#line 16816 "PhotoPage.c" +#line 16765 "PhotoPage.c" } -#line 2624 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2613 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp0_) { -#line 2625 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2614 "/home/jens/Source/shotwell/src/PhotoPage.vala" result = NULL; -#line 2625 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2614 "/home/jens/Source/shotwell/src/PhotoPage.vala" return result; -#line 16824 "PhotoPage.c" +#line 16773 "PhotoPage.c" } -#line 2627 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2616 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp5_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage)); -#line 2627 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2616 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp6_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, TYPE_LIBRARY_PHOTO, LibraryPhoto); -#line 2627 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2616 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp7_ = media_source_get_rating (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, TYPE_MEDIA_SOURCE, MediaSource)); -#line 2627 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2616 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp8_ = scale; -#line 2627 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2616 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp9_ = resources_get_rating_trinket (_tmp7_, _tmp8_); -#line 2627 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2616 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp10_ = _tmp9_; -#line 2627 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2616 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (_tmp6_); -#line 2627 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2616 "/home/jens/Source/shotwell/src/PhotoPage.vala" result = _tmp10_; -#line 2627 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2616 "/home/jens/Source/shotwell/src/PhotoPage.vala" return result; -#line 16844 "PhotoPage.c" +#line 16793 "PhotoPage.c" } @@ -16855,46 +16804,46 @@ static GdkPixbuf* library_photo_page_real_get_top_right_trinket (EditingHostPage gboolean _tmp0_ = FALSE; gboolean _tmp1_ = FALSE; GdkPixbuf* _tmp5_ = NULL; -#line 2630 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2619 "/home/jens/Source/shotwell/src/PhotoPage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO_PAGE, LibraryPhotoPage); -#line 2631 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2620 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp1_ = editing_host_page_has_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage)); -#line 2631 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2620 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (!_tmp1_) { -#line 2631 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2620 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp0_ = TRUE; -#line 16862 "PhotoPage.c" +#line 16811 "PhotoPage.c" } else { Photo* _tmp2_ = NULL; LibraryPhoto* _tmp3_ = NULL; gboolean _tmp4_ = FALSE; -#line 2631 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2620 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp2_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage)); -#line 2631 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2620 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp3_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_LIBRARY_PHOTO, LibraryPhoto); -#line 2631 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2620 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp4_ = flaggable_is_flagged (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_FLAGGABLE, Flaggable)); -#line 2631 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2620 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp0_ = !_tmp4_; -#line 2631 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2620 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (_tmp3_); -#line 16877 "PhotoPage.c" +#line 16826 "PhotoPage.c" } -#line 2631 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2620 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp0_) { -#line 2632 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2621 "/home/jens/Source/shotwell/src/PhotoPage.vala" result = NULL; -#line 2632 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2621 "/home/jens/Source/shotwell/src/PhotoPage.vala" return result; -#line 16885 "PhotoPage.c" +#line 16834 "PhotoPage.c" } -#line 2634 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2623 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp5_ = resources_get_icon (RESOURCES_ICON_FLAGGED_TRINKET, RESOURCES_DEFAULT_ICON_SCALE); -#line 2634 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2623 "/home/jens/Source/shotwell/src/PhotoPage.vala" result = _tmp5_; -#line 2634 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2623 "/home/jens/Source/shotwell/src/PhotoPage.vala" return result; -#line 16893 "PhotoPage.c" +#line 16842 "PhotoPage.c" } @@ -16910,51 +16859,51 @@ static void library_photo_page_on_slideshow (LibraryPhotoPage* self) { LibraryPhoto* _tmp7_ = NULL; SlideshowPage* _tmp8_ = NULL; SlideshowPage* _tmp9_ = NULL; -#line 2637 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2626 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_if_fail (IS_LIBRARY_PHOTO_PAGE (self)); -#line 2638 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2627 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp0_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage)); -#line 2638 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2627 "/home/jens/Source/shotwell/src/PhotoPage.vala" photo = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_LIBRARY_PHOTO, LibraryPhoto); -#line 2639 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2628 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp1_ = photo; -#line 2639 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2628 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp1_ == NULL) { -#line 2640 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2629 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (photo); -#line 2640 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2629 "/home/jens/Source/shotwell/src/PhotoPage.vala" return; -#line 16923 "PhotoPage.c" +#line 16872 "PhotoPage.c" } -#line 2642 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2631 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp2_ = app_window_get_instance (); -#line 2642 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2631 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp3_ = _tmp2_; -#line 2642 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2631 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp4_ = library_photo_global; -#line 2642 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2631 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp5_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); -#line 2642 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2631 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp6_ = _tmp5_; -#line 2642 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2631 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp7_ = photo; -#line 2642 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2631 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp8_ = slideshow_page_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_SOURCE_COLLECTION, SourceCollection), _tmp6_, G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_PHOTO, Photo)); -#line 2642 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2631 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_object_ref_sink (_tmp8_); -#line 2642 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2631 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp9_ = _tmp8_; -#line 2642 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2631 "/home/jens/Source/shotwell/src/PhotoPage.vala" app_window_go_fullscreen (_tmp3_, G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, TYPE_PAGE, Page)); -#line 2642 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2631 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (_tmp9_); -#line 2642 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2631 "/home/jens/Source/shotwell/src/PhotoPage.vala" _data_collection_unref0 (_tmp6_); -#line 2642 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2631 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (_tmp3_); -#line 2637 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2626 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (photo); -#line 16953 "PhotoPage.c" +#line 16902 "PhotoPage.c" } @@ -16965,73 +16914,73 @@ static void library_photo_page_update_zoom_menu_item_sensitivity (LibraryPhotoPa gboolean _tmp4_ = FALSE; ZoomState _tmp5_ = {0}; gboolean _tmp6_ = FALSE; -#line 2646 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2635 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_if_fail (IS_LIBRARY_PHOTO_PAGE (self)); -#line 2647 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2636 "/home/jens/Source/shotwell/src/PhotoPage.vala" single_photo_page_get_zoom_state (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), &_tmp1_); -#line 2647 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2636 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp2_ = zoom_state_is_max (&_tmp1_); -#line 2647 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2636 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (!_tmp2_) { -#line 16972 "PhotoPage.c" +#line 16921 "PhotoPage.c" gboolean _tmp3_ = FALSE; -#line 2647 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2636 "/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 2647 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2636 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp0_ = !_tmp3_; -#line 16978 "PhotoPage.c" +#line 16927 "PhotoPage.c" } else { -#line 2647 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2636 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp0_ = FALSE; -#line 16982 "PhotoPage.c" +#line 16931 "PhotoPage.c" } -#line 2647 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2636 "/home/jens/Source/shotwell/src/PhotoPage.vala" page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "IncreaseSize", _tmp0_); -#line 2648 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2637 "/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_); -#line 2648 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2637 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp6_ = zoom_state_is_default (&_tmp5_); -#line 2648 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2637 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (!_tmp6_) { -#line 16992 "PhotoPage.c" +#line 16941 "PhotoPage.c" gboolean _tmp7_ = FALSE; -#line 2648 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2637 "/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 2648 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2637 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp4_ = !_tmp7_; -#line 16998 "PhotoPage.c" +#line 16947 "PhotoPage.c" } else { -#line 2648 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2637 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp4_ = FALSE; -#line 17002 "PhotoPage.c" +#line 16951 "PhotoPage.c" } -#line 2648 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2637 "/home/jens/Source/shotwell/src/PhotoPage.vala" page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "DecreaseSize", _tmp4_); -#line 17006 "PhotoPage.c" +#line 16955 "PhotoPage.c" } static void library_photo_page_real_on_increase_size (EditingHostPage* base) { LibraryPhotoPage * self; -#line 2651 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2640 "/home/jens/Source/shotwell/src/PhotoPage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO_PAGE, LibraryPhotoPage); -#line 2652 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2641 "/home/jens/Source/shotwell/src/PhotoPage.vala" EDITING_HOST_PAGE_CLASS (library_photo_page_parent_class)->on_increase_size (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage)); -#line 2654 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2643 "/home/jens/Source/shotwell/src/PhotoPage.vala" library_photo_page_update_zoom_menu_item_sensitivity (self); -#line 17018 "PhotoPage.c" +#line 16967 "PhotoPage.c" } static void library_photo_page_real_on_decrease_size (EditingHostPage* base) { LibraryPhotoPage * self; -#line 2657 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2646 "/home/jens/Source/shotwell/src/PhotoPage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO_PAGE, LibraryPhotoPage); -#line 2658 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2647 "/home/jens/Source/shotwell/src/PhotoPage.vala" EDITING_HOST_PAGE_CLASS (library_photo_page_parent_class)->on_decrease_size (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage)); -#line 2660 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2649 "/home/jens/Source/shotwell/src/PhotoPage.vala" library_photo_page_update_zoom_menu_item_sensitivity (self); -#line 17030 "PhotoPage.c" +#line 16979 "PhotoPage.c" } @@ -17043,43 +16992,43 @@ static gboolean library_photo_page_real_on_zoom_slider_key_press (EditingHostPag GdkEventKey* _tmp2_ = NULL; guint _tmp3_ = 0U; const gchar* _tmp4_ = NULL; -#line 2663 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2652 "/home/jens/Source/shotwell/src/PhotoPage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO_PAGE, LibraryPhotoPage); -#line 2663 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2652 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_val_if_fail (event != NULL, FALSE); -#line 2664 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2653 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp0_ = event; -#line 2664 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2653 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp1_ = EDITING_HOST_PAGE_CLASS (library_photo_page_parent_class)->on_zoom_slider_key_press (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage), _tmp0_); -#line 2664 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2653 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp1_) { -#line 2665 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2654 "/home/jens/Source/shotwell/src/PhotoPage.vala" result = TRUE; -#line 2665 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2654 "/home/jens/Source/shotwell/src/PhotoPage.vala" return result; -#line 17056 "PhotoPage.c" +#line 17005 "PhotoPage.c" } -#line 2667 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2656 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp2_ = event; -#line 2667 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2656 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp3_ = _tmp2_->keyval; -#line 2667 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2656 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp4_ = gdk_keyval_name (_tmp3_); -#line 2667 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2656 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (g_strcmp0 (_tmp4_, "Escape") == 0) { -#line 2668 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2657 "/home/jens/Source/shotwell/src/PhotoPage.vala" library_photo_page_return_to_collection (self); -#line 2669 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2658 "/home/jens/Source/shotwell/src/PhotoPage.vala" result = TRUE; -#line 2669 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2658 "/home/jens/Source/shotwell/src/PhotoPage.vala" return result; -#line 17072 "PhotoPage.c" +#line 17021 "PhotoPage.c" } else { -#line 2671 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2660 "/home/jens/Source/shotwell/src/PhotoPage.vala" result = FALSE; -#line 2671 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2660 "/home/jens/Source/shotwell/src/PhotoPage.vala" return result; -#line 17078 "PhotoPage.c" +#line 17027 "PhotoPage.c" } } @@ -17089,77 +17038,77 @@ static void library_photo_page_real_update_ui (EditingHostPage* base, gboolean m gboolean sensitivity = FALSE; gboolean _tmp0_ = FALSE; gboolean _tmp1_ = FALSE; -#line 2675 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2664 "/home/jens/Source/shotwell/src/PhotoPage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO_PAGE, LibraryPhotoPage); -#line 2676 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2665 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp0_ = missing; -#line 2676 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2665 "/home/jens/Source/shotwell/src/PhotoPage.vala" sensitivity = !_tmp0_; -#line 2678 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2667 "/home/jens/Source/shotwell/src/PhotoPage.vala" page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "SendTo", sensitivity); -#line 2679 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2668 "/home/jens/Source/shotwell/src/PhotoPage.vala" page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Publish", sensitivity); -#line 2680 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2669 "/home/jens/Source/shotwell/src/PhotoPage.vala" page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Print", sensitivity); -#line 2681 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2670 "/home/jens/Source/shotwell/src/PhotoPage.vala" page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "CommonJumpToFile", sensitivity); -#line 2683 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2672 "/home/jens/Source/shotwell/src/PhotoPage.vala" page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "CommonUndo", sensitivity); -#line 2684 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2673 "/home/jens/Source/shotwell/src/PhotoPage.vala" page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "CommonRedo", sensitivity); -#line 2686 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2675 "/home/jens/Source/shotwell/src/PhotoPage.vala" page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "IncreaseSize", sensitivity); -#line 2687 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2676 "/home/jens/Source/shotwell/src/PhotoPage.vala" page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "DecreaseSize", sensitivity); -#line 2688 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2677 "/home/jens/Source/shotwell/src/PhotoPage.vala" page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "ZoomFit", sensitivity); -#line 2689 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2678 "/home/jens/Source/shotwell/src/PhotoPage.vala" page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Zoom100", sensitivity); -#line 2690 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2679 "/home/jens/Source/shotwell/src/PhotoPage.vala" page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Zoom200", sensitivity); -#line 2691 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2680 "/home/jens/Source/shotwell/src/PhotoPage.vala" page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Slideshow", sensitivity); -#line 2693 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2682 "/home/jens/Source/shotwell/src/PhotoPage.vala" page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RotateClockwise", sensitivity); -#line 2694 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2683 "/home/jens/Source/shotwell/src/PhotoPage.vala" page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RotateCounterclockwise", sensitivity); -#line 2695 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2684 "/home/jens/Source/shotwell/src/PhotoPage.vala" page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "FlipHorizontally", sensitivity); -#line 2696 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2685 "/home/jens/Source/shotwell/src/PhotoPage.vala" page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "FlipVertically", sensitivity); -#line 2697 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2686 "/home/jens/Source/shotwell/src/PhotoPage.vala" page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Enhance", sensitivity); -#line 2698 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2687 "/home/jens/Source/shotwell/src/PhotoPage.vala" page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Crop", sensitivity); -#line 2699 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2688 "/home/jens/Source/shotwell/src/PhotoPage.vala" page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RedEye", sensitivity); -#line 2700 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2689 "/home/jens/Source/shotwell/src/PhotoPage.vala" page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Adjust", sensitivity); -#line 2701 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2690 "/home/jens/Source/shotwell/src/PhotoPage.vala" page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "EditTitle", sensitivity); -#line 2702 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2691 "/home/jens/Source/shotwell/src/PhotoPage.vala" page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "AdjustDateTime", sensitivity); -#line 2703 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2692 "/home/jens/Source/shotwell/src/PhotoPage.vala" page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "ExternalEdit", sensitivity); -#line 2704 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2693 "/home/jens/Source/shotwell/src/PhotoPage.vala" page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "ExternalEditRAW", sensitivity); -#line 2705 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2694 "/home/jens/Source/shotwell/src/PhotoPage.vala" page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Revert", sensitivity); -#line 2707 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2696 "/home/jens/Source/shotwell/src/PhotoPage.vala" page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Rate", sensitivity); -#line 2708 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2697 "/home/jens/Source/shotwell/src/PhotoPage.vala" page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Flag", sensitivity); -#line 2709 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2698 "/home/jens/Source/shotwell/src/PhotoPage.vala" page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "AddTags", sensitivity); -#line 2710 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2699 "/home/jens/Source/shotwell/src/PhotoPage.vala" page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "ModifyTags", sensitivity); -#line 2712 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2701 "/home/jens/Source/shotwell/src/PhotoPage.vala" page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "SetBackground", sensitivity); -#line 2714 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2703 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp1_ = missing; -#line 2714 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2703 "/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 17158 "PhotoPage.c" +#line 17107 "PhotoPage.c" } @@ -17168,36 +17117,36 @@ static void library_photo_page_real_notify_photo_backing_missing (EditingHostPag gboolean _tmp0_ = FALSE; Photo* _tmp3_ = NULL; gboolean _tmp4_ = FALSE; -#line 2717 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2706 "/home/jens/Source/shotwell/src/PhotoPage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO_PAGE, LibraryPhotoPage); -#line 2717 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2706 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_if_fail (IS_PHOTO (photo)); -#line 2718 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2707 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp0_ = missing; -#line 2718 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2707 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp0_) { -#line 17175 "PhotoPage.c" +#line 17124 "PhotoPage.c" Photo* _tmp1_ = NULL; -#line 2719 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2708 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp1_ = photo; -#line 2719 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2708 "/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 17181 "PhotoPage.c" +#line 17130 "PhotoPage.c" } else { Photo* _tmp2_ = NULL; -#line 2721 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2710 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp2_ = photo; -#line 2721 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2710 "/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 17188 "PhotoPage.c" +#line 17137 "PhotoPage.c" } -#line 2723 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2712 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp3_ = photo; -#line 2723 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2712 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp4_ = missing; -#line 2723 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2712 "/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 17196 "PhotoPage.c" +#line 17145 "PhotoPage.c" } @@ -17211,300 +17160,300 @@ static gboolean library_photo_page_real_key_press_event (GtkWidget* base, GdkEve const gchar* _tmp5_ = NULL; const gchar* _tmp6_ = NULL; GQuark _tmp8_ = 0U; -#line 2731 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2720 "/home/jens/Source/shotwell/src/PhotoPage.vala" static GQuark _tmp7_label0 = 0; -#line 2731 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2720 "/home/jens/Source/shotwell/src/PhotoPage.vala" static GQuark _tmp7_label1 = 0; -#line 2731 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2720 "/home/jens/Source/shotwell/src/PhotoPage.vala" static GQuark _tmp7_label2 = 0; -#line 2731 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2720 "/home/jens/Source/shotwell/src/PhotoPage.vala" static GQuark _tmp7_label3 = 0; -#line 2731 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2720 "/home/jens/Source/shotwell/src/PhotoPage.vala" static GQuark _tmp7_label4 = 0; -#line 2731 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2720 "/home/jens/Source/shotwell/src/PhotoPage.vala" static GQuark _tmp7_label5 = 0; -#line 2731 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2720 "/home/jens/Source/shotwell/src/PhotoPage.vala" static GQuark _tmp7_label6 = 0; -#line 2731 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2720 "/home/jens/Source/shotwell/src/PhotoPage.vala" static GQuark _tmp7_label7 = 0; -#line 2731 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2720 "/home/jens/Source/shotwell/src/PhotoPage.vala" static GQuark _tmp7_label8 = 0; -#line 2731 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2720 "/home/jens/Source/shotwell/src/PhotoPage.vala" static GQuark _tmp7_label9 = 0; -#line 2731 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2720 "/home/jens/Source/shotwell/src/PhotoPage.vala" static GQuark _tmp7_label10 = 0; -#line 2731 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2720 "/home/jens/Source/shotwell/src/PhotoPage.vala" static GQuark _tmp7_label11 = 0; -#line 2731 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2720 "/home/jens/Source/shotwell/src/PhotoPage.vala" static GQuark _tmp7_label12 = 0; -#line 2731 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2720 "/home/jens/Source/shotwell/src/PhotoPage.vala" static GQuark _tmp7_label13 = 0; -#line 2731 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2720 "/home/jens/Source/shotwell/src/PhotoPage.vala" static GQuark _tmp7_label14 = 0; -#line 2731 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2720 "/home/jens/Source/shotwell/src/PhotoPage.vala" static GQuark _tmp7_label15 = 0; -#line 2731 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2720 "/home/jens/Source/shotwell/src/PhotoPage.vala" static GQuark _tmp7_label16 = 0; -#line 2731 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2720 "/home/jens/Source/shotwell/src/PhotoPage.vala" static GQuark _tmp7_label17 = 0; -#line 2726 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2715 "/home/jens/Source/shotwell/src/PhotoPage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO_PAGE, LibraryPhotoPage); -#line 2726 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2715 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_val_if_fail (event != NULL, FALSE); -#line 2727 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2716 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (GTK_WIDGET_CLASS (library_photo_page_parent_class)->key_press_event != NULL) { -#line 17252 "PhotoPage.c" +#line 17201 "PhotoPage.c" GdkEventKey* _tmp1_ = NULL; gboolean _tmp2_ = FALSE; -#line 2727 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2716 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp1_ = event; -#line 2727 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2716 "/home/jens/Source/shotwell/src/PhotoPage.vala" _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 2727 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2716 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp0_ = _tmp2_ == TRUE; -#line 17261 "PhotoPage.c" +#line 17210 "PhotoPage.c" } else { -#line 2727 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2716 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp0_ = FALSE; -#line 17265 "PhotoPage.c" +#line 17214 "PhotoPage.c" } -#line 2727 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2716 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp0_) { -#line 2728 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2717 "/home/jens/Source/shotwell/src/PhotoPage.vala" result = TRUE; -#line 2728 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2717 "/home/jens/Source/shotwell/src/PhotoPage.vala" return result; -#line 17273 "PhotoPage.c" +#line 17222 "PhotoPage.c" } -#line 2730 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2719 "/home/jens/Source/shotwell/src/PhotoPage.vala" handled = TRUE; -#line 2731 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2720 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp3_ = event; -#line 2731 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2720 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp4_ = _tmp3_->keyval; -#line 2731 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2720 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp5_ = gdk_keyval_name (_tmp4_); -#line 2731 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2720 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp6_ = _tmp5_; -#line 2731 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2720 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp8_ = (NULL == _tmp6_) ? 0 : g_quark_from_string (_tmp6_); -#line 2731 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2720 "/home/jens/Source/shotwell/src/PhotoPage.vala" 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 2731 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2720 "/home/jens/Source/shotwell/src/PhotoPage.vala" switch (0) { -#line 17291 "PhotoPage.c" +#line 17240 "PhotoPage.c" default: { GtkWindow* _tmp9_ = NULL; GtkWindow* _tmp10_ = NULL; gboolean _tmp11_ = FALSE; -#line 2735 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2724 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp9_ = page_get_container (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); -#line 2735 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2724 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp10_ = _tmp9_; -#line 2735 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2724 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp11_ = !G_TYPE_CHECK_INSTANCE_TYPE (_tmp10_, TYPE_FULLSCREEN_WINDOW); -#line 2735 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2724 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (_tmp10_); -#line 2735 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2724 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp11_) { -#line 2736 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2725 "/home/jens/Source/shotwell/src/PhotoPage.vala" library_photo_page_return_to_collection (self); -#line 17309 "PhotoPage.c" +#line 17258 "PhotoPage.c" } -#line 2737 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2726 "/home/jens/Source/shotwell/src/PhotoPage.vala" break; -#line 17313 "PhotoPage.c" +#line 17262 "PhotoPage.c" } } } else if (_tmp8_ == ((0 != _tmp7_label3) ? _tmp7_label3 : (_tmp7_label3 = g_quark_from_static_string ("Delete")))) { -#line 2731 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2720 "/home/jens/Source/shotwell/src/PhotoPage.vala" switch (0) { -#line 17319 "PhotoPage.c" +#line 17268 "PhotoPage.c" default: { -#line 2743 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2732 "/home/jens/Source/shotwell/src/PhotoPage.vala" page_activate_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "MoveToTrash"); -#line 2744 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2733 "/home/jens/Source/shotwell/src/PhotoPage.vala" break; -#line 17326 "PhotoPage.c" +#line 17275 "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 2731 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2720 "/home/jens/Source/shotwell/src/PhotoPage.vala" switch (0) { -#line 17332 "PhotoPage.c" +#line 17281 "PhotoPage.c" default: { -#line 2748 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2737 "/home/jens/Source/shotwell/src/PhotoPage.vala" page_activate_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "IncreaseRating"); -#line 2749 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2738 "/home/jens/Source/shotwell/src/PhotoPage.vala" break; -#line 17339 "PhotoPage.c" +#line 17288 "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 2731 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2720 "/home/jens/Source/shotwell/src/PhotoPage.vala" switch (0) { -#line 17345 "PhotoPage.c" +#line 17294 "PhotoPage.c" default: { -#line 2753 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2742 "/home/jens/Source/shotwell/src/PhotoPage.vala" page_activate_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "DecreaseRating"); -#line 2754 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2743 "/home/jens/Source/shotwell/src/PhotoPage.vala" break; -#line 17352 "PhotoPage.c" +#line 17301 "PhotoPage.c" } } } else if (_tmp8_ == ((0 != _tmp7_label8) ? _tmp7_label8 : (_tmp7_label8 = g_quark_from_static_string ("KP_1")))) { -#line 2731 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2720 "/home/jens/Source/shotwell/src/PhotoPage.vala" switch (0) { -#line 17358 "PhotoPage.c" +#line 17307 "PhotoPage.c" default: { -#line 2757 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2746 "/home/jens/Source/shotwell/src/PhotoPage.vala" page_activate_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RateOne"); -#line 2758 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2747 "/home/jens/Source/shotwell/src/PhotoPage.vala" break; -#line 17365 "PhotoPage.c" +#line 17314 "PhotoPage.c" } } } else if (_tmp8_ == ((0 != _tmp7_label9) ? _tmp7_label9 : (_tmp7_label9 = g_quark_from_static_string ("KP_2")))) { -#line 2731 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2720 "/home/jens/Source/shotwell/src/PhotoPage.vala" switch (0) { -#line 17371 "PhotoPage.c" +#line 17320 "PhotoPage.c" default: { -#line 2761 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2750 "/home/jens/Source/shotwell/src/PhotoPage.vala" page_activate_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RateTwo"); -#line 2762 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2751 "/home/jens/Source/shotwell/src/PhotoPage.vala" break; -#line 17378 "PhotoPage.c" +#line 17327 "PhotoPage.c" } } } else if (_tmp8_ == ((0 != _tmp7_label10) ? _tmp7_label10 : (_tmp7_label10 = g_quark_from_static_string ("KP_3")))) { -#line 2731 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2720 "/home/jens/Source/shotwell/src/PhotoPage.vala" switch (0) { -#line 17384 "PhotoPage.c" +#line 17333 "PhotoPage.c" default: { -#line 2765 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2754 "/home/jens/Source/shotwell/src/PhotoPage.vala" page_activate_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RateThree"); -#line 2766 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2755 "/home/jens/Source/shotwell/src/PhotoPage.vala" break; -#line 17391 "PhotoPage.c" +#line 17340 "PhotoPage.c" } } } else if (_tmp8_ == ((0 != _tmp7_label11) ? _tmp7_label11 : (_tmp7_label11 = g_quark_from_static_string ("KP_4")))) { -#line 2731 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2720 "/home/jens/Source/shotwell/src/PhotoPage.vala" switch (0) { -#line 17397 "PhotoPage.c" +#line 17346 "PhotoPage.c" default: { -#line 2769 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2758 "/home/jens/Source/shotwell/src/PhotoPage.vala" page_activate_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RateFour"); -#line 2770 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2759 "/home/jens/Source/shotwell/src/PhotoPage.vala" break; -#line 17404 "PhotoPage.c" +#line 17353 "PhotoPage.c" } } } else if (_tmp8_ == ((0 != _tmp7_label12) ? _tmp7_label12 : (_tmp7_label12 = g_quark_from_static_string ("KP_5")))) { -#line 2731 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2720 "/home/jens/Source/shotwell/src/PhotoPage.vala" switch (0) { -#line 17410 "PhotoPage.c" +#line 17359 "PhotoPage.c" default: { -#line 2773 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2762 "/home/jens/Source/shotwell/src/PhotoPage.vala" page_activate_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RateFive"); -#line 2774 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2763 "/home/jens/Source/shotwell/src/PhotoPage.vala" break; -#line 17417 "PhotoPage.c" +#line 17366 "PhotoPage.c" } } } else if (_tmp8_ == ((0 != _tmp7_label13) ? _tmp7_label13 : (_tmp7_label13 = g_quark_from_static_string ("KP_0")))) { -#line 2731 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2720 "/home/jens/Source/shotwell/src/PhotoPage.vala" switch (0) { -#line 17423 "PhotoPage.c" +#line 17372 "PhotoPage.c" default: { -#line 2777 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2766 "/home/jens/Source/shotwell/src/PhotoPage.vala" page_activate_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RateUnrated"); -#line 2778 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2767 "/home/jens/Source/shotwell/src/PhotoPage.vala" break; -#line 17430 "PhotoPage.c" +#line 17379 "PhotoPage.c" } } } else if (_tmp8_ == ((0 != _tmp7_label14) ? _tmp7_label14 : (_tmp7_label14 = g_quark_from_static_string ("KP_9")))) { -#line 2731 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2720 "/home/jens/Source/shotwell/src/PhotoPage.vala" switch (0) { -#line 17436 "PhotoPage.c" +#line 17385 "PhotoPage.c" default: { -#line 2781 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2770 "/home/jens/Source/shotwell/src/PhotoPage.vala" page_activate_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RateRejected"); -#line 2782 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2771 "/home/jens/Source/shotwell/src/PhotoPage.vala" break; -#line 17443 "PhotoPage.c" +#line 17392 "PhotoPage.c" } } } else if (_tmp8_ == ((0 != _tmp7_label15) ? _tmp7_label15 : (_tmp7_label15 = g_quark_from_static_string ("bracketright")))) { -#line 2731 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2720 "/home/jens/Source/shotwell/src/PhotoPage.vala" switch (0) { -#line 17449 "PhotoPage.c" +#line 17398 "PhotoPage.c" default: { -#line 2785 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2774 "/home/jens/Source/shotwell/src/PhotoPage.vala" page_activate_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RotateClockwise"); -#line 2786 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2775 "/home/jens/Source/shotwell/src/PhotoPage.vala" break; -#line 17456 "PhotoPage.c" +#line 17405 "PhotoPage.c" } } } else if (_tmp8_ == ((0 != _tmp7_label16) ? _tmp7_label16 : (_tmp7_label16 = g_quark_from_static_string ("bracketleft")))) { -#line 2731 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2720 "/home/jens/Source/shotwell/src/PhotoPage.vala" switch (0) { -#line 17462 "PhotoPage.c" +#line 17411 "PhotoPage.c" default: { -#line 2789 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2778 "/home/jens/Source/shotwell/src/PhotoPage.vala" page_activate_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RotateCounterclockwise"); -#line 2790 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2779 "/home/jens/Source/shotwell/src/PhotoPage.vala" break; -#line 17469 "PhotoPage.c" +#line 17418 "PhotoPage.c" } } } else if (_tmp8_ == ((0 != _tmp7_label17) ? _tmp7_label17 : (_tmp7_label17 = g_quark_from_static_string ("slash")))) { -#line 2731 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2720 "/home/jens/Source/shotwell/src/PhotoPage.vala" switch (0) { -#line 17475 "PhotoPage.c" +#line 17424 "PhotoPage.c" default: { -#line 2793 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2782 "/home/jens/Source/shotwell/src/PhotoPage.vala" page_activate_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Flag"); -#line 2794 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2783 "/home/jens/Source/shotwell/src/PhotoPage.vala" break; -#line 17482 "PhotoPage.c" +#line 17431 "PhotoPage.c" } } } else { -#line 2731 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2720 "/home/jens/Source/shotwell/src/PhotoPage.vala" switch (0) { -#line 17488 "PhotoPage.c" +#line 17437 "PhotoPage.c" default: { -#line 2797 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2786 "/home/jens/Source/shotwell/src/PhotoPage.vala" handled = FALSE; -#line 2798 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2787 "/home/jens/Source/shotwell/src/PhotoPage.vala" break; -#line 17495 "PhotoPage.c" +#line 17444 "PhotoPage.c" } } } -#line 2801 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2790 "/home/jens/Source/shotwell/src/PhotoPage.vala" result = handled; -#line 2801 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2790 "/home/jens/Source/shotwell/src/PhotoPage.vala" return result; -#line 17503 "PhotoPage.c" +#line 17452 "PhotoPage.c" } @@ -17515,44 +17464,44 @@ static gboolean library_photo_page_real_on_double_click (EditingHostPage* base, GtkWindow* _tmp0_ = NULL; FullscreenWindow* _tmp1_ = NULL; FullscreenWindow* _tmp2_ = NULL; -#line 2804 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2793 "/home/jens/Source/shotwell/src/PhotoPage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO_PAGE, LibraryPhotoPage); -#line 2804 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2793 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_val_if_fail (event != NULL, FALSE); -#line 2805 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2794 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp0_ = page_get_container (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); -#line 2805 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2794 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp1_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp0_, TYPE_FULLSCREEN_WINDOW) ? ((FullscreenWindow*) _tmp0_) : NULL; -#line 2805 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2794 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp1_ == NULL) { -#line 2805 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2794 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (_tmp0_); -#line 17526 "PhotoPage.c" +#line 17475 "PhotoPage.c" } -#line 2805 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2794 "/home/jens/Source/shotwell/src/PhotoPage.vala" fs = _tmp1_; -#line 2806 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2795 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp2_ = fs; -#line 2806 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2795 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp2_ == NULL) { -#line 2807 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2796 "/home/jens/Source/shotwell/src/PhotoPage.vala" self->priv->return_to_collection_on_release = TRUE; -#line 17536 "PhotoPage.c" +#line 17485 "PhotoPage.c" } else { FullscreenWindow* _tmp3_ = NULL; -#line 2809 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2798 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp3_ = fs; -#line 2809 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2798 "/home/jens/Source/shotwell/src/PhotoPage.vala" fullscreen_window_close (_tmp3_); -#line 17543 "PhotoPage.c" +#line 17492 "PhotoPage.c" } -#line 2811 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2800 "/home/jens/Source/shotwell/src/PhotoPage.vala" result = TRUE; -#line 2811 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2800 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (fs); -#line 2811 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2800 "/home/jens/Source/shotwell/src/PhotoPage.vala" return result; -#line 17551 "PhotoPage.c" +#line 17500 "PhotoPage.c" } @@ -17562,33 +17511,33 @@ static gboolean library_photo_page_real_on_left_released (Page* base, GdkEventBu gboolean _tmp0_ = FALSE; GdkEventButton* _tmp1_ = NULL; gboolean _tmp2_ = FALSE; -#line 2814 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2803 "/home/jens/Source/shotwell/src/PhotoPage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO_PAGE, LibraryPhotoPage); -#line 2814 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2803 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_val_if_fail (event != NULL, FALSE); -#line 2815 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2804 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp0_ = self->priv->return_to_collection_on_release; -#line 2815 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2804 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp0_) { -#line 2816 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2805 "/home/jens/Source/shotwell/src/PhotoPage.vala" self->priv->return_to_collection_on_release = FALSE; -#line 2817 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2806 "/home/jens/Source/shotwell/src/PhotoPage.vala" library_photo_page_return_to_collection (self); -#line 2819 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2808 "/home/jens/Source/shotwell/src/PhotoPage.vala" result = TRUE; -#line 2819 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2808 "/home/jens/Source/shotwell/src/PhotoPage.vala" return result; -#line 17577 "PhotoPage.c" +#line 17526 "PhotoPage.c" } -#line 2822 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2811 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp1_ = event; -#line 2822 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2811 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp2_ = PAGE_CLASS (library_photo_page_parent_class)->on_left_released (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage), TYPE_PAGE, Page), _tmp1_); -#line 2822 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2811 "/home/jens/Source/shotwell/src/PhotoPage.vala" result = _tmp2_; -#line 2822 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2811 "/home/jens/Source/shotwell/src/PhotoPage.vala" return result; -#line 17587 "PhotoPage.c" +#line 17536 "PhotoPage.c" } @@ -17597,13 +17546,13 @@ static GtkMenu* library_photo_page_get_context_menu (LibraryPhotoPage* self) { GtkMenu* _tmp0_ = NULL; GtkMenu* _tmp7_ = NULL; GtkMenu* _tmp8_ = NULL; -#line 2827 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2816 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_val_if_fail (IS_LIBRARY_PHOTO_PAGE (self), NULL); -#line 2828 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2817 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp0_ = self->priv->context_menu; -#line 2828 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2817 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp0_ == NULL) { -#line 17602 "PhotoPage.c" +#line 17551 "PhotoPage.c" GMenuModel* model = NULL; GtkBuilder* _tmp1_ = NULL; GObject* _tmp2_ = NULL; @@ -17611,41 +17560,41 @@ static GtkMenu* library_photo_page_get_context_menu (LibraryPhotoPage* self) { GMenuModel* _tmp4_ = NULL; GtkMenu* _tmp5_ = NULL; GtkMenu* _tmp6_ = NULL; -#line 2829 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2818 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp1_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)->builder; -#line 2829 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2818 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp2_ = gtk_builder_get_object (_tmp1_, "PhotoContextMenu"); -#line 2829 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2818 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp3_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp2_, g_menu_model_get_type ()) ? ((GMenuModel*) _tmp2_) : NULL); -#line 2829 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2818 "/home/jens/Source/shotwell/src/PhotoPage.vala" model = _tmp3_; -#line 2831 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2820 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp4_ = model; -#line 2831 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2820 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp5_ = (GtkMenu*) gtk_menu_new_from_model (_tmp4_); -#line 2831 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2820 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_object_ref_sink (_tmp5_); -#line 2831 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2820 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (self->priv->context_menu); -#line 2831 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2820 "/home/jens/Source/shotwell/src/PhotoPage.vala" self->priv->context_menu = _tmp5_; -#line 2832 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2821 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp6_ = self->priv->context_menu; -#line 2832 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2821 "/home/jens/Source/shotwell/src/PhotoPage.vala" gtk_menu_attach_to_widget (_tmp6_, G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget), NULL); -#line 2828 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2817 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (model); -#line 17634 "PhotoPage.c" +#line 17583 "PhotoPage.c" } -#line 2835 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2824 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp7_ = self->priv->context_menu; -#line 2835 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2824 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp8_ = _g_object_ref0 (_tmp7_); -#line 2835 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2824 "/home/jens/Source/shotwell/src/PhotoPage.vala" result = _tmp8_; -#line 2835 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2824 "/home/jens/Source/shotwell/src/PhotoPage.vala" return result; -#line 17644 "PhotoPage.c" +#line 17593 "PhotoPage.c" } @@ -17655,25 +17604,25 @@ static gboolean library_photo_page_real_on_context_buttonpress (Page* base, GdkE GtkMenu* _tmp0_ = NULL; GtkMenu* _tmp1_ = NULL; GdkEventButton* _tmp2_ = NULL; -#line 2838 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2827 "/home/jens/Source/shotwell/src/PhotoPage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO_PAGE, LibraryPhotoPage); -#line 2838 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2827 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_val_if_fail (event != NULL, FALSE); -#line 2839 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2828 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp0_ = library_photo_page_get_context_menu (self); -#line 2839 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2828 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp1_ = _tmp0_; -#line 2839 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2828 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp2_ = event; -#line 2839 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2828 "/home/jens/Source/shotwell/src/PhotoPage.vala" page_popup_context_menu (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), _tmp1_, _tmp2_); -#line 2839 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2828 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (_tmp1_); -#line 2841 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2830 "/home/jens/Source/shotwell/src/PhotoPage.vala" result = TRUE; -#line 2841 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2830 "/home/jens/Source/shotwell/src/PhotoPage.vala" return result; -#line 17672 "PhotoPage.c" +#line 17621 "PhotoPage.c" } @@ -17682,59 +17631,59 @@ static gboolean library_photo_page_real_on_context_keypress (Page* base) { gboolean result = FALSE; GtkMenu* _tmp0_ = NULL; GtkMenu* _tmp1_ = NULL; -#line 2844 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2833 "/home/jens/Source/shotwell/src/PhotoPage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO_PAGE, LibraryPhotoPage); -#line 2845 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2834 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp0_ = library_photo_page_get_context_menu (self); -#line 2845 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2834 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp1_ = _tmp0_; -#line 2845 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2834 "/home/jens/Source/shotwell/src/PhotoPage.vala" page_popup_context_menu (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), _tmp1_, NULL); -#line 2845 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2834 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (_tmp1_); -#line 2847 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2836 "/home/jens/Source/shotwell/src/PhotoPage.vala" result = TRUE; -#line 2847 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2836 "/home/jens/Source/shotwell/src/PhotoPage.vala" return result; -#line 17695 "PhotoPage.c" +#line 17644 "PhotoPage.c" } static void library_photo_page_return_to_collection (LibraryPhotoPage* self) { CollectionPage* _tmp0_ = NULL; -#line 2850 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2839 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_if_fail (IS_LIBRARY_PHOTO_PAGE (self)); -#line 2852 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2841 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp0_ = self->priv->return_page; -#line 2852 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2841 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (NULL != _tmp0_) { -#line 17707 "PhotoPage.c" +#line 17656 "PhotoPage.c" LibraryWindow* _tmp1_ = NULL; LibraryWindow* _tmp2_ = NULL; CollectionPage* _tmp3_ = NULL; -#line 2853 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2842 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp1_ = library_window_get_app (); -#line 2853 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2842 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp2_ = _tmp1_; -#line 2853 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2842 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp3_ = self->priv->return_page; -#line 2853 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2842 "/home/jens/Source/shotwell/src/PhotoPage.vala" library_window_switch_to_page (_tmp2_, G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_PAGE, Page)); -#line 2853 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2842 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (_tmp2_); -#line 17721 "PhotoPage.c" +#line 17670 "PhotoPage.c" } else { LibraryWindow* _tmp4_ = NULL; LibraryWindow* _tmp5_ = NULL; -#line 2855 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2844 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp4_ = library_window_get_app (); -#line 2855 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2844 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp5_ = _tmp4_; -#line 2855 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2844 "/home/jens/Source/shotwell/src/PhotoPage.vala" library_window_switch_to_library_page (_tmp5_); -#line 2855 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2844 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (_tmp5_); -#line 17733 "PhotoPage.c" +#line 17682 "PhotoPage.c" } } @@ -17746,29 +17695,29 @@ static void library_photo_page_on_remove_from_library (LibraryPhotoPage* self) { GeeArrayList* _tmp1_ = NULL; const gchar* _tmp2_ = NULL; const gchar* _tmp3_ = NULL; -#line 2858 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2847 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_if_fail (IS_LIBRARY_PHOTO_PAGE (self)); -#line 2859 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2848 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp0_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage)); -#line 2859 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2848 "/home/jens/Source/shotwell/src/PhotoPage.vala" photo = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_LIBRARY_PHOTO, LibraryPhoto); -#line 2861 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2850 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp1_ = gee_array_list_new (TYPE_LIBRARY_PHOTO, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL); -#line 2861 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2850 "/home/jens/Source/shotwell/src/PhotoPage.vala" photos = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_COLLECTION, GeeCollection); -#line 2862 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2851 "/home/jens/Source/shotwell/src/PhotoPage.vala" gee_collection_add (photos, photo); -#line 2864 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2853 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp2_ = _ ("Remove From Library"); -#line 2864 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2853 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp3_ = _ ("Removing Photo From Library"); -#line 2864 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2853 "/home/jens/Source/shotwell/src/PhotoPage.vala" remove_from_app (photos, _tmp2_, _tmp3_); -#line 2858 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2847 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (photos); -#line 2858 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2847 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (photo); -#line 17767 "PhotoPage.c" +#line 17716 "PhotoPage.c" } @@ -17793,64 +17742,64 @@ static void library_photo_page_on_move_to_trash (LibraryPhotoPage* self) { TrashUntrashPhotosCommand* _tmp26_ = NULL; LibraryWindow* _tmp27_ = NULL; LibraryWindow* _tmp28_ = NULL; -#line 2867 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2856 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_if_fail (IS_LIBRARY_PHOTO_PAGE (self)); -#line 2868 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2857 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp0_ = editing_host_page_has_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage)); -#line 2868 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2857 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (!_tmp0_) { -#line 2869 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2858 "/home/jens/Source/shotwell/src/PhotoPage.vala" return; -#line 17800 "PhotoPage.c" +#line 17749 "PhotoPage.c" } -#line 2876 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2865 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp1_ = self->priv->return_page; -#line 2876 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2865 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp1_, TYPE_EVENT_PAGE)) { -#line 17806 "PhotoPage.c" +#line 17755 "PhotoPage.c" LibraryWindow* _tmp2_ = NULL; LibraryWindow* _tmp3_ = NULL; -#line 2877 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2866 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp2_ = library_window_get_app (); -#line 2877 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2866 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp3_ = _tmp2_; -#line 2877 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2866 "/home/jens/Source/shotwell/src/PhotoPage.vala" library_window_set_page_switching_enabled (_tmp3_, FALSE); -#line 2877 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2866 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (_tmp3_); -#line 17817 "PhotoPage.c" +#line 17766 "PhotoPage.c" } -#line 2880 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2869 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp4_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage)); -#line 2880 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2869 "/home/jens/Source/shotwell/src/PhotoPage.vala" photo = G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_LIBRARY_PHOTO, LibraryPhoto); -#line 2882 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2871 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp5_ = gee_array_list_new (TYPE_LIBRARY_PHOTO, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL); -#line 2882 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2871 "/home/jens/Source/shotwell/src/PhotoPage.vala" photos = G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, GEE_TYPE_COLLECTION, GeeCollection); -#line 2883 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2872 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp6_ = photos; -#line 2883 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2872 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp7_ = photo; -#line 2883 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2872 "/home/jens/Source/shotwell/src/PhotoPage.vala" gee_collection_add (_tmp6_, _tmp7_); -#line 2886 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2875 "/home/jens/Source/shotwell/src/PhotoPage.vala" single_photo_page_on_next_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage)); -#line 2890 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2879 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp8_ = photo; -#line 2890 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2879 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp9_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage)); -#line 2890 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2879 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp10_ = _tmp9_; -#line 2890 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2879 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp11_ = data_source_equals (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_DATA_SOURCE, DataSource), G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, TYPE_DATA_SOURCE, DataSource)); -#line 2890 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2879 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp12_ = _tmp11_; -#line 2890 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2879 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (_tmp10_); -#line 2890 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2879 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp12_) { -#line 17849 "PhotoPage.c" +#line 17798 "PhotoPage.c" LibraryWindow* _tmp13_ = NULL; LibraryWindow* _tmp14_ = NULL; GtkWindow* _tmp15_ = NULL; @@ -17858,88 +17807,88 @@ static void library_photo_page_on_move_to_trash (LibraryPhotoPage* self) { gboolean _tmp17_ = FALSE; LibraryWindow* _tmp20_ = NULL; LibraryWindow* _tmp21_ = NULL; -#line 2893 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2882 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp13_ = library_window_get_app (); -#line 2893 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2882 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp14_ = _tmp13_; -#line 2893 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2882 "/home/jens/Source/shotwell/src/PhotoPage.vala" library_window_set_page_switching_enabled (_tmp14_, TRUE); -#line 2893 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2882 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (_tmp14_); -#line 2895 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2884 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp15_ = page_get_container (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); -#line 2895 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2884 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp16_ = _tmp15_; -#line 2895 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2884 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp17_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp16_, TYPE_FULLSCREEN_WINDOW); -#line 2895 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2884 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (_tmp16_); -#line 2895 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2884 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp17_) { -#line 17875 "PhotoPage.c" +#line 17824 "PhotoPage.c" GtkWindow* _tmp18_ = NULL; FullscreenWindow* _tmp19_ = NULL; -#line 2896 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2885 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp18_ = page_get_container (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); -#line 2896 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2885 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp19_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, TYPE_FULLSCREEN_WINDOW, FullscreenWindow); -#line 2896 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2885 "/home/jens/Source/shotwell/src/PhotoPage.vala" fullscreen_window_close (_tmp19_); -#line 2896 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2885 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (_tmp19_); -#line 17886 "PhotoPage.c" +#line 17835 "PhotoPage.c" } -#line 2898 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2887 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp20_ = library_window_get_app (); -#line 2898 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2887 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp21_ = _tmp20_; -#line 2898 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2887 "/home/jens/Source/shotwell/src/PhotoPage.vala" library_window_switch_to_library_page (_tmp21_); -#line 2898 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2887 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (_tmp21_); -#line 17896 "PhotoPage.c" +#line 17845 "PhotoPage.c" } -#line 2901 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2890 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp22_ = page_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); -#line 2901 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2890 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp23_ = _tmp22_; -#line 2901 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2890 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp24_ = photos; -#line 2901 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2890 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp25_ = trash_untrash_photos_command_new (_tmp24_, TRUE); -#line 2901 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2890 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp26_ = _tmp25_; -#line 2901 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2890 "/home/jens/Source/shotwell/src/PhotoPage.vala" command_manager_execute (_tmp23_, G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, TYPE_COMMAND, Command)); -#line 2901 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2890 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (_tmp26_); -#line 2901 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2890 "/home/jens/Source/shotwell/src/PhotoPage.vala" _command_manager_unref0 (_tmp23_); -#line 2902 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2891 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp27_ = library_window_get_app (); -#line 2902 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2891 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp28_ = _tmp27_; -#line 2902 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2891 "/home/jens/Source/shotwell/src/PhotoPage.vala" library_window_set_page_switching_enabled (_tmp28_, TRUE); -#line 2902 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2891 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (_tmp28_); -#line 2867 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2856 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (photos); -#line 2867 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2856 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (photo); -#line 17926 "PhotoPage.c" +#line 17875 "PhotoPage.c" } static void library_photo_page_on_flag_unflag (LibraryPhotoPage* self) { gboolean _tmp0_ = FALSE; -#line 2905 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2894 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_if_fail (IS_LIBRARY_PHOTO_PAGE (self)); -#line 2906 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2895 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp0_ = editing_host_page_has_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage)); -#line 2906 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2895 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp0_) { -#line 17938 "PhotoPage.c" +#line 17887 "PhotoPage.c" GeeArrayList* photo_list = NULL; GeeArrayList* _tmp1_ = NULL; GeeArrayList* _tmp2_ = NULL; @@ -17953,62 +17902,62 @@ static void library_photo_page_on_flag_unflag (LibraryPhotoPage* self) { gboolean _tmp10_ = FALSE; FlagUnflagCommand* _tmp11_ = NULL; FlagUnflagCommand* _tmp12_ = NULL; -#line 2907 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2896 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp1_ = gee_array_list_new (TYPE_MEDIA_SOURCE, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL); -#line 2907 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2896 "/home/jens/Source/shotwell/src/PhotoPage.vala" photo_list = _tmp1_; -#line 2908 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2897 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp2_ = photo_list; -#line 2908 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2897 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp3_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage)); -#line 2908 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2897 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp4_ = _tmp3_; -#line 2908 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2897 "/home/jens/Source/shotwell/src/PhotoPage.vala" gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_MEDIA_SOURCE, MediaSource)); -#line 2908 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2897 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (_tmp4_); -#line 2909 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2898 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp5_ = page_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); -#line 2909 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2898 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp6_ = _tmp5_; -#line 2909 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2898 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp7_ = photo_list; -#line 2909 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2898 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp8_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage)); -#line 2909 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2898 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp9_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_LIBRARY_PHOTO, LibraryPhoto); -#line 2909 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2898 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp10_ = flaggable_is_flagged (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, TYPE_FLAGGABLE, Flaggable)); -#line 2909 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2898 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp11_ = flag_unflag_command_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GEE_TYPE_COLLECTION, GeeCollection), !_tmp10_); -#line 2909 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2898 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp12_ = _tmp11_; -#line 2909 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2898 "/home/jens/Source/shotwell/src/PhotoPage.vala" command_manager_execute (_tmp6_, G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, TYPE_COMMAND, Command)); -#line 2909 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2898 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (_tmp12_); -#line 2909 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2898 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (_tmp9_); -#line 2909 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2898 "/home/jens/Source/shotwell/src/PhotoPage.vala" _command_manager_unref0 (_tmp6_); -#line 2906 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2895 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (photo_list); -#line 17992 "PhotoPage.c" +#line 17941 "PhotoPage.c" } } static void library_photo_page_on_photo_destroyed (LibraryPhotoPage* self, DataSource* source) { DataSource* _tmp0_ = NULL; -#line 2914 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2903 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_if_fail (IS_LIBRARY_PHOTO_PAGE (self)); -#line 2914 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2903 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_if_fail (IS_DATA_SOURCE (source)); -#line 2915 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2904 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp0_ = source; -#line 2915 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2904 "/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 18007 "PhotoPage.c" +#line 17956 "PhotoPage.c" } @@ -18030,100 +17979,100 @@ static void library_photo_page_on_photo_removed (LibraryPhotoPage* self, Library Photo* _tmp17_ = NULL; gboolean _tmp18_ = FALSE; gboolean _tmp19_ = FALSE; -#line 2918 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2907 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_if_fail (IS_LIBRARY_PHOTO_PAGE (self)); -#line 2918 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2907 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_if_fail (IS_LIBRARY_PHOTO (photo)); -#line 2920 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2909 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp1_ = photo; -#line 2920 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2909 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp1_ == NULL) { -#line 2920 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2909 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp0_ = TRUE; -#line 18039 "PhotoPage.c" +#line 17988 "PhotoPage.c" } else { LibraryPhoto* _tmp2_ = NULL; Photo* _tmp3_ = NULL; Photo* _tmp4_ = NULL; gboolean _tmp5_ = FALSE; -#line 2920 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2909 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp2_ = photo; -#line 2920 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2909 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp3_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage)); -#line 2920 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2909 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp4_ = _tmp3_; -#line 2920 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2909 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp5_ = data_source_equals (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_DATA_SOURCE, DataSource), G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_DATA_SOURCE, DataSource)); -#line 2920 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2909 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp0_ = !_tmp5_; -#line 2920 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2909 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (_tmp4_); -#line 18057 "PhotoPage.c" +#line 18006 "PhotoPage.c" } -#line 2920 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2909 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp0_) { -#line 2921 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2910 "/home/jens/Source/shotwell/src/PhotoPage.vala" return; -#line 18063 "PhotoPage.c" +#line 18012 "PhotoPage.c" } -#line 2924 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2913 "/home/jens/Source/shotwell/src/PhotoPage.vala" single_photo_page_on_next_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage)); -#line 2926 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2915 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp6_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); -#line 2926 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2915 "/home/jens/Source/shotwell/src/PhotoPage.vala" view = _tmp6_; -#line 2927 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2916 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp7_ = view; -#line 2927 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2916 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp8_ = view; -#line 2927 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2916 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp9_ = view; -#line 2927 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2916 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp10_ = photo; -#line 2927 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2916 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp11_ = view_collection_get_view_for_source (_tmp9_, G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, TYPE_DATA_SOURCE, DataSource)); -#line 2927 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2916 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp12_ = _tmp11_; -#line 2927 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2916 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp13_ = data_collection_mark (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_DATA_COLLECTION, DataCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, TYPE_DATA_OBJECT, DataObject)); -#line 2927 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2916 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp14_ = _tmp13_; -#line 2927 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2916 "/home/jens/Source/shotwell/src/PhotoPage.vala" data_collection_remove_marked (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_DATA_COLLECTION, DataCollection), _tmp14_); -#line 2927 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2916 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (_tmp14_); -#line 2927 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2916 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (_tmp12_); -#line 2928 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2917 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp15_ = photo; -#line 2928 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2917 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp16_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage)); -#line 2928 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2917 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp17_ = _tmp16_; -#line 2928 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2917 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp18_ = data_source_equals (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, TYPE_DATA_SOURCE, DataSource), G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, TYPE_DATA_SOURCE, DataSource)); -#line 2928 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2917 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp19_ = _tmp18_; -#line 2928 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2917 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (_tmp17_); -#line 2928 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2917 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp19_) { -#line 18107 "PhotoPage.c" +#line 18056 "PhotoPage.c" LibraryWindow* _tmp20_ = NULL; LibraryWindow* _tmp21_ = NULL; -#line 2931 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2920 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp20_ = library_window_get_app (); -#line 2931 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2920 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp21_ = _tmp20_; -#line 2931 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2920 "/home/jens/Source/shotwell/src/PhotoPage.vala" library_window_switch_to_library_page (_tmp21_); -#line 2931 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2920 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (_tmp21_); -#line 18118 "PhotoPage.c" +#line 18067 "PhotoPage.c" } -#line 2918 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2907 "/home/jens/Source/shotwell/src/PhotoPage.vala" _data_collection_unref0 (view); -#line 18122 "PhotoPage.c" +#line 18071 "PhotoPage.c" } @@ -18132,48 +18081,48 @@ static void library_photo_page_on_print (LibraryPhotoPage* self) { ViewCollection* _tmp1_ = NULL; gint _tmp2_ = 0; gboolean _tmp3_ = FALSE; -#line 2935 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2924 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_if_fail (IS_LIBRARY_PHOTO_PAGE (self)); -#line 2936 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2925 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp0_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); -#line 2936 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2925 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp1_ = _tmp0_; -#line 2936 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2925 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp2_ = view_collection_get_selected_count (_tmp1_); -#line 2936 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2925 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp3_ = _tmp2_ > 0; -#line 2936 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2925 "/home/jens/Source/shotwell/src/PhotoPage.vala" _data_collection_unref0 (_tmp1_); -#line 2936 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2925 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp3_) { -#line 18145 "PhotoPage.c" +#line 18094 "PhotoPage.c" PrintManager* _tmp4_ = NULL; PrintManager* _tmp5_ = NULL; ViewCollection* _tmp6_ = NULL; ViewCollection* _tmp7_ = NULL; GeeList* _tmp8_ = NULL; GeeCollection* _tmp9_ = NULL; -#line 2937 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2926 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp4_ = print_manager_get_instance (); -#line 2937 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2926 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp5_ = _tmp4_; -#line 2937 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2926 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp6_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); -#line 2937 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2926 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp7_ = _tmp6_; -#line 2937 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2926 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp8_ = view_collection_get_selected_sources_of_type (_tmp7_, TYPE_PHOTO); -#line 2937 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2926 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp9_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, GEE_TYPE_COLLECTION, GeeCollection); -#line 2937 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2926 "/home/jens/Source/shotwell/src/PhotoPage.vala" print_manager_spool_photo (_tmp5_, _tmp9_); -#line 2937 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2926 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (_tmp9_); -#line 2937 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2926 "/home/jens/Source/shotwell/src/PhotoPage.vala" _data_collection_unref0 (_tmp7_); -#line 2937 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2926 "/home/jens/Source/shotwell/src/PhotoPage.vala" _print_manager_unref0 (_tmp5_); -#line 18172 "PhotoPage.c" +#line 18121 "PhotoPage.c" } } @@ -18181,55 +18130,55 @@ static void library_photo_page_on_print (LibraryPhotoPage* self) { static void library_photo_page_on_external_app_changed (LibraryPhotoPage* self) { gboolean _tmp0_ = FALSE; gboolean _tmp1_ = FALSE; -#line 2942 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2931 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_if_fail (IS_LIBRARY_PHOTO_PAGE (self)); -#line 2943 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2932 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp1_ = editing_host_page_has_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage)); -#line 2943 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2932 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp1_) { -#line 18186 "PhotoPage.c" +#line 18135 "PhotoPage.c" ConfigFacade* _tmp2_ = NULL; ConfigFacade* _tmp3_ = NULL; gchar* _tmp4_ = NULL; gchar* _tmp5_ = NULL; -#line 2944 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2933 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp2_ = config_facade_get_instance (); -#line 2944 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2933 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp3_ = _tmp2_; -#line 2944 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2933 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp4_ = configuration_facade_get_external_photo_app (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade)); -#line 2944 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2933 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp5_ = _tmp4_; -#line 2944 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2933 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp0_ = g_strcmp0 (_tmp5_, "") != 0; -#line 2944 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2933 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_free0 (_tmp5_); -#line 2944 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2933 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (_tmp3_); -#line 18205 "PhotoPage.c" +#line 18154 "PhotoPage.c" } else { -#line 2943 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2932 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp0_ = FALSE; -#line 18209 "PhotoPage.c" +#line 18158 "PhotoPage.c" } -#line 2943 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2932 "/home/jens/Source/shotwell/src/PhotoPage.vala" page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "ExternalEdit", _tmp0_); -#line 18213 "PhotoPage.c" +#line 18162 "PhotoPage.c" } static void library_photo_page_on_external_edit (LibraryPhotoPage* self) { gboolean _tmp0_ = FALSE; GError * _inner_error_ = NULL; -#line 2947 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2936 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_if_fail (IS_LIBRARY_PHOTO_PAGE (self)); -#line 2948 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2937 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp0_ = editing_host_page_has_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage)); -#line 2948 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2937 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (!_tmp0_) { -#line 2949 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2938 "/home/jens/Source/shotwell/src/PhotoPage.vala" return; -#line 18228 "PhotoPage.c" +#line 18177 "PhotoPage.c" } { AppWindow* _tmp1_ = NULL; @@ -18238,36 +18187,36 @@ static void library_photo_page_on_external_edit (LibraryPhotoPage* self) { Photo* _tmp4_ = NULL; AppWindow* _tmp5_ = NULL; AppWindow* _tmp6_ = NULL; -#line 2952 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2941 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp1_ = app_window_get_instance (); -#line 2952 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2941 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp2_ = _tmp1_; -#line 2952 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2941 "/home/jens/Source/shotwell/src/PhotoPage.vala" page_window_set_busy_cursor (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_PAGE_WINDOW, PageWindow)); -#line 2952 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2941 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (_tmp2_); -#line 2953 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2942 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp3_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage)); -#line 2953 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2942 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp4_ = _tmp3_; -#line 2953 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2942 "/home/jens/Source/shotwell/src/PhotoPage.vala" photo_open_with_external_editor (_tmp4_, &_inner_error_); -#line 2953 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2942 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (_tmp4_); -#line 2953 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2942 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 18255 "PhotoPage.c" +#line 18204 "PhotoPage.c" goto __catch248_g_error; } -#line 2954 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2943 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp5_ = app_window_get_instance (); -#line 2954 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2943 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp6_ = _tmp5_; -#line 2954 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2943 "/home/jens/Source/shotwell/src/PhotoPage.vala" page_window_set_normal_cursor (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, TYPE_PAGE_WINDOW, PageWindow)); -#line 2954 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2943 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (_tmp6_); -#line 18266 "PhotoPage.c" +#line 18215 "PhotoPage.c" } goto __finally248; __catch248_g_error: @@ -18278,42 +18227,42 @@ static void library_photo_page_on_external_edit (LibraryPhotoPage* self) { GError* _tmp9_ = NULL; Photo* _tmp10_ = NULL; Photo* _tmp11_ = NULL; -#line 2951 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2940 "/home/jens/Source/shotwell/src/PhotoPage.vala" err = _inner_error_; -#line 2951 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2940 "/home/jens/Source/shotwell/src/PhotoPage.vala" _inner_error_ = NULL; -#line 2956 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2945 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp7_ = app_window_get_instance (); -#line 2956 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2945 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp8_ = _tmp7_; -#line 2956 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2945 "/home/jens/Source/shotwell/src/PhotoPage.vala" page_window_set_normal_cursor (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_PAGE_WINDOW, PageWindow)); -#line 2956 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2945 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (_tmp8_); -#line 2957 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2946 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp9_ = err; -#line 2957 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2946 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp10_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage)); -#line 2957 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2946 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp11_ = _tmp10_; -#line 2957 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2946 "/home/jens/Source/shotwell/src/PhotoPage.vala" open_external_editor_error_dialog (_tmp9_, _tmp11_); -#line 2957 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2946 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (_tmp11_); -#line 2951 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2940 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_error_free0 (err); -#line 18301 "PhotoPage.c" +#line 18250 "PhotoPage.c" } __finally248: -#line 2951 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2940 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 2951 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2940 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); -#line 2951 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2940 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_clear_error (&_inner_error_); -#line 2951 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2940 "/home/jens/Source/shotwell/src/PhotoPage.vala" return; -#line 18312 "PhotoPage.c" +#line 18261 "PhotoPage.c" } } @@ -18325,31 +18274,31 @@ static void library_photo_page_on_external_edit_raw (LibraryPhotoPage* self) { PhotoFileFormat _tmp3_ = 0; gboolean _tmp4_ = FALSE; GError * _inner_error_ = NULL; -#line 2962 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2951 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_if_fail (IS_LIBRARY_PHOTO_PAGE (self)); -#line 2963 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2952 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp0_ = editing_host_page_has_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage)); -#line 2963 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2952 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (!_tmp0_) { -#line 2964 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2953 "/home/jens/Source/shotwell/src/PhotoPage.vala" return; -#line 18332 "PhotoPage.c" +#line 18281 "PhotoPage.c" } -#line 2966 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2955 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp1_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage)); -#line 2966 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2955 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp2_ = _tmp1_; -#line 2966 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2955 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp3_ = photo_get_master_file_format (_tmp2_); -#line 2966 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2955 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp4_ = _tmp3_ != PHOTO_FILE_FORMAT_RAW; -#line 2966 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2955 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (_tmp2_); -#line 2966 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2955 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp4_) { -#line 2967 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2956 "/home/jens/Source/shotwell/src/PhotoPage.vala" return; -#line 18348 "PhotoPage.c" +#line 18297 "PhotoPage.c" } { AppWindow* _tmp5_ = NULL; @@ -18358,36 +18307,36 @@ static void library_photo_page_on_external_edit_raw (LibraryPhotoPage* self) { Photo* _tmp8_ = NULL; AppWindow* _tmp9_ = NULL; AppWindow* _tmp10_ = NULL; -#line 2970 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2959 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp5_ = app_window_get_instance (); -#line 2970 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2959 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp6_ = _tmp5_; -#line 2970 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2959 "/home/jens/Source/shotwell/src/PhotoPage.vala" page_window_set_busy_cursor (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, TYPE_PAGE_WINDOW, PageWindow)); -#line 2970 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2959 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (_tmp6_); -#line 2971 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2960 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp7_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage)); -#line 2971 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2960 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp8_ = _tmp7_; -#line 2971 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2960 "/home/jens/Source/shotwell/src/PhotoPage.vala" photo_open_with_raw_external_editor (_tmp8_, &_inner_error_); -#line 2971 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2960 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (_tmp8_); -#line 2971 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2960 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 18375 "PhotoPage.c" +#line 18324 "PhotoPage.c" goto __catch249_g_error; } -#line 2972 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2961 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp9_ = app_window_get_instance (); -#line 2972 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2961 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp10_ = _tmp9_; -#line 2972 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2961 "/home/jens/Source/shotwell/src/PhotoPage.vala" page_window_set_normal_cursor (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, TYPE_PAGE_WINDOW, PageWindow)); -#line 2972 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2961 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (_tmp10_); -#line 18386 "PhotoPage.c" +#line 18335 "PhotoPage.c" } goto __finally249; __catch249_g_error: @@ -18398,74 +18347,74 @@ static void library_photo_page_on_external_edit_raw (LibraryPhotoPage* self) { GError* _tmp13_ = NULL; gchar* _tmp14_ = NULL; gchar* _tmp15_ = NULL; -#line 2969 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2958 "/home/jens/Source/shotwell/src/PhotoPage.vala" err = _inner_error_; -#line 2969 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2958 "/home/jens/Source/shotwell/src/PhotoPage.vala" _inner_error_ = NULL; -#line 2974 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2963 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp11_ = app_window_get_instance (); -#line 2974 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2963 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp12_ = _tmp11_; -#line 2974 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2963 "/home/jens/Source/shotwell/src/PhotoPage.vala" page_window_set_normal_cursor (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, TYPE_PAGE_WINDOW, PageWindow)); -#line 2974 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2963 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (_tmp12_); -#line 2975 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2964 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp13_ = err; -#line 2975 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2964 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp14_ = resources_launch_editor_failed (_tmp13_); -#line 2975 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2964 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp15_ = _tmp14_; -#line 2975 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2964 "/home/jens/Source/shotwell/src/PhotoPage.vala" app_window_error_message (_tmp15_, NULL); -#line 2975 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2964 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_free0 (_tmp15_); -#line 2969 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2958 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_error_free0 (err); -#line 18421 "PhotoPage.c" +#line 18370 "PhotoPage.c" } __finally249: -#line 2969 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2958 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 2969 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2958 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); -#line 2969 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2958 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_clear_error (&_inner_error_); -#line 2969 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2958 "/home/jens/Source/shotwell/src/PhotoPage.vala" return; -#line 18432 "PhotoPage.c" +#line 18381 "PhotoPage.c" } } static void library_photo_page_on_send_to (LibraryPhotoPage* self) { gboolean _tmp0_ = FALSE; -#line 2979 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2968 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_if_fail (IS_LIBRARY_PHOTO_PAGE (self)); -#line 2980 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2969 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp0_ = editing_host_page_has_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage)); -#line 2980 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2969 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp0_) { -#line 18445 "PhotoPage.c" +#line 18394 "PhotoPage.c" ViewCollection* _tmp1_ = NULL; ViewCollection* _tmp2_ = NULL; GeeList* _tmp3_ = NULL; GeeCollection* _tmp4_ = NULL; -#line 2981 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2970 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp1_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); -#line 2981 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2970 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp2_ = _tmp1_; -#line 2981 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2970 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp3_ = view_collection_get_selected_sources (_tmp2_); -#line 2981 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2970 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp4_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_COLLECTION, GeeCollection); -#line 2981 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2970 "/home/jens/Source/shotwell/src/PhotoPage.vala" desktop_integration_send_to (_tmp4_); -#line 2981 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2970 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (_tmp4_); -#line 2981 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2970 "/home/jens/Source/shotwell/src/PhotoPage.vala" _data_collection_unref0 (_tmp2_); -#line 18464 "PhotoPage.c" +#line 18413 "PhotoPage.c" } } @@ -18497,85 +18446,85 @@ static void library_photo_page_on_export (LibraryPhotoPage* self) { gint _tmp17_ = 0; Scaling _tmp18_ = {0}; GError * _inner_error_ = NULL; -#line 2984 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2973 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_if_fail (IS_LIBRARY_PHOTO_PAGE (self)); -#line 2985 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2974 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp0_ = editing_host_page_has_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage)); -#line 2985 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2974 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (!_tmp0_) { -#line 2986 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2975 "/home/jens/Source/shotwell/src/PhotoPage.vala" return; -#line 18504 "PhotoPage.c" +#line 18453 "PhotoPage.c" } -#line 2988 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2977 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp1_ = _ ("Export Photo"); -#line 2988 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2977 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp2_ = export_dialog_new (_tmp1_); -#line 2988 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2977 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_object_ref_sink (_tmp2_); -#line 2988 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2977 "/home/jens/Source/shotwell/src/PhotoPage.vala" export_dialog = _tmp2_; -#line 2992 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2981 "/home/jens/Source/shotwell/src/PhotoPage.vala" export_format_parameters_last (&_tmp3_); -#line 2992 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2981 "/home/jens/Source/shotwell/src/PhotoPage.vala" export_params = _tmp3_; -#line 2993 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2982 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp4_ = export_dialog; -#line 2993 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2982 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp7_ = export_dialog_execute (_tmp4_, &_tmp5_, &_tmp6_, &export_params); -#line 2993 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2982 "/home/jens/Source/shotwell/src/PhotoPage.vala" scale = _tmp5_; -#line 2993 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2982 "/home/jens/Source/shotwell/src/PhotoPage.vala" constraint = _tmp6_; -#line 2993 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2982 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (!_tmp7_) { -#line 2994 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2983 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (export_dialog); -#line 2994 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2983 "/home/jens/Source/shotwell/src/PhotoPage.vala" return; -#line 18532 "PhotoPage.c" +#line 18481 "PhotoPage.c" } -#line 2996 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2985 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp8_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage)); -#line 2996 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2985 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp9_ = _tmp8_; -#line 2996 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2985 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp10_ = export_params; -#line 2996 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2985 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp11_ = photo_get_export_basename_for_parameters (_tmp9_, &_tmp10_); -#line 2996 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2985 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp12_ = _tmp11_; -#line 2996 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2985 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp13_ = export_ui_choose_file (_tmp12_); -#line 2996 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2985 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp14_ = _tmp13_; -#line 2996 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2985 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_free0 (_tmp12_); -#line 2996 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2985 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (_tmp9_); -#line 2996 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2985 "/home/jens/Source/shotwell/src/PhotoPage.vala" save_as = _tmp14_; -#line 2998 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2987 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp15_ = save_as; -#line 2998 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2987 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp15_ == NULL) { -#line 2999 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2988 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (save_as); -#line 2999 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2988 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (export_dialog); -#line 2999 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2988 "/home/jens/Source/shotwell/src/PhotoPage.vala" return; -#line 18564 "PhotoPage.c" +#line 18513 "PhotoPage.c" } -#line 3001 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2990 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp16_ = constraint; -#line 3001 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2990 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp17_ = scale; -#line 3001 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2990 "/home/jens/Source/shotwell/src/PhotoPage.vala" scaling_for_constraint (_tmp16_, _tmp17_, FALSE, &_tmp18_); -#line 3001 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2990 "/home/jens/Source/shotwell/src/PhotoPage.vala" scaling = _tmp18_; -#line 18574 "PhotoPage.c" +#line 18523 "PhotoPage.c" { Photo* _tmp19_ = NULL; Photo* _tmp20_ = NULL; @@ -18591,43 +18540,43 @@ static void library_photo_page_on_export (LibraryPhotoPage* self) { ExportFormatMode _tmp30_ = 0; ExportFormatParameters _tmp31_ = {0}; gboolean _tmp32_ = FALSE; -#line 3004 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2993 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp19_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage)); -#line 3004 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2993 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp20_ = _tmp19_; -#line 3004 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2993 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp21_ = save_as; -#line 3004 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2993 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp22_ = scaling; -#line 3004 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2993 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp23_ = export_params; -#line 3004 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2993 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp24_ = _tmp23_.quality; -#line 3004 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2993 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp25_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage)); -#line 3004 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2993 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp26_ = _tmp25_; -#line 3004 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2993 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp27_ = export_params; -#line 3004 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2993 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp28_ = photo_get_export_format_for_parameters (_tmp26_, &_tmp27_); -#line 3004 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2993 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp29_ = export_params; -#line 3004 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2993 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp30_ = _tmp29_.mode; -#line 3004 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2993 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp31_ = export_params; -#line 3004 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2993 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp32_ = _tmp31_.export_metadata; -#line 3004 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2993 "/home/jens/Source/shotwell/src/PhotoPage.vala" photo_export (_tmp20_, _tmp21_, &_tmp22_, _tmp24_, _tmp28_, _tmp30_ == EXPORT_FORMAT_MODE_UNMODIFIED, _tmp32_, &_inner_error_); -#line 3004 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2993 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (_tmp26_); -#line 3004 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2993 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (_tmp20_); -#line 3004 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2993 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 18626 "PhotoPage.c" +#line 18575 "PhotoPage.c" goto __catch250_g_error; } } @@ -18643,56 +18592,56 @@ static void library_photo_page_on_export (LibraryPhotoPage* self) { const gchar* _tmp38_ = NULL; gchar* _tmp39_ = NULL; gchar* _tmp40_ = NULL; -#line 3003 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2992 "/home/jens/Source/shotwell/src/PhotoPage.vala" err = _inner_error_; -#line 3003 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2992 "/home/jens/Source/shotwell/src/PhotoPage.vala" _inner_error_ = NULL; -#line 3008 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2997 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp33_ = _ ("Unable to export %s: %s"); -#line 3008 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2997 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp34_ = save_as; -#line 3008 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2997 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp35_ = g_file_get_path (_tmp34_); -#line 3008 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2997 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp36_ = _tmp35_; -#line 3008 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2997 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp37_ = err; -#line 3008 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2997 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp38_ = _tmp37_->message; -#line 3008 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2997 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp39_ = g_strdup_printf (_tmp33_, _tmp36_, _tmp38_); -#line 3008 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2997 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp40_ = _tmp39_; -#line 3008 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2997 "/home/jens/Source/shotwell/src/PhotoPage.vala" app_window_error_message (_tmp40_, NULL); -#line 3008 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2997 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_free0 (_tmp40_); -#line 3008 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2997 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_free0 (_tmp36_); -#line 3003 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2992 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_error_free0 (err); -#line 18670 "PhotoPage.c" +#line 18619 "PhotoPage.c" } __finally250: -#line 3003 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2992 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 3003 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2992 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (save_as); -#line 3003 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2992 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (export_dialog); -#line 3003 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2992 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); -#line 3003 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2992 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_clear_error (&_inner_error_); -#line 3003 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2992 "/home/jens/Source/shotwell/src/PhotoPage.vala" return; -#line 18685 "PhotoPage.c" +#line 18634 "PhotoPage.c" } -#line 2984 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2973 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (save_as); -#line 2984 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2973 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (export_dialog); -#line 18691 "PhotoPage.c" +#line 18640 "PhotoPage.c" } @@ -18701,40 +18650,40 @@ static void library_photo_page_on_publish (LibraryPhotoPage* self) { ViewCollection* _tmp1_ = NULL; gint _tmp2_ = 0; gboolean _tmp3_ = FALSE; -#line 3012 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3001 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_if_fail (IS_LIBRARY_PHOTO_PAGE (self)); -#line 3013 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3002 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp0_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); -#line 3013 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3002 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp1_ = _tmp0_; -#line 3013 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3002 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp2_ = data_collection_get_count (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_DATA_COLLECTION, DataCollection)); -#line 3013 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3002 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp3_ = _tmp2_ > 0; -#line 3013 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3002 "/home/jens/Source/shotwell/src/PhotoPage.vala" _data_collection_unref0 (_tmp1_); -#line 3013 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3002 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp3_) { -#line 18714 "PhotoPage.c" +#line 18663 "PhotoPage.c" ViewCollection* _tmp4_ = NULL; ViewCollection* _tmp5_ = NULL; GeeList* _tmp6_ = NULL; GeeCollection* _tmp7_ = NULL; -#line 3014 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3003 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp4_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); -#line 3014 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3003 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp5_ = _tmp4_; -#line 3014 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3003 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp6_ = view_collection_get_selected_sources (_tmp5_); -#line 3014 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3003 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp7_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_COLLECTION, GeeCollection); -#line 3014 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3003 "/home/jens/Source/shotwell/src/PhotoPage.vala" publishing_ui_publishing_dialog_go (_tmp7_); -#line 3014 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3003 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (_tmp7_); -#line 3014 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3003 "/home/jens/Source/shotwell/src/PhotoPage.vala" _data_collection_unref0 (_tmp5_); -#line 18733 "PhotoPage.c" +#line 18682 "PhotoPage.c" } } @@ -18750,56 +18699,56 @@ static void library_photo_page_on_increase_rating (LibraryPhotoPage* self) { CommandManager* _tmp7_ = NULL; CommandManager* _tmp8_ = NULL; SetRatingSingleCommand* _tmp9_ = NULL; -#line 3018 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3007 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_if_fail (IS_LIBRARY_PHOTO_PAGE (self)); -#line 3019 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3008 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp1_ = editing_host_page_has_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage)); -#line 3019 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3008 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (!_tmp1_) { -#line 3019 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3008 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp0_ = TRUE; -#line 18757 "PhotoPage.c" +#line 18706 "PhotoPage.c" } else { gboolean _tmp2_ = FALSE; -#line 3019 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3008 "/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 3019 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3008 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp0_ = _tmp2_; -#line 18764 "PhotoPage.c" +#line 18713 "PhotoPage.c" } -#line 3019 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3008 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp0_) { -#line 3020 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3009 "/home/jens/Source/shotwell/src/PhotoPage.vala" return; -#line 18770 "PhotoPage.c" +#line 18719 "PhotoPage.c" } -#line 3022 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3011 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp3_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage)); -#line 3022 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3011 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp4_ = _tmp3_; -#line 3022 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3011 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp5_ = set_rating_single_command_new_inc_dec (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_DATA_SOURCE, DataSource), TRUE); -#line 3022 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3011 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp6_ = _tmp5_; -#line 3022 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3011 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (_tmp4_); -#line 3022 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3011 "/home/jens/Source/shotwell/src/PhotoPage.vala" command = _tmp6_; -#line 3023 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3012 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp7_ = page_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); -#line 3023 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3012 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp8_ = _tmp7_; -#line 3023 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3012 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp9_ = command; -#line 3023 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3012 "/home/jens/Source/shotwell/src/PhotoPage.vala" command_manager_execute (_tmp8_, G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, TYPE_COMMAND, Command)); -#line 3023 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3012 "/home/jens/Source/shotwell/src/PhotoPage.vala" _command_manager_unref0 (_tmp8_); -#line 3025 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3014 "/home/jens/Source/shotwell/src/PhotoPage.vala" library_photo_page_update_rating_menu_item_sensitivity (self); -#line 3018 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3007 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (command); -#line 18798 "PhotoPage.c" +#line 18747 "PhotoPage.c" } @@ -18814,56 +18763,56 @@ static void library_photo_page_on_decrease_rating (LibraryPhotoPage* self) { CommandManager* _tmp7_ = NULL; CommandManager* _tmp8_ = NULL; SetRatingSingleCommand* _tmp9_ = NULL; -#line 3028 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3017 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_if_fail (IS_LIBRARY_PHOTO_PAGE (self)); -#line 3029 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3018 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp1_ = editing_host_page_has_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage)); -#line 3029 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3018 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (!_tmp1_) { -#line 3029 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3018 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp0_ = TRUE; -#line 18821 "PhotoPage.c" +#line 18770 "PhotoPage.c" } else { gboolean _tmp2_ = FALSE; -#line 3029 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3018 "/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" +#line 3018 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp0_ = _tmp2_; -#line 18828 "PhotoPage.c" +#line 18777 "PhotoPage.c" } -#line 3029 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3018 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp0_) { -#line 3030 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3019 "/home/jens/Source/shotwell/src/PhotoPage.vala" return; -#line 18834 "PhotoPage.c" +#line 18783 "PhotoPage.c" } -#line 3032 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3021 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp3_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage)); -#line 3032 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3021 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp4_ = _tmp3_; -#line 3032 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3021 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp5_ = set_rating_single_command_new_inc_dec (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_DATA_SOURCE, DataSource), FALSE); -#line 3032 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3021 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp6_ = _tmp5_; -#line 3032 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3021 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (_tmp4_); -#line 3032 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3021 "/home/jens/Source/shotwell/src/PhotoPage.vala" command = _tmp6_; -#line 3033 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3022 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp7_ = page_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); -#line 3033 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3022 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp8_ = _tmp7_; -#line 3033 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3022 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp9_ = command; -#line 3033 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3022 "/home/jens/Source/shotwell/src/PhotoPage.vala" command_manager_execute (_tmp8_, G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, TYPE_COMMAND, Command)); -#line 3033 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3022 "/home/jens/Source/shotwell/src/PhotoPage.vala" _command_manager_unref0 (_tmp8_); -#line 3035 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3024 "/home/jens/Source/shotwell/src/PhotoPage.vala" library_photo_page_update_rating_menu_item_sensitivity (self); -#line 3028 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3017 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (command); -#line 18862 "PhotoPage.c" +#line 18811 "PhotoPage.c" } @@ -18879,121 +18828,121 @@ static void library_photo_page_on_set_rating (LibraryPhotoPage* self, Rating rat CommandManager* _tmp8_ = NULL; CommandManager* _tmp9_ = NULL; SetRatingSingleCommand* _tmp10_ = NULL; -#line 3038 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3027 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_if_fail (IS_LIBRARY_PHOTO_PAGE (self)); -#line 3039 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3028 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp1_ = editing_host_page_has_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage)); -#line 3039 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3028 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (!_tmp1_) { -#line 3039 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3028 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp0_ = TRUE; -#line 18886 "PhotoPage.c" +#line 18835 "PhotoPage.c" } else { gboolean _tmp2_ = FALSE; -#line 3039 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3028 "/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" +#line 3028 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp0_ = _tmp2_; -#line 18893 "PhotoPage.c" +#line 18842 "PhotoPage.c" } -#line 3039 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3028 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp0_) { -#line 3040 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3029 "/home/jens/Source/shotwell/src/PhotoPage.vala" return; -#line 18899 "PhotoPage.c" +#line 18848 "PhotoPage.c" } -#line 3042 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3031 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp3_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage)); -#line 3042 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3031 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp4_ = _tmp3_; -#line 3042 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3031 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp5_ = rating; -#line 3042 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3031 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp6_ = set_rating_single_command_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_DATA_SOURCE, DataSource), _tmp5_); -#line 3042 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3031 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp7_ = _tmp6_; -#line 3042 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3031 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (_tmp4_); -#line 3042 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3031 "/home/jens/Source/shotwell/src/PhotoPage.vala" command = _tmp7_; -#line 3043 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3032 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp8_ = page_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); -#line 3043 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3032 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp9_ = _tmp8_; -#line 3043 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3032 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp10_ = command; -#line 3043 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3032 "/home/jens/Source/shotwell/src/PhotoPage.vala" command_manager_execute (_tmp9_, G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, TYPE_COMMAND, Command)); -#line 3043 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3032 "/home/jens/Source/shotwell/src/PhotoPage.vala" _command_manager_unref0 (_tmp9_); -#line 3045 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3034 "/home/jens/Source/shotwell/src/PhotoPage.vala" library_photo_page_update_rating_menu_item_sensitivity (self); -#line 3038 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3027 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (command); -#line 18929 "PhotoPage.c" +#line 18878 "PhotoPage.c" } static void library_photo_page_on_rate_rejected (LibraryPhotoPage* self) { -#line 3048 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3037 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_if_fail (IS_LIBRARY_PHOTO_PAGE (self)); -#line 3049 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3038 "/home/jens/Source/shotwell/src/PhotoPage.vala" library_photo_page_on_set_rating (self, RATING_REJECTED); -#line 18938 "PhotoPage.c" +#line 18887 "PhotoPage.c" } static void library_photo_page_on_rate_unrated (LibraryPhotoPage* self) { -#line 3052 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3041 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_if_fail (IS_LIBRARY_PHOTO_PAGE (self)); -#line 3053 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3042 "/home/jens/Source/shotwell/src/PhotoPage.vala" library_photo_page_on_set_rating (self, RATING_UNRATED); -#line 18947 "PhotoPage.c" +#line 18896 "PhotoPage.c" } static void library_photo_page_on_rate_one (LibraryPhotoPage* self) { -#line 3056 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3045 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_if_fail (IS_LIBRARY_PHOTO_PAGE (self)); -#line 3057 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3046 "/home/jens/Source/shotwell/src/PhotoPage.vala" library_photo_page_on_set_rating (self, RATING_ONE); -#line 18956 "PhotoPage.c" +#line 18905 "PhotoPage.c" } static void library_photo_page_on_rate_two (LibraryPhotoPage* self) { -#line 3060 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3049 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_if_fail (IS_LIBRARY_PHOTO_PAGE (self)); -#line 3061 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3050 "/home/jens/Source/shotwell/src/PhotoPage.vala" library_photo_page_on_set_rating (self, RATING_TWO); -#line 18965 "PhotoPage.c" +#line 18914 "PhotoPage.c" } static void library_photo_page_on_rate_three (LibraryPhotoPage* self) { -#line 3064 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3053 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_if_fail (IS_LIBRARY_PHOTO_PAGE (self)); -#line 3065 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3054 "/home/jens/Source/shotwell/src/PhotoPage.vala" library_photo_page_on_set_rating (self, RATING_THREE); -#line 18974 "PhotoPage.c" +#line 18923 "PhotoPage.c" } static void library_photo_page_on_rate_four (LibraryPhotoPage* self) { -#line 3068 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3057 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_if_fail (IS_LIBRARY_PHOTO_PAGE (self)); -#line 3069 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3058 "/home/jens/Source/shotwell/src/PhotoPage.vala" library_photo_page_on_set_rating (self, RATING_FOUR); -#line 18983 "PhotoPage.c" +#line 18932 "PhotoPage.c" } static void library_photo_page_on_rate_five (LibraryPhotoPage* self) { -#line 3072 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3061 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_if_fail (IS_LIBRARY_PHOTO_PAGE (self)); -#line 3073 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3062 "/home/jens/Source/shotwell/src/PhotoPage.vala" library_photo_page_on_set_rating (self, RATING_FIVE); -#line 18992 "PhotoPage.c" +#line 18941 "PhotoPage.c" } @@ -19027,117 +18976,117 @@ static void library_photo_page_update_rating_menu_item_sensitivity (LibraryPhoto Photo* _tmp26_ = NULL; Rating _tmp27_ = 0; gboolean _tmp28_ = FALSE; -#line 3076 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3065 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_if_fail (IS_LIBRARY_PHOTO_PAGE (self)); -#line 3077 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3066 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp0_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage)); -#line 3077 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3066 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp1_ = _tmp0_; -#line 3077 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3066 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp2_ = media_source_get_rating (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_MEDIA_SOURCE, MediaSource)); -#line 3077 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3066 "/home/jens/Source/shotwell/src/PhotoPage.vala" page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RateRejected", _tmp2_ != RATING_REJECTED); -#line 3077 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3066 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (_tmp1_); -#line 3078 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3067 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp3_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage)); -#line 3078 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3067 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp4_ = _tmp3_; -#line 3078 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3067 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp5_ = media_source_get_rating (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_MEDIA_SOURCE, MediaSource)); -#line 3078 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3067 "/home/jens/Source/shotwell/src/PhotoPage.vala" page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RateUnrated", _tmp5_ != RATING_UNRATED); -#line 3078 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3067 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (_tmp4_); -#line 3079 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3068 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp6_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage)); -#line 3079 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3068 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp7_ = _tmp6_; -#line 3079 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3068 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp8_ = media_source_get_rating (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_MEDIA_SOURCE, MediaSource)); -#line 3079 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3068 "/home/jens/Source/shotwell/src/PhotoPage.vala" page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RateOne", _tmp8_ != RATING_ONE); -#line 3079 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3068 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (_tmp7_); -#line 3080 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3069 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp9_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage)); -#line 3080 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3069 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp10_ = _tmp9_; -#line 3080 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3069 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp11_ = media_source_get_rating (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, TYPE_MEDIA_SOURCE, MediaSource)); -#line 3080 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3069 "/home/jens/Source/shotwell/src/PhotoPage.vala" page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RateTwo", _tmp11_ != RATING_TWO); -#line 3080 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3069 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (_tmp10_); -#line 3081 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3070 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp12_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage)); -#line 3081 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3070 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp13_ = _tmp12_; -#line 3081 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3070 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp14_ = media_source_get_rating (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, TYPE_MEDIA_SOURCE, MediaSource)); -#line 3081 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3070 "/home/jens/Source/shotwell/src/PhotoPage.vala" page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RateThree", _tmp14_ != RATING_THREE); -#line 3081 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3070 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (_tmp13_); -#line 3082 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3071 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp15_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage)); -#line 3082 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3071 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp16_ = _tmp15_; -#line 3082 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3071 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp17_ = media_source_get_rating (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, TYPE_MEDIA_SOURCE, MediaSource)); -#line 3082 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3071 "/home/jens/Source/shotwell/src/PhotoPage.vala" page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RateFour", _tmp17_ != RATING_FOUR); -#line 3082 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3071 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (_tmp16_); -#line 3083 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3072 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp18_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage)); -#line 3083 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3072 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp19_ = _tmp18_; -#line 3083 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3072 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp20_ = media_source_get_rating (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, TYPE_MEDIA_SOURCE, MediaSource)); -#line 3083 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3072 "/home/jens/Source/shotwell/src/PhotoPage.vala" page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RateFive", _tmp20_ != RATING_FIVE); -#line 3083 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3072 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (_tmp19_); -#line 3084 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3073 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp21_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage)); -#line 3084 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3073 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp22_ = _tmp21_; -#line 3084 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3073 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp23_ = media_source_get_rating (G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, TYPE_MEDIA_SOURCE, MediaSource)); -#line 3084 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3073 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp24_ = rating_can_increase (_tmp23_); -#line 3084 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3073 "/home/jens/Source/shotwell/src/PhotoPage.vala" page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "IncreaseRating", _tmp24_); -#line 3084 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3073 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (_tmp22_); -#line 3085 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3074 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp25_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage)); -#line 3085 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3074 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp26_ = _tmp25_; -#line 3085 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3074 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp27_ = media_source_get_rating (G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, TYPE_MEDIA_SOURCE, MediaSource)); -#line 3085 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3074 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp28_ = rating_can_decrease (_tmp27_); -#line 3085 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3074 "/home/jens/Source/shotwell/src/PhotoPage.vala" page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "DecreaseRating", _tmp28_); -#line 3085 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3074 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (_tmp26_); -#line 19122 "PhotoPage.c" +#line 19071 "PhotoPage.c" } -static GVariant* _variant_new14 (const gchar* value) { -#line 3097 "/home/jens/Source/shotwell/src/PhotoPage.vala" +static GVariant* _variant_new18 (const gchar* value) { +#line 3086 "/home/jens/Source/shotwell/src/PhotoPage.vala" return g_variant_ref_sink (g_variant_new_string (value)); -#line 19129 "PhotoPage.c" +#line 19078 "PhotoPage.c" } -static GVariant* _variant_new15 (const gchar* value) { -#line 3102 "/home/jens/Source/shotwell/src/PhotoPage.vala" +static GVariant* _variant_new19 (const gchar* value) { +#line 3091 "/home/jens/Source/shotwell/src/PhotoPage.vala" return g_variant_ref_sink (g_variant_new_string (value)); -#line 19136 "PhotoPage.c" +#line 19085 "PhotoPage.c" } @@ -19149,98 +19098,98 @@ static void library_photo_page_update_development_menu_item_sensitivity (Library PhotoFileFormat _tmp3_ = 0; PhotoFileFormat _tmp4_ = 0; PhotoFileFormat _tmp5_ = 0; -#line 3088 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3077 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_if_fail (IS_LIBRARY_PHOTO_PAGE (self)); -#line 3089 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3078 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp0_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage)); -#line 3089 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3078 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp1_ = _tmp0_; -#line 3089 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3078 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp2_ = photo_get_master_file_format (_tmp1_); -#line 3089 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3078 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp3_ = _tmp2_; -#line 3089 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3078 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (_tmp1_); -#line 3089 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3078 "/home/jens/Source/shotwell/src/PhotoPage.vala" format = _tmp3_; -#line 3090 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3079 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp4_ = format; -#line 3090 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3079 "/home/jens/Source/shotwell/src/PhotoPage.vala" page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RawDeveloper", _tmp4_ == PHOTO_FILE_FORMAT_RAW); -#line 3092 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3081 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp5_ = format; -#line 3092 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3081 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp5_ == PHOTO_FILE_FORMAT_RAW) { -#line 19170 "PhotoPage.c" +#line 19119 "PhotoPage.c" Photo* _tmp6_ = NULL; Photo* _tmp7_ = NULL; RawDeveloper _tmp8_ = 0; RawDeveloper _tmp9_ = 0; -#line 3095 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3084 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp6_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage)); -#line 3095 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3084 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp7_ = _tmp6_; -#line 3095 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3084 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp8_ = photo_get_raw_developer (_tmp7_); -#line 3095 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3084 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp9_ = _tmp8_; -#line 3095 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3084 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (_tmp7_); -#line 3095 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3084 "/home/jens/Source/shotwell/src/PhotoPage.vala" switch (_tmp9_) { -#line 3095 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3084 "/home/jens/Source/shotwell/src/PhotoPage.vala" case RAW_DEVELOPER_SHOTWELL: -#line 19189 "PhotoPage.c" +#line 19138 "PhotoPage.c" { GAction* _tmp10_ = NULL; GAction* _tmp11_ = NULL; GVariant* _tmp12_ = NULL; -#line 3097 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3086 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp10_ = page_get_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RawDeveloper"); -#line 3097 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3086 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp11_ = _tmp10_; -#line 3097 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp12_ = _variant_new14 ("'Shotwell'"); -#line 3097 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3086 "/home/jens/Source/shotwell/src/PhotoPage.vala" + _tmp12_ = _variant_new18 ("Shotwell"); +#line 3086 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_action_change_state (_tmp11_, _tmp12_); -#line 3097 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3086 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_variant_unref0 (_tmp12_); -#line 3097 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3086 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (_tmp11_); -#line 3098 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3087 "/home/jens/Source/shotwell/src/PhotoPage.vala" break; -#line 19208 "PhotoPage.c" +#line 19157 "PhotoPage.c" } -#line 3095 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3084 "/home/jens/Source/shotwell/src/PhotoPage.vala" case RAW_DEVELOPER_CAMERA: -#line 3095 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3084 "/home/jens/Source/shotwell/src/PhotoPage.vala" case RAW_DEVELOPER_EMBEDDED: -#line 19214 "PhotoPage.c" +#line 19163 "PhotoPage.c" { GAction* _tmp13_ = NULL; GAction* _tmp14_ = NULL; GVariant* _tmp15_ = NULL; -#line 3102 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3091 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp13_ = page_get_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RawDeveloper"); -#line 3102 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3091 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp14_ = _tmp13_; -#line 3102 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp15_ = _variant_new15 ("'Camera'"); -#line 3102 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3091 "/home/jens/Source/shotwell/src/PhotoPage.vala" + _tmp15_ = _variant_new19 ("Camera"); +#line 3091 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_action_change_state (_tmp14_, _tmp15_); -#line 3102 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3091 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_variant_unref0 (_tmp15_); -#line 3102 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3091 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (_tmp14_); -#line 3103 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3092 "/home/jens/Source/shotwell/src/PhotoPage.vala" break; -#line 19233 "PhotoPage.c" +#line 19182 "PhotoPage.c" } default: { -#line 3106 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3095 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_assert_not_reached (); -#line 19239 "PhotoPage.c" +#line 19188 "PhotoPage.c" } } } @@ -19254,60 +19203,60 @@ static void library_photo_page_on_metadata_altered (LibraryPhotoPage* self, GeeM Photo* _tmp3_ = NULL; gboolean _tmp4_ = FALSE; gboolean _tmp5_ = FALSE; -#line 3111 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3100 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_if_fail (IS_LIBRARY_PHOTO_PAGE (self)); -#line 3111 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3100 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_if_fail (GEE_IS_MAP (map)); -#line 3112 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3101 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp1_ = map; -#line 3112 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3101 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp2_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage)); -#line 3112 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3101 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp3_ = _tmp2_; -#line 3112 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3101 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp4_ = gee_map_has_key (_tmp1_, G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_DATA_OBJECT, DataObject)); -#line 3112 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3101 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp5_ = _tmp4_; -#line 3112 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3101 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (_tmp3_); -#line 3112 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3101 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp5_) { -#line 19271 "PhotoPage.c" +#line 19220 "PhotoPage.c" GeeMap* _tmp6_ = NULL; Photo* _tmp7_ = NULL; Photo* _tmp8_ = NULL; gpointer _tmp9_ = NULL; Alteration* _tmp10_ = NULL; gboolean _tmp11_ = FALSE; -#line 3112 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3101 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp6_ = map; -#line 3112 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3101 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp7_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage)); -#line 3112 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3101 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp8_ = _tmp7_; -#line 3112 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3101 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp9_ = gee_map_get (_tmp6_, G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_DATA_OBJECT, DataObject)); -#line 3112 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3101 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp10_ = (Alteration*) _tmp9_; -#line 3112 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3101 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp11_ = alteration_has_subject (_tmp10_, "metadata"); -#line 3112 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3101 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp0_ = _tmp11_; -#line 3112 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3101 "/home/jens/Source/shotwell/src/PhotoPage.vala" _alteration_unref0 (_tmp10_); -#line 3112 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3101 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (_tmp8_); -#line 19296 "PhotoPage.c" +#line 19245 "PhotoPage.c" } else { -#line 3112 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3101 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp0_ = FALSE; -#line 19300 "PhotoPage.c" +#line 19249 "PhotoPage.c" } -#line 3112 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3101 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp0_) { -#line 3113 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3102 "/home/jens/Source/shotwell/src/PhotoPage.vala" single_photo_page_repaint (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), NULL); -#line 19306 "PhotoPage.c" +#line 19255 "PhotoPage.c" } } @@ -19323,29 +19272,29 @@ static void library_photo_page_on_add_tags (LibraryPhotoPage* self) { gint _names_size_ = 0; gchar** _tmp4_ = NULL; gint _tmp4__length1 = 0; -#line 3116 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3105 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_if_fail (IS_LIBRARY_PHOTO_PAGE (self)); -#line 3117 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3106 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp0_ = add_tags_dialog_new (); -#line 3117 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3106 "/home/jens/Source/shotwell/src/PhotoPage.vala" dialog = _tmp0_; -#line 3118 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3107 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp1_ = dialog; -#line 3118 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3107 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp3_ = add_tags_dialog_execute (_tmp1_, &_tmp2_); -#line 3118 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3107 "/home/jens/Source/shotwell/src/PhotoPage.vala" names = _tmp3_; -#line 3118 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3107 "/home/jens/Source/shotwell/src/PhotoPage.vala" names_length1 = _tmp2_; -#line 3118 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3107 "/home/jens/Source/shotwell/src/PhotoPage.vala" _names_size_ = names_length1; -#line 3119 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3108 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp4_ = names; -#line 3119 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3108 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp4__length1 = names_length1; -#line 3119 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3108 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp4_ != NULL) { -#line 19344 "PhotoPage.c" +#line 19293 "PhotoPage.c" CommandManager* _tmp5_ = NULL; CommandManager* _tmp6_ = NULL; HierarchicalTagIndex* _tmp7_ = NULL; @@ -19362,57 +19311,57 @@ static void library_photo_page_on_add_tags (LibraryPhotoPage* self) { GeeCollection* _tmp16_ = NULL; AddTagsCommand* _tmp17_ = NULL; AddTagsCommand* _tmp18_ = NULL; -#line 3120 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3109 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp5_ = page_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); -#line 3120 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3109 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp6_ = _tmp5_; -#line 3120 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3109 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp7_ = hierarchical_tag_index_get_global_index (); -#line 3120 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3109 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp8_ = _tmp7_; -#line 3120 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3109 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp9_ = names; -#line 3120 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3109 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp9__length1 = names_length1; -#line 3120 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3109 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp11_ = hierarchical_tag_index_get_paths_for_names_array (_tmp8_, _tmp9_, _tmp9__length1, &_tmp10_); -#line 3120 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3109 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp12_ = _tmp11_; -#line 3120 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3109 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp12__length1 = _tmp10_; -#line 3120 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3109 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp13_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); -#line 3120 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3109 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp14_ = _tmp13_; -#line 3120 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3109 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp15_ = view_collection_get_selected_sources (_tmp14_); -#line 3120 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3109 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp16_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, GEE_TYPE_COLLECTION, GeeCollection); -#line 3120 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3109 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp17_ = add_tags_command_new (_tmp12_, _tmp10_, _tmp16_); -#line 3120 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3109 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp18_ = _tmp17_; -#line 3120 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3109 "/home/jens/Source/shotwell/src/PhotoPage.vala" command_manager_execute (_tmp6_, G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, TYPE_COMMAND, Command)); -#line 3120 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3109 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (_tmp18_); -#line 3120 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3109 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (_tmp16_); -#line 3120 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3109 "/home/jens/Source/shotwell/src/PhotoPage.vala" _data_collection_unref0 (_tmp14_); -#line 3120 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3109 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp12_ = (_vala_array_free (_tmp12_, _tmp12__length1, (GDestroyNotify) g_free), NULL); -#line 3120 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3109 "/home/jens/Source/shotwell/src/PhotoPage.vala" _hierarchical_tag_index_unref0 (_tmp8_); -#line 3120 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3109 "/home/jens/Source/shotwell/src/PhotoPage.vala" _command_manager_unref0 (_tmp6_); -#line 19405 "PhotoPage.c" +#line 19354 "PhotoPage.c" } -#line 3116 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3105 "/home/jens/Source/shotwell/src/PhotoPage.vala" names = (_vala_array_free (names, names_length1, (GDestroyNotify) g_free), NULL); -#line 3116 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3105 "/home/jens/Source/shotwell/src/PhotoPage.vala" _text_entry_dialog_mediator_unref0 (dialog); -#line 19411 "PhotoPage.c" +#line 19360 "PhotoPage.c" } @@ -19437,77 +19386,77 @@ static void library_photo_page_on_modify_tags (LibraryPhotoPage* self) { GeeArrayList* _tmp14_ = NULL; ModifyTagsCommand* _tmp15_ = NULL; ModifyTagsCommand* _tmp16_ = NULL; -#line 3126 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3115 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_if_fail (IS_LIBRARY_PHOTO_PAGE (self)); -#line 3127 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3116 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp0_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); -#line 3127 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3116 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp1_ = _tmp0_; -#line 3127 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3116 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp2_ = view_collection_get_selected_at (_tmp1_, 0); -#line 3127 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3116 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp3_ = _tmp2_; -#line 3127 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3116 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp4_ = data_view_get_source (_tmp3_); -#line 3127 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3116 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp5_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_LIBRARY_PHOTO, LibraryPhoto); -#line 3127 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3116 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (_tmp3_); -#line 3127 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3116 "/home/jens/Source/shotwell/src/PhotoPage.vala" _data_collection_unref0 (_tmp1_); -#line 3127 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3116 "/home/jens/Source/shotwell/src/PhotoPage.vala" photo = _tmp5_; -#line 3129 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3118 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp6_ = photo; -#line 3129 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3118 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp7_ = modify_tags_dialog_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, TYPE_MEDIA_SOURCE, MediaSource)); -#line 3129 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3118 "/home/jens/Source/shotwell/src/PhotoPage.vala" dialog = _tmp7_; -#line 3130 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3119 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp8_ = dialog; -#line 3130 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3119 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp9_ = modify_tags_dialog_execute (_tmp8_); -#line 3130 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3119 "/home/jens/Source/shotwell/src/PhotoPage.vala" new_tags = _tmp9_; -#line 3132 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3121 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp10_ = new_tags; -#line 3132 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3121 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp10_ == NULL) { -#line 3133 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3122 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (new_tags); -#line 3133 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3122 "/home/jens/Source/shotwell/src/PhotoPage.vala" _text_entry_dialog_mediator_unref0 (dialog); -#line 3133 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3122 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (photo); -#line 3133 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3122 "/home/jens/Source/shotwell/src/PhotoPage.vala" return; -#line 19480 "PhotoPage.c" +#line 19429 "PhotoPage.c" } -#line 3135 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3124 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp11_ = page_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); -#line 3135 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3124 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp12_ = _tmp11_; -#line 3135 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3124 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp13_ = photo; -#line 3135 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3124 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp14_ = new_tags; -#line 3135 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3124 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp15_ = modify_tags_command_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, TYPE_MEDIA_SOURCE, MediaSource), G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, GEE_TYPE_COLLECTION, GeeCollection)); -#line 3135 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3124 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp16_ = _tmp15_; -#line 3135 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3124 "/home/jens/Source/shotwell/src/PhotoPage.vala" command_manager_execute (_tmp12_, G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, TYPE_COMMAND, Command)); -#line 3135 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3124 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (_tmp16_); -#line 3135 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3124 "/home/jens/Source/shotwell/src/PhotoPage.vala" _command_manager_unref0 (_tmp12_); -#line 3126 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3115 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (new_tags); -#line 3126 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3115 "/home/jens/Source/shotwell/src/PhotoPage.vala" _text_entry_dialog_mediator_unref0 (dialog); -#line 3126 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3115 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (photo); -#line 19506 "PhotoPage.c" +#line 19455 "PhotoPage.c" } @@ -19539,7 +19488,7 @@ static gboolean library_photo_page_library_photo_page_view_filter_real_predicate result = _tmp4_; #line 2332 "/home/jens/Source/shotwell/src/PhotoPage.vala" return result; -#line 19538 "PhotoPage.c" +#line 19487 "PhotoPage.c" } @@ -19549,14 +19498,14 @@ static LibraryPhotoPageLibraryPhotoPageViewFilter* library_photo_page_library_ph self = (LibraryPhotoPageLibraryPhotoPageViewFilter*) view_filter_construct (object_type); #line 2330 "/home/jens/Source/shotwell/src/PhotoPage.vala" return self; -#line 19548 "PhotoPage.c" +#line 19497 "PhotoPage.c" } static LibraryPhotoPageLibraryPhotoPageViewFilter* library_photo_page_library_photo_page_view_filter_new (void) { #line 2330 "/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 19555 "PhotoPage.c" +#line 19504 "PhotoPage.c" } @@ -19565,7 +19514,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 2330 "/home/jens/Source/shotwell/src/PhotoPage.vala" ((ViewFilterClass *) klass)->predicate = library_photo_page_library_photo_page_view_filter_real_predicate; -#line 19564 "PhotoPage.c" +#line 19513 "PhotoPage.c" } @@ -19628,7 +19577,7 @@ static void library_photo_page_class_init (LibraryPhotoPageClass * klass) { ((PageClass *) klass)->on_context_keypress = library_photo_page_real_on_context_keypress; #line 2328 "/home/jens/Source/shotwell/src/PhotoPage.vala" G_OBJECT_CLASS (klass)->finalize = library_photo_page_finalize; -#line 19627 "PhotoPage.c" +#line 19576 "PhotoPage.c" } @@ -19644,7 +19593,7 @@ static void library_photo_page_instance_init (LibraryPhotoPage * self) { _tmp0_ = library_photo_page_library_photo_page_view_filter_new (); #line 2338 "/home/jens/Source/shotwell/src/PhotoPage.vala" self->priv->filter = _tmp0_; -#line 19643 "PhotoPage.c" +#line 19592 "PhotoPage.c" } @@ -19685,11 +19634,11 @@ static void library_photo_page_finalize (GObject* obj) { _g_object_unref0 (self->priv->return_page); #line 2338 "/home/jens/Source/shotwell/src/PhotoPage.vala" _view_filter_unref0 (self->priv->filter); -#line 2825 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2814 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (self->priv->context_menu); #line 2328 "/home/jens/Source/shotwell/src/PhotoPage.vala" G_OBJECT_CLASS (library_photo_page_parent_class)->finalize (obj); -#line 19688 "PhotoPage.c" +#line 19637 "PhotoPage.c" } |