diff options
| author | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2016-11-25 04:10:33 +0100 |
|---|---|---|
| committer | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2016-11-25 04:10:33 +0100 |
| commit | 4a3f1fdfe1eb3743564adcee35d5513224339260 (patch) | |
| tree | 1bcc97c9bd5abcf181b9f19294a0f187ff8af103 /src/PhotoPage.c | |
| parent | 7152401783578b56343f578b4ec920998660de33 (diff) | |
New upstream version 0.25.1upstream/0.25.1
Diffstat (limited to 'src/PhotoPage.c')
| -rw-r--r-- | src/PhotoPage.c | 15176 |
1 files changed, 6337 insertions, 8839 deletions
diff --git a/src/PhotoPage.c b/src/PhotoPage.c index 01ce089..1fe61d0 100644 --- a/src/PhotoPage.c +++ b/src/PhotoPage.c @@ -810,8 +810,7 @@ typedef struct _ConfigurationFacadeClass ConfigurationFacadeClass; typedef struct _ConfigFacade ConfigFacade; typedef struct _ConfigFacadeClass ConfigFacadeClass; #define _view_filter_unref0(var) ((var == NULL) ? NULL : (var = (view_filter_unref (var), NULL))) - -#define TYPE_RATING (rating_get_type ()) +#define _g_variant_unref0(var) ((var == NULL) ? NULL : (var = (g_variant_unref (var), NULL))) #define _injection_group_unref0(var) ((var == NULL) ? NULL : (var = (injection_group_unref (var), NULL))) #define TYPE_MULTIPLE_DATA_SOURCE_COMMAND (multiple_data_source_command_get_type ()) @@ -834,6 +833,8 @@ typedef struct _MultipleDataSourceCommandClass MultipleDataSourceCommandClass; typedef struct _SetRawDeveloperCommand SetRawDeveloperCommand; typedef struct _SetRawDeveloperCommandClass SetRawDeveloperCommandClass; +#define TYPE_RATING (rating_get_type ()) + #define TYPE_FLAGGABLE (flaggable_get_type ()) #define FLAGGABLE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_FLAGGABLE, Flaggable)) #define IS_FLAGGABLE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_FLAGGABLE)) @@ -1158,7 +1159,7 @@ struct _ZoomBufferTransformationJobPrivate { struct _Page { GtkScrolledWindow parent_instance; PagePrivate * priv; - GtkUIManager* ui; + GtkBuilder* builder; GtkToolbar* toolbar; gboolean in_view; }; @@ -1168,8 +1169,6 @@ struct _PageClass { void (*set_page_name) (Page* self, const gchar* page_name); void (*set_container) (Page* self, GtkWindow* container); void (*clear_container) (Page* self); - GtkMenuBar* (*get_menubar) (Page* self); - GtkWidget* (*get_page_ui_widget) (Page* self, const gchar* path); GtkToolbar* (*get_toolbar) (Page* self); GtkMenu* (*get_page_context_menu) (Page* self); void (*switching_from) (Page* self); @@ -1177,10 +1176,8 @@ struct _PageClass { void (*ready) (Page* self); void (*switching_to_fullscreen) (Page* self, FullscreenWindow* fsw); void (*returning_from_fullscreen) (Page* self, FullscreenWindow* fsw); + void (*add_actions) (Page* self); void (*init_collect_ui_filenames) (Page* self, GeeList* ui_filenames); - GtkActionEntry* (*init_collect_action_entries) (Page* self, int* result_length1); - GtkToggleActionEntry* (*init_collect_toggle_action_entries) (Page* self, int* result_length1); - void (*register_radio_actions) (Page* self, GtkActionGroup* action_group); InjectionGroup** (*init_collect_injection_groups) (Page* self, int* result_length1); void (*init_actions) (Page* self, gint selected_count, gint count); void (*update_actions) (Page* self, gint selected_count, gint count); @@ -1423,6 +1420,7 @@ struct _LibraryPhotoPagePrivate { CollectionPage* return_page; gboolean return_to_collection_on_release; LibraryPhotoPageLibraryPhotoPageViewFilter* filter; + GtkMenu* context_menu; }; typedef enum { @@ -1670,22 +1668,19 @@ SinglePhotoPage* single_photo_page_construct (GType object_type, const gchar* pa static void editing_host_page_on_viewport_resized (EditingHostPage* self); static void _editing_host_page_on_viewport_resized_gtk_widget_size_allocate (GtkWidget* _sender, GtkAllocation* allocation, gpointer self); GtkToolbar* page_get_toolbar (Page* self); -#define RESOURCES_CLOCKWISE "object-rotate-right" #define RESOURCES_ROTATE_CW_LABEL _ ("Rotate") +#define RESOURCES_CLOCKWISE "object-rotate-right" #define RESOURCES_ROTATE_CW_TOOLTIP _ ("Rotate the photos right (press Ctrl to rotate left)") void editing_host_page_on_rotate_clockwise (EditingHostPage* self); static void _editing_host_page_on_rotate_clockwise_gtk_tool_button_clicked (GtkToolButton* _sender, gpointer self); -#define RESOURCES_CROP "shotwell-crop" #define RESOURCES_CROP_LABEL _ ("Crop") #define RESOURCES_CROP_TOOLTIP _ ("Crop the photo’s size") static void editing_host_page_on_crop_toggled (EditingHostPage* self); static void _editing_host_page_on_crop_toggled_gtk_toggle_tool_button_toggled (GtkToggleToolButton* _sender, gpointer self); -#define RESOURCES_STRAIGHTEN "shotwell-straighten" #define RESOURCES_STRAIGHTEN_LABEL _ ("Straighten") #define RESOURCES_STRAIGHTEN_TOOLTIP _ ("Straighten the photo") static void editing_host_page_on_straighten_toggled (EditingHostPage* self); static void _editing_host_page_on_straighten_toggled_gtk_toggle_tool_button_toggled (GtkToggleToolButton* _sender, gpointer self); -#define RESOURCES_REDEYE "shotwell-redeye" #define RESOURCES_RED_EYE_LABEL _ ("Red-eye") #define RESOURCES_RED_EYE_TOOLTIP _ ("Reduce or eliminate any red-eye effects in the photo") static void editing_host_page_on_redeye_toggled (EditingHostPage* self); @@ -2167,215 +2162,109 @@ static void library_photo_page_on_external_app_changed (LibraryPhotoPage* self); static void _library_photo_page_on_external_app_changed_configuration_facade_external_app_changed (ConfigurationFacade* _sender, gpointer self); static LibraryPhotoPageLibraryPhotoPageViewFilter* library_photo_page_library_photo_page_view_filter_new (void); static LibraryPhotoPageLibraryPhotoPageViewFilter* library_photo_page_library_photo_page_view_filter_construct (GType object_type); -LibraryPhotoPage* library_photo_page_new (void); -LibraryPhotoPage* library_photo_page_construct (GType object_type); -static void library_photo_page_on_photos_altered (LibraryPhotoPage* self); -static void _library_photo_page_on_photos_altered_data_collection_items_altered (DataCollection* _sender, GeeMap* items, gpointer self); -void view_collection_install_view_filter (ViewCollection* self, ViewFilter* f); -static void library_photo_page_on_photo_unlinking (LibraryPhotoPage* self, GeeCollection* unlinking); -static void _library_photo_page_on_photo_unlinking_source_collection_items_unlinking (SourceCollection* _sender, GeeCollection* unlinking, gpointer self); -static void library_photo_page_on_photo_relinked (LibraryPhotoPage* self, GeeCollection* relinked); -static void _library_photo_page_on_photo_relinked_source_collection_items_relinked (SourceCollection* _sender, GeeCollection* relinked, gpointer self); -gboolean library_photo_page_not_trashed_view_filter (LibraryPhotoPage* self, DataView* view); -gboolean media_source_is_trashed (MediaSource* self); -static void library_photo_page_real_init_collect_ui_filenames (Page* base, GeeList* ui_filenames); -void page_init_collect_ui_filenames (Page* self, GeeList* ui_filenames); -static GtkActionEntry* library_photo_page_real_init_collect_action_entries (Page* base, int* result_length1); -GtkActionEntry* page_init_collect_action_entries (Page* self, int* result_length1); -#define RESOURCES_SAVE_AS_LABEL _ ("Save _As") -#define TRANSLATABLE "translatable" static void library_photo_page_on_export (LibraryPhotoPage* self); -static void _library_photo_page_on_export_gtk_action_callback (GtkAction* action, gpointer self); -#define RESOURCES_EXPORT_MENU _ ("_Export…") -static void _vala_array_add193 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value); -#define RESOURCES_PRINT_LABEL _ ("_Print") +static void _library_photo_page_on_export_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self); static void library_photo_page_on_print (LibraryPhotoPage* self); -static void _library_photo_page_on_print_gtk_action_callback (GtkAction* action, gpointer self); -#define RESOURCES_PRINT_MENU _ ("_Print…") -static void _vala_array_add194 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value); -#define RESOURCES_PUBLISH "applications-internet" +static void _library_photo_page_on_print_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self); static void library_photo_page_on_publish (LibraryPhotoPage* self); -static void _library_photo_page_on_publish_gtk_action_callback (GtkAction* action, gpointer self); -#define RESOURCES_PUBLISH_MENU _ ("Pu_blish…") -#define RESOURCES_PUBLISH_TOOLTIP _ ("Publish to various websites") -static void _vala_array_add195 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value); -#define RESOURCES_REMOVE_LABEL _ ("_Remove") +static void _library_photo_page_on_publish_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self); static void library_photo_page_on_remove_from_library (LibraryPhotoPage* self); -static void _library_photo_page_on_remove_from_library_gtk_action_callback (GtkAction* action, gpointer self); -#define RESOURCES_REMOVE_FROM_LIBRARY_MENU _ ("R_emove From Library") -static void _vala_array_add196 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value); +static void _library_photo_page_on_remove_from_library_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self); static void library_photo_page_on_move_to_trash (LibraryPhotoPage* self); -static void _library_photo_page_on_move_to_trash_gtk_action_callback (GtkAction* action, gpointer self); -#define RESOURCES_MOVE_TO_TRASH_MENU _ ("_Move to Trash") -static void _vala_array_add197 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value); -static void library_photo_page_on_view_menu (LibraryPhotoPage* self); -static void _library_photo_page_on_view_menu_gtk_action_callback (GtkAction* action, gpointer self); -static void _vala_array_add198 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value); -static void _vala_array_add199 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value); -static void _single_photo_page_on_previous_photo_gtk_action_callback (GtkAction* action, gpointer self); -static void _vala_array_add200 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value); -static void _single_photo_page_on_next_photo_gtk_action_callback (GtkAction* action, gpointer self); -static void _vala_array_add201 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value); -static void _editing_host_page_on_rotate_clockwise_gtk_action_callback (GtkAction* action, gpointer self); -#define RESOURCES_ROTATE_CW_MENU _ ("Rotate _Right") -static void _vala_array_add202 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value); -static void _editing_host_page_on_rotate_counterclockwise_gtk_action_callback (GtkAction* action, gpointer self); -#define RESOURCES_ROTATE_CCW_MENU _ ("Rotate _Left") -static void _vala_array_add203 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value); -#define RESOURCES_HFLIP "object-flip-horizontal" -static void _editing_host_page_on_flip_horizontally_gtk_action_callback (GtkAction* action, gpointer self); -#define RESOURCES_HFLIP_MENU _ ("Flip Hori_zontally") -static void _vala_array_add204 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value); -#define RESOURCES_VFLIP "object-flip-vertical" -static void _editing_host_page_on_flip_vertically_gtk_action_callback (GtkAction* action, gpointer self); -#define RESOURCES_VFLIP_MENU _ ("Flip Verti_cally") -static void _vala_array_add205 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value); -static void _editing_host_page_on_enhance_gtk_action_callback (GtkAction* action, gpointer self); -#define RESOURCES_ENHANCE_MENU _ ("_Enhance") -static void _vala_array_add206 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value); -static void _editing_host_page_on_copy_adjustments_gtk_action_callback (GtkAction* action, gpointer self); -#define RESOURCES_COPY_ADJUSTMENTS_MENU _ ("_Copy Color Adjustments") -#define RESOURCES_COPY_ADJUSTMENTS_TOOLTIP _ ("Copy the color adjustments applied to the photo") -static void _vala_array_add207 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value); -static void _editing_host_page_on_paste_adjustments_gtk_action_callback (GtkAction* action, gpointer self); -#define RESOURCES_PASTE_ADJUSTMENTS_MENU _ ("_Paste Color Adjustments") -static void _vala_array_add208 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value); -static void _editing_host_page_toggle_crop_gtk_action_callback (GtkAction* action, gpointer self); -#define RESOURCES_CROP_MENU _ ("_Crop") -static void _vala_array_add209 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value); -#define RESOURCES_REFRESH_LABEL _ ("_Refresh") -static void _editing_host_page_toggle_straighten_gtk_action_callback (GtkAction* action, gpointer self); -#define RESOURCES_STRAIGHTEN_MENU _ ("_Straighten") -static void _vala_array_add210 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value); -static void _editing_host_page_toggle_redeye_gtk_action_callback (GtkAction* action, gpointer self); -#define RESOURCES_RED_EYE_MENU _ ("_Red-eye") -static void _vala_array_add211 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value); -static void _editing_host_page_toggle_adjust_gtk_action_callback (GtkAction* action, gpointer self); -#define RESOURCES_ADJUST_MENU _ ("_Adjust") -static void _vala_array_add212 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value); -#define RESOURCES_REVERT_TO_SAVED_LABEL _ ("_Revert") -static void _editing_host_page_on_revert_gtk_action_callback (GtkAction* action, gpointer self); -#define RESOURCES_REVERT_MENU _ ("Re_vert to Original") -static void _vala_array_add213 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value); -static void _editing_host_page_on_edit_title_gtk_action_callback (GtkAction* action, gpointer self); -#define RESOURCES_EDIT_TITLE_MENU _ ("Edit _Title…") -static void _vala_array_add214 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value); -static void _editing_host_page_on_edit_comment_gtk_action_callback (GtkAction* action, gpointer self); -#define RESOURCES_EDIT_COMMENT_MENU _ ("Edit _Comment…") -static void _vala_array_add215 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value); -static void _editing_host_page_on_adjust_date_time_gtk_action_callback (GtkAction* action, gpointer self); -#define RESOURCES_ADJUST_DATE_TIME_MENU _ ("_Adjust Date and Time…") -static void _vala_array_add216 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value); -#define RESOURCES_EDIT_LABEL _ ("_Edit") +static void _library_photo_page_on_move_to_trash_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self); +static void _single_photo_page_on_previous_photo_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self); +static void _single_photo_page_on_next_photo_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self); +static void _editing_host_page_on_rotate_clockwise_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self); +static void _editing_host_page_on_rotate_counterclockwise_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self); +static void _editing_host_page_on_flip_horizontally_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self); +static void _editing_host_page_on_flip_vertically_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self); +static void _editing_host_page_on_enhance_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self); +static void _editing_host_page_on_copy_adjustments_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self); +static void _editing_host_page_on_paste_adjustments_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self); +static void _editing_host_page_toggle_crop_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self); +static void _editing_host_page_toggle_straighten_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self); +static void _editing_host_page_toggle_redeye_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self); +static void _editing_host_page_toggle_adjust_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self); +static void _editing_host_page_on_revert_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self); +static void _editing_host_page_on_edit_title_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self); +static void _editing_host_page_on_edit_comment_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self); +static void _editing_host_page_on_adjust_date_time_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self); static void library_photo_page_on_external_edit (LibraryPhotoPage* self); -static void _library_photo_page_on_external_edit_gtk_action_callback (GtkAction* action, gpointer self); -#define RESOURCES_EXTERNAL_EDIT_MENU _ ("Open With E_xternal Editor") -static void _vala_array_add217 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value); +static void _library_photo_page_on_external_edit_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self); static void library_photo_page_on_external_edit_raw (LibraryPhotoPage* self); -static void _library_photo_page_on_external_edit_raw_gtk_action_callback (GtkAction* action, gpointer self); -#define RESOURCES_EXTERNAL_EDIT_RAW_MENU _ ("Open With RA_W Editor") -static void _vala_array_add218 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value); +static void _library_photo_page_on_external_edit_raw_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self); static void library_photo_page_on_send_to (LibraryPhotoPage* self); -static void _library_photo_page_on_send_to_gtk_action_callback (GtkAction* action, gpointer self); -#define RESOURCES_SEND_TO_MENU _ ("Send _To…") -static void _vala_array_add219 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value); -static void _editing_host_page_on_set_background_gtk_action_callback (GtkAction* action, gpointer self); -#define RESOURCES_SET_BACKGROUND_MENU _ ("Set as _Desktop Background") -#define RESOURCES_SET_BACKGROUND_TOOLTIP _ ("Set selected image to be the new desktop background") -static void _vala_array_add220 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value); +static void _library_photo_page_on_send_to_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self); +static void _editing_host_page_on_set_background_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self); static void library_photo_page_on_flag_unflag (LibraryPhotoPage* self); -static void _library_photo_page_on_flag_unflag_gtk_action_callback (GtkAction* action, gpointer self); -#define RESOURCES_FLAG_MENU _ ("_Flag") -static void _vala_array_add221 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value); -#define RESOURCES_RATING_MENU _ ("_Set Rating") -static void _vala_array_add222 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value); +static void _library_photo_page_on_flag_unflag_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self); static void library_photo_page_on_increase_rating (LibraryPhotoPage* self); -static void _library_photo_page_on_increase_rating_gtk_action_callback (GtkAction* action, gpointer self); -#define RESOURCES_INCREASE_RATING_MENU _ ("_Increase") -static void _vala_array_add223 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value); +static void _library_photo_page_on_increase_rating_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self); static void library_photo_page_on_decrease_rating (LibraryPhotoPage* self); -static void _library_photo_page_on_decrease_rating_gtk_action_callback (GtkAction* action, gpointer self); -#define RESOURCES_DECREASE_RATING_MENU _ ("_Decrease") -static void _vala_array_add224 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value); +static void _library_photo_page_on_decrease_rating_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self); static void library_photo_page_on_rate_rejected (LibraryPhotoPage* self); -static void _library_photo_page_on_rate_rejected_gtk_action_callback (GtkAction* action, gpointer self); -GType rating_get_type (void) G_GNUC_CONST; -const gchar* resources_rating_menu (Rating rating); -static void _vala_array_add225 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value); +static void _library_photo_page_on_rate_rejected_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self); static void library_photo_page_on_rate_unrated (LibraryPhotoPage* self); -static void _library_photo_page_on_rate_unrated_gtk_action_callback (GtkAction* action, gpointer self); -static void _vala_array_add226 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value); +static void _library_photo_page_on_rate_unrated_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self); static void library_photo_page_on_rate_one (LibraryPhotoPage* self); -static void _library_photo_page_on_rate_one_gtk_action_callback (GtkAction* action, gpointer self); -static void _vala_array_add227 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value); +static void _library_photo_page_on_rate_one_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self); static void library_photo_page_on_rate_two (LibraryPhotoPage* self); -static void _library_photo_page_on_rate_two_gtk_action_callback (GtkAction* action, gpointer self); -static void _vala_array_add228 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value); +static void _library_photo_page_on_rate_two_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self); static void library_photo_page_on_rate_three (LibraryPhotoPage* self); -static void _library_photo_page_on_rate_three_gtk_action_callback (GtkAction* action, gpointer self); -static void _vala_array_add229 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value); +static void _library_photo_page_on_rate_three_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self); static void library_photo_page_on_rate_four (LibraryPhotoPage* self); -static void _library_photo_page_on_rate_four_gtk_action_callback (GtkAction* action, gpointer self); -static void _vala_array_add230 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value); +static void _library_photo_page_on_rate_four_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self); static void library_photo_page_on_rate_five (LibraryPhotoPage* self); -static void _library_photo_page_on_rate_five_gtk_action_callback (GtkAction* action, gpointer self); -static void _vala_array_add231 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value); -#define RESOURCES_ZOOM_IN_LABEL _ ("Zoom _In") -static void _editing_host_page_on_increase_size_gtk_action_callback (GtkAction* action, gpointer self); -static void _vala_array_add232 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value); -#define RESOURCES_ZOOM_OUT_LABEL _ ("Zoom _Out") -static void _editing_host_page_on_decrease_size_gtk_action_callback (GtkAction* action, gpointer self); -static void _vala_array_add233 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value); -#define RESOURCES_ZOOM_FIT_LABEL _ ("Best _Fit") -static void _editing_host_page_snap_zoom_to_min_gtk_action_callback (GtkAction* action, gpointer self); -static void _vala_array_add234 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value); -#define RESOURCES_ZOOM_100_LABEL _ ("_Normal Size") -static void _editing_host_page_snap_zoom_to_isomorphic_gtk_action_callback (GtkAction* action, gpointer self); -static void _vala_array_add235 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value); -static void _editing_host_page_snap_zoom_to_max_gtk_action_callback (GtkAction* action, gpointer self); -static void _vala_array_add236 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value); +static void _library_photo_page_on_rate_five_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self); +static void _editing_host_page_on_increase_size_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self); +static void _editing_host_page_on_decrease_size_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self); +static void _editing_host_page_snap_zoom_to_min_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self); +static void _editing_host_page_snap_zoom_to_isomorphic_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self); +static void _editing_host_page_snap_zoom_to_max_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self); static void library_photo_page_on_add_tags (LibraryPhotoPage* self); -static void _library_photo_page_on_add_tags_gtk_action_callback (GtkAction* action, gpointer self); -#define RESOURCES_ADD_TAGS_MENU _ ("Add _Tags…") -static void _vala_array_add237 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value); +static void _library_photo_page_on_add_tags_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self); static void library_photo_page_on_modify_tags (LibraryPhotoPage* self); -static void _library_photo_page_on_modify_tags_gtk_action_callback (GtkAction* action, gpointer self); -#define RESOURCES_MODIFY_TAGS_MENU _ ("Modif_y Tags…") -static void _vala_array_add238 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value); +static void _library_photo_page_on_modify_tags_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self); static void library_photo_page_on_slideshow (LibraryPhotoPage* self); -static void _library_photo_page_on_slideshow_gtk_action_callback (GtkAction* action, gpointer self); -static void _vala_array_add239 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value); -static void _vala_array_add240 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value); -#define RESOURCES_SEND_TO_CONTEXT_MENU _ ("Send T_o…") -static void _vala_array_add241 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value); -#define RESOURCES_ADD_TAGS_CONTEXT_MENU _ ("_Add Tags…") -static void _vala_array_add242 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value); -static GtkToggleActionEntry* library_photo_page_real_init_collect_toggle_action_entries (Page* base, int* result_length1); -GtkToggleActionEntry* page_init_collect_toggle_action_entries (Page* self, int* result_length1); -static void library_photo_page_on_display_ratings (LibraryPhotoPage* self, GtkAction* action); -static void _library_photo_page_on_display_ratings_gtk_action_callback (GtkAction* action, gpointer self); +static void _library_photo_page_on_slideshow_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self); +void page_on_action_toggle (Page* self, GAction* action, GVariant* value); +static void _page_on_action_toggle_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self); +static void library_photo_page_on_display_ratings (LibraryPhotoPage* self, GSimpleAction* action, GVariant* value); +static void _library_photo_page_on_display_ratings_gsimple_action_change_state_callback (GSimpleAction* action, GVariant* value, gpointer self); +void page_on_action_radio (Page* self, GAction* action, GVariant* value); +static void _page_on_action_radio_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self); +static void library_photo_page_on_raw_developer_changed (LibraryPhotoPage* self, GSimpleAction* action, GVariant* value); +static void _library_photo_page_on_raw_developer_changed_gsimple_action_change_state_callback (GSimpleAction* action, GVariant* value, gpointer self); +LibraryPhotoPage* library_photo_page_new (void); +LibraryPhotoPage* library_photo_page_construct (GType object_type); +static void library_photo_page_on_photos_altered (LibraryPhotoPage* self); +static void _library_photo_page_on_photos_altered_data_collection_items_altered (DataCollection* _sender, GeeMap* items, gpointer self); +void view_collection_install_view_filter (ViewCollection* self, ViewFilter* f); +static void library_photo_page_on_photo_unlinking (LibraryPhotoPage* self, GeeCollection* unlinking); +static void _library_photo_page_on_photo_unlinking_source_collection_items_unlinking (SourceCollection* _sender, GeeCollection* unlinking, gpointer self); +static void library_photo_page_on_photo_relinked (LibraryPhotoPage* self, GeeCollection* relinked); +static void _library_photo_page_on_photo_relinked_source_collection_items_relinked (SourceCollection* _sender, GeeCollection* relinked, gpointer self); +gboolean library_photo_page_not_trashed_view_filter (LibraryPhotoPage* self, DataView* view); +gboolean media_source_is_trashed (MediaSource* self); +static void library_photo_page_real_init_collect_ui_filenames (Page* base, GeeList* ui_filenames); +void page_init_collect_ui_filenames (Page* self, GeeList* ui_filenames); +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); -#define RESOURCES_VIEW_RATINGS_MENU _ ("_Ratings") -#define RESOURCES_VIEW_RATINGS_TOOLTIP _ ("Display each photo’s rating") -static void _vala_array_add243 (GtkToggleActionEntry** array, int* length, int* size, const GtkToggleActionEntry* value); +static GVariant* _variant_new12 (gboolean value); +RawDeveloper configuration_facade_get_default_raw_developer (ConfigurationFacade* self); +static GVariant* _variant_new13 (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); InjectionGroup* injection_group_construct (GType object_type, const gchar* path); -void injection_group_add_menu_item (InjectionGroup* self, const gchar* name, const gchar* action); -static void _vala_array_add244 (InjectionGroup*** array, int* length, int* size, InjectionGroup* value); -static void _vala_array_add245 (InjectionGroup*** array, int* length, int* size, InjectionGroup* value); -static void _vala_array_add246 (InjectionGroup*** array, int* length, int* size, InjectionGroup* value); -static void library_photo_page_real_register_radio_actions (Page* base, GtkActionGroup* action_group); -gchar* raw_developer_get_label (RawDeveloper self); -static void _vala_array_add247 (GtkRadioActionEntry** array, int* length, int* size, const GtkRadioActionEntry* value); -static void _vala_array_add248 (GtkRadioActionEntry** array, int* length, int* size, const GtkRadioActionEntry* value); -static void library_photo_page_on_raw_developer_changed (LibraryPhotoPage* self, GtkAction* action, GtkAction* current); -static void _library_photo_page_on_raw_developer_changed_gtk_radio_action_callback (GtkAction* action, GtkAction* current, gpointer self); -void page_register_radio_actions (Page* self, GtkActionGroup* action_group); +void injection_group_add_menu_item (InjectionGroup* self, const gchar* name, const gchar* action, const gchar* accellerator); +static void _vala_array_add82 (InjectionGroup*** array, int* length, int* size, InjectionGroup* value); +static void _vala_array_add83 (InjectionGroup*** array, int* length, int* size, InjectionGroup* value); +static void _vala_array_add84 (InjectionGroup*** array, int* length, int* size, InjectionGroup* value); static void library_photo_page_set_display_ratings (LibraryPhotoPage* self, gboolean display); void configuration_facade_set_display_photo_ratings (ConfigurationFacade* self, gboolean display); -GtkAction* page_get_action (Page* self, const gchar* name); static void library_photo_page_real_update_actions (Page* base, gint selected_count, gint count); PhotoFileFormat photo_get_master_file_format (Photo* self); gchar* configuration_facade_get_external_photo_app (ConfigurationFacade* self); @@ -2395,9 +2284,6 @@ GType multiple_data_source_command_get_type (void) G_GNUC_CONST; GType set_raw_developer_command_get_type (void) G_GNUC_CONST; SetRawDeveloperCommand* set_raw_developer_command_new (GeeIterable* iter, RawDeveloper developer); SetRawDeveloperCommand* set_raw_developer_command_construct (GType object_type, GeeIterable* iter, RawDeveloper developer); -GType flaggable_get_type (void) G_GNUC_CONST; -gboolean flaggable_is_flagged (Flaggable* self); -#define RESOURCES_UNFLAG_MENU _ ("Un_flag") void library_photo_page_display_for_collection (LibraryPhotoPage* self, CollectionPage* return_page, Photo* photo, ViewCollection* view); void library_photo_page_on_page_destroyed (LibraryPhotoPage* self); static void _library_photo_page_on_page_destroyed_gtk_widget_destroy (GtkWidget* _sender, gpointer self); @@ -2405,9 +2291,12 @@ CollectionPage* library_photo_page_get_controller_page (LibraryPhotoPage* self); static void library_photo_page_real_switched_to (Page* base); static void library_photo_page_update_zoom_menu_item_sensitivity (LibraryPhotoPage* self); static GdkPixbuf* library_photo_page_real_get_bottom_left_trinket (EditingHostPage* base, gint scale); +GType rating_get_type (void) G_GNUC_CONST; GdkPixbuf* resources_get_rating_trinket (Rating rating, gint scale); Rating media_source_get_rating (MediaSource* self); static GdkPixbuf* library_photo_page_real_get_top_right_trinket (EditingHostPage* base, gint scale); +GType flaggable_get_type (void) G_GNUC_CONST; +gboolean flaggable_is_flagged (Flaggable* self); GdkPixbuf* resources_get_icon (const gchar* name, gint scale); #define RESOURCES_ICON_FLAGGED_TRINKET "flag-trinket.png" #define RESOURCES_DEFAULT_ICON_SCALE 24 @@ -2489,7 +2378,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); -gboolean photo_is_raw_developer_available (Photo* self, RawDeveloper d); +static GVariant* _variant_new14 (const gchar* value); +static GVariant* _variant_new15 (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; @@ -2525,6 +2415,7 @@ static void library_photo_page_finalize (GObject* obj); static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNotify destroy_func); static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify destroy_func); +static const GActionEntry LIBRARY_PHOTO_PAGE_entries[46] = {{"Export", _library_photo_page_on_export_gsimple_action_activate_callback}, {"Print", _library_photo_page_on_print_gsimple_action_activate_callback}, {"Publish", _library_photo_page_on_publish_gsimple_action_activate_callback}, {"RemoveFromLibrary", _library_photo_page_on_remove_from_library_gsimple_action_activate_callback}, {"MoveToTrash", _library_photo_page_on_move_to_trash_gsimple_action_activate_callback}, {"PrevPhoto", _single_photo_page_on_previous_photo_gsimple_action_activate_callback}, {"NextPhoto", _single_photo_page_on_next_photo_gsimple_action_activate_callback}, {"RotateClockwise", _editing_host_page_on_rotate_clockwise_gsimple_action_activate_callback}, {"RotateCounterclockwise", _editing_host_page_on_rotate_counterclockwise_gsimple_action_activate_callback}, {"FlipHorizontally", _editing_host_page_on_flip_horizontally_gsimple_action_activate_callback}, {"FlipVertically", _editing_host_page_on_flip_vertically_gsimple_action_activate_callback}, {"Enhance", _editing_host_page_on_enhance_gsimple_action_activate_callback}, {"CopyColorAdjustments", _editing_host_page_on_copy_adjustments_gsimple_action_activate_callback}, {"PasteColorAdjustments", _editing_host_page_on_paste_adjustments_gsimple_action_activate_callback}, {"Crop", _editing_host_page_toggle_crop_gsimple_action_activate_callback}, {"Straighten", _editing_host_page_toggle_straighten_gsimple_action_activate_callback}, {"RedEye", _editing_host_page_toggle_redeye_gsimple_action_activate_callback}, {"Adjust", _editing_host_page_toggle_adjust_gsimple_action_activate_callback}, {"Revert", _editing_host_page_on_revert_gsimple_action_activate_callback}, {"EditTitle", _editing_host_page_on_edit_title_gsimple_action_activate_callback}, {"EditComment", _editing_host_page_on_edit_comment_gsimple_action_activate_callback}, {"AdjustDateTime", _editing_host_page_on_adjust_date_time_gsimple_action_activate_callback}, {"ExternalEdit", _library_photo_page_on_external_edit_gsimple_action_activate_callback}, {"ExternalEditRAW", _library_photo_page_on_external_edit_raw_gsimple_action_activate_callback}, {"SendTo", _library_photo_page_on_send_to_gsimple_action_activate_callback}, {"SetBackground", _editing_host_page_on_set_background_gsimple_action_activate_callback}, {"Flag", _library_photo_page_on_flag_unflag_gsimple_action_activate_callback}, {"IncreaseRating", _library_photo_page_on_increase_rating_gsimple_action_activate_callback}, {"DecreaseRating", _library_photo_page_on_decrease_rating_gsimple_action_activate_callback}, {"RateRejected", _library_photo_page_on_rate_rejected_gsimple_action_activate_callback}, {"RateUnrated", _library_photo_page_on_rate_unrated_gsimple_action_activate_callback}, {"RateOne", _library_photo_page_on_rate_one_gsimple_action_activate_callback}, {"RateTwo", _library_photo_page_on_rate_two_gsimple_action_activate_callback}, {"RateThree", _library_photo_page_on_rate_three_gsimple_action_activate_callback}, {"RateFour", _library_photo_page_on_rate_four_gsimple_action_activate_callback}, {"RateFive", _library_photo_page_on_rate_five_gsimple_action_activate_callback}, {"IncreaseSize", _editing_host_page_on_increase_size_gsimple_action_activate_callback}, {"DecreaseSize", _editing_host_page_on_decrease_size_gsimple_action_activate_callback}, {"ZoomFit", _editing_host_page_snap_zoom_to_min_gsimple_action_activate_callback}, {"Zoom100", _editing_host_page_snap_zoom_to_isomorphic_gsimple_action_activate_callback}, {"Zoom200", _editing_host_page_snap_zoom_to_max_gsimple_action_activate_callback}, {"AddTags", _library_photo_page_on_add_tags_gsimple_action_activate_callback}, {"ModifyTags", _library_photo_page_on_modify_tags_gsimple_action_activate_callback}, {"Slideshow", _library_photo_page_on_slideshow_gsimple_action_activate_callback}, {"ViewRatings", _page_on_action_toggle_gsimple_action_activate_callback, NULL, "false", _library_photo_page_on_display_ratings_gsimple_action_change_state_callback}, {"RawDeveloper", _page_on_action_radio_gsimple_action_activate_callback, "s", "'Shotwell'", _library_photo_page_on_raw_developer_changed_gsimple_action_change_state_callback}}; static GType zoom_buffer_object_state_get_type (void) { static volatile gsize zoom_buffer_object_state_type_id__volatile = 0; @@ -2541,7 +2432,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 2545 "PhotoPage.c" +#line 2436 "PhotoPage.c" } @@ -2594,28 +2485,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 2598 "PhotoPage.c" +#line 2489 "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 2605 "PhotoPage.c" +#line 2496 "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 2612 "PhotoPage.c" +#line 2503 "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 2619 "PhotoPage.c" +#line 2510 "PhotoPage.c" } @@ -2669,7 +2560,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 2672 "PhotoPage.c" +#line 2563 "PhotoPage.c" } #line 99 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp4_ = fetch_job; @@ -2695,7 +2586,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 2698 "PhotoPage.c" +#line 2589 "PhotoPage.c" GdkPixbuf* _tmp13_ = NULL; GdkPixbuf* _tmp14_ = NULL; gint _tmp15_ = 0; @@ -2724,7 +2615,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 2727 "PhotoPage.c" +#line 2618 "PhotoPage.c" } #line 104 "/home/jens/Source/shotwell/src/PhotoPage.vala" self->priv->object_state = ZOOM_BUFFER_OBJECT_STATE_SOURCE_NOT_TRANSFORMED; @@ -2732,13 +2623,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 2735 "PhotoPage.c" +#line 2626 "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 2741 "PhotoPage.c" +#line 2632 "PhotoPage.c" } #line 109 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp23_ = self->priv->iso_source_image; @@ -2772,7 +2663,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 2775 "PhotoPage.c" +#line 2666 "PhotoPage.c" } @@ -2813,7 +2704,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 2816 "PhotoPage.c" +#line 2707 "PhotoPage.c" } #line 123 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp4_ = transform_job; @@ -2839,7 +2730,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 2842 "PhotoPage.c" +#line 2733 "PhotoPage.c" GdkPixbuf* _tmp13_ = NULL; GdkPixbuf* _tmp14_ = NULL; gint _tmp15_ = 0; @@ -2868,13 +2759,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 2871 "PhotoPage.c" +#line 2762 "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 2877 "PhotoPage.c" +#line 2768 "PhotoPage.c" } @@ -2910,7 +2801,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 2913 "PhotoPage.c" +#line 2804 "PhotoPage.c" } #line 140 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp4_ = transform_job; @@ -2932,7 +2823,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 2935 "PhotoPage.c" +#line 2826 "PhotoPage.c" } @@ -3005,21 +2896,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 3008 "PhotoPage.c" +#line 2899 "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 3014 "PhotoPage.c" +#line 2905 "PhotoPage.c" } else { #line 156 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp5_ = FALSE; -#line 3018 "PhotoPage.c" +#line 2909 "PhotoPage.c" } #line 156 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp5_) { -#line 3022 "PhotoPage.c" +#line 2913 "PhotoPage.c" GdkPixbuf* _tmp8_ = NULL; GdkPixbuf* _tmp9_ = NULL; gint _tmp10_ = 0; @@ -3050,7 +2941,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 3053 "PhotoPage.c" +#line 2944 "PhotoPage.c" } #line 167 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp14_ = view_rect_proj; @@ -3128,14 +3019,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 3131 "PhotoPage.c" +#line 3022 "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 3138 "PhotoPage.c" +#line 3029 "PhotoPage.c" } @@ -3154,7 +3045,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 3157 "PhotoPage.c" +#line 3048 "PhotoPage.c" ZoomState _tmp1_ = {0}; gboolean _tmp2_ = FALSE; #line 186 "/home/jens/Source/shotwell/src/PhotoPage.vala" @@ -3163,7 +3054,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 3166 "PhotoPage.c" +#line 3057 "PhotoPage.c" GdkPixbuf* _tmp3_ = NULL; GdkPixbuf* _tmp4_ = NULL; #line 190 "/home/jens/Source/shotwell/src/PhotoPage.vala" @@ -3174,7 +3065,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 3177 "PhotoPage.c" +#line 3068 "PhotoPage.c" } else { gdouble _tmp5_ = 0.0; gdouble _tmp6_ = 0.0; @@ -3184,7 +3075,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 3187 "PhotoPage.c" +#line 3078 "PhotoPage.c" GdkRectangle curr_rect = {0}; GdkRectangle _tmp7_ = {0}; GdkRectangle pre_rect = {0}; @@ -3504,7 +3395,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 3507 "PhotoPage.c" +#line 3398 "PhotoPage.c" } } } @@ -3512,7 +3403,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 3515 "PhotoPage.c" +#line 3406 "PhotoPage.c" ZoomState _tmp98_ = {0}; gboolean _tmp99_ = FALSE; #line 243 "/home/jens/Source/shotwell/src/PhotoPage.vala" @@ -3521,7 +3412,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 3524 "PhotoPage.c" +#line 3415 "PhotoPage.c" ZoomState _tmp100_ = {0}; GdkPixbuf* _tmp101_ = NULL; #line 244 "/home/jens/Source/shotwell/src/PhotoPage.vala" @@ -3532,7 +3423,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 3535 "PhotoPage.c" +#line 3426 "PhotoPage.c" } else { ZoomBufferTransformationJob* _tmp102_ = NULL; GdkPixbuf* zoomed = NULL; @@ -3612,14 +3503,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 3615 "PhotoPage.c" +#line 3506 "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 3622 "PhotoPage.c" +#line 3513 "PhotoPage.c" GdkPixbuf* zoomed = NULL; ZoomState _tmp120_ = {0}; GdkPixbuf* _tmp121_ = NULL; @@ -3689,7 +3580,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 3692 "PhotoPage.c" +#line 3583 "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" \ @@ -3702,14 +3593,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 3704 "PhotoPage.c" +#line 3595 "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 3711 "PhotoPage.c" +#line 3602 "PhotoPage.c" } @@ -3752,7 +3643,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 3754 "PhotoPage.c" +#line 3645 "PhotoPage.c" BackgroundJob* iso_source_fetch_job = NULL; Photo* _tmp1_ = NULL; ZoomBufferIsoSourceFetchJob* _tmp2_ = NULL; @@ -3774,7 +3665,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 3776 "PhotoPage.c" +#line 3667 "PhotoPage.c" } #line 296 "/home/jens/Source/shotwell/src/PhotoPage.vala" zoom_state_get_viewing_rectangle_wrt_content (zoom_state, &_tmp5_); @@ -3842,7 +3733,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 3844 "PhotoPage.c" +#line 3735 "PhotoPage.c" } @@ -3860,7 +3751,7 @@ Photo* zoom_buffer_get_backing_photo (ZoomBuffer* self) { result = _tmp1_; #line 313 "/home/jens/Source/shotwell/src/PhotoPage.vala" return result; -#line 3862 "PhotoPage.c" +#line 3753 "PhotoPage.c" } @@ -3879,7 +3770,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 3881 "PhotoPage.c" +#line 3772 "PhotoPage.c" } @@ -3895,7 +3786,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 3897 "PhotoPage.c" +#line 3788 "PhotoPage.c" ZoomState* _tmp1_ = NULL; ZoomState _tmp2_ = {0}; GdkPixbuf* _tmp3_ = NULL; @@ -3910,7 +3801,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 3912 "PhotoPage.c" +#line 3803 "PhotoPage.c" } } @@ -3929,7 +3820,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 3931 "PhotoPage.c" +#line 3822 "PhotoPage.c" ZoomState _tmp1_ = {0}; GdkPixbuf* _tmp2_ = NULL; #line 334 "/home/jens/Source/shotwell/src/PhotoPage.vala" @@ -3940,7 +3831,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 3942 "PhotoPage.c" +#line 3833 "PhotoPage.c" } #line 337 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp3_ = self->priv->object_state; @@ -3950,7 +3841,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 3952 "PhotoPage.c" +#line 3843 "PhotoPage.c" { ZoomState _tmp4_ = {0}; GdkPixbuf* _tmp5_ = NULL; @@ -3962,11 +3853,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 3964 "PhotoPage.c" +#line 3855 "PhotoPage.c" } #line 337 "/home/jens/Source/shotwell/src/PhotoPage.vala" case ZOOM_BUFFER_OBJECT_STATE_SOURCE_NOT_TRANSFORMED: -#line 3968 "PhotoPage.c" +#line 3859 "PhotoPage.c" { ZoomState _tmp6_ = {0}; GdkPixbuf* _tmp7_ = NULL; @@ -3978,11 +3869,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 3980 "PhotoPage.c" +#line 3871 "PhotoPage.c" } #line 337 "/home/jens/Source/shotwell/src/PhotoPage.vala" case ZOOM_BUFFER_OBJECT_STATE_TRANSFORMED_READY: -#line 3984 "PhotoPage.c" +#line 3875 "PhotoPage.c" { ZoomState _tmp8_ = {0}; GdkPixbuf* _tmp9_ = NULL; @@ -4000,7 +3891,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 4002 "PhotoPage.c" +#line 3893 "PhotoPage.c" } default: { @@ -4017,7 +3908,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 4018 "PhotoPage.c" +#line 3909 "PhotoPage.c" } } } @@ -4041,7 +3932,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 4042 "PhotoPage.c" +#line 3933 "PhotoPage.c" } @@ -4074,14 +3965,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 4075 "PhotoPage.c" +#line 3966 "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 4082 "PhotoPage.c" +#line 3973 "PhotoPage.c" } @@ -4090,7 +3981,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 4091 "PhotoPage.c" +#line 3982 "PhotoPage.c" { GdkPixbuf* _tmp0_ = NULL; Photo* _tmp1_ = NULL; @@ -4107,8 +3998,8 @@ static void zoom_buffer_iso_source_fetch_job_real_execute (BackgroundJob* base) _tmp0_ = _tmp3_; #line 29 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 4108 "PhotoPage.c" - goto __catch243_g_error; +#line 3999 "PhotoPage.c" + goto __catch240_g_error; } #line 29 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp4_ = _tmp0_; @@ -4120,10 +4011,10 @@ static void zoom_buffer_iso_source_fetch_job_real_execute (BackgroundJob* base) self->fetched = _tmp4_; #line 28 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (_tmp0_); -#line 4121 "PhotoPage.c" +#line 4012 "PhotoPage.c" } - goto __finally243; - __catch243_g_error: + goto __finally240; + __catch240_g_error: { GError* fetch_error = NULL; #line 28 "/home/jens/Source/shotwell/src/PhotoPage.vala" @@ -4135,9 +4026,9 @@ static void zoom_buffer_iso_source_fetch_job_real_execute (BackgroundJob* base) "m backing photo"); #line 28 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_error_free0 (fetch_error); -#line 4135 "PhotoPage.c" +#line 4026 "PhotoPage.c" } - __finally243: + __finally240: #line 28 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 28 "/home/jens/Source/shotwell/src/PhotoPage.vala" @@ -4146,7 +4037,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 4146 "PhotoPage.c" +#line 4037 "PhotoPage.c" } } @@ -4160,7 +4051,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 4160 "PhotoPage.c" +#line 4051 "PhotoPage.c" } @@ -4169,7 +4060,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 4169 "PhotoPage.c" +#line 4060 "PhotoPage.c" } @@ -4183,7 +4074,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 4183 "PhotoPage.c" +#line 4074 "PhotoPage.c" } @@ -4202,7 +4093,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 4202 "PhotoPage.c" +#line 4093 "PhotoPage.c" } @@ -4272,14 +4163,14 @@ static ZoomBufferTransformationJob* zoom_buffer_transformation_job_construct (GT self->transformed = _tmp10_; #line 49 "/home/jens/Source/shotwell/src/PhotoPage.vala" return self; -#line 4272 "PhotoPage.c" +#line 4163 "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 4279 "PhotoPage.c" +#line 4170 "PhotoPage.c" } @@ -4292,7 +4183,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 4292 "PhotoPage.c" +#line 4183 "PhotoPage.c" PixelTransformer* _tmp1_ = NULL; GdkPixbuf* _tmp2_ = NULL; GdkPixbuf* _tmp3_ = NULL; @@ -4307,7 +4198,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 4307 "PhotoPage.c" +#line 4198 "PhotoPage.c" } } @@ -4321,7 +4212,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 4321 "PhotoPage.c" +#line 4212 "PhotoPage.c" } @@ -4330,7 +4221,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 4330 "PhotoPage.c" +#line 4221 "PhotoPage.c" } @@ -4348,7 +4239,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 4348 "PhotoPage.c" +#line 4239 "PhotoPage.c" } @@ -4371,7 +4262,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 4371 "PhotoPage.c" +#line 4262 "PhotoPage.c" } @@ -4400,7 +4291,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 4400 "PhotoPage.c" +#line 4291 "PhotoPage.c" } @@ -4430,7 +4321,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 4430 "PhotoPage.c" +#line 4321 "PhotoPage.c" } @@ -4447,145 +4338,145 @@ 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 546 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 548 "/home/jens/Source/shotwell/src/PhotoPage.vala" editing_host_page_on_photos_altered ((EditingHostPage*) self, items); -#line 4449 "PhotoPage.c" +#line 4340 "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 548 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 550 "/home/jens/Source/shotwell/src/PhotoPage.vala" editing_host_page_on_view_contents_ordering_altered ((EditingHostPage*) self); -#line 4456 "PhotoPage.c" +#line 4347 "PhotoPage.c" } static void _editing_host_page_on_view_contents_ordering_altered_data_collection_ordering_changed (DataCollection* _sender, gpointer self) { -#line 549 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 551 "/home/jens/Source/shotwell/src/PhotoPage.vala" editing_host_page_on_view_contents_ordering_altered ((EditingHostPage*) self); -#line 4463 "PhotoPage.c" +#line 4354 "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 4470 "PhotoPage.c" +#line 4361 "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 4477 "PhotoPage.c" +#line 4368 "PhotoPage.c" } static void _editing_host_page_on_rotate_clockwise_gtk_tool_button_clicked (GtkToolButton* _sender, gpointer self) { -#line 441 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 440 "/home/jens/Source/shotwell/src/PhotoPage.vala" editing_host_page_on_rotate_clockwise ((EditingHostPage*) self); -#line 4484 "PhotoPage.c" +#line 4375 "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 4491 "PhotoPage.c" +#line 4382 "PhotoPage.c" } static void _editing_host_page_on_straighten_toggled_gtk_toggle_tool_button_toggled (GtkToggleToolButton* _sender, gpointer self) { -#line 457 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 458 "/home/jens/Source/shotwell/src/PhotoPage.vala" editing_host_page_on_straighten_toggled ((EditingHostPage*) self); -#line 4498 "PhotoPage.c" +#line 4389 "PhotoPage.c" } static void _editing_host_page_on_redeye_toggled_gtk_toggle_tool_button_toggled (GtkToggleToolButton* _sender, gpointer self) { -#line 465 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 467 "/home/jens/Source/shotwell/src/PhotoPage.vala" editing_host_page_on_redeye_toggled ((EditingHostPage*) self); -#line 4505 "PhotoPage.c" +#line 4396 "PhotoPage.c" } static void _editing_host_page_on_adjust_toggled_gtk_toggle_tool_button_toggled (GtkToggleToolButton* _sender, gpointer self) { -#line 474 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 476 "/home/jens/Source/shotwell/src/PhotoPage.vala" editing_host_page_on_adjust_toggled ((EditingHostPage*) self); -#line 4512 "PhotoPage.c" +#line 4403 "PhotoPage.c" } static void _editing_host_page_on_enhance_gtk_tool_button_clicked (GtkToolButton* _sender, gpointer self) { -#line 482 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 484 "/home/jens/Source/shotwell/src/PhotoPage.vala" editing_host_page_on_enhance ((EditingHostPage*) self); -#line 4519 "PhotoPage.c" +#line 4410 "PhotoPage.c" } static gboolean _editing_host_page_on_zoom_out_pressed_gtk_widget_button_press_event (GtkWidget* _sender, GdkEventButton* event, gpointer self) { gboolean result; result = editing_host_page_on_zoom_out_pressed ((EditingHostPage*) self, event); -#line 501 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 503 "/home/jens/Source/shotwell/src/PhotoPage.vala" return result; -#line 4528 "PhotoPage.c" +#line 4419 "PhotoPage.c" } static void _editing_host_page_on_zoom_slider_value_changed_gtk_range_value_changed (GtkRange* _sender, gpointer self) { -#line 509 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 511 "/home/jens/Source/shotwell/src/PhotoPage.vala" editing_host_page_on_zoom_slider_value_changed ((EditingHostPage*) self); -#line 4535 "PhotoPage.c" +#line 4426 "PhotoPage.c" } static gboolean _editing_host_page_on_zoom_slider_drag_begin_gtk_widget_button_press_event (GtkWidget* _sender, GdkEventButton* event, gpointer self) { gboolean result; result = editing_host_page_on_zoom_slider_drag_begin ((EditingHostPage*) self, event); -#line 510 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 512 "/home/jens/Source/shotwell/src/PhotoPage.vala" return result; -#line 4544 "PhotoPage.c" +#line 4435 "PhotoPage.c" } static gboolean _editing_host_page_on_zoom_slider_drag_end_gtk_widget_button_release_event (GtkWidget* _sender, GdkEventButton* event, gpointer self) { gboolean result; result = editing_host_page_on_zoom_slider_drag_end ((EditingHostPage*) self, event); -#line 511 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 513 "/home/jens/Source/shotwell/src/PhotoPage.vala" return result; -#line 4553 "PhotoPage.c" +#line 4444 "PhotoPage.c" } static gboolean _editing_host_page_on_zoom_slider_key_press_gtk_widget_key_press_event (GtkWidget* _sender, GdkEventKey* event, gpointer self) { gboolean result; result = editing_host_page_on_zoom_slider_key_press ((EditingHostPage*) self, event); -#line 512 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 514 "/home/jens/Source/shotwell/src/PhotoPage.vala" return result; -#line 4562 "PhotoPage.c" +#line 4453 "PhotoPage.c" } static gboolean _editing_host_page_on_zoom_in_pressed_gtk_widget_button_press_event (GtkWidget* _sender, GdkEventButton* event, gpointer self) { gboolean result; result = editing_host_page_on_zoom_in_pressed ((EditingHostPage*) self, event); -#line 523 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 525 "/home/jens/Source/shotwell/src/PhotoPage.vala" return result; -#line 4571 "PhotoPage.c" +#line 4462 "PhotoPage.c" } static void _single_photo_page_on_previous_photo_gtk_tool_button_clicked (GtkToolButton* _sender, gpointer self) { -#line 535 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 537 "/home/jens/Source/shotwell/src/PhotoPage.vala" single_photo_page_on_previous_photo ((SinglePhotoPage*) self); -#line 4578 "PhotoPage.c" +#line 4469 "PhotoPage.c" } static void _single_photo_page_on_next_photo_gtk_tool_button_clicked (GtkToolButton* _sender, gpointer self) { -#line 541 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 543 "/home/jens/Source/shotwell/src/PhotoPage.vala" single_photo_page_on_next_photo ((SinglePhotoPage*) self); -#line 4585 "PhotoPage.c" +#line 4476 "PhotoPage.c" } @@ -4608,7 +4499,7 @@ EditingHostPage* editing_host_page_construct (GType object_type, SourceCollectio GtkToolButton* _tmp13_ = NULL; GtkToolButton* _tmp14_ = NULL; GtkToolButton* _tmp15_ = NULL; - GtkToolButton* _tmp16_ = NULL; + GtkToggleToolButton* _tmp16_ = NULL; GtkToggleToolButton* _tmp17_ = NULL; GtkToggleToolButton* _tmp18_ = NULL; GtkToggleToolButton* _tmp19_ = NULL; @@ -4634,52 +4525,54 @@ EditingHostPage* editing_host_page_construct (GType object_type, SourceCollectio GtkToggleToolButton* _tmp39_ = NULL; GtkToggleToolButton* _tmp40_ = NULL; GtkToggleToolButton* _tmp41_ = NULL; - GtkToolButton* _tmp42_ = NULL; - GtkToolButton* _tmp43_ = NULL; + GtkToggleToolButton* _tmp42_ = NULL; + GtkToggleToolButton* _tmp43_ = NULL; GtkToolButton* _tmp44_ = NULL; GtkToolButton* _tmp45_ = NULL; GtkToolButton* _tmp46_ = NULL; GtkToolButton* _tmp47_ = NULL; + GtkToolButton* _tmp48_ = NULL; + GtkToolButton* _tmp49_ = NULL; GtkSeparatorToolItem* separator = NULL; - GtkSeparatorToolItem* _tmp48_ = NULL; + GtkSeparatorToolItem* _tmp50_ = NULL; GtkBox* zoom_group = NULL; - GtkBox* _tmp49_ = NULL; + GtkBox* _tmp51_ = NULL; GtkImage* zoom_out = NULL; - GdkPixbuf* _tmp50_ = NULL; - GdkPixbuf* _tmp51_ = NULL; - GtkImage* _tmp52_ = NULL; - GtkImage* _tmp53_ = NULL; + GdkPixbuf* _tmp52_ = NULL; + GdkPixbuf* _tmp53_ = NULL; + GtkImage* _tmp54_ = NULL; + GtkImage* _tmp55_ = NULL; GtkEventBox* zoom_out_box = NULL; - GtkEventBox* _tmp54_ = NULL; - GtkAdjustment* _tmp55_ = NULL; - GtkAdjustment* _tmp56_ = NULL; - GtkScale* _tmp57_ = NULL; - GtkScale* _tmp58_ = NULL; + GtkEventBox* _tmp56_ = NULL; + GtkAdjustment* _tmp57_ = NULL; + GtkAdjustment* _tmp58_ = NULL; GtkScale* _tmp59_ = NULL; GtkScale* _tmp60_ = NULL; GtkScale* _tmp61_ = NULL; GtkScale* _tmp62_ = NULL; GtkScale* _tmp63_ = NULL; GtkScale* _tmp64_ = NULL; + GtkScale* _tmp65_ = NULL; + GtkScale* _tmp66_ = NULL; GtkImage* zoom_in = NULL; - GdkPixbuf* _tmp65_ = NULL; - GdkPixbuf* _tmp66_ = NULL; - GtkImage* _tmp67_ = NULL; - GtkImage* _tmp68_ = NULL; + GdkPixbuf* _tmp67_ = NULL; + GdkPixbuf* _tmp68_ = NULL; + GtkImage* _tmp69_ = NULL; + GtkImage* _tmp70_ = NULL; GtkEventBox* zoom_in_box = NULL; - GtkEventBox* _tmp69_ = NULL; + GtkEventBox* _tmp71_ = NULL; GtkToolItem* group_wrapper = NULL; - GtkToolItem* _tmp70_ = NULL; - GtkToolButton* _tmp71_ = NULL; - const gchar* _tmp72_ = NULL; + GtkToolItem* _tmp72_ = NULL; GtkToolButton* _tmp73_ = NULL; - GtkToolButton* _tmp74_ = NULL; + const gchar* _tmp74_ = NULL; GtkToolButton* _tmp75_ = NULL; GtkToolButton* _tmp76_ = NULL; - const gchar* _tmp77_ = NULL; + GtkToolButton* _tmp77_ = NULL; GtkToolButton* _tmp78_ = NULL; - GtkToolButton* _tmp79_ = NULL; + const gchar* _tmp79_ = NULL; GtkToolButton* _tmp80_ = NULL; + GtkToolButton* _tmp81_ = NULL; + GtkToolButton* _tmp82_ = NULL; #line 417 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_val_if_fail (IS_SOURCE_COLLECTION (sources), NULL); #line 417 "/home/jens/Source/shotwell/src/PhotoPage.vala" @@ -4725,7 +4618,7 @@ EditingHostPage* editing_host_page_construct (GType object_type, SourceCollectio #line 434 "/home/jens/Source/shotwell/src/PhotoPage.vala" toolbar = _tmp9_; #line 437 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp10_ = (GtkToolButton*) gtk_tool_button_new_from_stock (""); + _tmp10_ = (GtkToolButton*) gtk_tool_button_new (NULL, RESOURCES_ROTATE_CW_LABEL); #line 437 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_object_ref_sink (_tmp10_); #line 437 "/home/jens/Source/shotwell/src/PhotoPage.vala" @@ -4739,31 +4632,31 @@ EditingHostPage* editing_host_page_construct (GType object_type, SourceCollectio #line 439 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp12_ = self->priv->rotate_button; #line 439 "/home/jens/Source/shotwell/src/PhotoPage.vala" - gtk_tool_button_set_label (_tmp12_, RESOURCES_ROTATE_CW_LABEL); + gtk_tool_item_set_tooltip_text (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, gtk_tool_item_get_type (), GtkToolItem), RESOURCES_ROTATE_CW_TOOLTIP); #line 440 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp13_ = self->priv->rotate_button; #line 440 "/home/jens/Source/shotwell/src/PhotoPage.vala" - gtk_tool_item_set_tooltip_text (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, gtk_tool_item_get_type (), GtkToolItem), RESOURCES_ROTATE_CW_TOOLTIP); + g_signal_connect_object (_tmp13_, "clicked", (GCallback) _editing_host_page_on_rotate_clockwise_gtk_tool_button_clicked, self, 0); #line 441 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp14_ = self->priv->rotate_button; #line 441 "/home/jens/Source/shotwell/src/PhotoPage.vala" - g_signal_connect_object (_tmp14_, "clicked", (GCallback) _editing_host_page_on_rotate_clockwise_gtk_tool_button_clicked, self, 0); + gtk_tool_item_set_is_important (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, gtk_tool_item_get_type (), GtkToolItem), TRUE); #line 442 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp15_ = self->priv->rotate_button; #line 442 "/home/jens/Source/shotwell/src/PhotoPage.vala" - gtk_tool_item_set_is_important (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, gtk_tool_item_get_type (), GtkToolItem), TRUE); -#line 443 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp16_ = self->priv->rotate_button; -#line 443 "/home/jens/Source/shotwell/src/PhotoPage.vala" - gtk_toolbar_insert (toolbar, G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, gtk_tool_item_get_type (), GtkToolItem), -1); -#line 446 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp17_ = (GtkToggleToolButton*) gtk_toggle_tool_button_new_from_stock (RESOURCES_CROP); -#line 446 "/home/jens/Source/shotwell/src/PhotoPage.vala" - g_object_ref_sink (_tmp17_); -#line 446 "/home/jens/Source/shotwell/src/PhotoPage.vala" + gtk_toolbar_insert (toolbar, G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, gtk_tool_item_get_type (), GtkToolItem), -1); +#line 445 "/home/jens/Source/shotwell/src/PhotoPage.vala" + _tmp16_ = (GtkToggleToolButton*) gtk_toggle_tool_button_new (); +#line 445 "/home/jens/Source/shotwell/src/PhotoPage.vala" + g_object_ref_sink (_tmp16_); +#line 445 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (self->priv->crop_button); +#line 445 "/home/jens/Source/shotwell/src/PhotoPage.vala" + self->priv->crop_button = _tmp16_; #line 446 "/home/jens/Source/shotwell/src/PhotoPage.vala" - self->priv->crop_button = _tmp17_; + _tmp17_ = self->priv->crop_button; +#line 446 "/home/jens/Source/shotwell/src/PhotoPage.vala" + gtk_tool_button_set_icon_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, gtk_tool_button_get_type (), GtkToolButton), "crop"); #line 447 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp18_ = self->priv->crop_button; #line 447 "/home/jens/Source/shotwell/src/PhotoPage.vala" @@ -4785,7 +4678,7 @@ EditingHostPage* editing_host_page_construct (GType object_type, SourceCollectio #line 451 "/home/jens/Source/shotwell/src/PhotoPage.vala" gtk_toolbar_insert (toolbar, G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, gtk_tool_item_get_type (), GtkToolItem), -1); #line 454 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp23_ = (GtkToggleToolButton*) gtk_toggle_tool_button_new_from_stock (RESOURCES_STRAIGHTEN); + _tmp23_ = (GtkToggleToolButton*) gtk_toggle_tool_button_new (); #line 454 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_object_ref_sink (_tmp23_); #line 454 "/home/jens/Source/shotwell/src/PhotoPage.vala" @@ -4795,279 +4688,287 @@ EditingHostPage* editing_host_page_construct (GType object_type, SourceCollectio #line 455 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp24_ = self->priv->straighten_button; #line 455 "/home/jens/Source/shotwell/src/PhotoPage.vala" - gtk_tool_button_set_label (G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, gtk_tool_button_get_type (), GtkToolButton), RESOURCES_STRAIGHTEN_LABEL); + gtk_tool_button_set_icon_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, gtk_tool_button_get_type (), GtkToolButton), "straighten"); #line 456 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp25_ = self->priv->straighten_button; #line 456 "/home/jens/Source/shotwell/src/PhotoPage.vala" - gtk_tool_item_set_tooltip_text (G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, gtk_tool_item_get_type (), GtkToolItem), RESOURCES_STRAIGHTEN_TOOLTIP); + gtk_tool_button_set_label (G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, gtk_tool_button_get_type (), GtkToolButton), RESOURCES_STRAIGHTEN_LABEL); #line 457 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp26_ = self->priv->straighten_button; #line 457 "/home/jens/Source/shotwell/src/PhotoPage.vala" - g_signal_connect_object (_tmp26_, "toggled", (GCallback) _editing_host_page_on_straighten_toggled_gtk_toggle_tool_button_toggled, self, 0); + gtk_tool_item_set_tooltip_text (G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, gtk_tool_item_get_type (), GtkToolItem), RESOURCES_STRAIGHTEN_TOOLTIP); #line 458 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp27_ = self->priv->straighten_button; #line 458 "/home/jens/Source/shotwell/src/PhotoPage.vala" - gtk_tool_item_set_is_important (G_TYPE_CHECK_INSTANCE_CAST (_tmp27_, gtk_tool_item_get_type (), GtkToolItem), TRUE); + g_signal_connect_object (_tmp27_, "toggled", (GCallback) _editing_host_page_on_straighten_toggled_gtk_toggle_tool_button_toggled, self, 0); #line 459 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp28_ = self->priv->straighten_button; #line 459 "/home/jens/Source/shotwell/src/PhotoPage.vala" - gtk_toolbar_insert (toolbar, G_TYPE_CHECK_INSTANCE_CAST (_tmp28_, gtk_tool_item_get_type (), GtkToolItem), -1); -#line 462 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp29_ = (GtkToggleToolButton*) gtk_toggle_tool_button_new_from_stock (RESOURCES_REDEYE); -#line 462 "/home/jens/Source/shotwell/src/PhotoPage.vala" - g_object_ref_sink (_tmp29_); -#line 462 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _g_object_unref0 (self->priv->redeye_button); -#line 462 "/home/jens/Source/shotwell/src/PhotoPage.vala" - self->priv->redeye_button = _tmp29_; + gtk_tool_item_set_is_important (G_TYPE_CHECK_INSTANCE_CAST (_tmp28_, gtk_tool_item_get_type (), GtkToolItem), TRUE); +#line 460 "/home/jens/Source/shotwell/src/PhotoPage.vala" + _tmp29_ = self->priv->straighten_button; +#line 460 "/home/jens/Source/shotwell/src/PhotoPage.vala" + gtk_toolbar_insert (toolbar, G_TYPE_CHECK_INSTANCE_CAST (_tmp29_, gtk_tool_item_get_type (), GtkToolItem), -1); +#line 463 "/home/jens/Source/shotwell/src/PhotoPage.vala" + _tmp30_ = (GtkToggleToolButton*) gtk_toggle_tool_button_new (); #line 463 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp30_ = self->priv->redeye_button; + g_object_ref_sink (_tmp30_); +#line 463 "/home/jens/Source/shotwell/src/PhotoPage.vala" + _g_object_unref0 (self->priv->redeye_button); #line 463 "/home/jens/Source/shotwell/src/PhotoPage.vala" - gtk_tool_button_set_label (G_TYPE_CHECK_INSTANCE_CAST (_tmp30_, gtk_tool_button_get_type (), GtkToolButton), RESOURCES_RED_EYE_LABEL); + self->priv->redeye_button = _tmp30_; #line 464 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp31_ = self->priv->redeye_button; #line 464 "/home/jens/Source/shotwell/src/PhotoPage.vala" - gtk_tool_item_set_tooltip_text (G_TYPE_CHECK_INSTANCE_CAST (_tmp31_, gtk_tool_item_get_type (), GtkToolItem), RESOURCES_RED_EYE_TOOLTIP); + gtk_tool_button_set_icon_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp31_, gtk_tool_button_get_type (), GtkToolButton), "redeye"); #line 465 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp32_ = self->priv->redeye_button; #line 465 "/home/jens/Source/shotwell/src/PhotoPage.vala" - g_signal_connect_object (_tmp32_, "toggled", (GCallback) _editing_host_page_on_redeye_toggled_gtk_toggle_tool_button_toggled, self, 0); + gtk_tool_button_set_label (G_TYPE_CHECK_INSTANCE_CAST (_tmp32_, gtk_tool_button_get_type (), GtkToolButton), RESOURCES_RED_EYE_LABEL); #line 466 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp33_ = self->priv->redeye_button; #line 466 "/home/jens/Source/shotwell/src/PhotoPage.vala" - gtk_tool_item_set_is_important (G_TYPE_CHECK_INSTANCE_CAST (_tmp33_, gtk_tool_item_get_type (), GtkToolItem), TRUE); + gtk_tool_item_set_tooltip_text (G_TYPE_CHECK_INSTANCE_CAST (_tmp33_, gtk_tool_item_get_type (), GtkToolItem), RESOURCES_RED_EYE_TOOLTIP); #line 467 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp34_ = self->priv->redeye_button; #line 467 "/home/jens/Source/shotwell/src/PhotoPage.vala" - gtk_toolbar_insert (toolbar, G_TYPE_CHECK_INSTANCE_CAST (_tmp34_, gtk_tool_item_get_type (), GtkToolItem), -1); -#line 470 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp35_ = (GtkToggleToolButton*) gtk_toggle_tool_button_new (); -#line 470 "/home/jens/Source/shotwell/src/PhotoPage.vala" - g_object_ref_sink (_tmp35_); -#line 470 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _g_object_unref0 (self->priv->adjust_button); -#line 470 "/home/jens/Source/shotwell/src/PhotoPage.vala" - self->priv->adjust_button = _tmp35_; -#line 471 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp36_ = self->priv->adjust_button; -#line 471 "/home/jens/Source/shotwell/src/PhotoPage.vala" - gtk_tool_button_set_icon_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp36_, gtk_tool_button_get_type (), GtkToolButton), RESOURCES_ADJUST); + g_signal_connect_object (_tmp34_, "toggled", (GCallback) _editing_host_page_on_redeye_toggled_gtk_toggle_tool_button_toggled, self, 0); +#line 468 "/home/jens/Source/shotwell/src/PhotoPage.vala" + _tmp35_ = self->priv->redeye_button; +#line 468 "/home/jens/Source/shotwell/src/PhotoPage.vala" + gtk_tool_item_set_is_important (G_TYPE_CHECK_INSTANCE_CAST (_tmp35_, gtk_tool_item_get_type (), GtkToolItem), TRUE); +#line 469 "/home/jens/Source/shotwell/src/PhotoPage.vala" + _tmp36_ = self->priv->redeye_button; +#line 469 "/home/jens/Source/shotwell/src/PhotoPage.vala" + gtk_toolbar_insert (toolbar, G_TYPE_CHECK_INSTANCE_CAST (_tmp36_, gtk_tool_item_get_type (), GtkToolItem), -1); +#line 472 "/home/jens/Source/shotwell/src/PhotoPage.vala" + _tmp37_ = (GtkToggleToolButton*) gtk_toggle_tool_button_new (); #line 472 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp37_ = self->priv->adjust_button; + g_object_ref_sink (_tmp37_); +#line 472 "/home/jens/Source/shotwell/src/PhotoPage.vala" + _g_object_unref0 (self->priv->adjust_button); #line 472 "/home/jens/Source/shotwell/src/PhotoPage.vala" - gtk_tool_button_set_label (G_TYPE_CHECK_INSTANCE_CAST (_tmp37_, gtk_tool_button_get_type (), GtkToolButton), RESOURCES_ADJUST_LABEL); + self->priv->adjust_button = _tmp37_; #line 473 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp38_ = self->priv->adjust_button; #line 473 "/home/jens/Source/shotwell/src/PhotoPage.vala" - gtk_tool_item_set_tooltip_text (G_TYPE_CHECK_INSTANCE_CAST (_tmp38_, gtk_tool_item_get_type (), GtkToolItem), RESOURCES_ADJUST_TOOLTIP); + gtk_tool_button_set_icon_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp38_, gtk_tool_button_get_type (), GtkToolButton), RESOURCES_ADJUST); #line 474 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp39_ = self->priv->adjust_button; #line 474 "/home/jens/Source/shotwell/src/PhotoPage.vala" - g_signal_connect_object (_tmp39_, "toggled", (GCallback) _editing_host_page_on_adjust_toggled_gtk_toggle_tool_button_toggled, self, 0); + gtk_tool_button_set_label (G_TYPE_CHECK_INSTANCE_CAST (_tmp39_, gtk_tool_button_get_type (), GtkToolButton), RESOURCES_ADJUST_LABEL); #line 475 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp40_ = self->priv->adjust_button; #line 475 "/home/jens/Source/shotwell/src/PhotoPage.vala" - gtk_tool_item_set_is_important (G_TYPE_CHECK_INSTANCE_CAST (_tmp40_, gtk_tool_item_get_type (), GtkToolItem), TRUE); + gtk_tool_item_set_tooltip_text (G_TYPE_CHECK_INSTANCE_CAST (_tmp40_, gtk_tool_item_get_type (), GtkToolItem), RESOURCES_ADJUST_TOOLTIP); #line 476 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp41_ = self->priv->adjust_button; #line 476 "/home/jens/Source/shotwell/src/PhotoPage.vala" - gtk_toolbar_insert (toolbar, G_TYPE_CHECK_INSTANCE_CAST (_tmp41_, gtk_tool_item_get_type (), GtkToolItem), -1); -#line 479 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp42_ = (GtkToolButton*) gtk_tool_button_new (NULL, RESOURCES_ENHANCE_LABEL); -#line 479 "/home/jens/Source/shotwell/src/PhotoPage.vala" - g_object_ref_sink (_tmp42_); -#line 479 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _g_object_unref0 (self->priv->enhance_button); -#line 479 "/home/jens/Source/shotwell/src/PhotoPage.vala" - self->priv->enhance_button = _tmp42_; -#line 480 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp43_ = self->priv->enhance_button; -#line 480 "/home/jens/Source/shotwell/src/PhotoPage.vala" - gtk_tool_button_set_icon_name (_tmp43_, RESOURCES_ENHANCE); + g_signal_connect_object (_tmp41_, "toggled", (GCallback) _editing_host_page_on_adjust_toggled_gtk_toggle_tool_button_toggled, self, 0); +#line 477 "/home/jens/Source/shotwell/src/PhotoPage.vala" + _tmp42_ = self->priv->adjust_button; +#line 477 "/home/jens/Source/shotwell/src/PhotoPage.vala" + gtk_tool_item_set_is_important (G_TYPE_CHECK_INSTANCE_CAST (_tmp42_, gtk_tool_item_get_type (), GtkToolItem), TRUE); +#line 478 "/home/jens/Source/shotwell/src/PhotoPage.vala" + _tmp43_ = self->priv->adjust_button; +#line 478 "/home/jens/Source/shotwell/src/PhotoPage.vala" + gtk_toolbar_insert (toolbar, G_TYPE_CHECK_INSTANCE_CAST (_tmp43_, gtk_tool_item_get_type (), GtkToolItem), -1); +#line 481 "/home/jens/Source/shotwell/src/PhotoPage.vala" + _tmp44_ = (GtkToolButton*) gtk_tool_button_new (NULL, RESOURCES_ENHANCE_LABEL); #line 481 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp44_ = self->priv->enhance_button; + g_object_ref_sink (_tmp44_); #line 481 "/home/jens/Source/shotwell/src/PhotoPage.vala" - gtk_tool_item_set_tooltip_text (G_TYPE_CHECK_INSTANCE_CAST (_tmp44_, gtk_tool_item_get_type (), GtkToolItem), RESOURCES_ENHANCE_TOOLTIP); + _g_object_unref0 (self->priv->enhance_button); +#line 481 "/home/jens/Source/shotwell/src/PhotoPage.vala" + self->priv->enhance_button = _tmp44_; #line 482 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp45_ = self->priv->enhance_button; #line 482 "/home/jens/Source/shotwell/src/PhotoPage.vala" - g_signal_connect_object (_tmp45_, "clicked", (GCallback) _editing_host_page_on_enhance_gtk_tool_button_clicked, self, 0); + gtk_tool_button_set_icon_name (_tmp45_, RESOURCES_ENHANCE); #line 483 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp46_ = self->priv->enhance_button; #line 483 "/home/jens/Source/shotwell/src/PhotoPage.vala" - gtk_tool_item_set_is_important (G_TYPE_CHECK_INSTANCE_CAST (_tmp46_, gtk_tool_item_get_type (), GtkToolItem), TRUE); + gtk_tool_item_set_tooltip_text (G_TYPE_CHECK_INSTANCE_CAST (_tmp46_, gtk_tool_item_get_type (), GtkToolItem), RESOURCES_ENHANCE_TOOLTIP); #line 484 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp47_ = self->priv->enhance_button; #line 484 "/home/jens/Source/shotwell/src/PhotoPage.vala" - gtk_toolbar_insert (toolbar, G_TYPE_CHECK_INSTANCE_CAST (_tmp47_, gtk_tool_item_get_type (), GtkToolItem), -1); -#line 487 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp48_ = (GtkSeparatorToolItem*) gtk_separator_tool_item_new (); -#line 487 "/home/jens/Source/shotwell/src/PhotoPage.vala" - g_object_ref_sink (_tmp48_); -#line 487 "/home/jens/Source/shotwell/src/PhotoPage.vala" - separator = _tmp48_; -#line 488 "/home/jens/Source/shotwell/src/PhotoPage.vala" - gtk_tool_item_set_expand (G_TYPE_CHECK_INSTANCE_CAST (separator, gtk_tool_item_get_type (), GtkToolItem), TRUE); + g_signal_connect_object (_tmp47_, "clicked", (GCallback) _editing_host_page_on_enhance_gtk_tool_button_clicked, self, 0); +#line 485 "/home/jens/Source/shotwell/src/PhotoPage.vala" + _tmp48_ = self->priv->enhance_button; +#line 485 "/home/jens/Source/shotwell/src/PhotoPage.vala" + gtk_tool_item_set_is_important (G_TYPE_CHECK_INSTANCE_CAST (_tmp48_, gtk_tool_item_get_type (), GtkToolItem), TRUE); +#line 486 "/home/jens/Source/shotwell/src/PhotoPage.vala" + _tmp49_ = self->priv->enhance_button; +#line 486 "/home/jens/Source/shotwell/src/PhotoPage.vala" + gtk_toolbar_insert (toolbar, G_TYPE_CHECK_INSTANCE_CAST (_tmp49_, gtk_tool_item_get_type (), GtkToolItem), -1); #line 489 "/home/jens/Source/shotwell/src/PhotoPage.vala" - gtk_separator_tool_item_set_draw (separator, FALSE); + _tmp50_ = (GtkSeparatorToolItem*) gtk_separator_tool_item_new (); +#line 489 "/home/jens/Source/shotwell/src/PhotoPage.vala" + g_object_ref_sink (_tmp50_); +#line 489 "/home/jens/Source/shotwell/src/PhotoPage.vala" + separator = _tmp50_; #line 490 "/home/jens/Source/shotwell/src/PhotoPage.vala" - gtk_toolbar_insert (toolbar, G_TYPE_CHECK_INSTANCE_CAST (separator, gtk_tool_item_get_type (), GtkToolItem), -1); -#line 492 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp49_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0); -#line 492 "/home/jens/Source/shotwell/src/PhotoPage.vala" - g_object_ref_sink (_tmp49_); + gtk_tool_item_set_expand (G_TYPE_CHECK_INSTANCE_CAST (separator, gtk_tool_item_get_type (), GtkToolItem), TRUE); +#line 491 "/home/jens/Source/shotwell/src/PhotoPage.vala" + gtk_separator_tool_item_set_draw (separator, FALSE); #line 492 "/home/jens/Source/shotwell/src/PhotoPage.vala" - zoom_group = _tmp49_; -#line 494 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp50_ = resources_load_icon (RESOURCES_ICON_ZOOM_OUT, RESOURCES_ICON_ZOOM_SCALE); -#line 494 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp51_ = _tmp50_; + gtk_toolbar_insert (toolbar, G_TYPE_CHECK_INSTANCE_CAST (separator, gtk_tool_item_get_type (), GtkToolItem), -1); #line 494 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp52_ = (GtkImage*) gtk_image_new_from_pixbuf (_tmp51_); + _tmp51_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0); #line 494 "/home/jens/Source/shotwell/src/PhotoPage.vala" - g_object_ref_sink (_tmp52_); + g_object_ref_sink (_tmp51_); #line 494 "/home/jens/Source/shotwell/src/PhotoPage.vala" + zoom_group = _tmp51_; +#line 496 "/home/jens/Source/shotwell/src/PhotoPage.vala" + _tmp52_ = resources_load_icon (RESOURCES_ICON_ZOOM_OUT, RESOURCES_ICON_ZOOM_SCALE); +#line 496 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp53_ = _tmp52_; -#line 494 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _g_object_unref0 (_tmp51_); -#line 494 "/home/jens/Source/shotwell/src/PhotoPage.vala" - zoom_out = _tmp53_; #line 496 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp54_ = (GtkEventBox*) gtk_event_box_new (); + _tmp54_ = (GtkImage*) gtk_image_new_from_pixbuf (_tmp53_); #line 496 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_object_ref_sink (_tmp54_); #line 496 "/home/jens/Source/shotwell/src/PhotoPage.vala" - zoom_out_box = _tmp54_; -#line 497 "/home/jens/Source/shotwell/src/PhotoPage.vala" - gtk_event_box_set_above_child (zoom_out_box, TRUE); + _tmp55_ = _tmp54_; +#line 496 "/home/jens/Source/shotwell/src/PhotoPage.vala" + _g_object_unref0 (_tmp53_); +#line 496 "/home/jens/Source/shotwell/src/PhotoPage.vala" + zoom_out = _tmp55_; #line 498 "/home/jens/Source/shotwell/src/PhotoPage.vala" - gtk_event_box_set_visible_window (zoom_out_box, FALSE); + _tmp56_ = (GtkEventBox*) gtk_event_box_new (); +#line 498 "/home/jens/Source/shotwell/src/PhotoPage.vala" + g_object_ref_sink (_tmp56_); +#line 498 "/home/jens/Source/shotwell/src/PhotoPage.vala" + zoom_out_box = _tmp56_; #line 499 "/home/jens/Source/shotwell/src/PhotoPage.vala" - gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (zoom_out_box, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (zoom_out, gtk_widget_get_type (), GtkWidget)); + gtk_event_box_set_above_child (zoom_out_box, TRUE); +#line 500 "/home/jens/Source/shotwell/src/PhotoPage.vala" + gtk_event_box_set_visible_window (zoom_out_box, FALSE); #line 501 "/home/jens/Source/shotwell/src/PhotoPage.vala" - g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (zoom_out_box, gtk_widget_get_type (), GtkWidget), "button-press-event", (GCallback) _editing_host_page_on_zoom_out_pressed_gtk_widget_button_press_event, self, 0); + gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (zoom_out_box, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (zoom_out, gtk_widget_get_type (), GtkWidget)); #line 503 "/home/jens/Source/shotwell/src/PhotoPage.vala" + g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (zoom_out_box, gtk_widget_get_type (), GtkWidget), "button-press-event", (GCallback) _editing_host_page_on_zoom_out_pressed_gtk_widget_button_press_event, self, 0); +#line 505 "/home/jens/Source/shotwell/src/PhotoPage.vala" gtk_box_pack_start (zoom_group, G_TYPE_CHECK_INSTANCE_CAST (zoom_out_box, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0); -#line 506 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp55_ = gtk_adjustment_new (0.0, 0.0, 1.1, 0.1, 0.1, 0.1); -#line 506 "/home/jens/Source/shotwell/src/PhotoPage.vala" - g_object_ref_sink (_tmp55_); -#line 506 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp56_ = _tmp55_; -#line 506 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp57_ = (GtkScale*) gtk_scale_new (GTK_ORIENTATION_HORIZONTAL, _tmp56_); -#line 506 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 508 "/home/jens/Source/shotwell/src/PhotoPage.vala" + _tmp57_ = gtk_adjustment_new (0.0, 0.0, 1.1, 0.1, 0.1, 0.1); +#line 508 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_object_ref_sink (_tmp57_); -#line 506 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 508 "/home/jens/Source/shotwell/src/PhotoPage.vala" + _tmp58_ = _tmp57_; +#line 508 "/home/jens/Source/shotwell/src/PhotoPage.vala" + _tmp59_ = (GtkScale*) gtk_scale_new (GTK_ORIENTATION_HORIZONTAL, _tmp58_); +#line 508 "/home/jens/Source/shotwell/src/PhotoPage.vala" + g_object_ref_sink (_tmp59_); +#line 508 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (self->priv->zoom_slider); -#line 506 "/home/jens/Source/shotwell/src/PhotoPage.vala" - self->priv->zoom_slider = _tmp57_; -#line 506 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _g_object_unref0 (_tmp56_); -#line 507 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp58_ = self->priv->zoom_slider; -#line 507 "/home/jens/Source/shotwell/src/PhotoPage.vala" - gtk_scale_set_draw_value (_tmp58_, FALSE); #line 508 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp59_ = self->priv->zoom_slider; + self->priv->zoom_slider = _tmp59_; #line 508 "/home/jens/Source/shotwell/src/PhotoPage.vala" - gtk_widget_set_size_request (G_TYPE_CHECK_INSTANCE_CAST (_tmp59_, gtk_widget_get_type (), GtkWidget), 120, -1); + _g_object_unref0 (_tmp58_); #line 509 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp60_ = self->priv->zoom_slider; #line 509 "/home/jens/Source/shotwell/src/PhotoPage.vala" - g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp60_, gtk_range_get_type (), GtkRange), "value-changed", (GCallback) _editing_host_page_on_zoom_slider_value_changed_gtk_range_value_changed, self, 0); + gtk_scale_set_draw_value (_tmp60_, FALSE); #line 510 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp61_ = self->priv->zoom_slider; #line 510 "/home/jens/Source/shotwell/src/PhotoPage.vala" - g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp61_, gtk_widget_get_type (), GtkWidget), "button-press-event", (GCallback) _editing_host_page_on_zoom_slider_drag_begin_gtk_widget_button_press_event, self, 0); + gtk_widget_set_size_request (G_TYPE_CHECK_INSTANCE_CAST (_tmp61_, gtk_widget_get_type (), GtkWidget), 120, -1); #line 511 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp62_ = self->priv->zoom_slider; #line 511 "/home/jens/Source/shotwell/src/PhotoPage.vala" - g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp62_, gtk_widget_get_type (), GtkWidget), "button-release-event", (GCallback) _editing_host_page_on_zoom_slider_drag_end_gtk_widget_button_release_event, self, 0); + g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp62_, gtk_range_get_type (), GtkRange), "value-changed", (GCallback) _editing_host_page_on_zoom_slider_value_changed_gtk_range_value_changed, self, 0); #line 512 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp63_ = self->priv->zoom_slider; #line 512 "/home/jens/Source/shotwell/src/PhotoPage.vala" - g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp63_, gtk_widget_get_type (), GtkWidget), "key-press-event", (GCallback) _editing_host_page_on_zoom_slider_key_press_gtk_widget_key_press_event, self, 0); -#line 514 "/home/jens/Source/shotwell/src/PhotoPage.vala" + g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp63_, gtk_widget_get_type (), GtkWidget), "button-press-event", (GCallback) _editing_host_page_on_zoom_slider_drag_begin_gtk_widget_button_press_event, self, 0); +#line 513 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp64_ = self->priv->zoom_slider; +#line 513 "/home/jens/Source/shotwell/src/PhotoPage.vala" + g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp64_, gtk_widget_get_type (), GtkWidget), "button-release-event", (GCallback) _editing_host_page_on_zoom_slider_drag_end_gtk_widget_button_release_event, self, 0); #line 514 "/home/jens/Source/shotwell/src/PhotoPage.vala" - gtk_box_pack_start (zoom_group, G_TYPE_CHECK_INSTANCE_CAST (_tmp64_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0); -#line 516 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp65_ = resources_load_icon (RESOURCES_ICON_ZOOM_IN, RESOURCES_ICON_ZOOM_SCALE); -#line 516 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp66_ = _tmp65_; -#line 516 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp67_ = (GtkImage*) gtk_image_new_from_pixbuf (_tmp66_); + _tmp65_ = self->priv->zoom_slider; +#line 514 "/home/jens/Source/shotwell/src/PhotoPage.vala" + g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp65_, gtk_widget_get_type (), GtkWidget), "key-press-event", (GCallback) _editing_host_page_on_zoom_slider_key_press_gtk_widget_key_press_event, self, 0); #line 516 "/home/jens/Source/shotwell/src/PhotoPage.vala" - g_object_ref_sink (_tmp67_); + _tmp66_ = self->priv->zoom_slider; #line 516 "/home/jens/Source/shotwell/src/PhotoPage.vala" + gtk_box_pack_start (zoom_group, G_TYPE_CHECK_INSTANCE_CAST (_tmp66_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0); +#line 518 "/home/jens/Source/shotwell/src/PhotoPage.vala" + _tmp67_ = resources_load_icon (RESOURCES_ICON_ZOOM_IN, RESOURCES_ICON_ZOOM_SCALE); +#line 518 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp68_ = _tmp67_; -#line 516 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _g_object_unref0 (_tmp66_); -#line 516 "/home/jens/Source/shotwell/src/PhotoPage.vala" - zoom_in = _tmp68_; #line 518 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp69_ = (GtkEventBox*) gtk_event_box_new (); + _tmp69_ = (GtkImage*) gtk_image_new_from_pixbuf (_tmp68_); #line 518 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_object_ref_sink (_tmp69_); #line 518 "/home/jens/Source/shotwell/src/PhotoPage.vala" - zoom_in_box = _tmp69_; -#line 519 "/home/jens/Source/shotwell/src/PhotoPage.vala" - gtk_event_box_set_above_child (zoom_in_box, TRUE); + _tmp70_ = _tmp69_; +#line 518 "/home/jens/Source/shotwell/src/PhotoPage.vala" + _g_object_unref0 (_tmp68_); +#line 518 "/home/jens/Source/shotwell/src/PhotoPage.vala" + zoom_in = _tmp70_; #line 520 "/home/jens/Source/shotwell/src/PhotoPage.vala" - gtk_event_box_set_visible_window (zoom_in_box, FALSE); + _tmp71_ = (GtkEventBox*) gtk_event_box_new (); +#line 520 "/home/jens/Source/shotwell/src/PhotoPage.vala" + g_object_ref_sink (_tmp71_); +#line 520 "/home/jens/Source/shotwell/src/PhotoPage.vala" + zoom_in_box = _tmp71_; #line 521 "/home/jens/Source/shotwell/src/PhotoPage.vala" - gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (zoom_in_box, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (zoom_in, gtk_widget_get_type (), GtkWidget)); + gtk_event_box_set_above_child (zoom_in_box, TRUE); +#line 522 "/home/jens/Source/shotwell/src/PhotoPage.vala" + gtk_event_box_set_visible_window (zoom_in_box, FALSE); #line 523 "/home/jens/Source/shotwell/src/PhotoPage.vala" - g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (zoom_in_box, gtk_widget_get_type (), GtkWidget), "button-press-event", (GCallback) _editing_host_page_on_zoom_in_pressed_gtk_widget_button_press_event, self, 0); + gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (zoom_in_box, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (zoom_in, gtk_widget_get_type (), GtkWidget)); #line 525 "/home/jens/Source/shotwell/src/PhotoPage.vala" - gtk_box_pack_start (zoom_group, G_TYPE_CHECK_INSTANCE_CAST (zoom_in_box, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0); -#line 527 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp70_ = gtk_tool_item_new (); -#line 527 "/home/jens/Source/shotwell/src/PhotoPage.vala" - g_object_ref_sink (_tmp70_); + g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (zoom_in_box, gtk_widget_get_type (), GtkWidget), "button-press-event", (GCallback) _editing_host_page_on_zoom_in_pressed_gtk_widget_button_press_event, self, 0); #line 527 "/home/jens/Source/shotwell/src/PhotoPage.vala" - group_wrapper = _tmp70_; -#line 528 "/home/jens/Source/shotwell/src/PhotoPage.vala" - gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (group_wrapper, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (zoom_group, gtk_widget_get_type (), GtkWidget)); + gtk_box_pack_start (zoom_group, G_TYPE_CHECK_INSTANCE_CAST (zoom_in_box, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0); +#line 529 "/home/jens/Source/shotwell/src/PhotoPage.vala" + _tmp72_ = gtk_tool_item_new (); +#line 529 "/home/jens/Source/shotwell/src/PhotoPage.vala" + g_object_ref_sink (_tmp72_); +#line 529 "/home/jens/Source/shotwell/src/PhotoPage.vala" + group_wrapper = _tmp72_; #line 530 "/home/jens/Source/shotwell/src/PhotoPage.vala" + gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (group_wrapper, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (zoom_group, gtk_widget_get_type (), GtkWidget)); +#line 532 "/home/jens/Source/shotwell/src/PhotoPage.vala" gtk_toolbar_insert (toolbar, group_wrapper, -1); -#line 533 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp71_ = self->priv->prev_button; -#line 533 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp72_ = _ ("Previous photo"); -#line 533 "/home/jens/Source/shotwell/src/PhotoPage.vala" - gtk_tool_item_set_tooltip_text (G_TYPE_CHECK_INSTANCE_CAST (_tmp71_, gtk_tool_item_get_type (), GtkToolItem), _tmp72_); -#line 534 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 535 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp73_ = self->priv->prev_button; -#line 534 "/home/jens/Source/shotwell/src/PhotoPage.vala" - gtk_tool_button_set_icon_name (_tmp73_, "go-previous"); #line 535 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp74_ = self->priv->prev_button; + _tmp74_ = _ ("Previous photo"); #line 535 "/home/jens/Source/shotwell/src/PhotoPage.vala" - g_signal_connect_object (_tmp74_, "clicked", (GCallback) _single_photo_page_on_previous_photo_gtk_tool_button_clicked, G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), 0); + gtk_tool_item_set_tooltip_text (G_TYPE_CHECK_INSTANCE_CAST (_tmp73_, gtk_tool_item_get_type (), GtkToolItem), _tmp74_); #line 536 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp75_ = self->priv->prev_button; #line 536 "/home/jens/Source/shotwell/src/PhotoPage.vala" - gtk_toolbar_insert (toolbar, G_TYPE_CHECK_INSTANCE_CAST (_tmp75_, gtk_tool_item_get_type (), GtkToolItem), -1); -#line 539 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp76_ = self->priv->next_button; -#line 539 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp77_ = _ ("Next photo"); -#line 539 "/home/jens/Source/shotwell/src/PhotoPage.vala" - gtk_tool_item_set_tooltip_text (G_TYPE_CHECK_INSTANCE_CAST (_tmp76_, gtk_tool_item_get_type (), GtkToolItem), _tmp77_); -#line 540 "/home/jens/Source/shotwell/src/PhotoPage.vala" + gtk_tool_button_set_icon_name (_tmp75_, "go-previous"); +#line 537 "/home/jens/Source/shotwell/src/PhotoPage.vala" + _tmp76_ = self->priv->prev_button; +#line 537 "/home/jens/Source/shotwell/src/PhotoPage.vala" + g_signal_connect_object (_tmp76_, "clicked", (GCallback) _single_photo_page_on_previous_photo_gtk_tool_button_clicked, G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), 0); +#line 538 "/home/jens/Source/shotwell/src/PhotoPage.vala" + _tmp77_ = self->priv->prev_button; +#line 538 "/home/jens/Source/shotwell/src/PhotoPage.vala" + gtk_toolbar_insert (toolbar, G_TYPE_CHECK_INSTANCE_CAST (_tmp77_, gtk_tool_item_get_type (), GtkToolItem), -1); +#line 541 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp78_ = self->priv->next_button; -#line 540 "/home/jens/Source/shotwell/src/PhotoPage.vala" - gtk_tool_button_set_icon_name (_tmp78_, "go-next"); #line 541 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp79_ = self->priv->next_button; + _tmp79_ = _ ("Next photo"); #line 541 "/home/jens/Source/shotwell/src/PhotoPage.vala" - g_signal_connect_object (_tmp79_, "clicked", (GCallback) _single_photo_page_on_next_photo_gtk_tool_button_clicked, G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), 0); + gtk_tool_item_set_tooltip_text (G_TYPE_CHECK_INSTANCE_CAST (_tmp78_, gtk_tool_item_get_type (), GtkToolItem), _tmp79_); #line 542 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp80_ = self->priv->next_button; #line 542 "/home/jens/Source/shotwell/src/PhotoPage.vala" - gtk_toolbar_insert (toolbar, G_TYPE_CHECK_INSTANCE_CAST (_tmp80_, gtk_tool_item_get_type (), GtkToolItem), -1); + gtk_tool_button_set_icon_name (_tmp80_, "go-next"); +#line 543 "/home/jens/Source/shotwell/src/PhotoPage.vala" + _tmp81_ = self->priv->next_button; +#line 543 "/home/jens/Source/shotwell/src/PhotoPage.vala" + g_signal_connect_object (_tmp81_, "clicked", (GCallback) _single_photo_page_on_next_photo_gtk_tool_button_clicked, G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), 0); +#line 544 "/home/jens/Source/shotwell/src/PhotoPage.vala" + _tmp82_ = self->priv->next_button; +#line 544 "/home/jens/Source/shotwell/src/PhotoPage.vala" + gtk_toolbar_insert (toolbar, G_TYPE_CHECK_INSTANCE_CAST (_tmp82_, gtk_tool_item_get_type (), GtkToolItem), -1); #line 417 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (group_wrapper); #line 417 "/home/jens/Source/shotwell/src/PhotoPage.vala" @@ -5086,7 +4987,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 5086 "PhotoPage.c" +#line 4987 "PhotoPage.c" } @@ -5096,63 +4997,63 @@ static void editing_host_page_on_zoom_slider_value_changed (EditingHostPage* sel GtkScale* _tmp1_ = NULL; gdouble _tmp2_ = 0.0; gboolean _tmp3_ = FALSE; -#line 552 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 554 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_if_fail (IS_EDITING_HOST_PAGE (self)); -#line 553 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 555 "/home/jens/Source/shotwell/src/PhotoPage.vala" single_photo_page_get_zoom_state (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), &_tmp0_); -#line 553 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 555 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp1_ = self->priv->zoom_slider; -#line 553 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 555 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp2_ = gtk_range_get_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_range_get_type (), GtkRange)); -#line 553 "/home/jens/Source/shotwell/src/PhotoPage.vala" - zoom_state_init_rescale (&new_zoom_state, &_tmp0_, _tmp2_); #line 555 "/home/jens/Source/shotwell/src/PhotoPage.vala" + zoom_state_init_rescale (&new_zoom_state, &_tmp0_, _tmp2_); +#line 557 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp3_ = self->priv->enable_interactive_zoom_refresh; -#line 555 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 557 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp3_) { -#line 5110 "PhotoPage.c" +#line 5011 "PhotoPage.c" ZoomState _tmp4_ = {0}; gboolean _tmp5_ = FALSE; -#line 556 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 558 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp4_ = new_zoom_state; -#line 556 "/home/jens/Source/shotwell/src/PhotoPage.vala" - single_photo_page_on_interactive_zoom (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), &_tmp4_); #line 558 "/home/jens/Source/shotwell/src/PhotoPage.vala" + single_photo_page_on_interactive_zoom (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), &_tmp4_); +#line 560 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp5_ = zoom_state_is_default (&new_zoom_state); -#line 558 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 560 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp5_) { -#line 5121 "PhotoPage.c" +#line 5022 "PhotoPage.c" ZoomState _tmp6_ = {0}; -#line 559 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 561 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp6_ = new_zoom_state; -#line 559 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#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 5127 "PhotoPage.c" +#line 5028 "PhotoPage.c" } } else { gboolean _tmp7_ = FALSE; -#line 561 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 563 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp7_ = zoom_state_is_default (&new_zoom_state); -#line 561 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 563 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp7_) { -#line 562 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#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 5137 "PhotoPage.c" +#line 5038 "PhotoPage.c" } else { ZoomState _tmp8_ = {0}; -#line 564 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 566 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp8_ = new_zoom_state; -#line 564 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#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 5144 "PhotoPage.c" +#line 5045 "PhotoPage.c" } -#line 566 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#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 5148 "PhotoPage.c" +#line 5049 "PhotoPage.c" } -#line 569 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 571 "/home/jens/Source/shotwell/src/PhotoPage.vala" editing_host_page_update_cursor_for_zoom_context (self); -#line 5152 "PhotoPage.c" +#line 5053 "PhotoPage.c" } @@ -5161,40 +5062,40 @@ static gboolean editing_host_page_on_zoom_slider_drag_begin (EditingHostPage* se GtkWindow* _tmp0_ = NULL; GtkWindow* _tmp1_ = NULL; gboolean _tmp2_ = FALSE; -#line 572 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 574 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_val_if_fail (IS_EDITING_HOST_PAGE (self), FALSE); -#line 572 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 574 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_val_if_fail (event != NULL, FALSE); -#line 573 "/home/jens/Source/shotwell/src/PhotoPage.vala" - self->priv->enable_interactive_zoom_refresh = TRUE; #line 575 "/home/jens/Source/shotwell/src/PhotoPage.vala" + self->priv->enable_interactive_zoom_refresh = TRUE; +#line 577 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp0_ = page_get_container (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); -#line 575 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 577 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp1_ = _tmp0_; -#line 575 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 577 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp2_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp1_, TYPE_FULLSCREEN_WINDOW); -#line 575 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 577 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (_tmp1_); -#line 575 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 577 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp2_) { -#line 5177 "PhotoPage.c" +#line 5078 "PhotoPage.c" GtkWindow* _tmp3_ = NULL; FullscreenWindow* _tmp4_ = NULL; -#line 576 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 578 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp3_ = page_get_container (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); -#line 576 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 578 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp4_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_FULLSCREEN_WINDOW, FullscreenWindow); -#line 576 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 578 "/home/jens/Source/shotwell/src/PhotoPage.vala" fullscreen_window_disable_toolbar_dismissal (_tmp4_); -#line 576 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 578 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (_tmp4_); -#line 5188 "PhotoPage.c" +#line 5089 "PhotoPage.c" } -#line 578 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 580 "/home/jens/Source/shotwell/src/PhotoPage.vala" result = FALSE; -#line 578 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 580 "/home/jens/Source/shotwell/src/PhotoPage.vala" return result; -#line 5194 "PhotoPage.c" +#line 5095 "PhotoPage.c" } @@ -5208,86 +5109,86 @@ static gboolean editing_host_page_on_zoom_slider_drag_end (EditingHostPage* self GtkScale* _tmp6_ = NULL; gdouble _tmp7_ = 0.0; ZoomState _tmp8_ = {0}; -#line 581 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 583 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_val_if_fail (IS_EDITING_HOST_PAGE (self), FALSE); -#line 581 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 583 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_val_if_fail (event != NULL, FALSE); -#line 582 "/home/jens/Source/shotwell/src/PhotoPage.vala" - self->priv->enable_interactive_zoom_refresh = FALSE; #line 584 "/home/jens/Source/shotwell/src/PhotoPage.vala" + self->priv->enable_interactive_zoom_refresh = FALSE; +#line 586 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp0_ = page_get_container (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); -#line 584 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 586 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp1_ = _tmp0_; -#line 584 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 586 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp2_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp1_, TYPE_FULLSCREEN_WINDOW); -#line 584 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 586 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (_tmp1_); -#line 584 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 586 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp2_) { -#line 5224 "PhotoPage.c" +#line 5125 "PhotoPage.c" GtkWindow* _tmp3_ = NULL; FullscreenWindow* _tmp4_ = NULL; -#line 585 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 587 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp3_ = page_get_container (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); -#line 585 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 587 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp4_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_FULLSCREEN_WINDOW, FullscreenWindow); -#line 585 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 587 "/home/jens/Source/shotwell/src/PhotoPage.vala" fullscreen_window_update_toolbar_dismissal (_tmp4_); -#line 585 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 587 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (_tmp4_); -#line 5235 "PhotoPage.c" +#line 5136 "PhotoPage.c" } -#line 587 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#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_); -#line 587 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 589 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp6_ = self->priv->zoom_slider; -#line 587 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 589 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp7_ = gtk_range_get_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, gtk_range_get_type (), GtkRange)); -#line 587 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 589 "/home/jens/Source/shotwell/src/PhotoPage.vala" zoom_state_init_rescale (&zoom_state, &_tmp5_, _tmp7_); -#line 588 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 590 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp8_ = zoom_state; -#line 588 "/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 590 "/home/jens/Source/shotwell/src/PhotoPage.vala" - single_photo_page_repaint (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), NULL); + single_photo_page_set_zoom_state (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), &_tmp8_); #line 592 "/home/jens/Source/shotwell/src/PhotoPage.vala" + single_photo_page_repaint (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), NULL); +#line 594 "/home/jens/Source/shotwell/src/PhotoPage.vala" result = FALSE; -#line 592 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 594 "/home/jens/Source/shotwell/src/PhotoPage.vala" return result; -#line 5255 "PhotoPage.c" +#line 5156 "PhotoPage.c" } static gboolean editing_host_page_on_zoom_out_pressed (EditingHostPage* self, GdkEventButton* event) { gboolean result = FALSE; -#line 595 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 597 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_val_if_fail (IS_EDITING_HOST_PAGE (self), FALSE); -#line 595 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 597 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_val_if_fail (event != NULL, FALSE); -#line 596 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 598 "/home/jens/Source/shotwell/src/PhotoPage.vala" editing_host_page_snap_zoom_to_min (self); -#line 597 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 599 "/home/jens/Source/shotwell/src/PhotoPage.vala" result = TRUE; -#line 597 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 599 "/home/jens/Source/shotwell/src/PhotoPage.vala" return result; -#line 5271 "PhotoPage.c" +#line 5172 "PhotoPage.c" } static gboolean editing_host_page_on_zoom_in_pressed (EditingHostPage* self, GdkEventButton* event) { gboolean result = FALSE; -#line 600 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 602 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_val_if_fail (IS_EDITING_HOST_PAGE (self), FALSE); -#line 600 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 602 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_val_if_fail (event != NULL, FALSE); -#line 601 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 603 "/home/jens/Source/shotwell/src/PhotoPage.vala" editing_host_page_snap_zoom_to_max (self); -#line 602 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 604 "/home/jens/Source/shotwell/src/PhotoPage.vala" result = TRUE; -#line 602 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 604 "/home/jens/Source/shotwell/src/PhotoPage.vala" return result; -#line 5287 "PhotoPage.c" +#line 5188 "PhotoPage.c" } @@ -5321,85 +5222,85 @@ static void editing_host_page_get_cursor_wrt_viewport (EditingHostPage* self, Gd GdkRectangle _tmp23_ = {0}; gint _tmp24_ = 0; gint _tmp25_ = 0; -#line 605 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 607 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_if_fail (IS_EDITING_HOST_PAGE (self)); -#line 605 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 607 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_if_fail (event != NULL); -#line 606 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 608 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp0_.x = 0; -#line 606 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 608 "/home/jens/Source/shotwell/src/PhotoPage.vala" cursor_wrt_canvas = _tmp0_; -#line 607 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 609 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp1_ = event; -#line 607 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 609 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp2_ = _tmp1_->x; -#line 607 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 609 "/home/jens/Source/shotwell/src/PhotoPage.vala" cursor_wrt_canvas.x = (gint) _tmp2_; -#line 608 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 610 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp3_ = event; -#line 608 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 610 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp4_ = _tmp3_->y; -#line 608 "/home/jens/Source/shotwell/src/PhotoPage.vala" - cursor_wrt_canvas.y = (gint) _tmp4_; #line 610 "/home/jens/Source/shotwell/src/PhotoPage.vala" + cursor_wrt_canvas.y = (gint) _tmp4_; +#line 612 "/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 610 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 612 "/home/jens/Source/shotwell/src/PhotoPage.vala" zoom_state_get_viewing_rectangle_wrt_screen (&_tmp5_, &_tmp6_); -#line 610 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 612 "/home/jens/Source/shotwell/src/PhotoPage.vala" viewport_wrt_canvas = _tmp6_; -#line 611 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 613 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp7_.x = 0; -#line 611 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 613 "/home/jens/Source/shotwell/src/PhotoPage.vala" _result_ = _tmp7_; -#line 612 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 614 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp8_ = cursor_wrt_canvas; -#line 612 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 614 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp9_ = _tmp8_.x; -#line 612 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 614 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp10_ = viewport_wrt_canvas; -#line 612 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 614 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp11_ = _tmp10_.x; -#line 612 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 614 "/home/jens/Source/shotwell/src/PhotoPage.vala" _result_.x = _tmp9_ - _tmp11_; -#line 613 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 615 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp12_ = _result_; -#line 613 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 615 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp13_ = _tmp12_.x; -#line 613 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 615 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp14_ = viewport_wrt_canvas; -#line 613 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 615 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp15_ = _tmp14_.width; -#line 613 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 615 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp16_ = CLAMP (_tmp13_, 0, _tmp15_); -#line 613 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 615 "/home/jens/Source/shotwell/src/PhotoPage.vala" _result_.x = _tmp16_; -#line 614 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 616 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp17_ = cursor_wrt_canvas; -#line 614 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 616 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp18_ = _tmp17_.y; -#line 614 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 616 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp19_ = viewport_wrt_canvas; -#line 614 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 616 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp20_ = _tmp19_.y; -#line 614 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 616 "/home/jens/Source/shotwell/src/PhotoPage.vala" _result_.y = _tmp18_ - _tmp20_; -#line 615 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 617 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp21_ = _result_; -#line 615 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 617 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp22_ = _tmp21_.y; -#line 615 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 617 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp23_ = viewport_wrt_canvas; -#line 615 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 617 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp24_ = _tmp23_.height; -#line 615 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 617 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp25_ = CLAMP (_tmp22_, 0, _tmp24_); -#line 615 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _result_.y = _tmp25_; #line 617 "/home/jens/Source/shotwell/src/PhotoPage.vala" + _result_.y = _tmp25_; +#line 619 "/home/jens/Source/shotwell/src/PhotoPage.vala" *result = _result_; -#line 617 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 619 "/home/jens/Source/shotwell/src/PhotoPage.vala" return; -#line 5399 "PhotoPage.c" +#line 5300 "PhotoPage.c" } @@ -5419,49 +5320,49 @@ static void editing_host_page_get_cursor_wrt_viewport_center (EditingHostPage* s GdkPoint _tmp9_ = {0}; GdkPoint _tmp10_ = {0}; GdkPoint _tmp11_ = {0}; -#line 620 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 622 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_if_fail (IS_EDITING_HOST_PAGE (self)); -#line 620 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 622 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_if_fail (event != NULL); -#line 621 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 623 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp0_ = event; -#line 621 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 623 "/home/jens/Source/shotwell/src/PhotoPage.vala" editing_host_page_get_cursor_wrt_viewport (self, _tmp0_, &_tmp1_); -#line 621 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 623 "/home/jens/Source/shotwell/src/PhotoPage.vala" cursor_wrt_viewport = _tmp1_; -#line 622 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 624 "/home/jens/Source/shotwell/src/PhotoPage.vala" single_photo_page_get_zoom_state (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), &_tmp2_); -#line 622 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 624 "/home/jens/Source/shotwell/src/PhotoPage.vala" zoom_state_get_viewing_rectangle_wrt_screen (&_tmp2_, &_tmp3_); -#line 622 "/home/jens/Source/shotwell/src/PhotoPage.vala" - viewport_wrt_canvas = _tmp3_; #line 624 "/home/jens/Source/shotwell/src/PhotoPage.vala" + viewport_wrt_canvas = _tmp3_; +#line 626 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp4_.x = 0; -#line 624 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 626 "/home/jens/Source/shotwell/src/PhotoPage.vala" viewport_center = _tmp4_; -#line 625 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 627 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp5_ = viewport_wrt_canvas; -#line 625 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 627 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp6_ = _tmp5_.width; -#line 625 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 627 "/home/jens/Source/shotwell/src/PhotoPage.vala" viewport_center.x = _tmp6_ / 2; -#line 626 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 628 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp7_ = viewport_wrt_canvas; -#line 626 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 628 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp8_ = _tmp7_.height; -#line 626 "/home/jens/Source/shotwell/src/PhotoPage.vala" - viewport_center.y = _tmp8_ / 2; #line 628 "/home/jens/Source/shotwell/src/PhotoPage.vala" + viewport_center.y = _tmp8_ / 2; +#line 630 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp9_ = cursor_wrt_viewport; -#line 628 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 630 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp10_ = viewport_center; -#line 628 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 630 "/home/jens/Source/shotwell/src/PhotoPage.vala" subtract_points (&_tmp9_, &_tmp10_, &_tmp11_); -#line 628 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 630 "/home/jens/Source/shotwell/src/PhotoPage.vala" *result = _tmp11_; -#line 628 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 630 "/home/jens/Source/shotwell/src/PhotoPage.vala" return; -#line 5461 "PhotoPage.c" +#line 5362 "PhotoPage.c" } @@ -5481,45 +5382,45 @@ static void editing_host_page_get_iso_pixel_under_cursor (EditingHostPage* self, GdkPoint _tmp10_ = {0}; GdkPoint _tmp11_ = {0}; GdkPoint _tmp12_ = {0}; -#line 631 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 633 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_if_fail (IS_EDITING_HOST_PAGE (self)); -#line 631 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 633 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_if_fail (event != NULL); -#line 632 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 634 "/home/jens/Source/shotwell/src/PhotoPage.vala" single_photo_page_get_zoom_state (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), &_tmp0_); -#line 632 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 634 "/home/jens/Source/shotwell/src/PhotoPage.vala" zoom_state_get_viewport_center (&_tmp0_, &_tmp1_); -#line 632 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 634 "/home/jens/Source/shotwell/src/PhotoPage.vala" single_photo_page_get_zoom_state (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), &_tmp2_); -#line 632 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 634 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp3_ = zoom_state_get_zoom_factor (&_tmp2_); -#line 632 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 634 "/home/jens/Source/shotwell/src/PhotoPage.vala" scale_point (&_tmp1_, 1.0 / _tmp3_, &_tmp4_); -#line 632 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 634 "/home/jens/Source/shotwell/src/PhotoPage.vala" viewport_center_iso = _tmp4_; -#line 635 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 637 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp5_ = event; -#line 635 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 637 "/home/jens/Source/shotwell/src/PhotoPage.vala" editing_host_page_get_cursor_wrt_viewport_center (self, _tmp5_, &_tmp6_); -#line 635 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 637 "/home/jens/Source/shotwell/src/PhotoPage.vala" single_photo_page_get_zoom_state (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), &_tmp7_); -#line 635 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 637 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp8_ = zoom_state_get_zoom_factor (&_tmp7_); -#line 635 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 637 "/home/jens/Source/shotwell/src/PhotoPage.vala" scale_point (&_tmp6_, 1.0 / _tmp8_, &_tmp9_); -#line 635 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 637 "/home/jens/Source/shotwell/src/PhotoPage.vala" cursor_wrt_center_iso = _tmp9_; -#line 638 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 640 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp10_ = viewport_center_iso; -#line 638 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 640 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp11_ = cursor_wrt_center_iso; -#line 638 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 640 "/home/jens/Source/shotwell/src/PhotoPage.vala" add_points (&_tmp10_, &_tmp11_, &_tmp12_); -#line 638 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 640 "/home/jens/Source/shotwell/src/PhotoPage.vala" *result = _tmp12_; -#line 638 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 640 "/home/jens/Source/shotwell/src/PhotoPage.vala" return; -#line 5519 "PhotoPage.c" +#line 5420 "PhotoPage.c" } @@ -5527,33 +5428,33 @@ static gdouble editing_host_page_snap_interpolation_factor (EditingHostPage* sel gdouble result = 0.0; gdouble _tmp0_ = 0.0; gdouble _tmp2_ = 0.0; -#line 641 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 643 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_val_if_fail (IS_EDITING_HOST_PAGE (self), 0.0); -#line 642 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 644 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp0_ = interp; -#line 642 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 644 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp0_ < 0.03) { -#line 643 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 645 "/home/jens/Source/shotwell/src/PhotoPage.vala" interp = 0.0; -#line 5535 "PhotoPage.c" +#line 5436 "PhotoPage.c" } else { gdouble _tmp1_ = 0.0; -#line 644 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 646 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp1_ = interp; -#line 644 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 646 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp1_ > 0.97) { -#line 645 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 647 "/home/jens/Source/shotwell/src/PhotoPage.vala" interp = 1.0; -#line 5544 "PhotoPage.c" +#line 5445 "PhotoPage.c" } } -#line 647 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 649 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp2_ = interp; -#line 647 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 649 "/home/jens/Source/shotwell/src/PhotoPage.vala" result = _tmp2_; -#line 647 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 649 "/home/jens/Source/shotwell/src/PhotoPage.vala" return result; -#line 5553 "PhotoPage.c" +#line 5454 "PhotoPage.c" } @@ -5563,21 +5464,21 @@ static gdouble editing_host_page_adjust_interpolation_factor (EditingHostPage* s gdouble _tmp1_ = 0.0; gdouble _tmp2_ = 0.0; gdouble _tmp3_ = 0.0; -#line 650 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 652 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_val_if_fail (IS_EDITING_HOST_PAGE (self), 0.0); -#line 651 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 653 "/home/jens/Source/shotwell/src/PhotoPage.vala" single_photo_page_get_zoom_state (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), &_tmp0_); -#line 651 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 653 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp1_ = zoom_state_get_interpolation_factor (&_tmp0_); -#line 651 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 653 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp2_ = adjustment; -#line 651 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 653 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp3_ = editing_host_page_snap_interpolation_factor (self, _tmp1_ + _tmp2_); -#line 651 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 653 "/home/jens/Source/shotwell/src/PhotoPage.vala" result = _tmp3_; -#line 651 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 653 "/home/jens/Source/shotwell/src/PhotoPage.vala" return result; -#line 5577 "PhotoPage.c" +#line 5478 "PhotoPage.c" } @@ -5612,127 +5513,127 @@ static void editing_host_page_zoom_about_event_cursor_point (EditingHostPage* se ZoomState _tmp21_ = {0}; GdkPoint _tmp22_ = {0}; ZoomState _tmp23_ = {0}; -#line 654 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 656 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_if_fail (IS_EDITING_HOST_PAGE (self)); -#line 654 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 656 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_if_fail (event != NULL); -#line 655 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 657 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp0_ = self->priv->photo_missing; -#line 655 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 657 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp0_) { -#line 656 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 658 "/home/jens/Source/shotwell/src/PhotoPage.vala" return; -#line 5622 "PhotoPage.c" +#line 5523 "PhotoPage.c" } -#line 658 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 660 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp1_ = event; -#line 658 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 660 "/home/jens/Source/shotwell/src/PhotoPage.vala" editing_host_page_get_cursor_wrt_viewport_center (self, _tmp1_, &_tmp2_); -#line 658 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 660 "/home/jens/Source/shotwell/src/PhotoPage.vala" cursor_wrt_viewport_center = _tmp2_; -#line 659 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 661 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp3_ = event; -#line 659 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 661 "/home/jens/Source/shotwell/src/PhotoPage.vala" editing_host_page_get_iso_pixel_under_cursor (self, _tmp3_, &_tmp4_); -#line 659 "/home/jens/Source/shotwell/src/PhotoPage.vala" - iso_pixel_under_cursor = _tmp4_; #line 661 "/home/jens/Source/shotwell/src/PhotoPage.vala" + iso_pixel_under_cursor = _tmp4_; +#line 663 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp5_ = zoom_increment; -#line 661 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 663 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp6_ = editing_host_page_adjust_interpolation_factor (self, _tmp5_); -#line 661 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 663 "/home/jens/Source/shotwell/src/PhotoPage.vala" interp = _tmp6_; -#line 662 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 664 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp7_ = self->priv->zoom_slider; -#line 662 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 664 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_signal_parse_name ("value-changed", gtk_range_get_type (), &_tmp8_, NULL, FALSE); -#line 662 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 664 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, gtk_range_get_type (), GtkRange), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp8_, 0, NULL, (GCallback) _editing_host_page_on_zoom_slider_value_changed_gtk_range_value_changed, self); -#line 663 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 665 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp9_ = self->priv->zoom_slider; -#line 663 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 665 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp10_ = interp; -#line 663 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 665 "/home/jens/Source/shotwell/src/PhotoPage.vala" gtk_range_set_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, gtk_range_get_type (), GtkRange), _tmp10_); -#line 664 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 666 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp11_ = self->priv->zoom_slider; -#line 664 "/home/jens/Source/shotwell/src/PhotoPage.vala" - g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, gtk_range_get_type (), GtkRange), "value-changed", (GCallback) _editing_host_page_on_zoom_slider_value_changed_gtk_range_value_changed, self, 0); #line 666 "/home/jens/Source/shotwell/src/PhotoPage.vala" + g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, gtk_range_get_type (), GtkRange), "value-changed", (GCallback) _editing_host_page_on_zoom_slider_value_changed_gtk_range_value_changed, self, 0); +#line 668 "/home/jens/Source/shotwell/src/PhotoPage.vala" single_photo_page_get_zoom_state (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), &_tmp12_); -#line 666 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 668 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp13_ = interp; -#line 666 "/home/jens/Source/shotwell/src/PhotoPage.vala" - zoom_state_init_rescale (&new_zoom_state, &_tmp12_, _tmp13_); #line 668 "/home/jens/Source/shotwell/src/PhotoPage.vala" + zoom_state_init_rescale (&new_zoom_state, &_tmp12_, _tmp13_); +#line 670 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp14_ = zoom_state_is_min (&new_zoom_state); -#line 668 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 670 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp14_) { -#line 669 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 671 "/home/jens/Source/shotwell/src/PhotoPage.vala" single_photo_page_cancel_zoom (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage)); -#line 670 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 672 "/home/jens/Source/shotwell/src/PhotoPage.vala" editing_host_page_update_cursor_for_zoom_context (self); -#line 671 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 673 "/home/jens/Source/shotwell/src/PhotoPage.vala" single_photo_page_repaint (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), NULL); -#line 672 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 674 "/home/jens/Source/shotwell/src/PhotoPage.vala" return; -#line 5676 "PhotoPage.c" +#line 5577 "PhotoPage.c" } -#line 675 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 677 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp15_ = iso_pixel_under_cursor; -#line 675 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 677 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp16_ = zoom_state_get_zoom_factor (&new_zoom_state); -#line 675 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 677 "/home/jens/Source/shotwell/src/PhotoPage.vala" scale_point (&_tmp15_, _tmp16_, &_tmp17_); -#line 675 "/home/jens/Source/shotwell/src/PhotoPage.vala" - new_zoomed_old_cursor = _tmp17_; #line 677 "/home/jens/Source/shotwell/src/PhotoPage.vala" + new_zoomed_old_cursor = _tmp17_; +#line 679 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp18_ = new_zoomed_old_cursor; -#line 677 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 679 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp19_ = cursor_wrt_viewport_center; -#line 677 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 679 "/home/jens/Source/shotwell/src/PhotoPage.vala" subtract_points (&_tmp18_, &_tmp19_, &_tmp20_); -#line 677 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 679 "/home/jens/Source/shotwell/src/PhotoPage.vala" desired_new_viewport_center = _tmp20_; -#line 680 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 682 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp21_ = new_zoom_state; -#line 680 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 682 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp22_ = desired_new_viewport_center; -#line 680 "/home/jens/Source/shotwell/src/PhotoPage.vala" - zoom_state_init_pan (&new_zoom_state, &_tmp21_, &_tmp22_); #line 682 "/home/jens/Source/shotwell/src/PhotoPage.vala" + zoom_state_init_pan (&new_zoom_state, &_tmp21_, &_tmp22_); +#line 684 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp23_ = new_zoom_state; -#line 682 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 684 "/home/jens/Source/shotwell/src/PhotoPage.vala" single_photo_page_set_zoom_state (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), &_tmp23_); -#line 683 "/home/jens/Source/shotwell/src/PhotoPage.vala" - single_photo_page_repaint (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), NULL); #line 685 "/home/jens/Source/shotwell/src/PhotoPage.vala" + 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 5708 "PhotoPage.c" +#line 5609 "PhotoPage.c" } void editing_host_page_snap_zoom_to_min (EditingHostPage* self) { GtkScale* _tmp0_ = NULL; -#line 688 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 690 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_if_fail (IS_EDITING_HOST_PAGE (self)); -#line 689 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 691 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp0_ = self->priv->zoom_slider; -#line 689 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#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 5720 "PhotoPage.c" +#line 5621 "PhotoPage.c" } void editing_host_page_snap_zoom_to_max (EditingHostPage* self) { GtkScale* _tmp0_ = NULL; -#line 692 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 694 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_if_fail (IS_EDITING_HOST_PAGE (self)); -#line 693 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 695 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp0_ = self->priv->zoom_slider; -#line 693 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#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 5732 "PhotoPage.c" +#line 5633 "PhotoPage.c" } @@ -5741,19 +5642,19 @@ void editing_host_page_snap_zoom_to_isomorphic (EditingHostPage* self) { ZoomState _tmp0_ = {0}; GtkScale* _tmp1_ = NULL; gdouble _tmp2_ = 0.0; -#line 696 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 698 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_if_fail (IS_EDITING_HOST_PAGE (self)); -#line 697 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 699 "/home/jens/Source/shotwell/src/PhotoPage.vala" single_photo_page_get_zoom_state (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), &_tmp0_); -#line 697 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 699 "/home/jens/Source/shotwell/src/PhotoPage.vala" zoom_state_init_rescale_to_isomorphic (&iso_state, &_tmp0_); -#line 698 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 700 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp1_ = self->priv->zoom_slider; -#line 698 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 700 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp2_ = zoom_state_get_interpolation_factor (&iso_state); -#line 698 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#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 5753 "PhotoPage.c" +#line 5654 "PhotoPage.c" } @@ -5764,154 +5665,154 @@ static gboolean editing_host_page_real_on_zoom_slider_key_press (EditingHostPage const gchar* _tmp2_ = NULL; const gchar* _tmp3_ = NULL; GQuark _tmp5_ = 0U; -#line 702 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 704 "/home/jens/Source/shotwell/src/PhotoPage.vala" static GQuark _tmp4_label0 = 0; -#line 702 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 704 "/home/jens/Source/shotwell/src/PhotoPage.vala" static GQuark _tmp4_label1 = 0; -#line 702 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 704 "/home/jens/Source/shotwell/src/PhotoPage.vala" static GQuark _tmp4_label2 = 0; -#line 702 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 704 "/home/jens/Source/shotwell/src/PhotoPage.vala" static GQuark _tmp4_label3 = 0; -#line 702 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 704 "/home/jens/Source/shotwell/src/PhotoPage.vala" static GQuark _tmp4_label4 = 0; -#line 702 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 704 "/home/jens/Source/shotwell/src/PhotoPage.vala" static GQuark _tmp4_label5 = 0; -#line 702 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 704 "/home/jens/Source/shotwell/src/PhotoPage.vala" static GQuark _tmp4_label6 = 0; -#line 702 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 704 "/home/jens/Source/shotwell/src/PhotoPage.vala" static GQuark _tmp4_label7 = 0; -#line 701 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 703 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_val_if_fail (event != NULL, FALSE); -#line 702 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 704 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp0_ = event; -#line 702 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 704 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp1_ = _tmp0_->keyval; -#line 702 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 704 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp2_ = gdk_keyval_name (_tmp1_); -#line 702 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 704 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp3_ = _tmp2_; -#line 702 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 704 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp5_ = (NULL == _tmp3_) ? 0 : g_quark_from_string (_tmp3_); -#line 702 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 704 "/home/jens/Source/shotwell/src/PhotoPage.vala" 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 702 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 704 "/home/jens/Source/shotwell/src/PhotoPage.vala" switch (0) { -#line 5796 "PhotoPage.c" +#line 5697 "PhotoPage.c" default: { -#line 706 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 708 "/home/jens/Source/shotwell/src/PhotoPage.vala" page_activate_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "IncreaseSize"); -#line 707 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 709 "/home/jens/Source/shotwell/src/PhotoPage.vala" result = TRUE; -#line 707 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 709 "/home/jens/Source/shotwell/src/PhotoPage.vala" return result; -#line 5805 "PhotoPage.c" +#line 5706 "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 702 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 704 "/home/jens/Source/shotwell/src/PhotoPage.vala" switch (0) { -#line 5811 "PhotoPage.c" +#line 5712 "PhotoPage.c" default: { -#line 712 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 714 "/home/jens/Source/shotwell/src/PhotoPage.vala" page_activate_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "DecreaseSize"); -#line 713 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 715 "/home/jens/Source/shotwell/src/PhotoPage.vala" result = TRUE; -#line 713 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 715 "/home/jens/Source/shotwell/src/PhotoPage.vala" return result; -#line 5820 "PhotoPage.c" +#line 5721 "PhotoPage.c" } } } else if (_tmp5_ == ((0 != _tmp4_label6) ? _tmp4_label6 : (_tmp4_label6 = g_quark_from_static_string ("KP_Divide")))) { -#line 702 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 704 "/home/jens/Source/shotwell/src/PhotoPage.vala" switch (0) { -#line 5826 "PhotoPage.c" +#line 5727 "PhotoPage.c" default: { -#line 716 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 718 "/home/jens/Source/shotwell/src/PhotoPage.vala" page_activate_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Zoom100"); -#line 717 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 719 "/home/jens/Source/shotwell/src/PhotoPage.vala" result = TRUE; -#line 717 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 719 "/home/jens/Source/shotwell/src/PhotoPage.vala" return result; -#line 5835 "PhotoPage.c" +#line 5736 "PhotoPage.c" } } } else if (_tmp5_ == ((0 != _tmp4_label7) ? _tmp4_label7 : (_tmp4_label7 = g_quark_from_static_string ("KP_Multiply")))) { -#line 702 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 704 "/home/jens/Source/shotwell/src/PhotoPage.vala" switch (0) { -#line 5841 "PhotoPage.c" +#line 5742 "PhotoPage.c" default: { -#line 720 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 722 "/home/jens/Source/shotwell/src/PhotoPage.vala" page_activate_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "ZoomFit"); -#line 721 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 723 "/home/jens/Source/shotwell/src/PhotoPage.vala" result = TRUE; -#line 721 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 723 "/home/jens/Source/shotwell/src/PhotoPage.vala" return result; -#line 5850 "PhotoPage.c" +#line 5751 "PhotoPage.c" } } } -#line 724 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 726 "/home/jens/Source/shotwell/src/PhotoPage.vala" result = FALSE; -#line 724 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 726 "/home/jens/Source/shotwell/src/PhotoPage.vala" return result; -#line 5858 "PhotoPage.c" +#line 5759 "PhotoPage.c" } gboolean editing_host_page_on_zoom_slider_key_press (EditingHostPage* self, GdkEventKey* event) { -#line 701 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 703 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_val_if_fail (IS_EDITING_HOST_PAGE (self), FALSE); -#line 701 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 703 "/home/jens/Source/shotwell/src/PhotoPage.vala" return EDITING_HOST_PAGE_GET_CLASS (self)->on_zoom_slider_key_press (self, event); -#line 5867 "PhotoPage.c" +#line 5768 "PhotoPage.c" } static void editing_host_page_real_on_increase_size (EditingHostPage* self) { GtkScale* _tmp0_ = NULL; gdouble _tmp1_ = 0.0; -#line 728 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 730 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp0_ = self->priv->zoom_slider; -#line 728 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 730 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp1_ = editing_host_page_adjust_interpolation_factor (self, EDITING_HOST_PAGE_ZOOM_INCREMENT_SIZE); -#line 728 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#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 5880 "PhotoPage.c" +#line 5781 "PhotoPage.c" } void editing_host_page_on_increase_size (EditingHostPage* self) { -#line 727 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 729 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_if_fail (IS_EDITING_HOST_PAGE (self)); -#line 727 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 729 "/home/jens/Source/shotwell/src/PhotoPage.vala" EDITING_HOST_PAGE_GET_CLASS (self)->on_increase_size (self); -#line 5889 "PhotoPage.c" +#line 5790 "PhotoPage.c" } static void editing_host_page_real_on_decrease_size (EditingHostPage* self) { GtkScale* _tmp0_ = NULL; gdouble _tmp1_ = 0.0; -#line 732 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 734 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp0_ = self->priv->zoom_slider; -#line 732 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 734 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp1_ = editing_host_page_adjust_interpolation_factor (self, -EDITING_HOST_PAGE_ZOOM_INCREMENT_SIZE); -#line 732 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#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 5902 "PhotoPage.c" +#line 5803 "PhotoPage.c" } void editing_host_page_on_decrease_size (EditingHostPage* self) { -#line 731 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 733 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_if_fail (IS_EDITING_HOST_PAGE (self)); -#line 731 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 733 "/home/jens/Source/shotwell/src/PhotoPage.vala" EDITING_HOST_PAGE_GET_CLASS (self)->on_decrease_size (self); -#line 5911 "PhotoPage.c" +#line 5812 "PhotoPage.c" } @@ -5919,17 +5820,17 @@ static void editing_host_page_real_save_zoom_state (SinglePhotoPage* base) { EditingHostPage * self; GtkScale* _tmp0_ = NULL; gdouble _tmp1_ = 0.0; -#line 735 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 737 "/home/jens/Source/shotwell/src/PhotoPage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EDITING_HOST_PAGE, EditingHostPage); -#line 736 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 738 "/home/jens/Source/shotwell/src/PhotoPage.vala" SINGLE_PHOTO_PAGE_CLASS (editing_host_page_parent_class)->save_zoom_state (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage)); -#line 737 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 739 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp0_ = self->priv->zoom_slider; -#line 737 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 739 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp1_ = gtk_range_get_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_range_get_type (), GtkRange)); -#line 737 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 739 "/home/jens/Source/shotwell/src/PhotoPage.vala" self->priv->saved_slider_val = _tmp1_; -#line 5929 "PhotoPage.c" +#line 5830 "PhotoPage.c" } @@ -5938,17 +5839,17 @@ static ZoomBuffer* editing_host_page_real_get_zoom_buffer (SinglePhotoPage* base ZoomBuffer* result = NULL; ZoomBuffer* _tmp0_ = NULL; ZoomBuffer* _tmp1_ = NULL; -#line 740 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 742 "/home/jens/Source/shotwell/src/PhotoPage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EDITING_HOST_PAGE, EditingHostPage); -#line 741 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 743 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp0_ = self->priv->zoom_buffer; -#line 741 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 743 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp1_ = _g_object_ref0 (_tmp0_); -#line 741 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 743 "/home/jens/Source/shotwell/src/PhotoPage.vala" result = _tmp1_; -#line 741 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 743 "/home/jens/Source/shotwell/src/PhotoPage.vala" return result; -#line 5948 "PhotoPage.c" +#line 5849 "PhotoPage.c" } @@ -5959,47 +5860,47 @@ static gboolean editing_host_page_real_on_mousewheel_up (Page* base, GdkEventScr ZoomState _tmp1_ = {0}; gboolean _tmp2_ = FALSE; GdkEventScroll* _tmp5_ = NULL; -#line 744 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 746 "/home/jens/Source/shotwell/src/PhotoPage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EDITING_HOST_PAGE, EditingHostPage); -#line 744 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 746 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_val_if_fail (event != NULL, FALSE); -#line 745 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 747 "/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 745 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 747 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp2_ = zoom_state_is_max (&_tmp1_); -#line 745 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 747 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp2_) { -#line 745 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 747 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp0_ = TRUE; -#line 5971 "PhotoPage.c" +#line 5872 "PhotoPage.c" } else { GtkScale* _tmp3_ = NULL; gboolean _tmp4_ = FALSE; -#line 745 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 747 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp3_ = self->priv->zoom_slider; -#line 745 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 747 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp4_ = gtk_widget_get_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, gtk_widget_get_type (), GtkWidget)); -#line 745 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 747 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp0_ = !_tmp4_; -#line 5981 "PhotoPage.c" +#line 5882 "PhotoPage.c" } -#line 745 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 747 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp0_) { -#line 746 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 748 "/home/jens/Source/shotwell/src/PhotoPage.vala" result = FALSE; -#line 746 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 748 "/home/jens/Source/shotwell/src/PhotoPage.vala" return result; -#line 5989 "PhotoPage.c" +#line 5890 "PhotoPage.c" } -#line 748 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 750 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp5_ = event; -#line 748 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 750 "/home/jens/Source/shotwell/src/PhotoPage.vala" editing_host_page_zoom_about_event_cursor_point (self, _tmp5_, EDITING_HOST_PAGE_ZOOM_INCREMENT_SIZE); -#line 749 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 751 "/home/jens/Source/shotwell/src/PhotoPage.vala" result = FALSE; -#line 749 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 751 "/home/jens/Source/shotwell/src/PhotoPage.vala" return result; -#line 5999 "PhotoPage.c" +#line 5900 "PhotoPage.c" } @@ -6010,47 +5911,47 @@ static gboolean editing_host_page_real_on_mousewheel_down (Page* base, GdkEventS ZoomState _tmp1_ = {0}; gboolean _tmp2_ = FALSE; GdkEventScroll* _tmp5_ = NULL; -#line 752 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 754 "/home/jens/Source/shotwell/src/PhotoPage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EDITING_HOST_PAGE, EditingHostPage); -#line 752 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 754 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_val_if_fail (event != NULL, FALSE); -#line 753 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 755 "/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 753 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 755 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp2_ = zoom_state_is_min (&_tmp1_); -#line 753 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 755 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp2_) { -#line 753 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 755 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp0_ = TRUE; -#line 6022 "PhotoPage.c" +#line 5923 "PhotoPage.c" } else { GtkScale* _tmp3_ = NULL; gboolean _tmp4_ = FALSE; -#line 753 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 755 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp3_ = self->priv->zoom_slider; -#line 753 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 755 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp4_ = gtk_widget_get_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, gtk_widget_get_type (), GtkWidget)); -#line 753 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 755 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp0_ = !_tmp4_; -#line 6032 "PhotoPage.c" +#line 5933 "PhotoPage.c" } -#line 753 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 755 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp0_) { -#line 754 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 756 "/home/jens/Source/shotwell/src/PhotoPage.vala" result = FALSE; -#line 754 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 756 "/home/jens/Source/shotwell/src/PhotoPage.vala" return result; -#line 6040 "PhotoPage.c" +#line 5941 "PhotoPage.c" } -#line 756 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 758 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp5_ = event; -#line 756 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 758 "/home/jens/Source/shotwell/src/PhotoPage.vala" editing_host_page_zoom_about_event_cursor_point (self, _tmp5_, -EDITING_HOST_PAGE_ZOOM_INCREMENT_SIZE); -#line 757 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 759 "/home/jens/Source/shotwell/src/PhotoPage.vala" result = FALSE; -#line 757 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 759 "/home/jens/Source/shotwell/src/PhotoPage.vala" return result; -#line 6050 "PhotoPage.c" +#line 5951 "PhotoPage.c" } @@ -6061,40 +5962,40 @@ static void editing_host_page_real_restore_zoom_state (SinglePhotoPage* base) { GtkScale* _tmp2_ = NULL; gdouble _tmp3_ = 0.0; GtkScale* _tmp4_ = NULL; -#line 760 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 762 "/home/jens/Source/shotwell/src/PhotoPage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EDITING_HOST_PAGE, EditingHostPage); -#line 761 "/home/jens/Source/shotwell/src/PhotoPage.vala" - SINGLE_PHOTO_PAGE_CLASS (editing_host_page_parent_class)->restore_zoom_state (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage)); #line 763 "/home/jens/Source/shotwell/src/PhotoPage.vala" + SINGLE_PHOTO_PAGE_CLASS (editing_host_page_parent_class)->restore_zoom_state (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage)); +#line 765 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp0_ = self->priv->zoom_slider; -#line 763 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 765 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_signal_parse_name ("value-changed", gtk_range_get_type (), &_tmp1_, NULL, FALSE); -#line 763 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 765 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_range_get_type (), GtkRange), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _editing_host_page_on_zoom_slider_value_changed_gtk_range_value_changed, self); -#line 764 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 766 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp2_ = self->priv->zoom_slider; -#line 764 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 766 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp3_ = self->priv->saved_slider_val; -#line 764 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 766 "/home/jens/Source/shotwell/src/PhotoPage.vala" gtk_range_set_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_range_get_type (), GtkRange), _tmp3_); -#line 765 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 767 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp4_ = self->priv->zoom_slider; -#line 765 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#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 6081 "PhotoPage.c" +#line 5982 "PhotoPage.c" } static gboolean editing_host_page_real_is_zoom_supported (SinglePhotoPage* base) { EditingHostPage * self; gboolean result = FALSE; -#line 768 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 770 "/home/jens/Source/shotwell/src/PhotoPage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EDITING_HOST_PAGE, EditingHostPage); -#line 769 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 771 "/home/jens/Source/shotwell/src/PhotoPage.vala" result = TRUE; -#line 769 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 771 "/home/jens/Source/shotwell/src/PhotoPage.vala" return result; -#line 6094 "PhotoPage.c" +#line 5995 "PhotoPage.c" } @@ -6102,27 +6003,27 @@ static void editing_host_page_real_set_container (Page* base, GtkWindow* contain EditingHostPage * self; GtkWindow* _tmp0_ = NULL; GtkWindow* _tmp1_ = NULL; -#line 772 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 774 "/home/jens/Source/shotwell/src/PhotoPage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EDITING_HOST_PAGE, EditingHostPage); -#line 772 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 774 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_if_fail (GTK_IS_WINDOW (container)); -#line 773 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 775 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp0_ = container; -#line 773 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 775 "/home/jens/Source/shotwell/src/PhotoPage.vala" PAGE_CLASS (editing_host_page_parent_class)->set_container (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), TYPE_PAGE, Page), _tmp0_); -#line 776 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 778 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp1_ = container; -#line 776 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 778 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (!G_TYPE_CHECK_INSTANCE_TYPE (_tmp1_, TYPE_FULLSCREEN_WINDOW)) { -#line 6114 "PhotoPage.c" +#line 6015 "PhotoPage.c" DragAndDropHandler* _tmp2_ = NULL; -#line 777 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 779 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp2_ = drag_and_drop_handler_new (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); -#line 777 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 779 "/home/jens/Source/shotwell/src/PhotoPage.vala" _drag_and_drop_handler_unref0 (self->priv->dnd_handler); -#line 777 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 779 "/home/jens/Source/shotwell/src/PhotoPage.vala" self->priv->dnd_handler = _tmp2_; -#line 6122 "PhotoPage.c" +#line 6023 "PhotoPage.c" } } @@ -6131,17 +6032,17 @@ ViewCollection* editing_host_page_get_parent_view (EditingHostPage* self) { ViewCollection* result = NULL; ViewCollection* _tmp0_ = NULL; ViewCollection* _tmp1_ = NULL; -#line 780 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 782 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_val_if_fail (IS_EDITING_HOST_PAGE (self), NULL); -#line 781 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 783 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp0_ = self->priv->parent_view; -#line 781 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 783 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp1_ = _data_collection_ref0 (_tmp0_); -#line 781 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 783 "/home/jens/Source/shotwell/src/PhotoPage.vala" result = _tmp1_; -#line 781 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 783 "/home/jens/Source/shotwell/src/PhotoPage.vala" return result; -#line 6141 "PhotoPage.c" +#line 6042 "PhotoPage.c" } @@ -6150,21 +6051,21 @@ gboolean editing_host_page_has_photo (EditingHostPage* self) { Photo* _tmp0_ = NULL; Photo* _tmp1_ = NULL; gboolean _tmp2_ = FALSE; -#line 784 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 786 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_val_if_fail (IS_EDITING_HOST_PAGE (self), FALSE); -#line 785 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 787 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp0_ = editing_host_page_get_photo (self); -#line 785 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 787 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp1_ = _tmp0_; -#line 785 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 787 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp2_ = _tmp1_ != NULL; -#line 785 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 787 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (_tmp1_); -#line 785 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 787 "/home/jens/Source/shotwell/src/PhotoPage.vala" result = _tmp2_; -#line 785 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 787 "/home/jens/Source/shotwell/src/PhotoPage.vala" return result; -#line 6164 "PhotoPage.c" +#line 6065 "PhotoPage.c" } @@ -6183,57 +6084,57 @@ Photo* editing_host_page_get_photo (EditingHostPage* self) { DataView* _tmp10_ = NULL; DataSource* _tmp11_ = NULL; Photo* _tmp12_ = NULL; -#line 788 "/home/jens/Source/shotwell/src/PhotoPage.vala" - g_return_val_if_fail (IS_EDITING_HOST_PAGE (self), NULL); #line 790 "/home/jens/Source/shotwell/src/PhotoPage.vala" + g_return_val_if_fail (IS_EDITING_HOST_PAGE (self), NULL); +#line 792 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp0_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); -#line 790 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 792 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp1_ = _tmp0_; -#line 790 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 792 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp2_ = view_collection_get_selected_count (_tmp1_); -#line 790 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 792 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp3_ = _tmp2_ == 0; -#line 790 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 792 "/home/jens/Source/shotwell/src/PhotoPage.vala" _data_collection_unref0 (_tmp1_); -#line 790 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 792 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp3_) { -#line 791 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 793 "/home/jens/Source/shotwell/src/PhotoPage.vala" result = NULL; -#line 791 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 793 "/home/jens/Source/shotwell/src/PhotoPage.vala" return result; -#line 6201 "PhotoPage.c" +#line 6102 "PhotoPage.c" } -#line 795 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 797 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp4_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); -#line 795 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 797 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp5_ = _tmp4_; -#line 795 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 797 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp6_ = view_collection_get_selected_count (_tmp5_); -#line 795 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 797 "/home/jens/Source/shotwell/src/PhotoPage.vala" _vala_assert (_tmp6_ == 1, "get_view().get_selected_count() == 1"); -#line 795 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 797 "/home/jens/Source/shotwell/src/PhotoPage.vala" _data_collection_unref0 (_tmp5_); -#line 796 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 798 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp7_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); -#line 796 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 798 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp8_ = _tmp7_; -#line 796 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 798 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp9_ = view_collection_get_selected_at (_tmp8_, 0); -#line 796 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 798 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp10_ = _tmp9_; -#line 796 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 798 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp11_ = data_view_get_source (_tmp10_); -#line 796 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 798 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp12_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, TYPE_PHOTO, Photo); -#line 796 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 798 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (_tmp10_); -#line 796 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 798 "/home/jens/Source/shotwell/src/PhotoPage.vala" _data_collection_unref0 (_tmp8_); -#line 796 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 798 "/home/jens/Source/shotwell/src/PhotoPage.vala" result = _tmp12_; -#line 796 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 798 "/home/jens/Source/shotwell/src/PhotoPage.vala" return result; -#line 6233 "PhotoPage.c" +#line 6134 "PhotoPage.c" } @@ -6241,50 +6142,50 @@ static void editing_host_page_real_photo_changing (EditingHostPage* self, Photo* Photo* _tmp0_ = NULL; PhotoFileFormat _tmp1_ = 0; gboolean _tmp6_ = FALSE; -#line 800 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 802 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_if_fail (IS_PHOTO (new_photo)); -#line 803 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 805 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp0_ = new_photo; -#line 803 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 805 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp1_ = photo_get_file_format (_tmp0_); -#line 803 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 805 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp1_ == PHOTO_FILE_FORMAT_RAW) { -#line 804 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 806 "/home/jens/Source/shotwell/src/PhotoPage.vala" editing_host_page_set_photo_missing (self, FALSE); -#line 6251 "PhotoPage.c" +#line 6152 "PhotoPage.c" } else { Photo* _tmp2_ = NULL; GFile* _tmp3_ = NULL; GFile* _tmp4_ = NULL; gboolean _tmp5_ = FALSE; -#line 806 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 808 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp2_ = new_photo; -#line 806 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 808 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp3_ = media_source_get_file (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_MEDIA_SOURCE, MediaSource)); -#line 806 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 808 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp4_ = _tmp3_; -#line 806 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 808 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp5_ = g_file_query_exists (_tmp4_, NULL); -#line 806 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 808 "/home/jens/Source/shotwell/src/PhotoPage.vala" editing_host_page_set_photo_missing (self, !_tmp5_); -#line 806 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 808 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (_tmp4_); -#line 6269 "PhotoPage.c" +#line 6170 "PhotoPage.c" } -#line 808 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 810 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp6_ = self->priv->photo_missing; -#line 808 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 810 "/home/jens/Source/shotwell/src/PhotoPage.vala" editing_host_page_update_ui (self, _tmp6_); -#line 6275 "PhotoPage.c" +#line 6176 "PhotoPage.c" } void editing_host_page_photo_changing (EditingHostPage* self, Photo* new_photo) { -#line 800 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 802 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_if_fail (IS_EDITING_HOST_PAGE (self)); -#line 800 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 802 "/home/jens/Source/shotwell/src/PhotoPage.vala" EDITING_HOST_PAGE_GET_CLASS (self)->photo_changing (self, new_photo); -#line 6284 "PhotoPage.c" +#line 6185 "PhotoPage.c" } @@ -6313,148 +6214,148 @@ static void editing_host_page_set_photo (EditingHostPage* self, Photo* photo) { ViewCollection* _tmp19_ = NULL; Marker* _tmp20_ = NULL; ViewCollection* _tmp21_ = NULL; -#line 811 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 813 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_if_fail (IS_EDITING_HOST_PAGE (self)); -#line 811 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 813 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_if_fail (IS_PHOTO (photo)); -#line 812 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 814 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp0_ = self->priv->zoom_slider; -#line 812 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 814 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_signal_parse_name ("value-changed", gtk_range_get_type (), &_tmp1_, NULL, FALSE); -#line 812 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 814 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_range_get_type (), GtkRange), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _editing_host_page_on_zoom_slider_value_changed_gtk_range_value_changed, self); -#line 813 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 815 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp2_ = self->priv->zoom_slider; -#line 813 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 815 "/home/jens/Source/shotwell/src/PhotoPage.vala" gtk_range_set_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_range_get_type (), GtkRange), 0.0); -#line 814 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 816 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp3_ = self->priv->zoom_slider; -#line 814 "/home/jens/Source/shotwell/src/PhotoPage.vala" - g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, gtk_range_get_type (), GtkRange), "value-changed", (GCallback) _editing_host_page_on_zoom_slider_value_changed_gtk_range_value_changed, self, 0); #line 816 "/home/jens/Source/shotwell/src/PhotoPage.vala" + g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, gtk_range_get_type (), GtkRange), "value-changed", (GCallback) _editing_host_page_on_zoom_slider_value_changed_gtk_range_value_changed, self, 0); +#line 818 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp4_ = photo; -#line 816 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 818 "/home/jens/Source/shotwell/src/PhotoPage.vala" editing_host_page_photo_changing (self, _tmp4_); -#line 817 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 819 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp5_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); -#line 817 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 819 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp6_ = _tmp5_; -#line 817 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 819 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp7_ = photo; -#line 817 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 819 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp8_ = view_collection_get_view_for_source (_tmp6_, G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_DATA_SOURCE, DataSource)); -#line 817 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 819 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp9_ = _tmp8_; -#line 817 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 819 "/home/jens/Source/shotwell/src/PhotoPage.vala" _data_collection_unref0 (_tmp6_); -#line 817 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 819 "/home/jens/Source/shotwell/src/PhotoPage.vala" view = _tmp9_; -#line 818 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 820 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp10_ = view; -#line 818 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 820 "/home/jens/Source/shotwell/src/PhotoPage.vala" _vala_assert (_tmp10_ != NULL, "view != null"); -#line 821 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 823 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp11_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); -#line 821 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 823 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp12_ = _tmp11_; -#line 821 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 823 "/home/jens/Source/shotwell/src/PhotoPage.vala" view_collection_unselect_all (_tmp12_); -#line 821 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 823 "/home/jens/Source/shotwell/src/PhotoPage.vala" _data_collection_unref0 (_tmp12_); -#line 822 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 824 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp13_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); -#line 822 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 824 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp14_ = _tmp13_; -#line 822 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 824 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp15_ = view; -#line 822 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 824 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp16_ = data_collection_mark (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, TYPE_DATA_COLLECTION, DataCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, TYPE_DATA_OBJECT, DataObject)); -#line 822 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 824 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp17_ = _tmp16_; -#line 822 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 824 "/home/jens/Source/shotwell/src/PhotoPage.vala" _data_collection_unref0 (_tmp14_); -#line 822 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 824 "/home/jens/Source/shotwell/src/PhotoPage.vala" marker = _tmp17_; -#line 823 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 825 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp18_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); -#line 823 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 825 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp19_ = _tmp18_; -#line 823 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 825 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp20_ = marker; -#line 823 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 825 "/home/jens/Source/shotwell/src/PhotoPage.vala" view_collection_select_marked (_tmp19_, _tmp20_); -#line 823 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 825 "/home/jens/Source/shotwell/src/PhotoPage.vala" _data_collection_unref0 (_tmp19_); -#line 827 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 829 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp21_ = self->priv->parent_view; -#line 827 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 829 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp21_ != NULL) { -#line 6389 "PhotoPage.c" +#line 6290 "PhotoPage.c" ViewCollection* _tmp22_ = NULL; DataView* view_in_parent = NULL; ViewCollection* _tmp23_ = NULL; Photo* _tmp24_ = NULL; DataView* _tmp25_ = NULL; DataView* _tmp26_ = NULL; -#line 828 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 830 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp22_ = self->priv->parent_view; -#line 828 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 830 "/home/jens/Source/shotwell/src/PhotoPage.vala" view_collection_unselect_all (_tmp22_); -#line 829 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 831 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp23_ = self->priv->parent_view; -#line 829 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 831 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp24_ = photo; -#line 829 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 831 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp25_ = view_collection_get_view_for_source_filtered (_tmp23_, G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, TYPE_DATA_SOURCE, DataSource)); -#line 829 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 831 "/home/jens/Source/shotwell/src/PhotoPage.vala" view_in_parent = _tmp25_; -#line 830 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 832 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp26_ = view_in_parent; -#line 830 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 832 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (NULL != _tmp26_) { -#line 6412 "PhotoPage.c" +#line 6313 "PhotoPage.c" ViewCollection* _tmp27_ = NULL; ViewCollection* _tmp28_ = NULL; DataView* _tmp29_ = NULL; Marker* _tmp30_ = NULL; Marker* _tmp31_ = NULL; -#line 831 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 833 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp27_ = self->priv->parent_view; -#line 831 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 833 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp28_ = self->priv->parent_view; -#line 831 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 833 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp29_ = view_in_parent; -#line 831 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 833 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp30_ = data_collection_mark (G_TYPE_CHECK_INSTANCE_CAST (_tmp28_, TYPE_DATA_COLLECTION, DataCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp29_, TYPE_DATA_OBJECT, DataObject)); -#line 831 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 833 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp31_ = _tmp30_; -#line 831 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 833 "/home/jens/Source/shotwell/src/PhotoPage.vala" view_collection_select_marked (_tmp27_, _tmp31_); -#line 831 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 833 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (_tmp31_); -#line 6432 "PhotoPage.c" +#line 6333 "PhotoPage.c" } -#line 827 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 829 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (view_in_parent); -#line 6436 "PhotoPage.c" +#line 6337 "PhotoPage.c" } -#line 811 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 813 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (marker); -#line 811 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 813 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (view); -#line 6442 "PhotoPage.c" +#line 6343 "PhotoPage.c" } static void editing_host_page_real_realize (GtkWidget* base) { EditingHostPage * self; -#line 835 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 837 "/home/jens/Source/shotwell/src/PhotoPage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EDITING_HOST_PAGE, EditingHostPage); -#line 836 "/home/jens/Source/shotwell/src/PhotoPage.vala" - 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 838 "/home/jens/Source/shotwell/src/PhotoPage.vala" + 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 6454 "PhotoPage.c" +#line 6355 "PhotoPage.c" } @@ -6462,42 +6363,42 @@ static void editing_host_page_real_switched_to (Page* base) { EditingHostPage * self; gboolean _tmp0_ = FALSE; gboolean _tmp1_ = FALSE; -#line 841 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 843 "/home/jens/Source/shotwell/src/PhotoPage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EDITING_HOST_PAGE, EditingHostPage); -#line 842 "/home/jens/Source/shotwell/src/PhotoPage.vala" - PAGE_CLASS (editing_host_page_parent_class)->switched_to (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), TYPE_PAGE, Page)); #line 844 "/home/jens/Source/shotwell/src/PhotoPage.vala" + PAGE_CLASS (editing_host_page_parent_class)->switched_to (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), TYPE_PAGE, Page)); +#line 846 "/home/jens/Source/shotwell/src/PhotoPage.vala" editing_host_page_rebuild_caches (self, "switched_to"); -#line 847 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 849 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp1_ = editing_host_page_has_photo (self); -#line 847 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 849 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp1_) { -#line 6472 "PhotoPage.c" +#line 6373 "PhotoPage.c" gboolean _tmp2_ = FALSE; -#line 847 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 849 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp2_ = self->priv->pixbuf_dirty; -#line 847 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 849 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp0_ = _tmp2_; -#line 6478 "PhotoPage.c" +#line 6379 "PhotoPage.c" } else { -#line 847 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 849 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp0_ = FALSE; -#line 6482 "PhotoPage.c" +#line 6383 "PhotoPage.c" } -#line 847 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 849 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp0_) { -#line 6486 "PhotoPage.c" +#line 6387 "PhotoPage.c" Photo* _tmp3_ = NULL; Photo* _tmp4_ = NULL; -#line 848 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 850 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp3_ = editing_host_page_get_photo (self); -#line 848 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 850 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp4_ = _tmp3_; -#line 848 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 850 "/home/jens/Source/shotwell/src/PhotoPage.vala" editing_host_page_replace_photo (self, _tmp4_); -#line 848 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 850 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (_tmp4_); -#line 6497 "PhotoPage.c" +#line 6398 "PhotoPage.c" } } @@ -6509,37 +6410,37 @@ static void editing_host_page_real_switching_from (Page* base) { gboolean _tmp2_ = FALSE; ViewCollection* _tmp13_ = NULL; ViewCollection* _tmp14_ = NULL; -#line 851 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 853 "/home/jens/Source/shotwell/src/PhotoPage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EDITING_HOST_PAGE, EditingHostPage); -#line 852 "/home/jens/Source/shotwell/src/PhotoPage.vala" - PAGE_CLASS (editing_host_page_parent_class)->switching_from (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), TYPE_PAGE, Page)); #line 854 "/home/jens/Source/shotwell/src/PhotoPage.vala" + PAGE_CLASS (editing_host_page_parent_class)->switching_from (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), TYPE_PAGE, Page)); +#line 856 "/home/jens/Source/shotwell/src/PhotoPage.vala" single_photo_page_cancel_zoom (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage)); -#line 855 "/home/jens/Source/shotwell/src/PhotoPage.vala" - self->priv->is_pan_in_progress = FALSE; #line 857 "/home/jens/Source/shotwell/src/PhotoPage.vala" + self->priv->is_pan_in_progress = FALSE; +#line 859 "/home/jens/Source/shotwell/src/PhotoPage.vala" dimensions_init (&_tmp0_, 0, 0); -#line 857 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 859 "/home/jens/Source/shotwell/src/PhotoPage.vala" editing_host_page_deactivate_tool (self, NULL, NULL, &_tmp0_, FALSE); -#line 864 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 866 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp2_ = editing_host_page_has_photo (self); -#line 864 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 866 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp2_) { -#line 6525 "PhotoPage.c" +#line 6426 "PhotoPage.c" ViewCollection* _tmp3_ = NULL; -#line 864 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 866 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp3_ = self->priv->parent_view; -#line 864 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 866 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp1_ = _tmp3_ != NULL; -#line 6531 "PhotoPage.c" +#line 6432 "PhotoPage.c" } else { -#line 864 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 866 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp1_ = FALSE; -#line 6535 "PhotoPage.c" +#line 6436 "PhotoPage.c" } -#line 864 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 866 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp1_) { -#line 6539 "PhotoPage.c" +#line 6440 "PhotoPage.c" ViewCollection* _tmp4_ = NULL; ViewCollection* _tmp5_ = NULL; ViewCollection* _tmp6_ = NULL; @@ -6549,54 +6450,54 @@ static void editing_host_page_real_switching_from (Page* base) { DataView* _tmp10_ = NULL; Marker* _tmp11_ = NULL; Marker* _tmp12_ = NULL; -#line 865 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 867 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp4_ = self->priv->parent_view; -#line 865 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 867 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp5_ = self->priv->parent_view; -#line 865 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 867 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp6_ = self->priv->parent_view; -#line 865 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 867 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp7_ = editing_host_page_get_photo (self); -#line 865 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 867 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp8_ = _tmp7_; -#line 865 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 867 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp9_ = view_collection_get_view_for_source (_tmp6_, G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_DATA_SOURCE, DataSource)); -#line 865 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 867 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp10_ = _tmp9_; -#line 865 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 867 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp11_ = data_collection_mark (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, TYPE_DATA_COLLECTION, DataCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, TYPE_DATA_OBJECT, DataObject)); -#line 865 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 867 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp12_ = _tmp11_; -#line 865 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 867 "/home/jens/Source/shotwell/src/PhotoPage.vala" view_collection_select_marked (_tmp4_, _tmp12_); -#line 865 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 867 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (_tmp12_); -#line 865 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 867 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (_tmp10_); -#line 865 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 867 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (_tmp8_); -#line 6575 "PhotoPage.c" +#line 6476 "PhotoPage.c" } -#line 868 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 870 "/home/jens/Source/shotwell/src/PhotoPage.vala" _data_collection_unref0 (self->priv->parent_view); -#line 868 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 870 "/home/jens/Source/shotwell/src/PhotoPage.vala" self->priv->parent_view = NULL; -#line 869 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 871 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp13_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); -#line 869 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 871 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp14_ = _tmp13_; -#line 869 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 871 "/home/jens/Source/shotwell/src/PhotoPage.vala" data_collection_clear (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, TYPE_DATA_COLLECTION, DataCollection)); -#line 869 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 871 "/home/jens/Source/shotwell/src/PhotoPage.vala" _data_collection_unref0 (_tmp14_); -#line 6589 "PhotoPage.c" +#line 6490 "PhotoPage.c" } static void _editing_host_page_on_selection_changed_view_collection_items_selected (ViewCollection* _sender, GeeIterable* selected, gpointer self) { -#line 882 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 884 "/home/jens/Source/shotwell/src/PhotoPage.vala" editing_host_page_on_selection_changed ((EditingHostPage*) self, selected); -#line 6596 "PhotoPage.c" +#line 6497 "PhotoPage.c" } @@ -6608,51 +6509,51 @@ static void editing_host_page_real_switching_to_fullscreen (Page* base, Fullscre FullscreenWindow* _tmp2_ = NULL; Page* _tmp3_ = NULL; Page* _tmp4_ = NULL; -#line 872 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 874 "/home/jens/Source/shotwell/src/PhotoPage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EDITING_HOST_PAGE, EditingHostPage); -#line 872 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 874 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_if_fail (IS_FULLSCREEN_WINDOW (fsw)); -#line 873 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 875 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp0_ = fsw; -#line 873 "/home/jens/Source/shotwell/src/PhotoPage.vala" - PAGE_CLASS (editing_host_page_parent_class)->switching_to_fullscreen (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), TYPE_PAGE, Page), _tmp0_); #line 875 "/home/jens/Source/shotwell/src/PhotoPage.vala" + PAGE_CLASS (editing_host_page_parent_class)->switching_to_fullscreen (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), TYPE_PAGE, Page), _tmp0_); +#line 877 "/home/jens/Source/shotwell/src/PhotoPage.vala" dimensions_init (&_tmp1_, 0, 0); -#line 875 "/home/jens/Source/shotwell/src/PhotoPage.vala" - editing_host_page_deactivate_tool (self, NULL, NULL, &_tmp1_, FALSE); #line 877 "/home/jens/Source/shotwell/src/PhotoPage.vala" + editing_host_page_deactivate_tool (self, NULL, NULL, &_tmp1_, FALSE); +#line 879 "/home/jens/Source/shotwell/src/PhotoPage.vala" single_photo_page_cancel_zoom (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage)); -#line 878 "/home/jens/Source/shotwell/src/PhotoPage.vala" - self->priv->is_pan_in_progress = FALSE; #line 880 "/home/jens/Source/shotwell/src/PhotoPage.vala" + self->priv->is_pan_in_progress = FALSE; +#line 882 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp2_ = fsw; -#line 880 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 882 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp3_ = page_window_get_current_page (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_PAGE_WINDOW, PageWindow)); -#line 880 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 882 "/home/jens/Source/shotwell/src/PhotoPage.vala" page = _tmp3_; -#line 881 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 883 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp4_ = page; -#line 881 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 883 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp4_ != NULL) { -#line 6634 "PhotoPage.c" +#line 6535 "PhotoPage.c" Page* _tmp5_ = NULL; ViewCollection* _tmp6_ = NULL; ViewCollection* _tmp7_ = NULL; -#line 882 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 884 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp5_ = page; -#line 882 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 884 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp6_ = page_get_view (_tmp5_); -#line 882 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 884 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp7_ = _tmp6_; -#line 882 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 884 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_signal_connect_object (_tmp7_, "items-selected", (GCallback) _editing_host_page_on_selection_changed_view_collection_items_selected, self, 0); -#line 882 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 884 "/home/jens/Source/shotwell/src/PhotoPage.vala" _data_collection_unref0 (_tmp7_); -#line 6648 "PhotoPage.c" +#line 6549 "PhotoPage.c" } -#line 872 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 874 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (page); -#line 6652 "PhotoPage.c" +#line 6553 "PhotoPage.c" } @@ -6663,107 +6564,107 @@ static void editing_host_page_real_returning_from_fullscreen (Page* base, Fullsc FullscreenWindow* _tmp1_ = NULL; Page* _tmp2_ = NULL; Page* _tmp3_ = NULL; -#line 885 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 887 "/home/jens/Source/shotwell/src/PhotoPage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EDITING_HOST_PAGE, EditingHostPage); -#line 885 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 887 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_if_fail (IS_FULLSCREEN_WINDOW (fsw)); -#line 886 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 888 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp0_ = fsw; -#line 886 "/home/jens/Source/shotwell/src/PhotoPage.vala" - PAGE_CLASS (editing_host_page_parent_class)->returning_from_fullscreen (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), TYPE_PAGE, Page), _tmp0_); #line 888 "/home/jens/Source/shotwell/src/PhotoPage.vala" - single_photo_page_repaint (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), NULL); + PAGE_CLASS (editing_host_page_parent_class)->returning_from_fullscreen (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), TYPE_PAGE, Page), _tmp0_); #line 890 "/home/jens/Source/shotwell/src/PhotoPage.vala" + single_photo_page_repaint (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), NULL); +#line 892 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp1_ = fsw; -#line 890 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 892 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp2_ = page_window_get_current_page (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_PAGE_WINDOW, PageWindow)); -#line 890 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 892 "/home/jens/Source/shotwell/src/PhotoPage.vala" page = _tmp2_; -#line 891 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 893 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp3_ = page; -#line 891 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 893 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp3_ != NULL) { -#line 6683 "PhotoPage.c" +#line 6584 "PhotoPage.c" Page* _tmp4_ = NULL; ViewCollection* _tmp5_ = NULL; ViewCollection* _tmp6_ = NULL; guint _tmp7_ = 0U; -#line 892 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 894 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp4_ = page; -#line 892 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 894 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp5_ = page_get_view (_tmp4_); -#line 892 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 894 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp6_ = _tmp5_; -#line 892 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 894 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_signal_parse_name ("items-selected", TYPE_VIEW_COLLECTION, &_tmp7_, NULL, FALSE); -#line 892 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 894 "/home/jens/Source/shotwell/src/PhotoPage.vala" 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 892 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 894 "/home/jens/Source/shotwell/src/PhotoPage.vala" _data_collection_unref0 (_tmp6_); -#line 6700 "PhotoPage.c" +#line 6601 "PhotoPage.c" } -#line 885 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 887 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (page); -#line 6704 "PhotoPage.c" +#line 6605 "PhotoPage.c" } static void editing_host_page_on_selection_changed (EditingHostPage* self, GeeIterable* selected) { -#line 895 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 897 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_if_fail (IS_EDITING_HOST_PAGE (self)); -#line 895 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 897 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_if_fail (GEE_IS_ITERABLE (selected)); -#line 6713 "PhotoPage.c" +#line 6614 "PhotoPage.c" { GeeIterator* _view_it = NULL; GeeIterable* _tmp0_ = NULL; GeeIterator* _tmp1_ = NULL; -#line 896 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 898 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp0_ = selected; -#line 896 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 898 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp1_ = gee_iterable_iterator (_tmp0_); -#line 896 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 898 "/home/jens/Source/shotwell/src/PhotoPage.vala" _view_it = _tmp1_; -#line 896 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 898 "/home/jens/Source/shotwell/src/PhotoPage.vala" while (TRUE) { -#line 6726 "PhotoPage.c" +#line 6627 "PhotoPage.c" gboolean _tmp2_ = FALSE; DataView* view = NULL; gpointer _tmp3_ = NULL; DataView* _tmp4_ = NULL; DataSource* _tmp5_ = NULL; Photo* _tmp6_ = NULL; -#line 896 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 898 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp2_ = gee_iterator_next (_view_it); -#line 896 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 898 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (!_tmp2_) { -#line 896 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 898 "/home/jens/Source/shotwell/src/PhotoPage.vala" break; -#line 6739 "PhotoPage.c" +#line 6640 "PhotoPage.c" } -#line 896 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 898 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp3_ = gee_iterator_get (_view_it); -#line 896 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 898 "/home/jens/Source/shotwell/src/PhotoPage.vala" view = (DataView*) _tmp3_; -#line 897 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 899 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp4_ = view; -#line 897 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 899 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp5_ = data_view_get_source (_tmp4_); -#line 897 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 899 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp6_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, TYPE_PHOTO, Photo); -#line 897 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 899 "/home/jens/Source/shotwell/src/PhotoPage.vala" editing_host_page_replace_photo (self, _tmp6_); -#line 897 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 899 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (_tmp6_); -#line 898 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 900 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (view); -#line 898 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 900 "/home/jens/Source/shotwell/src/PhotoPage.vala" break; -#line 6759 "PhotoPage.c" +#line 6660 "PhotoPage.c" } -#line 896 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 898 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (_view_it); -#line 6763 "PhotoPage.c" +#line 6664 "PhotoPage.c" } } @@ -6771,31 +6672,31 @@ static void editing_host_page_on_selection_changed (EditingHostPage* self, GeeIt void editing_host_page_enable_rotate (EditingHostPage* self, gboolean should_enable) { GtkToolButton* _tmp0_ = NULL; gboolean _tmp1_ = FALSE; -#line 902 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 904 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_if_fail (IS_EDITING_HOST_PAGE (self)); -#line 903 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 905 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp0_ = self->priv->rotate_button; -#line 903 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 905 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp1_ = should_enable; -#line 903 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#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 6779 "PhotoPage.c" +#line 6680 "PhotoPage.c" } static void _editing_host_page_on_pixbuf_fetched_pixbuf_cache_fetched (PixbufCache* _sender, Photo* photo, GdkPixbuf* pixbuf, GError* err, gpointer self) { -#line 921 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 923 "/home/jens/Source/shotwell/src/PhotoPage.vala" editing_host_page_on_pixbuf_fetched ((EditingHostPage*) self, photo, pixbuf, err); -#line 6786 "PhotoPage.c" +#line 6687 "PhotoPage.c" } static gboolean _editing_host_page_master_cache_filter_pixbuf_cache_cache_filter (Photo* photo, gpointer self) { gboolean result; result = editing_host_page_master_cache_filter ((EditingHostPage*) self, photo); -#line 928 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 930 "/home/jens/Source/shotwell/src/PhotoPage.vala" return result; -#line 6795 "PhotoPage.c" +#line 6696 "PhotoPage.c" } @@ -6816,118 +6717,118 @@ static void editing_host_page_rebuild_caches (EditingHostPage* self, const gchar Scaling _tmp19_ = {0}; PixbufCache* _tmp20_ = NULL; const gchar* _tmp21_ = NULL; -#line 909 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 911 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_if_fail (IS_EDITING_HOST_PAGE (self)); -#line 909 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 911 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_if_fail (caller != NULL); -#line 910 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 912 "/home/jens/Source/shotwell/src/PhotoPage.vala" single_photo_page_get_canvas_scaling (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), &_tmp0_); -#line 910 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 912 "/home/jens/Source/shotwell/src/PhotoPage.vala" scaling = _tmp0_; -#line 913 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 915 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp2_ = self->priv->cache; -#line 913 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 915 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp2_ != NULL) { -#line 6828 "PhotoPage.c" +#line 6729 "PhotoPage.c" PixbufCache* _tmp3_ = NULL; Scaling _tmp4_ = {0}; Scaling _tmp5_ = {0}; gboolean _tmp6_ = FALSE; -#line 913 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 915 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp3_ = self->priv->cache; -#line 913 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 915 "/home/jens/Source/shotwell/src/PhotoPage.vala" pixbuf_cache_get_scaling (_tmp3_, &_tmp4_); -#line 913 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 915 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp5_ = scaling; -#line 913 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 915 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp6_ = scaling_equals (&_tmp4_, &_tmp5_); -#line 913 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 915 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp1_ = _tmp6_; -#line 6843 "PhotoPage.c" +#line 6744 "PhotoPage.c" } else { -#line 913 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 915 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp1_ = FALSE; -#line 6847 "PhotoPage.c" +#line 6748 "PhotoPage.c" } -#line 913 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 915 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp1_) { -#line 914 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 916 "/home/jens/Source/shotwell/src/PhotoPage.vala" return; -#line 6853 "PhotoPage.c" +#line 6754 "PhotoPage.c" } -#line 916 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 918 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp7_ = caller; -#line 916 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 918 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp8_ = scaling_to_string (&scaling); -#line 916 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 918 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp9_ = _tmp8_; -#line 916 "/home/jens/Source/shotwell/src/PhotoPage.vala" - g_debug ("PhotoPage.vala:916: Rebuild pixbuf caches: %s (%s)", _tmp7_, _tmp9_); -#line 916 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 918 "/home/jens/Source/shotwell/src/PhotoPage.vala" + g_debug ("PhotoPage.vala:918: Rebuild pixbuf caches: %s (%s)", _tmp7_, _tmp9_); +#line 918 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_free0 (_tmp9_); -#line 920 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 922 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp10_ = self->priv->cache; -#line 920 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 922 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp10_ != NULL) { -#line 6869 "PhotoPage.c" +#line 6770 "PhotoPage.c" PixbufCache* _tmp11_ = NULL; guint _tmp12_ = 0U; PixbufCache* _tmp13_ = NULL; -#line 921 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 923 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp11_ = self->priv->cache; -#line 921 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 923 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_signal_parse_name ("fetched", TYPE_PIXBUF_CACHE, &_tmp12_, NULL, FALSE); -#line 921 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 923 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_signal_handlers_disconnect_matched (_tmp11_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp12_, 0, NULL, (GCallback) _editing_host_page_on_pixbuf_fetched_pixbuf_cache_fetched, self); -#line 922 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 924 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp13_ = self->priv->cache; -#line 922 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 924 "/home/jens/Source/shotwell/src/PhotoPage.vala" pixbuf_cache_cancel_all (_tmp13_); -#line 6883 "PhotoPage.c" +#line 6784 "PhotoPage.c" } -#line 925 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 927 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp14_ = self->priv->sources; -#line 925 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 927 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp15_ = scaling; -#line 925 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 927 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp16_ = pixbuf_cache_new (_tmp14_, PIXBUF_CACHE_PHOTO_TYPE_BASELINE, &_tmp15_, EDITING_HOST_PAGE_PIXBUF_CACHE_COUNT, NULL, NULL); -#line 925 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 927 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (self->priv->cache); -#line 925 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 927 "/home/jens/Source/shotwell/src/PhotoPage.vala" self->priv->cache = _tmp16_; -#line 926 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 928 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp17_ = self->priv->cache; -#line 926 "/home/jens/Source/shotwell/src/PhotoPage.vala" - g_signal_connect_object (_tmp17_, "fetched", (GCallback) _editing_host_page_on_pixbuf_fetched_pixbuf_cache_fetched, self, 0); #line 928 "/home/jens/Source/shotwell/src/PhotoPage.vala" + g_signal_connect_object (_tmp17_, "fetched", (GCallback) _editing_host_page_on_pixbuf_fetched_pixbuf_cache_fetched, self, 0); +#line 930 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp18_ = self->priv->sources; -#line 928 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 930 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp19_ = scaling; -#line 928 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 930 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp20_ = pixbuf_cache_new (_tmp18_, PIXBUF_CACHE_PHOTO_TYPE_MASTER, &_tmp19_, EDITING_HOST_PAGE_ORIGINAL_PIXBUF_CACHE_COUNT, _editing_host_page_master_cache_filter_pixbuf_cache_cache_filter, self); -#line 928 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 930 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (self->priv->master_cache); -#line 928 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 930 "/home/jens/Source/shotwell/src/PhotoPage.vala" self->priv->master_cache = _tmp20_; -#line 931 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 933 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp21_ = caller; -#line 931 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 933 "/home/jens/Source/shotwell/src/PhotoPage.vala" editing_host_page_refresh_caches (self, _tmp21_); -#line 6913 "PhotoPage.c" +#line 6814 "PhotoPage.c" } static void editing_host_page_refresh_caches (EditingHostPage* self, const gchar* caller) { gboolean _tmp0_ = FALSE; -#line 935 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 937 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_if_fail (IS_EDITING_HOST_PAGE (self)); -#line 935 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 937 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_if_fail (caller != NULL); -#line 936 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 938 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp0_ = editing_host_page_has_photo (self); -#line 936 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 938 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp0_) { -#line 6927 "PhotoPage.c" +#line 6828 "PhotoPage.c" const gchar* _tmp1_ = NULL; Photo* _tmp2_ = NULL; Photo* _tmp3_ = NULL; @@ -6937,45 +6838,45 @@ static void editing_host_page_refresh_caches (EditingHostPage* self, const gchar ViewCollection* _tmp7_ = NULL; Photo* _tmp8_ = NULL; Photo* _tmp9_ = NULL; -#line 937 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 939 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp1_ = caller; -#line 937 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 939 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp2_ = editing_host_page_get_photo (self); -#line 937 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 939 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp3_ = _tmp2_; -#line 937 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 939 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp4_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_DATA_OBJECT, DataObject)); -#line 937 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 939 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp5_ = _tmp4_; -#line 937 "/home/jens/Source/shotwell/src/PhotoPage.vala" - g_debug ("PhotoPage.vala:937: Refresh pixbuf caches (%s): prefetching neighbors " \ +#line 939 "/home/jens/Source/shotwell/src/PhotoPage.vala" + g_debug ("PhotoPage.vala:939: Refresh pixbuf caches (%s): prefetching neighbors " \ "of %s", _tmp1_, _tmp5_); -#line 937 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 939 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_free0 (_tmp5_); -#line 937 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _g_object_unref0 (_tmp3_); #line 939 "/home/jens/Source/shotwell/src/PhotoPage.vala" + _g_object_unref0 (_tmp3_); +#line 941 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp6_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); -#line 939 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 941 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp7_ = _tmp6_; -#line 939 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 941 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp8_ = editing_host_page_get_photo (self); -#line 939 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 941 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp9_ = _tmp8_; -#line 939 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 941 "/home/jens/Source/shotwell/src/PhotoPage.vala" editing_host_page_prefetch_neighbors (self, _tmp7_, _tmp9_); -#line 939 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 941 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (_tmp9_); -#line 939 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 941 "/home/jens/Source/shotwell/src/PhotoPage.vala" _data_collection_unref0 (_tmp7_); -#line 6967 "PhotoPage.c" +#line 6868 "PhotoPage.c" } else { const gchar* _tmp10_ = NULL; -#line 941 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 943 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp10_ = caller; -#line 941 "/home/jens/Source/shotwell/src/PhotoPage.vala" - g_debug ("PhotoPage.vala:941: Refresh pixbuf caches (%s): (no photo)", _tmp10_); -#line 6974 "PhotoPage.c" +#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" } } @@ -6985,35 +6886,35 @@ static gboolean editing_host_page_master_cache_filter (EditingHostPage* self, Ph gboolean _tmp0_ = FALSE; Photo* _tmp1_ = NULL; gboolean _tmp2_ = FALSE; -#line 945 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 947 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_val_if_fail (IS_EDITING_HOST_PAGE (self), FALSE); -#line 945 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 947 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_val_if_fail (IS_PHOTO (photo), FALSE); -#line 946 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 948 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp1_ = photo; -#line 946 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 948 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp2_ = photo_has_transformations (_tmp1_); -#line 946 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 948 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp2_) { -#line 946 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 948 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp0_ = TRUE; -#line 6996 "PhotoPage.c" +#line 6897 "PhotoPage.c" } else { Photo* _tmp3_ = NULL; gboolean _tmp4_ = FALSE; -#line 946 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 948 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp3_ = photo; -#line 946 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 948 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp4_ = photo_has_editable (_tmp3_); -#line 946 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 948 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp0_ = _tmp4_; -#line 7006 "PhotoPage.c" +#line 6907 "PhotoPage.c" } -#line 946 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 948 "/home/jens/Source/shotwell/src/PhotoPage.vala" result = _tmp0_; -#line 946 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 948 "/home/jens/Source/shotwell/src/PhotoPage.vala" return result; -#line 7012 "PhotoPage.c" +#line 6913 "PhotoPage.c" } @@ -7025,35 +6926,35 @@ static void editing_host_page_on_pixbuf_fetched (EditingHostPage* self, Photo* p gboolean _tmp4_ = FALSE; GdkPixbuf* _tmp5_ = NULL; GError * _inner_error_ = NULL; -#line 949 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 951 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_if_fail (IS_EDITING_HOST_PAGE (self)); -#line 949 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 951 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_if_fail (IS_PHOTO (photo)); -#line 949 "/home/jens/Source/shotwell/src/PhotoPage.vala" - g_return_if_fail ((pixbuf == NULL) || GDK_IS_PIXBUF (pixbuf)); #line 951 "/home/jens/Source/shotwell/src/PhotoPage.vala" + g_return_if_fail ((pixbuf == NULL) || GDK_IS_PIXBUF (pixbuf)); +#line 953 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp0_ = photo; -#line 951 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 953 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp1_ = editing_host_page_get_photo (self); -#line 951 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 953 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp2_ = _tmp1_; -#line 951 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 953 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp3_ = data_source_equals (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_DATA_SOURCE, DataSource), G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_DATA_SOURCE, DataSource)); -#line 951 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 953 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp4_ = !_tmp3_; -#line 951 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 953 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (_tmp2_); -#line 951 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 953 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp4_) { -#line 952 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 954 "/home/jens/Source/shotwell/src/PhotoPage.vala" return; -#line 7046 "PhotoPage.c" +#line 6947 "PhotoPage.c" } -#line 954 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 956 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp5_ = pixbuf; -#line 954 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 956 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp5_ != NULL) { -#line 7052 "PhotoPage.c" +#line 6953 "PhotoPage.c" gboolean _tmp6_ = FALSE; ZoomBuffer* _tmp7_ = NULL; Dimensions max_dim = {0}; @@ -7063,62 +6964,62 @@ static void editing_host_page_on_pixbuf_fetched (EditingHostPage* self, Photo* p GdkPixbuf* _tmp31_ = NULL; Dimensions _tmp32_ = {0}; Photo* _tmp33_ = NULL; -#line 956 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 958 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp7_ = self->priv->zoom_buffer; -#line 956 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 958 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp7_ != NULL) { -#line 7066 "PhotoPage.c" +#line 6967 "PhotoPage.c" ZoomBuffer* _tmp8_ = NULL; Photo* _tmp9_ = NULL; Photo* _tmp10_ = NULL; Photo* _tmp11_ = NULL; -#line 956 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 958 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp8_ = self->priv->zoom_buffer; -#line 956 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 958 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp9_ = zoom_buffer_get_backing_photo (_tmp8_); -#line 956 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 958 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp10_ = _tmp9_; -#line 956 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 958 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp11_ = photo; -#line 956 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 958 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp6_ = _tmp10_ == _tmp11_; -#line 956 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 958 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (_tmp10_); -#line 7083 "PhotoPage.c" +#line 6984 "PhotoPage.c" } else { -#line 956 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 958 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp6_ = FALSE; -#line 7087 "PhotoPage.c" +#line 6988 "PhotoPage.c" } -#line 956 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 958 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp6_) { -#line 7091 "PhotoPage.c" +#line 6992 "PhotoPage.c" Photo* _tmp12_ = NULL; GdkPixbuf* _tmp13_ = NULL; ZoomBuffer* _tmp14_ = NULL; -#line 957 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 959 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp12_ = photo; -#line 957 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 959 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp13_ = pixbuf; -#line 957 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 959 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp14_ = zoom_buffer_new (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), _tmp12_, _tmp13_); -#line 957 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 959 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (self->priv->zoom_buffer); -#line 957 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 959 "/home/jens/Source/shotwell/src/PhotoPage.vala" self->priv->zoom_buffer = _tmp14_; -#line 7105 "PhotoPage.c" +#line 7006 "PhotoPage.c" } -#line 961 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 963 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp15_ = photo; -#line 961 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 963 "/home/jens/Source/shotwell/src/PhotoPage.vala" media_source_get_dimensions (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, TYPE_MEDIA_SOURCE, MediaSource), PHOTO_EXCEPTION_NONE, &_tmp16_); -#line 961 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 963 "/home/jens/Source/shotwell/src/PhotoPage.vala" max_dim = _tmp16_; -#line 962 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 964 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp17_ = self->priv->current_tool; -#line 962 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 964 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp17_ != NULL) { -#line 7117 "PhotoPage.c" +#line 7018 "PhotoPage.c" { Dimensions tool_pixbuf_dim = {0}; GdkPixbuf* tool_pixbuf = NULL; @@ -7128,46 +7029,46 @@ static void editing_host_page_on_pixbuf_fetched (EditingHostPage* self, Photo* p Dimensions _tmp21_ = {0}; GdkPixbuf* _tmp22_ = NULL; GdkPixbuf* _tmp23_ = NULL; -#line 965 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 967 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp18_ = self->priv->current_tool; -#line 965 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 967 "/home/jens/Source/shotwell/src/PhotoPage.vala" single_photo_page_get_canvas_scaling (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), &_tmp19_); -#line 965 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 967 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp20_ = photo; -#line 965 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 967 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp22_ = editing_tools_editing_tool_get_display_pixbuf (_tmp18_, &_tmp19_, _tmp20_, &_tmp21_, &_inner_error_); -#line 965 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 967 "/home/jens/Source/shotwell/src/PhotoPage.vala" tool_pixbuf_dim = _tmp21_; -#line 965 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 967 "/home/jens/Source/shotwell/src/PhotoPage.vala" tool_pixbuf = _tmp22_; -#line 965 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 967 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 7141 "PhotoPage.c" - goto __catch244_g_error; +#line 7042 "PhotoPage.c" + goto __catch241_g_error; } -#line 968 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 970 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp23_ = tool_pixbuf; -#line 968 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 970 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp23_ != NULL) { -#line 7148 "PhotoPage.c" +#line 7049 "PhotoPage.c" GdkPixbuf* _tmp24_ = NULL; Dimensions _tmp25_ = {0}; -#line 969 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 971 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp24_ = tool_pixbuf; -#line 969 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 971 "/home/jens/Source/shotwell/src/PhotoPage.vala" pixbuf = _tmp24_; -#line 970 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 972 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp25_ = tool_pixbuf_dim; -#line 970 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 972 "/home/jens/Source/shotwell/src/PhotoPage.vala" max_dim = _tmp25_; -#line 7159 "PhotoPage.c" +#line 7060 "PhotoPage.c" } -#line 963 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 965 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (tool_pixbuf); -#line 7163 "PhotoPage.c" +#line 7064 "PhotoPage.c" } - goto __finally244; - __catch244_g_error: + goto __finally241; + __catch241_g_error: { GError* err = NULL; Photo* _tmp26_ = NULL; @@ -7175,72 +7076,72 @@ static void editing_host_page_on_pixbuf_fetched (EditingHostPage* self, Photo* p gchar* _tmp28_ = NULL; GError* _tmp29_ = NULL; const gchar* _tmp30_ = NULL; -#line 963 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 965 "/home/jens/Source/shotwell/src/PhotoPage.vala" err = _inner_error_; -#line 963 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 965 "/home/jens/Source/shotwell/src/PhotoPage.vala" _inner_error_ = NULL; -#line 973 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 975 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp26_ = photo; -#line 973 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 975 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp27_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, TYPE_DATA_OBJECT, DataObject)); -#line 973 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 975 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp28_ = _tmp27_; -#line 973 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 975 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp29_ = err; -#line 973 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 975 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp30_ = _tmp29_->message; -#line 973 "/home/jens/Source/shotwell/src/PhotoPage.vala" - g_warning ("PhotoPage.vala:973: Unable to fetch tool pixbuf for %s: %s", _tmp28_, _tmp30_); -#line 973 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 975 "/home/jens/Source/shotwell/src/PhotoPage.vala" + g_warning ("PhotoPage.vala:975: Unable to fetch tool pixbuf for %s: %s", _tmp28_, _tmp30_); +#line 975 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_free0 (_tmp28_); -#line 974 "/home/jens/Source/shotwell/src/PhotoPage.vala" - editing_host_page_set_photo_missing (self, TRUE); #line 976 "/home/jens/Source/shotwell/src/PhotoPage.vala" + editing_host_page_set_photo_missing (self, TRUE); +#line 978 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_error_free0 (err); -#line 976 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 978 "/home/jens/Source/shotwell/src/PhotoPage.vala" return; -#line 7198 "PhotoPage.c" +#line 7099 "PhotoPage.c" } - __finally244: -#line 963 "/home/jens/Source/shotwell/src/PhotoPage.vala" + __finally241: +#line 965 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 963 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 965 "/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 963 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 965 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_clear_error (&_inner_error_); -#line 963 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 965 "/home/jens/Source/shotwell/src/PhotoPage.vala" return; -#line 7209 "PhotoPage.c" +#line 7110 "PhotoPage.c" } } -#line 980 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 982 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp31_ = pixbuf; -#line 980 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 982 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp32_ = max_dim; -#line 980 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 982 "/home/jens/Source/shotwell/src/PhotoPage.vala" single_photo_page_set_pixbuf (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), _tmp31_, &_tmp32_, NULL); -#line 981 "/home/jens/Source/shotwell/src/PhotoPage.vala" - self->priv->pixbuf_dirty = FALSE; #line 983 "/home/jens/Source/shotwell/src/PhotoPage.vala" + self->priv->pixbuf_dirty = FALSE; +#line 985 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp33_ = photo; -#line 983 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#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 7224 "PhotoPage.c" +#line 7125 "PhotoPage.c" } else { GError* _tmp34_ = NULL; -#line 984 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 986 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp34_ = err; -#line 984 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 986 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp34_ != NULL) { -#line 7231 "PhotoPage.c" +#line 7132 "PhotoPage.c" Photo* _tmp35_ = NULL; -#line 987 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 989 "/home/jens/Source/shotwell/src/PhotoPage.vala" editing_host_page_set_photo_missing (self, TRUE); -#line 990 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 992 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp35_ = photo; -#line 990 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#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 7239 "PhotoPage.c" +#line 7140 "PhotoPage.c" } } } @@ -7272,73 +7173,73 @@ static void editing_host_page_prefetch_neighbors (EditingHostPage* self, ViewCol PixbufCachePixbufCacheBatch* _tmp40_ = NULL; PixbufCache* _tmp41_ = NULL; PixbufCachePixbufCacheBatch* _tmp42_ = NULL; -#line 994 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 996 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_if_fail (IS_EDITING_HOST_PAGE (self)); -#line 994 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 996 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_if_fail (IS_VIEW_COLLECTION (controller)); -#line 994 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 996 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_if_fail (IS_PHOTO (photo)); -#line 995 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 997 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp0_ = pixbuf_cache_pixbuf_cache_batch_new (); -#line 995 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 997 "/home/jens/Source/shotwell/src/PhotoPage.vala" normal_batch = _tmp0_; -#line 996 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 998 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp1_ = pixbuf_cache_pixbuf_cache_batch_new (); -#line 996 "/home/jens/Source/shotwell/src/PhotoPage.vala" - master_batch = _tmp1_; #line 998 "/home/jens/Source/shotwell/src/PhotoPage.vala" + master_batch = _tmp1_; +#line 1000 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp2_ = normal_batch; -#line 998 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1000 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp3_ = photo; -#line 998 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1000 "/home/jens/Source/shotwell/src/PhotoPage.vala" gee_multi_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_MULTI_MAP, GeeMultiMap), (gpointer) ((gintptr) BACKGROUND_JOB_JOB_PRIORITY_HIGHEST), _tmp3_); -#line 999 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1001 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp4_ = master_batch; -#line 999 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1001 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp5_ = photo; -#line 999 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1001 "/home/jens/Source/shotwell/src/PhotoPage.vala" gee_multi_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, GEE_TYPE_MULTI_MAP, GeeMultiMap), (gpointer) ((gintptr) BACKGROUND_JOB_JOB_PRIORITY_LOW), _tmp5_); -#line 1002 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1004 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp6_ = controller; -#line 1002 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1004 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp7_ = photo; -#line 1002 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1004 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp10_ = view_collection_get_immediate_neighbors (_tmp6_, G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_DATA_SOURCE, DataSource), &_tmp8_, &_tmp9_, PHOTO_TYPENAME); -#line 1002 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1004 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (next_source); -#line 1002 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1004 "/home/jens/Source/shotwell/src/PhotoPage.vala" next_source = _tmp8_; -#line 1002 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1004 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (prev_source); -#line 1002 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1004 "/home/jens/Source/shotwell/src/PhotoPage.vala" prev_source = _tmp9_; -#line 1002 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1004 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (!_tmp10_) { -#line 1003 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1005 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (prev_source); -#line 1003 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1005 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (next_source); -#line 1003 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1005 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (master_batch); -#line 1003 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1005 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (normal_batch); -#line 1003 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1005 "/home/jens/Source/shotwell/src/PhotoPage.vala" return; -#line 7323 "PhotoPage.c" +#line 7224 "PhotoPage.c" } -#line 1005 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1007 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp11_ = next_source; -#line 1005 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1007 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp12_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, TYPE_PHOTO, Photo)); -#line 1005 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1007 "/home/jens/Source/shotwell/src/PhotoPage.vala" next = _tmp12_; -#line 1006 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1008 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp13_ = prev_source; -#line 1006 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1008 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp14_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, TYPE_PHOTO, Photo)); -#line 1006 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1008 "/home/jens/Source/shotwell/src/PhotoPage.vala" prev = _tmp14_; -#line 7337 "PhotoPage.c" +#line 7238 "PhotoPage.c" { GeeIterator* _neighbor_source_it = NULL; ViewCollection* _tmp15_ = NULL; @@ -7347,25 +7248,25 @@ static void editing_host_page_prefetch_neighbors (EditingHostPage* self, ViewCol GeeSet* _tmp18_ = NULL; GeeIterator* _tmp19_ = NULL; GeeIterator* _tmp20_ = NULL; -#line 1009 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1011 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp15_ = controller; -#line 1009 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1011 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp16_ = photo; -#line 1009 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1011 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp17_ = view_collection_get_extended_neighbors (_tmp15_, G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, TYPE_DATA_SOURCE, DataSource), PHOTO_TYPENAME); -#line 1009 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1011 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp18_ = _tmp17_; -#line 1009 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1011 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp19_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, GEE_TYPE_ITERABLE, GeeIterable)); -#line 1009 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1011 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp20_ = _tmp19_; -#line 1009 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1011 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (_tmp18_); -#line 1009 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1011 "/home/jens/Source/shotwell/src/PhotoPage.vala" _neighbor_source_it = _tmp20_; -#line 1009 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1011 "/home/jens/Source/shotwell/src/PhotoPage.vala" while (TRUE) { -#line 7364 "PhotoPage.c" +#line 7265 "PhotoPage.c" GeeIterator* _tmp21_ = NULL; gboolean _tmp22_ = FALSE; DataSource* neighbor_source = NULL; @@ -7384,110 +7285,110 @@ static void editing_host_page_prefetch_neighbors (EditingHostPage* self, ViewCol Photo* _tmp36_ = NULL; PixbufCachePixbufCacheBatch* _tmp37_ = NULL; Photo* _tmp38_ = NULL; -#line 1009 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1011 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp21_ = _neighbor_source_it; -#line 1009 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1011 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp22_ = gee_iterator_next (_tmp21_); -#line 1009 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1011 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (!_tmp22_) { -#line 1009 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1011 "/home/jens/Source/shotwell/src/PhotoPage.vala" break; -#line 7391 "PhotoPage.c" +#line 7292 "PhotoPage.c" } -#line 1009 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1011 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp23_ = _neighbor_source_it; -#line 1009 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1011 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp24_ = gee_iterator_get (_tmp23_); -#line 1009 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1011 "/home/jens/Source/shotwell/src/PhotoPage.vala" neighbor_source = (DataSource*) _tmp24_; -#line 1010 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1012 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp25_ = neighbor_source; -#line 1010 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1012 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp26_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, TYPE_PHOTO, Photo)); -#line 1010 "/home/jens/Source/shotwell/src/PhotoPage.vala" - neighbor = _tmp26_; #line 1012 "/home/jens/Source/shotwell/src/PhotoPage.vala" + neighbor = _tmp26_; +#line 1014 "/home/jens/Source/shotwell/src/PhotoPage.vala" priority = BACKGROUND_JOB_JOB_PRIORITY_NORMAL; -#line 1013 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1015 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp28_ = neighbor; -#line 1013 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1015 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp29_ = next; -#line 1013 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1015 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp30_ = data_source_equals (G_TYPE_CHECK_INSTANCE_CAST (_tmp28_, TYPE_DATA_SOURCE, DataSource), G_TYPE_CHECK_INSTANCE_CAST (_tmp29_, TYPE_DATA_SOURCE, DataSource)); -#line 1013 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1015 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp30_) { -#line 1013 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1015 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp27_ = TRUE; -#line 7417 "PhotoPage.c" +#line 7318 "PhotoPage.c" } else { Photo* _tmp31_ = NULL; Photo* _tmp32_ = NULL; gboolean _tmp33_ = FALSE; -#line 1013 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1015 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp31_ = neighbor; -#line 1013 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1015 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp32_ = prev; -#line 1013 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1015 "/home/jens/Source/shotwell/src/PhotoPage.vala" _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 1013 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1015 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp27_ = _tmp33_; -#line 7430 "PhotoPage.c" +#line 7331 "PhotoPage.c" } -#line 1013 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1015 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp27_) { -#line 1014 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1016 "/home/jens/Source/shotwell/src/PhotoPage.vala" priority = BACKGROUND_JOB_JOB_PRIORITY_HIGH; -#line 7436 "PhotoPage.c" +#line 7337 "PhotoPage.c" } -#line 1016 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1018 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp34_ = normal_batch; -#line 1016 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1018 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp35_ = priority; -#line 1016 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1018 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp36_ = neighbor; -#line 1016 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1018 "/home/jens/Source/shotwell/src/PhotoPage.vala" gee_multi_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp34_, GEE_TYPE_MULTI_MAP, GeeMultiMap), (gpointer) ((gintptr) _tmp35_), _tmp36_); -#line 1017 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1019 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp37_ = master_batch; -#line 1017 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1019 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp38_ = neighbor; -#line 1017 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1019 "/home/jens/Source/shotwell/src/PhotoPage.vala" gee_multi_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp37_, GEE_TYPE_MULTI_MAP, GeeMultiMap), (gpointer) ((gintptr) BACKGROUND_JOB_JOB_PRIORITY_LOWEST), _tmp38_); -#line 1009 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1011 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (neighbor); -#line 1009 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1011 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (neighbor_source); -#line 7456 "PhotoPage.c" +#line 7357 "PhotoPage.c" } -#line 1009 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1011 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (_neighbor_source_it); -#line 7460 "PhotoPage.c" +#line 7361 "PhotoPage.c" } -#line 1020 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1022 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp39_ = self->priv->cache; -#line 1020 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1022 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp40_ = normal_batch; -#line 1020 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1022 "/home/jens/Source/shotwell/src/PhotoPage.vala" pixbuf_cache_prefetch_batch (_tmp39_, _tmp40_, FALSE); -#line 1021 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1023 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp41_ = self->priv->master_cache; -#line 1021 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1023 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp42_ = master_batch; -#line 1021 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1023 "/home/jens/Source/shotwell/src/PhotoPage.vala" pixbuf_cache_prefetch_batch (_tmp41_, _tmp42_, FALSE); -#line 994 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 996 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (prev); -#line 994 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 996 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (next); -#line 994 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 996 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (prev_source); -#line 994 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 996 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (next_source); -#line 994 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 996 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (master_batch); -#line 994 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 996 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (normal_batch); -#line 7486 "PhotoPage.c" +#line 7387 "PhotoPage.c" } @@ -7504,46 +7405,46 @@ static void editing_host_page_cancel_prefetch_neighbors (EditingHostPage* self, GeeSet* _tmp24_ = NULL; Photo* _tmp25_ = NULL; gboolean _tmp26_ = FALSE; -#line 1026 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1028 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_if_fail (IS_EDITING_HOST_PAGE (self)); -#line 1026 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1028 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_if_fail (IS_VIEW_COLLECTION (old_controller)); -#line 1026 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1028 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_if_fail (IS_PHOTO (old_photo)); -#line 1026 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1028 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_if_fail (IS_VIEW_COLLECTION (new_controller)); -#line 1026 "/home/jens/Source/shotwell/src/PhotoPage.vala" - g_return_if_fail (IS_PHOTO (new_photo)); #line 1028 "/home/jens/Source/shotwell/src/PhotoPage.vala" + g_return_if_fail (IS_PHOTO (new_photo)); +#line 1030 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp0_ = old_controller; -#line 1028 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1030 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp1_ = old_photo; -#line 1028 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1030 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp2_ = view_collection_get_extended_neighbors (_tmp0_, G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_DATA_SOURCE, DataSource), PHOTO_TYPENAME); -#line 1028 "/home/jens/Source/shotwell/src/PhotoPage.vala" - old_neighbors = G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_SET, GeeSet); #line 1030 "/home/jens/Source/shotwell/src/PhotoPage.vala" + old_neighbors = G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_SET, GeeSet); +#line 1032 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp3_ = new_controller; -#line 1030 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1032 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp4_ = new_photo; -#line 1030 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1032 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp5_ = view_collection_get_extended_neighbors (_tmp3_, G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_DATA_SOURCE, DataSource), PHOTO_TYPENAME); -#line 1030 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1032 "/home/jens/Source/shotwell/src/PhotoPage.vala" new_neighbors = G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, GEE_TYPE_SET, GeeSet); -#line 7529 "PhotoPage.c" +#line 7430 "PhotoPage.c" { GeeIterator* _old_neighbor_it = NULL; GeeSet* _tmp6_ = NULL; GeeIterator* _tmp7_ = NULL; -#line 1033 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1035 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp6_ = old_neighbors; -#line 1033 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1035 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp7_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_ITERABLE, GeeIterable)); -#line 1033 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1035 "/home/jens/Source/shotwell/src/PhotoPage.vala" _old_neighbor_it = _tmp7_; -#line 1033 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1035 "/home/jens/Source/shotwell/src/PhotoPage.vala" while (TRUE) { -#line 7542 "PhotoPage.c" +#line 7443 "PhotoPage.c" GeeIterator* _tmp8_ = NULL; gboolean _tmp9_ = FALSE; Photo* old_neighbor = NULL; @@ -7553,129 +7454,129 @@ static void editing_host_page_cancel_prefetch_neighbors (EditingHostPage* self, GeeSet* _tmp13_ = NULL; Photo* _tmp14_ = NULL; gboolean _tmp15_ = FALSE; -#line 1033 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1035 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp8_ = _old_neighbor_it; -#line 1033 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1035 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp9_ = gee_iterator_next (_tmp8_); -#line 1033 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1035 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (!_tmp9_) { -#line 1033 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1035 "/home/jens/Source/shotwell/src/PhotoPage.vala" break; -#line 7560 "PhotoPage.c" +#line 7461 "PhotoPage.c" } -#line 1033 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1035 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp10_ = _old_neighbor_it; -#line 1033 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1035 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp11_ = gee_iterator_get (_tmp10_); -#line 1033 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1035 "/home/jens/Source/shotwell/src/PhotoPage.vala" old_neighbor = (Photo*) _tmp11_; -#line 1036 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1038 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp13_ = new_neighbors; -#line 1036 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1038 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp14_ = old_neighbor; -#line 1036 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1038 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp15_ = gee_collection_contains (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, GEE_TYPE_COLLECTION, GeeCollection), _tmp14_); -#line 1036 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1038 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (!_tmp15_) { -#line 7576 "PhotoPage.c" +#line 7477 "PhotoPage.c" Photo* _tmp16_ = NULL; Photo* _tmp17_ = NULL; gboolean _tmp18_ = FALSE; -#line 1036 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1038 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp16_ = new_photo; -#line 1036 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1038 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp17_ = old_neighbor; -#line 1036 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1038 "/home/jens/Source/shotwell/src/PhotoPage.vala" _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 1036 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1038 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp12_ = !_tmp18_; -#line 7588 "PhotoPage.c" +#line 7489 "PhotoPage.c" } else { -#line 1036 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1038 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp12_ = FALSE; -#line 7592 "PhotoPage.c" +#line 7493 "PhotoPage.c" } -#line 1036 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1038 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp12_) { -#line 7596 "PhotoPage.c" +#line 7497 "PhotoPage.c" PixbufCache* _tmp19_ = NULL; Photo* _tmp20_ = NULL; PixbufCache* _tmp21_ = NULL; Photo* _tmp22_ = NULL; -#line 1037 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1039 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp19_ = self->priv->cache; -#line 1037 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1039 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp20_ = old_neighbor; -#line 1037 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1039 "/home/jens/Source/shotwell/src/PhotoPage.vala" pixbuf_cache_drop (_tmp19_, _tmp20_); -#line 1038 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1040 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp21_ = self->priv->master_cache; -#line 1038 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1040 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp22_ = old_neighbor; -#line 1038 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1040 "/home/jens/Source/shotwell/src/PhotoPage.vala" pixbuf_cache_drop (_tmp21_, _tmp22_); -#line 7613 "PhotoPage.c" +#line 7514 "PhotoPage.c" } -#line 1033 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1035 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (old_neighbor); -#line 7617 "PhotoPage.c" +#line 7518 "PhotoPage.c" } -#line 1033 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1035 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (_old_neighbor_it); -#line 7621 "PhotoPage.c" +#line 7522 "PhotoPage.c" } -#line 1043 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1045 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp24_ = new_neighbors; -#line 1043 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1045 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp25_ = old_photo; -#line 1043 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1045 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp26_ = gee_collection_contains (G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, GEE_TYPE_COLLECTION, GeeCollection), _tmp25_); -#line 1043 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1045 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (!_tmp26_) { -#line 7631 "PhotoPage.c" +#line 7532 "PhotoPage.c" Photo* _tmp27_ = NULL; Photo* _tmp28_ = NULL; gboolean _tmp29_ = FALSE; -#line 1043 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1045 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp27_ = new_photo; -#line 1043 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1045 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp28_ = old_photo; -#line 1043 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1045 "/home/jens/Source/shotwell/src/PhotoPage.vala" _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 1043 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1045 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp23_ = !_tmp29_; -#line 7643 "PhotoPage.c" +#line 7544 "PhotoPage.c" } else { -#line 1043 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1045 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp23_ = FALSE; -#line 7647 "PhotoPage.c" +#line 7548 "PhotoPage.c" } -#line 1043 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1045 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp23_) { -#line 7651 "PhotoPage.c" +#line 7552 "PhotoPage.c" PixbufCache* _tmp30_ = NULL; Photo* _tmp31_ = NULL; PixbufCache* _tmp32_ = NULL; Photo* _tmp33_ = NULL; -#line 1044 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1046 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp30_ = self->priv->cache; -#line 1044 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1046 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp31_ = old_photo; -#line 1044 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1046 "/home/jens/Source/shotwell/src/PhotoPage.vala" pixbuf_cache_drop (_tmp30_, _tmp31_); -#line 1045 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1047 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp32_ = self->priv->master_cache; -#line 1045 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1047 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp33_ = old_photo; -#line 1045 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1047 "/home/jens/Source/shotwell/src/PhotoPage.vala" pixbuf_cache_drop (_tmp32_, _tmp33_); -#line 7668 "PhotoPage.c" +#line 7569 "PhotoPage.c" } -#line 1026 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1028 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (new_neighbors); -#line 1026 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1028 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (old_neighbors); -#line 7674 "PhotoPage.c" +#line 7575 "PhotoPage.c" } @@ -7683,61 +7584,61 @@ static DataView* editing_host_page_real_create_photo_view (EditingHostPage* self DataView* result = NULL; DataSource* _tmp0_ = NULL; PhotoView* _tmp1_ = NULL; -#line 1049 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1051 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_val_if_fail (IS_DATA_SOURCE (source), NULL); -#line 1050 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1052 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp0_ = source; -#line 1050 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1052 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp1_ = photo_view_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_PHOTO_SOURCE, PhotoSource)); -#line 1050 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1052 "/home/jens/Source/shotwell/src/PhotoPage.vala" result = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_DATA_VIEW, DataView); -#line 1050 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1052 "/home/jens/Source/shotwell/src/PhotoPage.vala" return result; -#line 7692 "PhotoPage.c" +#line 7593 "PhotoPage.c" } DataView* editing_host_page_create_photo_view (EditingHostPage* self, DataSource* source) { -#line 1049 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1051 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_val_if_fail (IS_EDITING_HOST_PAGE (self), NULL); -#line 1049 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1051 "/home/jens/Source/shotwell/src/PhotoPage.vala" return EDITING_HOST_PAGE_GET_CLASS (self)->create_photo_view (self, source); -#line 7701 "PhotoPage.c" +#line 7602 "PhotoPage.c" } static gboolean editing_host_page_is_photo (EditingHostPage* self, DataSource* source) { gboolean result = FALSE; DataSource* _tmp0_ = NULL; -#line 1053 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1055 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_val_if_fail (IS_EDITING_HOST_PAGE (self), FALSE); -#line 1053 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1055 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_val_if_fail (IS_DATA_SOURCE (source), FALSE); -#line 1054 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1056 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp0_ = source; -#line 1054 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1056 "/home/jens/Source/shotwell/src/PhotoPage.vala" result = G_TYPE_CHECK_INSTANCE_TYPE (_tmp0_, TYPE_PHOTO_SOURCE); -#line 1054 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1056 "/home/jens/Source/shotwell/src/PhotoPage.vala" return result; -#line 7718 "PhotoPage.c" +#line 7619 "PhotoPage.c" } static DataView* _editing_host_page_create_photo_view_create_view (DataSource* source, gpointer self) { DataView* result; result = editing_host_page_create_photo_view ((EditingHostPage*) self, source); -#line 1062 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1064 "/home/jens/Source/shotwell/src/PhotoPage.vala" return result; -#line 7727 "PhotoPage.c" +#line 7628 "PhotoPage.c" } static gboolean _editing_host_page_is_photo_create_view_predicate (DataSource* source, gpointer self) { gboolean result; result = editing_host_page_is_photo ((EditingHostPage*) self, source); -#line 1062 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1064 "/home/jens/Source/shotwell/src/PhotoPage.vala" return result; -#line 7736 "PhotoPage.c" +#line 7637 "PhotoPage.c" } @@ -7752,54 +7653,54 @@ void editing_host_page_display_copy_of (EditingHostPage* self, ViewCollection* c ViewCollection* _tmp7_ = NULL; gboolean _tmp8_ = FALSE; Photo* _tmp18_ = NULL; -#line 1057 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1059 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_if_fail (IS_EDITING_HOST_PAGE (self)); -#line 1057 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1059 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_if_fail (IS_VIEW_COLLECTION (controller)); -#line 1057 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1059 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_if_fail (IS_PHOTO (starting_photo)); -#line 1058 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1060 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp0_ = controller; -#line 1058 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1060 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp1_ = starting_photo; -#line 1058 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1060 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp2_ = view_collection_get_view_for_source (_tmp0_, G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_DATA_SOURCE, DataSource)); -#line 1058 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1060 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp3_ = _tmp2_; -#line 1058 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1060 "/home/jens/Source/shotwell/src/PhotoPage.vala" _vala_assert (_tmp3_ != NULL, "controller.get_view_for_source(starting_photo) != null"); -#line 1058 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _g_object_unref0 (_tmp3_); #line 1060 "/home/jens/Source/shotwell/src/PhotoPage.vala" + _g_object_unref0 (_tmp3_); +#line 1062 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp5_ = controller; -#line 1060 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1062 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp6_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); -#line 1060 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1062 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp7_ = _tmp6_; -#line 1060 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1062 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp8_ = _tmp5_ != _tmp7_; -#line 1060 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1062 "/home/jens/Source/shotwell/src/PhotoPage.vala" _data_collection_unref0 (_tmp7_); -#line 1060 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1062 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp8_) { -#line 7781 "PhotoPage.c" +#line 7682 "PhotoPage.c" ViewCollection* _tmp9_ = NULL; ViewCollection* _tmp10_ = NULL; -#line 1060 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1062 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp9_ = controller; -#line 1060 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1062 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp10_ = self->priv->parent_view; -#line 1060 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1062 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp4_ = _tmp9_ != _tmp10_; -#line 7790 "PhotoPage.c" +#line 7691 "PhotoPage.c" } else { -#line 1060 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1062 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp4_ = FALSE; -#line 7794 "PhotoPage.c" +#line 7695 "PhotoPage.c" } -#line 1060 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1062 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp4_) { -#line 7798 "PhotoPage.c" +#line 7699 "PhotoPage.c" ViewCollection* _tmp11_ = NULL; ViewCollection* _tmp12_ = NULL; ViewCollection* _tmp13_ = NULL; @@ -7807,39 +7708,39 @@ void editing_host_page_display_copy_of (EditingHostPage* self, ViewCollection* c ViewCollection* _tmp15_ = NULL; ViewCollection* _tmp16_ = NULL; ViewCollection* _tmp17_ = NULL; -#line 1061 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1063 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp11_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); -#line 1061 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1063 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp12_ = _tmp11_; -#line 1061 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1063 "/home/jens/Source/shotwell/src/PhotoPage.vala" data_collection_clear (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, TYPE_DATA_COLLECTION, DataCollection)); -#line 1061 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1063 "/home/jens/Source/shotwell/src/PhotoPage.vala" _data_collection_unref0 (_tmp12_); -#line 1062 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1064 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp13_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); -#line 1062 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1064 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp14_ = _tmp13_; -#line 1062 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1064 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp15_ = controller; -#line 1062 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1064 "/home/jens/Source/shotwell/src/PhotoPage.vala" view_collection_copy_into (_tmp14_, _tmp15_, _editing_host_page_create_photo_view_create_view, self, _editing_host_page_is_photo_create_view_predicate, self); -#line 1062 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1064 "/home/jens/Source/shotwell/src/PhotoPage.vala" _data_collection_unref0 (_tmp14_); -#line 1063 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1065 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp16_ = controller; -#line 1063 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1065 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp17_ = _data_collection_ref0 (_tmp16_); -#line 1063 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1065 "/home/jens/Source/shotwell/src/PhotoPage.vala" _data_collection_unref0 (self->priv->parent_view); -#line 1063 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1065 "/home/jens/Source/shotwell/src/PhotoPage.vala" self->priv->parent_view = _tmp17_; -#line 7832 "PhotoPage.c" +#line 7733 "PhotoPage.c" } -#line 1066 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1068 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp18_ = starting_photo; -#line 1066 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1068 "/home/jens/Source/shotwell/src/PhotoPage.vala" editing_host_page_replace_photo (self, _tmp18_); -#line 7838 "PhotoPage.c" +#line 7739 "PhotoPage.c" } @@ -7854,54 +7755,54 @@ void editing_host_page_display_mirror_of (EditingHostPage* self, ViewCollection* ViewCollection* _tmp7_ = NULL; gboolean _tmp8_ = FALSE; Photo* _tmp18_ = NULL; -#line 1069 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1071 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_if_fail (IS_EDITING_HOST_PAGE (self)); -#line 1069 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1071 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_if_fail (IS_VIEW_COLLECTION (controller)); -#line 1069 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1071 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_if_fail (IS_PHOTO (starting_photo)); -#line 1070 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1072 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp0_ = controller; -#line 1070 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1072 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp1_ = starting_photo; -#line 1070 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1072 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp2_ = view_collection_get_view_for_source (_tmp0_, G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_DATA_SOURCE, DataSource)); -#line 1070 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1072 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp3_ = _tmp2_; -#line 1070 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1072 "/home/jens/Source/shotwell/src/PhotoPage.vala" _vala_assert (_tmp3_ != NULL, "controller.get_view_for_source(starting_photo) != null"); -#line 1070 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _g_object_unref0 (_tmp3_); #line 1072 "/home/jens/Source/shotwell/src/PhotoPage.vala" + _g_object_unref0 (_tmp3_); +#line 1074 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp5_ = controller; -#line 1072 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1074 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp6_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); -#line 1072 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1074 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp7_ = _tmp6_; -#line 1072 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1074 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp8_ = _tmp5_ != _tmp7_; -#line 1072 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1074 "/home/jens/Source/shotwell/src/PhotoPage.vala" _data_collection_unref0 (_tmp7_); -#line 1072 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1074 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp8_) { -#line 7883 "PhotoPage.c" +#line 7784 "PhotoPage.c" ViewCollection* _tmp9_ = NULL; ViewCollection* _tmp10_ = NULL; -#line 1072 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1074 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp9_ = controller; -#line 1072 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1074 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp10_ = self->priv->parent_view; -#line 1072 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1074 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp4_ = _tmp9_ != _tmp10_; -#line 7892 "PhotoPage.c" +#line 7793 "PhotoPage.c" } else { -#line 1072 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1074 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp4_ = FALSE; -#line 7896 "PhotoPage.c" +#line 7797 "PhotoPage.c" } -#line 1072 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1074 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp4_) { -#line 7900 "PhotoPage.c" +#line 7801 "PhotoPage.c" ViewCollection* _tmp11_ = NULL; ViewCollection* _tmp12_ = NULL; ViewCollection* _tmp13_ = NULL; @@ -7909,39 +7810,39 @@ void editing_host_page_display_mirror_of (EditingHostPage* self, ViewCollection* ViewCollection* _tmp15_ = NULL; ViewCollection* _tmp16_ = NULL; ViewCollection* _tmp17_ = NULL; -#line 1073 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1075 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp11_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); -#line 1073 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1075 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp12_ = _tmp11_; -#line 1073 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1075 "/home/jens/Source/shotwell/src/PhotoPage.vala" data_collection_clear (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, TYPE_DATA_COLLECTION, DataCollection)); -#line 1073 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1075 "/home/jens/Source/shotwell/src/PhotoPage.vala" _data_collection_unref0 (_tmp12_); -#line 1074 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1076 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp13_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); -#line 1074 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1076 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp14_ = _tmp13_; -#line 1074 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1076 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp15_ = controller; -#line 1074 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1076 "/home/jens/Source/shotwell/src/PhotoPage.vala" view_collection_mirror (_tmp14_, _tmp15_, _editing_host_page_create_photo_view_create_view, self, _editing_host_page_is_photo_create_view_predicate, self); -#line 1074 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1076 "/home/jens/Source/shotwell/src/PhotoPage.vala" _data_collection_unref0 (_tmp14_); -#line 1075 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1077 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp16_ = controller; -#line 1075 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1077 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp17_ = _data_collection_ref0 (_tmp16_); -#line 1075 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1077 "/home/jens/Source/shotwell/src/PhotoPage.vala" _data_collection_unref0 (self->priv->parent_view); -#line 1075 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1077 "/home/jens/Source/shotwell/src/PhotoPage.vala" self->priv->parent_view = _tmp17_; -#line 7934 "PhotoPage.c" +#line 7835 "PhotoPage.c" } -#line 1078 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1080 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp18_ = starting_photo; -#line 1078 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1080 "/home/jens/Source/shotwell/src/PhotoPage.vala" editing_host_page_replace_photo (self, _tmp18_); -#line 7940 "PhotoPage.c" +#line 7841 "PhotoPage.c" } @@ -7956,68 +7857,68 @@ static void editing_host_page_real_update_ui (EditingHostPage* self, gboolean mi GtkToolButton* _tmp6_ = NULL; GtkScale* _tmp7_ = NULL; Dimensions _tmp8_ = {0}; -#line 1082 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1084 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp0_ = missing; -#line 1082 "/home/jens/Source/shotwell/src/PhotoPage.vala" - sensitivity = !_tmp0_; #line 1084 "/home/jens/Source/shotwell/src/PhotoPage.vala" + sensitivity = !_tmp0_; +#line 1086 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp1_ = self->priv->rotate_button; -#line 1084 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1086 "/home/jens/Source/shotwell/src/PhotoPage.vala" gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_widget_get_type (), GtkWidget), sensitivity); -#line 1085 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1087 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp2_ = self->priv->crop_button; -#line 1085 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1087 "/home/jens/Source/shotwell/src/PhotoPage.vala" gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_widget_get_type (), GtkWidget), sensitivity); -#line 1086 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1088 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp3_ = self->priv->straighten_button; -#line 1086 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1088 "/home/jens/Source/shotwell/src/PhotoPage.vala" gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, gtk_widget_get_type (), GtkWidget), sensitivity); -#line 1087 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1089 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp4_ = self->priv->redeye_button; -#line 1087 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1089 "/home/jens/Source/shotwell/src/PhotoPage.vala" gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, gtk_widget_get_type (), GtkWidget), sensitivity); -#line 1088 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1090 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp5_ = self->priv->adjust_button; -#line 1088 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1090 "/home/jens/Source/shotwell/src/PhotoPage.vala" gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, gtk_widget_get_type (), GtkWidget), sensitivity); -#line 1089 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1091 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp6_ = self->priv->enhance_button; -#line 1089 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1091 "/home/jens/Source/shotwell/src/PhotoPage.vala" gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, gtk_widget_get_type (), GtkWidget), sensitivity); -#line 1090 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1092 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp7_ = self->priv->zoom_slider; -#line 1090 "/home/jens/Source/shotwell/src/PhotoPage.vala" - gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, gtk_widget_get_type (), GtkWidget), sensitivity); #line 1092 "/home/jens/Source/shotwell/src/PhotoPage.vala" + gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, gtk_widget_get_type (), GtkWidget), sensitivity); +#line 1094 "/home/jens/Source/shotwell/src/PhotoPage.vala" dimensions_init (&_tmp8_, 0, 0); -#line 1092 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1094 "/home/jens/Source/shotwell/src/PhotoPage.vala" editing_host_page_deactivate_tool (self, NULL, NULL, &_tmp8_, FALSE); -#line 7991 "PhotoPage.c" +#line 7892 "PhotoPage.c" } void editing_host_page_update_ui (EditingHostPage* self, gboolean missing) { -#line 1081 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1083 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_if_fail (IS_EDITING_HOST_PAGE (self)); -#line 1081 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1083 "/home/jens/Source/shotwell/src/PhotoPage.vala" EDITING_HOST_PAGE_GET_CLASS (self)->update_ui (self, missing); -#line 8000 "PhotoPage.c" +#line 7901 "PhotoPage.c" } static void editing_host_page_real_notify_photo_backing_missing (EditingHostPage* self, Photo* photo, gboolean missing) { -#line 1096 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1098 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_if_fail (IS_PHOTO (photo)); -#line 8007 "PhotoPage.c" +#line 7908 "PhotoPage.c" } void editing_host_page_notify_photo_backing_missing (EditingHostPage* self, Photo* photo, gboolean missing) { -#line 1096 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1098 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_if_fail (IS_EDITING_HOST_PAGE (self)); -#line 1096 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1098 "/home/jens/Source/shotwell/src/PhotoPage.vala" EDITING_HOST_PAGE_GET_CLASS (self)->notify_photo_backing_missing (self, photo, missing); -#line 8016 "PhotoPage.c" +#line 7917 "PhotoPage.c" } @@ -8047,91 +7948,91 @@ static void editing_host_page_draw_message (EditingHostPage* self, const gchar* PangoLayout* _tmp18_ = NULL; gint _tmp19_ = 0; gint _tmp20_ = 0; -#line 1099 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1101 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_if_fail (IS_EDITING_HOST_PAGE (self)); -#line 1099 "/home/jens/Source/shotwell/src/PhotoPage.vala" - g_return_if_fail (message != NULL); #line 1101 "/home/jens/Source/shotwell/src/PhotoPage.vala" + g_return_if_fail (message != NULL); +#line 1103 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp0_ = message; -#line 1101 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1103 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp1_ = gtk_widget_create_pango_layout (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget), _tmp0_); -#line 1101 "/home/jens/Source/shotwell/src/PhotoPage.vala" - pango_layout = _tmp1_; #line 1103 "/home/jens/Source/shotwell/src/PhotoPage.vala" + pango_layout = _tmp1_; +#line 1105 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp2_ = pango_layout; -#line 1103 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1105 "/home/jens/Source/shotwell/src/PhotoPage.vala" pango_layout_get_pixel_size (_tmp2_, &_tmp3_, &_tmp4_); -#line 1103 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1105 "/home/jens/Source/shotwell/src/PhotoPage.vala" text_width = _tmp3_; -#line 1103 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1105 "/home/jens/Source/shotwell/src/PhotoPage.vala" text_height = _tmp4_; -#line 1106 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1108 "/home/jens/Source/shotwell/src/PhotoPage.vala" gtk_widget_get_allocation (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget), &_tmp5_); -#line 1106 "/home/jens/Source/shotwell/src/PhotoPage.vala" - allocation = _tmp5_; #line 1108 "/home/jens/Source/shotwell/src/PhotoPage.vala" + allocation = _tmp5_; +#line 1110 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp6_ = allocation; -#line 1108 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1110 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp7_ = _tmp6_.width; -#line 1108 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1110 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp8_ = text_width; -#line 1108 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1110 "/home/jens/Source/shotwell/src/PhotoPage.vala" x = _tmp7_ - _tmp8_; -#line 1109 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1111 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp10_ = x; -#line 1109 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1111 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp10_ > 0) { -#line 8080 "PhotoPage.c" +#line 7981 "PhotoPage.c" gint _tmp11_ = 0; -#line 1109 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1111 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp11_ = x; -#line 1109 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1111 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp9_ = _tmp11_ / 2; -#line 8086 "PhotoPage.c" +#line 7987 "PhotoPage.c" } else { -#line 1109 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1111 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp9_ = 0; -#line 8090 "PhotoPage.c" +#line 7991 "PhotoPage.c" } -#line 1109 "/home/jens/Source/shotwell/src/PhotoPage.vala" - x = _tmp9_; #line 1111 "/home/jens/Source/shotwell/src/PhotoPage.vala" + x = _tmp9_; +#line 1113 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp12_ = allocation; -#line 1111 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1113 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp13_ = _tmp12_.height; -#line 1111 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1113 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp14_ = text_height; -#line 1111 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1113 "/home/jens/Source/shotwell/src/PhotoPage.vala" y = _tmp13_ - _tmp14_; -#line 1112 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1114 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp16_ = y; -#line 1112 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1114 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp16_ > 0) { -#line 8106 "PhotoPage.c" +#line 8007 "PhotoPage.c" gint _tmp17_ = 0; -#line 1112 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1114 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp17_ = y; -#line 1112 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1114 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp15_ = _tmp17_ / 2; -#line 8112 "PhotoPage.c" +#line 8013 "PhotoPage.c" } else { -#line 1112 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1114 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp15_ = 0; -#line 8116 "PhotoPage.c" +#line 8017 "PhotoPage.c" } -#line 1112 "/home/jens/Source/shotwell/src/PhotoPage.vala" - y = _tmp15_; #line 1114 "/home/jens/Source/shotwell/src/PhotoPage.vala" + y = _tmp15_; +#line 1116 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp18_ = pango_layout; -#line 1114 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1116 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp19_ = x; -#line 1114 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1116 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp20_ = y; -#line 1114 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1116 "/home/jens/Source/shotwell/src/PhotoPage.vala" single_photo_page_paint_text (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), _tmp18_, _tmp19_, _tmp20_); -#line 1099 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1101 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (pango_layout); -#line 8130 "PhotoPage.c" +#line 8031 "PhotoPage.c" } @@ -8145,45 +8046,45 @@ void editing_host_page_set_photo_missing (EditingHostPage* self, gboolean missin gboolean _tmp5_ = FALSE; gboolean _tmp6_ = FALSE; GError * _inner_error_ = NULL; -#line 1118 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1120 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_if_fail (IS_EDITING_HOST_PAGE (self)); -#line 1119 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1121 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp0_ = self->priv->photo_missing; -#line 1119 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1121 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp1_ = missing; -#line 1119 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1121 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp0_ == _tmp1_) { -#line 1120 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1122 "/home/jens/Source/shotwell/src/PhotoPage.vala" return; -#line 8154 "PhotoPage.c" +#line 8055 "PhotoPage.c" } -#line 1122 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1124 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp2_ = missing; -#line 1122 "/home/jens/Source/shotwell/src/PhotoPage.vala" - self->priv->photo_missing = _tmp2_; #line 1124 "/home/jens/Source/shotwell/src/PhotoPage.vala" + self->priv->photo_missing = _tmp2_; +#line 1126 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp3_ = editing_host_page_get_photo (self); -#line 1124 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1126 "/home/jens/Source/shotwell/src/PhotoPage.vala" photo = _tmp3_; -#line 1125 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1127 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp4_ = photo; -#line 1125 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1127 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp4_ == NULL) { -#line 1126 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1128 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (photo); -#line 1126 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1128 "/home/jens/Source/shotwell/src/PhotoPage.vala" return; -#line 8172 "PhotoPage.c" +#line 8073 "PhotoPage.c" } -#line 1128 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1130 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp5_ = missing; -#line 1128 "/home/jens/Source/shotwell/src/PhotoPage.vala" - editing_host_page_update_ui (self, _tmp5_); #line 1130 "/home/jens/Source/shotwell/src/PhotoPage.vala" + editing_host_page_update_ui (self, _tmp5_); +#line 1132 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp6_ = self->priv->photo_missing; -#line 1130 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1132 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp6_) { -#line 8182 "PhotoPage.c" +#line 8083 "PhotoPage.c" { GdkPixbuf* pixbuf = NULL; Photo* _tmp7_ = NULL; @@ -8198,49 +8099,49 @@ void editing_host_page_set_photo_missing (EditingHostPage* self, gboolean missin GdkPixbuf* _tmp16_ = NULL; Photo* _tmp17_ = NULL; Dimensions _tmp18_ = {0}; -#line 1132 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1134 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp7_ = photo; -#line 1132 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1134 "/home/jens/Source/shotwell/src/PhotoPage.vala" single_photo_page_get_canvas_scaling (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), &_tmp8_); -#line 1132 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1134 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp9_ = media_source_get_preview_pixbuf (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_MEDIA_SOURCE, MediaSource), &_tmp8_, &_inner_error_); -#line 1132 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1134 "/home/jens/Source/shotwell/src/PhotoPage.vala" pixbuf = _tmp9_; -#line 1132 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1134 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 8207 "PhotoPage.c" - goto __catch245_g_error; +#line 8108 "PhotoPage.c" + goto __catch242_g_error; } -#line 1134 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1136 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp10_ = pixbuf; -#line 1134 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1136 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp11_ = pixbuf; -#line 1134 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1136 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp12_ = gdk_pixbuf_get_width (_tmp11_); -#line 1134 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1136 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp13_ = pixbuf; -#line 1134 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1136 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp14_ = gdk_pixbuf_get_height (_tmp13_); -#line 1134 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1136 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp15_ = gdk_pixbuf_composite_color_simple (_tmp10_, _tmp12_, _tmp14_, GDK_INTERP_NEAREST, 100, 2, (guint32) 0, (guint32) 0); -#line 1134 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1136 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (pixbuf); -#line 1134 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1136 "/home/jens/Source/shotwell/src/PhotoPage.vala" pixbuf = _tmp15_; -#line 1137 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1139 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp16_ = pixbuf; -#line 1137 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1139 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp17_ = photo; -#line 1137 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1139 "/home/jens/Source/shotwell/src/PhotoPage.vala" media_source_get_dimensions (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, TYPE_MEDIA_SOURCE, MediaSource), PHOTO_EXCEPTION_NONE, &_tmp18_); -#line 1137 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1139 "/home/jens/Source/shotwell/src/PhotoPage.vala" single_photo_page_set_pixbuf (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), _tmp16_, &_tmp18_, NULL); -#line 1131 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1133 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (pixbuf); -#line 8236 "PhotoPage.c" +#line 8137 "PhotoPage.c" } - goto __finally245; - __catch245_g_error: + goto __finally242; + __catch242_g_error: { GError* err = NULL; GdkPixbuf* _tmp19_ = NULL; @@ -8249,87 +8150,87 @@ void editing_host_page_set_photo_missing (EditingHostPage* self, gboolean missin Dimensions _tmp22_ = {0}; GError* _tmp23_ = NULL; const gchar* _tmp24_ = NULL; -#line 1131 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1133 "/home/jens/Source/shotwell/src/PhotoPage.vala" err = _inner_error_; -#line 1131 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1133 "/home/jens/Source/shotwell/src/PhotoPage.vala" _inner_error_ = NULL; -#line 1139 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1141 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp19_ = gdk_pixbuf_new (GDK_COLORSPACE_RGB, FALSE, 8, 1, 1); -#line 1139 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1141 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp20_ = _tmp19_; -#line 1139 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1141 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp21_ = photo; -#line 1139 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1141 "/home/jens/Source/shotwell/src/PhotoPage.vala" media_source_get_dimensions (G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, TYPE_MEDIA_SOURCE, MediaSource), PHOTO_EXCEPTION_NONE, &_tmp22_); -#line 1139 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1141 "/home/jens/Source/shotwell/src/PhotoPage.vala" single_photo_page_set_pixbuf (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), _tmp20_, &_tmp22_, NULL); -#line 1139 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1141 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (_tmp20_); -#line 1140 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1142 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp23_ = err; -#line 1140 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1142 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp24_ = _tmp23_->message; -#line 1140 "/home/jens/Source/shotwell/src/PhotoPage.vala" - g_warning ("PhotoPage.vala:1140: %s", _tmp24_); -#line 1131 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1142 "/home/jens/Source/shotwell/src/PhotoPage.vala" + g_warning ("PhotoPage.vala:1142: %s", _tmp24_); +#line 1133 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_error_free0 (err); -#line 8272 "PhotoPage.c" +#line 8173 "PhotoPage.c" } - __finally245: -#line 1131 "/home/jens/Source/shotwell/src/PhotoPage.vala" + __finally242: +#line 1133 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1131 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1133 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (photo); -#line 1131 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1133 "/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 1131 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1133 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_clear_error (&_inner_error_); -#line 1131 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1133 "/home/jens/Source/shotwell/src/PhotoPage.vala" return; -#line 8285 "PhotoPage.c" +#line 8186 "PhotoPage.c" } } -#line 1118 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1120 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (photo); -#line 8290 "PhotoPage.c" +#line 8191 "PhotoPage.c" } gboolean editing_host_page_get_photo_missing (EditingHostPage* self) { gboolean result = FALSE; gboolean _tmp0_ = FALSE; -#line 1145 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1147 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_val_if_fail (IS_EDITING_HOST_PAGE (self), FALSE); -#line 1146 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1148 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp0_ = self->priv->photo_missing; -#line 1146 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1148 "/home/jens/Source/shotwell/src/PhotoPage.vala" result = _tmp0_; -#line 1146 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1148 "/home/jens/Source/shotwell/src/PhotoPage.vala" return result; -#line 8305 "PhotoPage.c" +#line 8206 "PhotoPage.c" } static gboolean editing_host_page_real_confirm_replace_photo (EditingHostPage* self, Photo* old_photo, Photo* new_photo) { gboolean result = FALSE; -#line 1149 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1151 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_val_if_fail ((old_photo == NULL) || IS_PHOTO (old_photo), FALSE); -#line 1149 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1151 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_val_if_fail (IS_PHOTO (new_photo), FALSE); -#line 1150 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1152 "/home/jens/Source/shotwell/src/PhotoPage.vala" result = TRUE; -#line 1150 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1152 "/home/jens/Source/shotwell/src/PhotoPage.vala" return result; -#line 8319 "PhotoPage.c" +#line 8220 "PhotoPage.c" } gboolean editing_host_page_confirm_replace_photo (EditingHostPage* self, Photo* old_photo, Photo* new_photo) { -#line 1149 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1151 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_val_if_fail (IS_EDITING_HOST_PAGE (self), FALSE); -#line 1149 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#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 8328 "PhotoPage.c" +#line 8229 "PhotoPage.c" } @@ -8342,121 +8243,121 @@ static GdkPixbuf* editing_host_page_get_zoom_pixbuf (EditingHostPage* self, Phot GdkPixbuf* _tmp3_ = NULL; GdkPixbuf* _tmp11_ = NULL; GError * _inner_error_ = NULL; -#line 1153 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1155 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_val_if_fail (IS_EDITING_HOST_PAGE (self), NULL); -#line 1153 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1155 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_val_if_fail (IS_PHOTO (new_photo), NULL); -#line 1154 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1156 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp0_ = self->priv->cache; -#line 1154 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1156 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp1_ = new_photo; -#line 1154 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1156 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp2_ = pixbuf_cache_get_ready_pixbuf (_tmp0_, _tmp1_); -#line 1154 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1156 "/home/jens/Source/shotwell/src/PhotoPage.vala" pixbuf = _tmp2_; -#line 1155 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1157 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp3_ = pixbuf; -#line 1155 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1157 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp3_ == NULL) { -#line 8357 "PhotoPage.c" +#line 8258 "PhotoPage.c" { GdkPixbuf* _tmp4_ = NULL; Photo* _tmp5_ = NULL; Scaling _tmp6_ = {0}; GdkPixbuf* _tmp7_ = NULL; GdkPixbuf* _tmp8_ = NULL; -#line 1157 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1159 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp5_ = new_photo; -#line 1157 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1159 "/home/jens/Source/shotwell/src/PhotoPage.vala" single_photo_page_get_canvas_scaling (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), &_tmp6_); -#line 1157 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1159 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp7_ = media_source_get_preview_pixbuf (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, TYPE_MEDIA_SOURCE, MediaSource), &_tmp6_, &_inner_error_); -#line 1157 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1159 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp4_ = _tmp7_; -#line 1157 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1159 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 8374 "PhotoPage.c" - goto __catch246_g_error; +#line 8275 "PhotoPage.c" + goto __catch243_g_error; } -#line 1157 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1159 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp8_ = _tmp4_; -#line 1157 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1159 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp4_ = NULL; -#line 1157 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1159 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (pixbuf); -#line 1157 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1159 "/home/jens/Source/shotwell/src/PhotoPage.vala" pixbuf = _tmp8_; -#line 1156 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1158 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (_tmp4_); -#line 8387 "PhotoPage.c" +#line 8288 "PhotoPage.c" } - goto __finally246; - __catch246_g_error: + goto __finally243; + __catch243_g_error: { GError* err = NULL; GError* _tmp9_ = NULL; const gchar* _tmp10_ = NULL; -#line 1156 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1158 "/home/jens/Source/shotwell/src/PhotoPage.vala" err = _inner_error_; -#line 1156 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1158 "/home/jens/Source/shotwell/src/PhotoPage.vala" _inner_error_ = NULL; -#line 1159 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1161 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp9_ = err; -#line 1159 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1161 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp10_ = _tmp9_->message; -#line 1159 "/home/jens/Source/shotwell/src/PhotoPage.vala" - g_warning ("PhotoPage.vala:1159: %s", _tmp10_); -#line 1156 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1161 "/home/jens/Source/shotwell/src/PhotoPage.vala" + g_warning ("PhotoPage.vala:1161: %s", _tmp10_); +#line 1158 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_error_free0 (err); -#line 8407 "PhotoPage.c" +#line 8308 "PhotoPage.c" } - __finally246: -#line 1156 "/home/jens/Source/shotwell/src/PhotoPage.vala" + __finally243: +#line 1158 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1156 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1158 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (pixbuf); -#line 1156 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1158 "/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 1156 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1158 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_clear_error (&_inner_error_); -#line 1156 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1158 "/home/jens/Source/shotwell/src/PhotoPage.vala" return NULL; -#line 8420 "PhotoPage.c" +#line 8321 "PhotoPage.c" } } -#line 1162 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1164 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp11_ = pixbuf; -#line 1162 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1164 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp11_ == NULL) { -#line 8427 "PhotoPage.c" +#line 8328 "PhotoPage.c" GdkPixbuf* _tmp12_ = NULL; Scaling _tmp13_ = {0}; GdkPixbuf* _tmp14_ = NULL; GdkPixbuf* _tmp15_ = NULL; GdkPixbuf* _tmp16_ = NULL; -#line 1163 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1165 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp12_ = get_placeholder_pixbuf (); -#line 1163 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1165 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (pixbuf); -#line 1163 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1165 "/home/jens/Source/shotwell/src/PhotoPage.vala" pixbuf = _tmp12_; -#line 1164 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1166 "/home/jens/Source/shotwell/src/PhotoPage.vala" single_photo_page_get_canvas_scaling (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), &_tmp13_); -#line 1164 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1166 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp14_ = pixbuf; -#line 1164 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1166 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp15_ = scaling_perform_on_pixbuf (&_tmp13_, _tmp14_, GDK_INTERP_NEAREST, TRUE); -#line 1164 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1166 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp16_ = _tmp15_; -#line 1164 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1166 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (_tmp16_); -#line 8449 "PhotoPage.c" +#line 8350 "PhotoPage.c" } -#line 1166 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1168 "/home/jens/Source/shotwell/src/PhotoPage.vala" result = pixbuf; -#line 1166 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1168 "/home/jens/Source/shotwell/src/PhotoPage.vala" return result; -#line 8455 "PhotoPage.c" +#line 8356 "PhotoPage.c" } @@ -8488,240 +8389,240 @@ static void editing_host_page_replace_photo (EditingHostPage* self, Photo* new_p GdkPixbuf* _tmp45_ = NULL; GdkPixbuf* _tmp46_ = NULL; ZoomBuffer* _tmp47_ = NULL; -#line 1169 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1171 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_if_fail (IS_EDITING_HOST_PAGE (self)); -#line 1169 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1171 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_if_fail (IS_PHOTO (new_photo)); -#line 1174 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1176 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp2_ = new_photo; -#line 1174 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1176 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp3_ = editing_host_page_get_photo (self); -#line 1174 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1176 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp4_ = _tmp3_; -#line 1174 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1176 "/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 1174 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1176 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp6_ = _tmp5_; -#line 1174 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1176 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (_tmp4_); -#line 1174 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1176 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp6_) { -#line 8505 "PhotoPage.c" +#line 8406 "PhotoPage.c" gboolean _tmp7_ = FALSE; -#line 1174 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1176 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp7_ = self->priv->pixbuf_dirty; -#line 1174 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1176 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp1_ = !_tmp7_; -#line 8511 "PhotoPage.c" +#line 8412 "PhotoPage.c" } else { -#line 1174 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1176 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp1_ = FALSE; -#line 8515 "PhotoPage.c" +#line 8416 "PhotoPage.c" } -#line 1174 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1176 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp1_) { -#line 8519 "PhotoPage.c" +#line 8420 "PhotoPage.c" gboolean _tmp8_ = FALSE; -#line 1174 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1176 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp8_ = self->priv->photo_missing; -#line 1174 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1176 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp0_ = !_tmp8_; -#line 8525 "PhotoPage.c" +#line 8426 "PhotoPage.c" } else { -#line 1174 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1176 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp0_ = FALSE; -#line 8529 "PhotoPage.c" +#line 8430 "PhotoPage.c" } -#line 1174 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1176 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp0_) { -#line 8533 "PhotoPage.c" +#line 8434 "PhotoPage.c" Photo* _tmp9_ = NULL; Photo* _tmp10_ = NULL; GdkPixbuf* _tmp11_ = NULL; GdkPixbuf* _tmp12_ = NULL; ZoomBuffer* _tmp13_ = NULL; -#line 1175 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1177 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp9_ = new_photo; -#line 1175 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1177 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp10_ = new_photo; -#line 1175 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1177 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp11_ = editing_host_page_get_zoom_pixbuf (self, _tmp10_); -#line 1175 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1177 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp12_ = _tmp11_; -#line 1175 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1177 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp13_ = zoom_buffer_new (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), _tmp9_, _tmp12_); -#line 1175 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1177 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (self->priv->zoom_buffer); -#line 1175 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1177 "/home/jens/Source/shotwell/src/PhotoPage.vala" self->priv->zoom_buffer = _tmp13_; -#line 1175 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1177 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (_tmp12_); -#line 1176 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1178 "/home/jens/Source/shotwell/src/PhotoPage.vala" return; -#line 8557 "PhotoPage.c" +#line 8458 "PhotoPage.c" } -#line 1180 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1182 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp16_ = editing_host_page_has_photo (self); -#line 1180 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1182 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp16_) { -#line 8563 "PhotoPage.c" +#line 8464 "PhotoPage.c" Photo* _tmp17_ = NULL; Photo* _tmp18_ = NULL; Photo* _tmp19_ = NULL; gboolean _tmp20_ = FALSE; -#line 1180 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1182 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp17_ = new_photo; -#line 1180 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1182 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp18_ = editing_host_page_get_photo (self); -#line 1180 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1182 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp19_ = _tmp18_; -#line 1180 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1182 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp20_ = data_source_equals (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, TYPE_DATA_SOURCE, DataSource), G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, TYPE_DATA_SOURCE, DataSource)); -#line 1180 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1182 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp15_ = !_tmp20_; -#line 1180 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1182 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (_tmp19_); -#line 8580 "PhotoPage.c" +#line 8481 "PhotoPage.c" } else { -#line 1180 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1182 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp15_ = FALSE; -#line 8584 "PhotoPage.c" +#line 8485 "PhotoPage.c" } -#line 1180 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1182 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp15_) { -#line 1180 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1182 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp14_ = editing_host_page_confirm_replace_photo != NULL; -#line 8590 "PhotoPage.c" +#line 8491 "PhotoPage.c" } else { -#line 1180 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1182 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp14_ = FALSE; -#line 8594 "PhotoPage.c" +#line 8495 "PhotoPage.c" } -#line 1180 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1182 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp14_) { -#line 8598 "PhotoPage.c" +#line 8499 "PhotoPage.c" Photo* _tmp21_ = NULL; Photo* _tmp22_ = NULL; Photo* _tmp23_ = NULL; gboolean _tmp24_ = FALSE; gboolean _tmp25_ = FALSE; -#line 1181 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1183 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp21_ = editing_host_page_get_photo (self); -#line 1181 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1183 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp22_ = _tmp21_; -#line 1181 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1183 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp23_ = new_photo; -#line 1181 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1183 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp24_ = editing_host_page_confirm_replace_photo (self, _tmp22_, _tmp23_); -#line 1181 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1183 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp25_ = !_tmp24_; -#line 1181 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1183 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (_tmp22_); -#line 1181 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1183 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp25_) { -#line 1182 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1184 "/home/jens/Source/shotwell/src/PhotoPage.vala" return; -#line 8620 "PhotoPage.c" +#line 8521 "PhotoPage.c" } } -#line 1185 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1187 "/home/jens/Source/shotwell/src/PhotoPage.vala" dimensions_init (&_tmp26_, 0, 0); -#line 1185 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1187 "/home/jens/Source/shotwell/src/PhotoPage.vala" editing_host_page_deactivate_tool (self, NULL, NULL, &_tmp26_, FALSE); -#line 1188 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1190 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp27_ = editing_host_page_get_photo (self); -#line 1188 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1190 "/home/jens/Source/shotwell/src/PhotoPage.vala" old_photo = _tmp27_; -#line 1189 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1191 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp28_ = new_photo; -#line 1189 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1191 "/home/jens/Source/shotwell/src/PhotoPage.vala" editing_host_page_set_photo (self, _tmp28_); -#line 1190 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1192 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp29_ = new_photo; -#line 1190 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1192 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp30_ = data_object_get_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp29_, TYPE_DATA_OBJECT, DataObject)); -#line 1190 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1192 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp31_ = _tmp30_; -#line 1190 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1192 "/home/jens/Source/shotwell/src/PhotoPage.vala" page_set_page_name (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), _tmp31_); -#line 1190 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1192 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_free0 (_tmp31_); -#line 1193 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1195 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (self->priv->swapped); -#line 1193 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1195 "/home/jens/Source/shotwell/src/PhotoPage.vala" self->priv->swapped = NULL; -#line 1196 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1198 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp32_ = new_photo; -#line 1196 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1198 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp33_ = media_source_get_file (G_TYPE_CHECK_INSTANCE_CAST (_tmp32_, TYPE_MEDIA_SOURCE, MediaSource)); -#line 1196 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1198 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp34_ = _tmp33_; -#line 1196 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1198 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp35_ = g_file_query_exists (_tmp34_, NULL); -#line 1196 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1198 "/home/jens/Source/shotwell/src/PhotoPage.vala" editing_host_page_set_photo_missing (self, !_tmp35_); -#line 1196 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1198 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (_tmp34_); -#line 1197 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1199 "/home/jens/Source/shotwell/src/PhotoPage.vala" self->priv->pixbuf_dirty = TRUE; -#line 1201 "/home/jens/Source/shotwell/src/PhotoPage.vala" - editing_host_page_rebuild_caches (self, "replace_photo"); #line 1203 "/home/jens/Source/shotwell/src/PhotoPage.vala" + editing_host_page_rebuild_caches (self, "replace_photo"); +#line 1205 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp36_ = old_photo; -#line 1203 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1205 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp36_ != NULL) { -#line 8669 "PhotoPage.c" +#line 8570 "PhotoPage.c" ViewCollection* _tmp37_ = NULL; ViewCollection* _tmp38_ = NULL; Photo* _tmp39_ = NULL; ViewCollection* _tmp40_ = NULL; ViewCollection* _tmp41_ = NULL; Photo* _tmp42_ = NULL; -#line 1204 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1206 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp37_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); -#line 1204 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1206 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp38_ = _tmp37_; -#line 1204 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1206 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp39_ = old_photo; -#line 1204 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1206 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp40_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); -#line 1204 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1206 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp41_ = _tmp40_; -#line 1204 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1206 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp42_ = new_photo; -#line 1204 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1206 "/home/jens/Source/shotwell/src/PhotoPage.vala" editing_host_page_cancel_prefetch_neighbors (self, _tmp38_, _tmp39_, _tmp41_, _tmp42_); -#line 1204 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1206 "/home/jens/Source/shotwell/src/PhotoPage.vala" _data_collection_unref0 (_tmp41_); -#line 1204 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1206 "/home/jens/Source/shotwell/src/PhotoPage.vala" _data_collection_unref0 (_tmp38_); -#line 8694 "PhotoPage.c" +#line 8595 "PhotoPage.c" } -#line 1206 "/home/jens/Source/shotwell/src/PhotoPage.vala" - single_photo_page_cancel_zoom (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage)); #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)); +#line 1210 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp43_ = new_photo; -#line 1208 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1210 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp44_ = new_photo; -#line 1208 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1210 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp45_ = editing_host_page_get_zoom_pixbuf (self, _tmp44_); -#line 1208 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1210 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp46_ = _tmp45_; -#line 1208 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1210 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp47_ = zoom_buffer_new (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), _tmp43_, _tmp46_); -#line 1208 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1210 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (self->priv->zoom_buffer); -#line 1208 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1210 "/home/jens/Source/shotwell/src/PhotoPage.vala" self->priv->zoom_buffer = _tmp47_; -#line 1208 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _g_object_unref0 (_tmp46_); #line 1210 "/home/jens/Source/shotwell/src/PhotoPage.vala" + _g_object_unref0 (_tmp46_); +#line 1212 "/home/jens/Source/shotwell/src/PhotoPage.vala" editing_host_page_quick_update_pixbuf (self); -#line 1213 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1215 "/home/jens/Source/shotwell/src/PhotoPage.vala" editing_host_page_refresh_caches (self, "replace_photo"); -#line 1169 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1171 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (old_photo); -#line 8720 "PhotoPage.c" +#line 8621 "PhotoPage.c" } @@ -8736,84 +8637,84 @@ static void editing_host_page_real_cancel_zoom (SinglePhotoPage* base) { gboolean _tmp6_ = FALSE; gboolean _tmp12_ = FALSE; GtkDrawingArea* _tmp13_ = NULL; -#line 1216 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1218 "/home/jens/Source/shotwell/src/PhotoPage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EDITING_HOST_PAGE, EditingHostPage); -#line 1217 "/home/jens/Source/shotwell/src/PhotoPage.vala" - SINGLE_PHOTO_PAGE_CLASS (editing_host_page_parent_class)->cancel_zoom (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage)); #line 1219 "/home/jens/Source/shotwell/src/PhotoPage.vala" + SINGLE_PHOTO_PAGE_CLASS (editing_host_page_parent_class)->cancel_zoom (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage)); +#line 1221 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp0_ = self->priv->zoom_slider; -#line 1219 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1221 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_signal_parse_name ("value-changed", gtk_range_get_type (), &_tmp1_, NULL, FALSE); -#line 1219 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1221 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_range_get_type (), GtkRange), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _editing_host_page_on_zoom_slider_value_changed_gtk_range_value_changed, self); -#line 1220 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1222 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp2_ = self->priv->zoom_slider; -#line 1220 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1222 "/home/jens/Source/shotwell/src/PhotoPage.vala" gtk_range_set_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_range_get_type (), GtkRange), 0.0); -#line 1221 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1223 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp3_ = self->priv->zoom_slider; -#line 1221 "/home/jens/Source/shotwell/src/PhotoPage.vala" - g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, gtk_range_get_type (), GtkRange), "value-changed", (GCallback) _editing_host_page_on_zoom_slider_value_changed_gtk_range_value_changed, self, 0); #line 1223 "/home/jens/Source/shotwell/src/PhotoPage.vala" + g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, gtk_range_get_type (), GtkRange), "value-changed", (GCallback) _editing_host_page_on_zoom_slider_value_changed_gtk_range_value_changed, self, 0); +#line 1225 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp4_ = editing_host_page_get_photo (self); -#line 1223 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1225 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp5_ = _tmp4_; -#line 1223 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1225 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp6_ = _tmp5_ != NULL; -#line 1223 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1225 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (_tmp5_); -#line 1223 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1225 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp6_) { -#line 8763 "PhotoPage.c" +#line 8664 "PhotoPage.c" Photo* _tmp7_ = NULL; Photo* _tmp8_ = NULL; Dimensions _tmp9_ = {0}; Dimensions _tmp10_ = {0}; ZoomState _tmp11_ = {0}; -#line 1224 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1226 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp7_ = editing_host_page_get_photo (self); -#line 1224 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1226 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp8_ = _tmp7_; -#line 1224 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1226 "/home/jens/Source/shotwell/src/PhotoPage.vala" media_source_get_dimensions (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_MEDIA_SOURCE, MediaSource), PHOTO_EXCEPTION_NONE, &_tmp9_); -#line 1224 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1226 "/home/jens/Source/shotwell/src/PhotoPage.vala" single_photo_page_get_surface_dim (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), &_tmp10_); -#line 1224 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1226 "/home/jens/Source/shotwell/src/PhotoPage.vala" zoom_state_init (&_tmp11_, &_tmp9_, &_tmp10_, 0.0, NULL); -#line 1224 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1226 "/home/jens/Source/shotwell/src/PhotoPage.vala" single_photo_page_set_zoom_state (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), &_tmp11_); -#line 1224 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1226 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (_tmp8_); -#line 8783 "PhotoPage.c" +#line 8684 "PhotoPage.c" } -#line 1230 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1232 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp13_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage)->canvas; -#line 1230 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1232 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp13_ != NULL) { -#line 8789 "PhotoPage.c" +#line 8690 "PhotoPage.c" GtkDrawingArea* _tmp14_ = NULL; GdkWindow* _tmp15_ = NULL; -#line 1230 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1232 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp14_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage)->canvas; -#line 1230 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1232 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp15_ = gtk_widget_get_window (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, gtk_widget_get_type (), GtkWidget)); -#line 1230 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1232 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp12_ = _tmp15_ != NULL; -#line 8798 "PhotoPage.c" +#line 8699 "PhotoPage.c" } else { -#line 1230 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1232 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp12_ = FALSE; -#line 8802 "PhotoPage.c" +#line 8703 "PhotoPage.c" } -#line 1230 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1232 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp12_) { -#line 1231 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#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 8808 "PhotoPage.c" +#line 8709 "PhotoPage.c" } -#line 1233 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#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 8812 "PhotoPage.c" +#line 8713 "PhotoPage.c" } @@ -8837,76 +8738,76 @@ static void editing_host_page_quick_update_pixbuf (EditingHostPage* self) { Photo* _tmp29_ = NULL; Photo* _tmp30_ = NULL; GError * _inner_error_ = NULL; -#line 1236 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1238 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_if_fail (IS_EDITING_HOST_PAGE (self)); -#line 1237 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1239 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp0_ = self->priv->cache; -#line 1237 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1239 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp1_ = editing_host_page_get_photo (self); -#line 1237 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1239 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp2_ = _tmp1_; -#line 1237 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1239 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp3_ = pixbuf_cache_get_ready_pixbuf (_tmp0_, _tmp2_); -#line 1237 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1239 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp4_ = _tmp3_; -#line 1237 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1239 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (_tmp2_); -#line 1237 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1239 "/home/jens/Source/shotwell/src/PhotoPage.vala" pixbuf = _tmp4_; -#line 1238 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1240 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp5_ = pixbuf; -#line 1238 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1240 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp5_ != NULL) { -#line 8856 "PhotoPage.c" +#line 8757 "PhotoPage.c" GdkPixbuf* _tmp6_ = NULL; Photo* _tmp7_ = NULL; Photo* _tmp8_ = NULL; Dimensions _tmp9_ = {0}; -#line 1239 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1241 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp6_ = pixbuf; -#line 1239 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1241 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp7_ = editing_host_page_get_photo (self); -#line 1239 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1241 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp8_ = _tmp7_; -#line 1239 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1241 "/home/jens/Source/shotwell/src/PhotoPage.vala" media_source_get_dimensions (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_MEDIA_SOURCE, MediaSource), PHOTO_EXCEPTION_NONE, &_tmp9_); -#line 1239 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1241 "/home/jens/Source/shotwell/src/PhotoPage.vala" single_photo_page_set_pixbuf (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), _tmp6_, &_tmp9_, NULL); -#line 1239 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1241 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (_tmp8_); -#line 1240 "/home/jens/Source/shotwell/src/PhotoPage.vala" - self->priv->pixbuf_dirty = FALSE; #line 1242 "/home/jens/Source/shotwell/src/PhotoPage.vala" + self->priv->pixbuf_dirty = FALSE; +#line 1244 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (pixbuf); -#line 1242 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1244 "/home/jens/Source/shotwell/src/PhotoPage.vala" return; -#line 8879 "PhotoPage.c" +#line 8780 "PhotoPage.c" } -#line 1245 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#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_); -#line 1245 "/home/jens/Source/shotwell/src/PhotoPage.vala" - scaling = _tmp10_; #line 1247 "/home/jens/Source/shotwell/src/PhotoPage.vala" + scaling = _tmp10_; +#line 1249 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp11_ = editing_host_page_get_photo (self); -#line 1247 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1249 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp12_ = _tmp11_; -#line 1247 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1249 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp13_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, TYPE_DATA_OBJECT, DataObject)); -#line 1247 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1249 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp14_ = _tmp13_; -#line 1247 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1249 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp15_ = scaling_to_string (&scaling); -#line 1247 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1249 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp16_ = _tmp15_; -#line 1247 "/home/jens/Source/shotwell/src/PhotoPage.vala" - g_debug ("PhotoPage.vala:1247: Using progressive load for %s (%s)", _tmp14_, _tmp16_); -#line 1247 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1249 "/home/jens/Source/shotwell/src/PhotoPage.vala" + g_debug ("PhotoPage.vala:1249: Using progressive load for %s (%s)", _tmp14_, _tmp16_); +#line 1249 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_free0 (_tmp16_); -#line 1247 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1249 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_free0 (_tmp14_); -#line 1247 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1249 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (_tmp12_); -#line 8905 "PhotoPage.c" +#line 8806 "PhotoPage.c" { GdkPixbuf* _tmp17_ = NULL; Photo* _tmp18_ = NULL; @@ -8917,87 +8818,87 @@ static void editing_host_page_quick_update_pixbuf (EditingHostPage* self) { Photo* _tmp23_ = NULL; Photo* _tmp24_ = NULL; Dimensions _tmp25_ = {0}; -#line 1252 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1254 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp18_ = editing_host_page_get_photo (self); -#line 1252 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1254 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp19_ = _tmp18_; -#line 1252 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1254 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp20_ = scaling; -#line 1252 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1254 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp21_ = media_source_get_preview_pixbuf (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, TYPE_MEDIA_SOURCE, MediaSource), &_tmp20_, &_inner_error_); -#line 1252 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1254 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp22_ = _tmp21_; -#line 1252 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1254 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (_tmp19_); -#line 1252 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1254 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp17_ = _tmp22_; -#line 1252 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1254 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 8932 "PhotoPage.c" - goto __catch247_g_error; +#line 8833 "PhotoPage.c" + goto __catch244_g_error; } -#line 1252 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1254 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp23_ = editing_host_page_get_photo (self); -#line 1252 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1254 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp24_ = _tmp23_; -#line 1252 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1254 "/home/jens/Source/shotwell/src/PhotoPage.vala" media_source_get_dimensions (G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, TYPE_MEDIA_SOURCE, MediaSource), PHOTO_EXCEPTION_NONE, &_tmp25_); -#line 1252 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1254 "/home/jens/Source/shotwell/src/PhotoPage.vala" single_photo_page_set_pixbuf (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), _tmp17_, &_tmp25_, NULL); -#line 1252 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1254 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (_tmp24_); -#line 1251 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1253 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (_tmp17_); -#line 8947 "PhotoPage.c" +#line 8848 "PhotoPage.c" } - goto __finally247; - __catch247_g_error: + goto __finally244; + __catch244_g_error: { GError* err = NULL; GError* _tmp26_ = NULL; const gchar* _tmp27_ = NULL; -#line 1251 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1253 "/home/jens/Source/shotwell/src/PhotoPage.vala" err = _inner_error_; -#line 1251 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1253 "/home/jens/Source/shotwell/src/PhotoPage.vala" _inner_error_ = NULL; -#line 1254 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1256 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp26_ = err; -#line 1254 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1256 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp27_ = _tmp26_->message; -#line 1254 "/home/jens/Source/shotwell/src/PhotoPage.vala" - g_warning ("PhotoPage.vala:1254: %s", _tmp27_); -#line 1251 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1256 "/home/jens/Source/shotwell/src/PhotoPage.vala" + g_warning ("PhotoPage.vala:1256: %s", _tmp27_); +#line 1253 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_error_free0 (err); -#line 8967 "PhotoPage.c" +#line 8868 "PhotoPage.c" } - __finally247: -#line 1251 "/home/jens/Source/shotwell/src/PhotoPage.vala" + __finally244: +#line 1253 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1251 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1253 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (pixbuf); -#line 1251 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1253 "/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 1251 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1253 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_clear_error (&_inner_error_); -#line 1251 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1253 "/home/jens/Source/shotwell/src/PhotoPage.vala" return; -#line 8980 "PhotoPage.c" +#line 8881 "PhotoPage.c" } -#line 1257 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1259 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp28_ = self->priv->cache; -#line 1257 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1259 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp29_ = editing_host_page_get_photo (self); -#line 1257 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1259 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp30_ = _tmp29_; -#line 1257 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1259 "/home/jens/Source/shotwell/src/PhotoPage.vala" pixbuf_cache_prefetch (_tmp28_, _tmp30_, BACKGROUND_JOB_JOB_PRIORITY_HIGHEST, FALSE); -#line 1257 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1259 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (_tmp30_); -#line 1261 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1263 "/home/jens/Source/shotwell/src/PhotoPage.vala" self->priv->pixbuf_dirty = FALSE; -#line 1236 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1238 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (pixbuf); -#line 8996 "PhotoPage.c" +#line 8897 "PhotoPage.c" } @@ -9014,47 +8915,47 @@ static gboolean editing_host_page_update_pixbuf (EditingHostPage* self) { gboolean _tmp25_ = FALSE; gboolean _tmp26_ = FALSE; GError * _inner_error_ = NULL; -#line 1264 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1266 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_val_if_fail (IS_EDITING_HOST_PAGE (self), FALSE); -#line 1269 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1271 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp0_ = editing_host_page_get_photo (self); -#line 1269 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1271 "/home/jens/Source/shotwell/src/PhotoPage.vala" photo = _tmp0_; -#line 1270 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1272 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp1_ = photo; -#line 1270 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1272 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp1_ == NULL) { -#line 1271 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1273 "/home/jens/Source/shotwell/src/PhotoPage.vala" result = FALSE; -#line 1271 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1273 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (photo); -#line 1271 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1273 "/home/jens/Source/shotwell/src/PhotoPage.vala" return result; -#line 9029 "PhotoPage.c" +#line 8930 "PhotoPage.c" } -#line 1273 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1275 "/home/jens/Source/shotwell/src/PhotoPage.vala" pixbuf = NULL; -#line 1274 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1276 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp2_ = photo; -#line 1274 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1276 "/home/jens/Source/shotwell/src/PhotoPage.vala" media_source_get_dimensions (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_MEDIA_SOURCE, MediaSource), PHOTO_EXCEPTION_NONE, &_tmp3_); -#line 1274 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1276 "/home/jens/Source/shotwell/src/PhotoPage.vala" max_dim = _tmp3_; -#line 9039 "PhotoPage.c" +#line 8940 "PhotoPage.c" { Dimensions tool_pixbuf_dim = {0}; Dimensions _tmp4_ = {0}; EditingToolsEditingTool* _tmp5_ = NULL; GdkPixbuf* _tmp13_ = NULL; -#line 1277 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1279 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp4_.width = 0; -#line 1277 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1279 "/home/jens/Source/shotwell/src/PhotoPage.vala" tool_pixbuf_dim = _tmp4_; -#line 1278 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1280 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp5_ = self->priv->current_tool; -#line 1278 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1280 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp5_ != NULL) { -#line 9053 "PhotoPage.c" +#line 8954 "PhotoPage.c" GdkPixbuf* _tmp6_ = NULL; EditingToolsEditingTool* _tmp7_ = NULL; Scaling _tmp8_ = {0}; @@ -9062,214 +8963,214 @@ static gboolean editing_host_page_update_pixbuf (EditingHostPage* self) { Dimensions _tmp10_ = {0}; GdkPixbuf* _tmp11_ = NULL; GdkPixbuf* _tmp12_ = NULL; -#line 1279 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1281 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp7_ = self->priv->current_tool; -#line 1279 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1281 "/home/jens/Source/shotwell/src/PhotoPage.vala" single_photo_page_get_canvas_scaling (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), &_tmp8_); -#line 1279 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1281 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp9_ = photo; -#line 1279 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1281 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp11_ = editing_tools_editing_tool_get_display_pixbuf (_tmp7_, &_tmp8_, _tmp9_, &_tmp10_, &_inner_error_); -#line 1279 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1281 "/home/jens/Source/shotwell/src/PhotoPage.vala" tool_pixbuf_dim = _tmp10_; -#line 1279 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1281 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp6_ = _tmp11_; -#line 1279 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1281 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 9075 "PhotoPage.c" - goto __catch248_g_error; +#line 8976 "PhotoPage.c" + goto __catch245_g_error; } -#line 1279 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1281 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp12_ = _tmp6_; -#line 1279 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1281 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp6_ = NULL; -#line 1279 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1281 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (pixbuf); -#line 1279 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1281 "/home/jens/Source/shotwell/src/PhotoPage.vala" pixbuf = _tmp12_; -#line 1278 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1280 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (_tmp6_); -#line 9088 "PhotoPage.c" +#line 8989 "PhotoPage.c" } -#line 1281 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1283 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp13_ = pixbuf; -#line 1281 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1283 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp13_ != NULL) { -#line 9094 "PhotoPage.c" +#line 8995 "PhotoPage.c" Dimensions _tmp14_ = {0}; -#line 1282 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1284 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp14_ = tool_pixbuf_dim; -#line 1282 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1284 "/home/jens/Source/shotwell/src/PhotoPage.vala" max_dim = _tmp14_; -#line 9100 "PhotoPage.c" +#line 9001 "PhotoPage.c" } } - goto __finally248; - __catch248_g_error: + goto __finally245; + __catch245_g_error: { GError* err = NULL; GError* _tmp15_ = NULL; const gchar* _tmp16_ = NULL; -#line 1276 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1278 "/home/jens/Source/shotwell/src/PhotoPage.vala" err = _inner_error_; -#line 1276 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1278 "/home/jens/Source/shotwell/src/PhotoPage.vala" _inner_error_ = NULL; -#line 1284 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1286 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp15_ = err; -#line 1284 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1286 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp16_ = _tmp15_->message; -#line 1284 "/home/jens/Source/shotwell/src/PhotoPage.vala" - g_warning ("PhotoPage.vala:1284: %s", _tmp16_); -#line 1285 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1286 "/home/jens/Source/shotwell/src/PhotoPage.vala" + g_warning ("PhotoPage.vala:1286: %s", _tmp16_); +#line 1287 "/home/jens/Source/shotwell/src/PhotoPage.vala" editing_host_page_set_photo_missing (self, TRUE); -#line 1276 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1278 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_error_free0 (err); -#line 9123 "PhotoPage.c" +#line 9024 "PhotoPage.c" } - __finally248: -#line 1276 "/home/jens/Source/shotwell/src/PhotoPage.vala" + __finally245: +#line 1278 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1276 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1278 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (pixbuf); -#line 1276 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1278 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (photo); -#line 1276 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1278 "/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 1276 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1278 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_clear_error (&_inner_error_); -#line 1276 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1278 "/home/jens/Source/shotwell/src/PhotoPage.vala" return FALSE; -#line 9138 "PhotoPage.c" +#line 9039 "PhotoPage.c" } -#line 1288 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1290 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp17_ = self->priv->photo_missing; -#line 1288 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1290 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (!_tmp17_) { -#line 9144 "PhotoPage.c" +#line 9045 "PhotoPage.c" GdkPixbuf* _tmp18_ = NULL; GdkPixbuf* _tmp22_ = NULL; -#line 1290 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1292 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp18_ = pixbuf; -#line 1290 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1292 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp18_ == NULL) { -#line 9151 "PhotoPage.c" +#line 9052 "PhotoPage.c" PixbufCache* _tmp19_ = NULL; Photo* _tmp20_ = NULL; GdkPixbuf* _tmp21_ = NULL; -#line 1291 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1293 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp19_ = self->priv->cache; -#line 1291 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1293 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp20_ = photo; -#line 1291 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1293 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp21_ = pixbuf_cache_get_ready_pixbuf (_tmp19_, _tmp20_); -#line 1291 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1293 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (pixbuf); -#line 1291 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1293 "/home/jens/Source/shotwell/src/PhotoPage.vala" pixbuf = _tmp21_; -#line 9165 "PhotoPage.c" +#line 9066 "PhotoPage.c" } -#line 1294 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1296 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp22_ = pixbuf; -#line 1294 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1296 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp22_ == NULL) { -#line 9171 "PhotoPage.c" +#line 9072 "PhotoPage.c" PixbufCache* _tmp23_ = NULL; Photo* _tmp24_ = NULL; -#line 1295 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1297 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp23_ = self->priv->cache; -#line 1295 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1297 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp24_ = photo; -#line 1295 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1297 "/home/jens/Source/shotwell/src/PhotoPage.vala" pixbuf_cache_prefetch (_tmp23_, _tmp24_, BACKGROUND_JOB_JOB_PRIORITY_NORMAL, FALSE); -#line 9180 "PhotoPage.c" +#line 9081 "PhotoPage.c" } } -#line 1298 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1300 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp26_ = self->priv->photo_missing; -#line 1298 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1300 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (!_tmp26_) { -#line 9187 "PhotoPage.c" +#line 9088 "PhotoPage.c" GdkPixbuf* _tmp27_ = NULL; -#line 1298 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1300 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp27_ = pixbuf; -#line 1298 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1300 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp25_ = _tmp27_ != NULL; -#line 9193 "PhotoPage.c" +#line 9094 "PhotoPage.c" } else { -#line 1298 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1300 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp25_ = FALSE; -#line 9197 "PhotoPage.c" +#line 9098 "PhotoPage.c" } -#line 1298 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1300 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp25_) { -#line 9201 "PhotoPage.c" +#line 9102 "PhotoPage.c" GdkPixbuf* _tmp28_ = NULL; Dimensions _tmp29_ = {0}; -#line 1299 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1301 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp28_ = pixbuf; -#line 1299 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1301 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp29_ = max_dim; -#line 1299 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1301 "/home/jens/Source/shotwell/src/PhotoPage.vala" single_photo_page_set_pixbuf (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), _tmp28_, &_tmp29_, NULL); -#line 1300 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1302 "/home/jens/Source/shotwell/src/PhotoPage.vala" self->priv->pixbuf_dirty = FALSE; -#line 9212 "PhotoPage.c" +#line 9113 "PhotoPage.c" } -#line 1307 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1309 "/home/jens/Source/shotwell/src/PhotoPage.vala" result = FALSE; -#line 1307 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1309 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (pixbuf); -#line 1307 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1309 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (photo); -#line 1307 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1309 "/home/jens/Source/shotwell/src/PhotoPage.vala" return result; -#line 9222 "PhotoPage.c" +#line 9123 "PhotoPage.c" } static void editing_host_page_real_on_resize (Page* base, GdkRectangle* rect) { EditingHostPage * self; GdkRectangle _tmp0_ = {0}; -#line 1310 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1312 "/home/jens/Source/shotwell/src/PhotoPage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EDITING_HOST_PAGE, EditingHostPage); -#line 1310 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1312 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_if_fail (rect != NULL); -#line 1311 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1313 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp0_ = *rect; -#line 1311 "/home/jens/Source/shotwell/src/PhotoPage.vala" - 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 1313 "/home/jens/Source/shotwell/src/PhotoPage.vala" + 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 9239 "PhotoPage.c" +#line 9140 "PhotoPage.c" } static void editing_host_page_real_on_resize_finished (Page* base, GdkRectangle* rect) { EditingHostPage * self; -#line 1316 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1318 "/home/jens/Source/shotwell/src/PhotoPage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EDITING_HOST_PAGE, EditingHostPage); -#line 1316 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1318 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_if_fail (rect != NULL); -#line 1320 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1322 "/home/jens/Source/shotwell/src/PhotoPage.vala" editing_host_page_rebuild_caches (self, "on_resize_finished"); -#line 1321 "/home/jens/Source/shotwell/src/PhotoPage.vala" - self->priv->pixbuf_dirty = TRUE; #line 1323 "/home/jens/Source/shotwell/src/PhotoPage.vala" + self->priv->pixbuf_dirty = TRUE; +#line 1325 "/home/jens/Source/shotwell/src/PhotoPage.vala" editing_host_page_update_pixbuf (self); -#line 9255 "PhotoPage.c" +#line 9156 "PhotoPage.c" } static void editing_host_page_on_viewport_resized (EditingHostPage* self) { -#line 1326 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1328 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_if_fail (IS_EDITING_HOST_PAGE (self)); -#line 1329 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1331 "/home/jens/Source/shotwell/src/PhotoPage.vala" editing_host_page_rebuild_caches (self, "on_viewport_resized"); -#line 1330 "/home/jens/Source/shotwell/src/PhotoPage.vala" - self->priv->pixbuf_dirty = TRUE; #line 1332 "/home/jens/Source/shotwell/src/PhotoPage.vala" + self->priv->pixbuf_dirty = TRUE; +#line 1334 "/home/jens/Source/shotwell/src/PhotoPage.vala" editing_host_page_update_pixbuf (self); -#line 9268 "PhotoPage.c" +#line 9169 "PhotoPage.c" } @@ -9315,300 +9216,300 @@ static void editing_host_page_real_update_actions (Page* base, gint selected_cou GtkToggleToolButton* _tmp58_ = NULL; gint _tmp59_ = 0; gint _tmp60_ = 0; -#line 1335 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1337 "/home/jens/Source/shotwell/src/PhotoPage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EDITING_HOST_PAGE, EditingHostPage); -#line 1336 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1338 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp0_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); -#line 1336 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1338 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp1_ = _tmp0_; -#line 1336 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1338 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp2_ = view_collection_get_sources_of_type_count (_tmp1_, TYPE_PHOTO); -#line 1336 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1338 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp3_ = _tmp2_ > 1; -#line 1336 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1338 "/home/jens/Source/shotwell/src/PhotoPage.vala" _data_collection_unref0 (_tmp1_); -#line 1336 "/home/jens/Source/shotwell/src/PhotoPage.vala" - multiple_photos = _tmp3_; #line 1338 "/home/jens/Source/shotwell/src/PhotoPage.vala" + multiple_photos = _tmp3_; +#line 1340 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp4_ = self->priv->prev_button; -#line 1338 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1340 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp5_ = multiple_photos; -#line 1338 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1340 "/home/jens/Source/shotwell/src/PhotoPage.vala" gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, gtk_widget_get_type (), GtkWidget), _tmp5_); -#line 1339 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1341 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp6_ = self->priv->next_button; -#line 1339 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1341 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp7_ = multiple_photos; -#line 1339 "/home/jens/Source/shotwell/src/PhotoPage.vala" - gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, gtk_widget_get_type (), GtkWidget), _tmp7_); #line 1341 "/home/jens/Source/shotwell/src/PhotoPage.vala" + gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, gtk_widget_get_type (), GtkWidget), _tmp7_); +#line 1343 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp8_ = editing_host_page_get_photo (self); -#line 1341 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1343 "/home/jens/Source/shotwell/src/PhotoPage.vala" photo = _tmp8_; -#line 1342 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1344 "/home/jens/Source/shotwell/src/PhotoPage.vala" single_photo_page_get_canvas_scaling (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), &_tmp9_); -#line 1342 "/home/jens/Source/shotwell/src/PhotoPage.vala" - scaling = _tmp9_; #line 1344 "/home/jens/Source/shotwell/src/PhotoPage.vala" + scaling = _tmp9_; +#line 1346 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp13_ = photo; -#line 1344 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1346 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp13_ != NULL) { -#line 9352 "PhotoPage.c" +#line 9253 "PhotoPage.c" gboolean _tmp14_ = FALSE; -#line 1344 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1346 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp14_ = self->priv->photo_missing; -#line 1344 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1346 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp12_ = !_tmp14_; -#line 9358 "PhotoPage.c" +#line 9259 "PhotoPage.c" } else { -#line 1344 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1346 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp12_ = FALSE; -#line 9362 "PhotoPage.c" +#line 9263 "PhotoPage.c" } -#line 1344 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1346 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp12_) { -#line 9366 "PhotoPage.c" +#line 9267 "PhotoPage.c" Photo* _tmp15_ = NULL; gboolean _tmp16_ = FALSE; -#line 1344 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1346 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp15_ = photo; -#line 1344 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1346 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp16_ = photo_check_can_rotate (_tmp15_); -#line 1344 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1346 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp11_ = _tmp16_; -#line 9375 "PhotoPage.c" +#line 9276 "PhotoPage.c" } else { -#line 1344 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1346 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp11_ = FALSE; -#line 9379 "PhotoPage.c" +#line 9280 "PhotoPage.c" } -#line 1344 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1346 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp11_) { -#line 9383 "PhotoPage.c" +#line 9284 "PhotoPage.c" Photo* _tmp17_ = NULL; gboolean _tmp18_ = FALSE; -#line 1345 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1347 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp17_ = photo; -#line 1345 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1347 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp18_ = editing_host_page_is_rotate_available (self, _tmp17_); -#line 1345 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1347 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp10_ = _tmp18_; -#line 9392 "PhotoPage.c" +#line 9293 "PhotoPage.c" } else { -#line 1345 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1347 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp10_ = FALSE; -#line 9396 "PhotoPage.c" +#line 9297 "PhotoPage.c" } -#line 1344 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1346 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp19_ = self->priv->rotate_button; -#line 1344 "/home/jens/Source/shotwell/src/PhotoPage.vala" - gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, gtk_widget_get_type (), GtkWidget), _tmp10_); #line 1346 "/home/jens/Source/shotwell/src/PhotoPage.vala" + gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, gtk_widget_get_type (), GtkWidget), _tmp10_); +#line 1348 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp22_ = photo; -#line 1346 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1348 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp22_ != NULL) { -#line 9406 "PhotoPage.c" +#line 9307 "PhotoPage.c" gboolean _tmp23_ = FALSE; -#line 1346 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1348 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp23_ = self->priv->photo_missing; -#line 1346 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1348 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp21_ = !_tmp23_; -#line 9412 "PhotoPage.c" +#line 9313 "PhotoPage.c" } else { -#line 1346 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1348 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp21_ = FALSE; -#line 9416 "PhotoPage.c" +#line 9317 "PhotoPage.c" } -#line 1346 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1348 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp21_) { -#line 9420 "PhotoPage.c" +#line 9321 "PhotoPage.c" Photo* _tmp24_ = NULL; Scaling _tmp25_ = {0}; gboolean _tmp26_ = FALSE; -#line 1347 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1349 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp24_ = photo; -#line 1347 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1349 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp25_ = scaling; -#line 1347 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1349 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp26_ = editing_tools_crop_tool_is_available (_tmp24_, &_tmp25_); -#line 1347 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1349 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp20_ = _tmp26_; -#line 9432 "PhotoPage.c" +#line 9333 "PhotoPage.c" } else { -#line 1347 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1349 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp20_ = FALSE; -#line 9436 "PhotoPage.c" +#line 9337 "PhotoPage.c" } -#line 1346 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1348 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp27_ = self->priv->crop_button; -#line 1346 "/home/jens/Source/shotwell/src/PhotoPage.vala" - gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp27_, gtk_widget_get_type (), GtkWidget), _tmp20_); #line 1348 "/home/jens/Source/shotwell/src/PhotoPage.vala" + gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp27_, gtk_widget_get_type (), GtkWidget), _tmp20_); +#line 1350 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp30_ = photo; -#line 1348 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1350 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp30_ != NULL) { -#line 9446 "PhotoPage.c" +#line 9347 "PhotoPage.c" gboolean _tmp31_ = FALSE; -#line 1348 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1350 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp31_ = self->priv->photo_missing; -#line 1348 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1350 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp29_ = !_tmp31_; -#line 9452 "PhotoPage.c" +#line 9353 "PhotoPage.c" } else { -#line 1348 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1350 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp29_ = FALSE; -#line 9456 "PhotoPage.c" +#line 9357 "PhotoPage.c" } -#line 1348 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1350 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp29_) { -#line 9460 "PhotoPage.c" +#line 9361 "PhotoPage.c" Photo* _tmp32_ = NULL; Scaling _tmp33_ = {0}; gboolean _tmp34_ = FALSE; -#line 1349 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1351 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp32_ = photo; -#line 1349 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1351 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp33_ = scaling; -#line 1349 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1351 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp34_ = editing_tools_redeye_tool_is_available (_tmp32_, &_tmp33_); -#line 1349 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1351 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp28_ = _tmp34_; -#line 9472 "PhotoPage.c" +#line 9373 "PhotoPage.c" } else { -#line 1349 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1351 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp28_ = FALSE; -#line 9476 "PhotoPage.c" +#line 9377 "PhotoPage.c" } -#line 1348 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1350 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp35_ = self->priv->redeye_button; -#line 1348 "/home/jens/Source/shotwell/src/PhotoPage.vala" - gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp35_, gtk_widget_get_type (), GtkWidget), _tmp28_); #line 1350 "/home/jens/Source/shotwell/src/PhotoPage.vala" + gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp35_, gtk_widget_get_type (), GtkWidget), _tmp28_); +#line 1352 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp38_ = photo; -#line 1350 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1352 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp38_ != NULL) { -#line 9486 "PhotoPage.c" +#line 9387 "PhotoPage.c" gboolean _tmp39_ = FALSE; -#line 1350 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1352 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp39_ = self->priv->photo_missing; -#line 1350 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1352 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp37_ = !_tmp39_; -#line 9492 "PhotoPage.c" +#line 9393 "PhotoPage.c" } else { -#line 1350 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1352 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp37_ = FALSE; -#line 9496 "PhotoPage.c" +#line 9397 "PhotoPage.c" } -#line 1350 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1352 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp37_) { -#line 9500 "PhotoPage.c" +#line 9401 "PhotoPage.c" Photo* _tmp40_ = NULL; Scaling _tmp41_ = {0}; gboolean _tmp42_ = FALSE; -#line 1351 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1353 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp40_ = photo; -#line 1351 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1353 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp41_ = scaling; -#line 1351 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1353 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp42_ = editing_tools_adjust_tool_is_available (_tmp40_, &_tmp41_); -#line 1351 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1353 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp36_ = _tmp42_; -#line 9512 "PhotoPage.c" +#line 9413 "PhotoPage.c" } else { -#line 1351 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1353 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp36_ = FALSE; -#line 9516 "PhotoPage.c" +#line 9417 "PhotoPage.c" } -#line 1350 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1352 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp43_ = self->priv->adjust_button; -#line 1350 "/home/jens/Source/shotwell/src/PhotoPage.vala" - gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp43_, gtk_widget_get_type (), GtkWidget), _tmp36_); #line 1352 "/home/jens/Source/shotwell/src/PhotoPage.vala" + gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp43_, gtk_widget_get_type (), GtkWidget), _tmp36_); +#line 1354 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp46_ = photo; -#line 1352 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1354 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp46_ != NULL) { -#line 9526 "PhotoPage.c" +#line 9427 "PhotoPage.c" gboolean _tmp47_ = FALSE; -#line 1352 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1354 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp47_ = self->priv->photo_missing; -#line 1352 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1354 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp45_ = !_tmp47_; -#line 9532 "PhotoPage.c" +#line 9433 "PhotoPage.c" } else { -#line 1352 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1354 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp45_ = FALSE; -#line 9536 "PhotoPage.c" +#line 9437 "PhotoPage.c" } -#line 1352 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1354 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp45_) { -#line 9540 "PhotoPage.c" +#line 9441 "PhotoPage.c" Photo* _tmp48_ = NULL; gboolean _tmp49_ = FALSE; -#line 1353 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1355 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp48_ = photo; -#line 1353 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1355 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp49_ = editing_host_page_is_enhance_available (self, _tmp48_); -#line 1353 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1355 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp44_ = _tmp49_; -#line 9549 "PhotoPage.c" +#line 9450 "PhotoPage.c" } else { -#line 1353 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1355 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp44_ = FALSE; -#line 9553 "PhotoPage.c" +#line 9454 "PhotoPage.c" } -#line 1352 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1354 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp50_ = self->priv->enhance_button; -#line 1352 "/home/jens/Source/shotwell/src/PhotoPage.vala" - gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp50_, gtk_widget_get_type (), GtkWidget), _tmp44_); #line 1354 "/home/jens/Source/shotwell/src/PhotoPage.vala" + gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp50_, gtk_widget_get_type (), GtkWidget), _tmp44_); +#line 1356 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp53_ = photo; -#line 1354 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1356 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp53_ != NULL) { -#line 9563 "PhotoPage.c" +#line 9464 "PhotoPage.c" gboolean _tmp54_ = FALSE; -#line 1354 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1356 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp54_ = self->priv->photo_missing; -#line 1354 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1356 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp52_ = !_tmp54_; -#line 9569 "PhotoPage.c" +#line 9470 "PhotoPage.c" } else { -#line 1354 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1356 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp52_ = FALSE; -#line 9573 "PhotoPage.c" +#line 9474 "PhotoPage.c" } -#line 1354 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1356 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp52_) { -#line 9577 "PhotoPage.c" +#line 9478 "PhotoPage.c" Photo* _tmp55_ = NULL; Scaling _tmp56_ = {0}; gboolean _tmp57_ = FALSE; -#line 1355 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1357 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp55_ = photo; -#line 1355 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1357 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp56_ = scaling; -#line 1355 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1357 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp57_ = editing_tools_straighten_tool_is_available (_tmp55_, &_tmp56_); -#line 1355 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1357 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp51_ = _tmp57_; -#line 9589 "PhotoPage.c" +#line 9490 "PhotoPage.c" } else { -#line 1355 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1357 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp51_ = FALSE; -#line 9593 "PhotoPage.c" +#line 9494 "PhotoPage.c" } -#line 1354 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1356 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp58_ = self->priv->straighten_button; -#line 1354 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1356 "/home/jens/Source/shotwell/src/PhotoPage.vala" gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp58_, gtk_widget_get_type (), GtkWidget), _tmp51_); -#line 1357 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1359 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp59_ = selected_count; -#line 1357 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1359 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp60_ = count; -#line 1357 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1359 "/home/jens/Source/shotwell/src/PhotoPage.vala" 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 1335 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1337 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (photo); -#line 9607 "PhotoPage.c" +#line 9508 "PhotoPage.c" } @@ -9621,67 +9522,67 @@ static gboolean editing_host_page_real_on_shift_pressed (Page* base, GdkEventKey EditingToolsEditingTool* _tmp3_ = NULL; GdkEventKey* _tmp7_ = NULL; gboolean _tmp8_ = FALSE; -#line 1360 "/home/jens/Source/shotwell/src/PhotoPage.vala" - self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EDITING_HOST_PAGE, EditingHostPage); #line 1362 "/home/jens/Source/shotwell/src/PhotoPage.vala" + self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EDITING_HOST_PAGE, EditingHostPage); +#line 1364 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp3_ = self->priv->current_tool; -#line 1362 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1364 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp3_ == NULL) { -#line 9626 "PhotoPage.c" +#line 9527 "PhotoPage.c" gboolean _tmp4_ = FALSE; -#line 1362 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1364 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp4_ = page_get_ctrl_pressed (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); -#line 1362 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1364 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp2_ = !_tmp4_; -#line 9632 "PhotoPage.c" +#line 9533 "PhotoPage.c" } else { -#line 1362 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1364 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp2_ = FALSE; -#line 9636 "PhotoPage.c" +#line 9537 "PhotoPage.c" } -#line 1362 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1364 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp2_) { -#line 9640 "PhotoPage.c" +#line 9541 "PhotoPage.c" gboolean _tmp5_ = FALSE; -#line 1362 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1364 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp5_ = page_get_alt_pressed (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); -#line 1362 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1364 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp1_ = !_tmp5_; -#line 9646 "PhotoPage.c" +#line 9547 "PhotoPage.c" } else { -#line 1362 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1364 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp1_ = FALSE; -#line 9650 "PhotoPage.c" +#line 9551 "PhotoPage.c" } -#line 1362 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1364 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp1_) { -#line 9654 "PhotoPage.c" +#line 9555 "PhotoPage.c" gboolean _tmp6_ = FALSE; -#line 1362 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1364 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp6_ = editing_host_page_has_photo (self); -#line 1362 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1364 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp0_ = _tmp6_; -#line 9660 "PhotoPage.c" +#line 9561 "PhotoPage.c" } else { -#line 1362 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1364 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp0_ = FALSE; -#line 9664 "PhotoPage.c" +#line 9565 "PhotoPage.c" } -#line 1362 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1364 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp0_) { -#line 1363 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1365 "/home/jens/Source/shotwell/src/PhotoPage.vala" editing_host_page_swap_in_original (self); -#line 9670 "PhotoPage.c" +#line 9571 "PhotoPage.c" } -#line 1365 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1367 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp7_ = event; -#line 1365 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1367 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp8_ = PAGE_CLASS (editing_host_page_parent_class)->on_shift_pressed (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), TYPE_PAGE, Page), _tmp7_); -#line 1365 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1367 "/home/jens/Source/shotwell/src/PhotoPage.vala" result = _tmp8_; -#line 1365 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1367 "/home/jens/Source/shotwell/src/PhotoPage.vala" return result; -#line 9680 "PhotoPage.c" +#line 9581 "PhotoPage.c" } @@ -9691,25 +9592,25 @@ static gboolean editing_host_page_real_on_shift_released (Page* base, GdkEventKe EditingToolsEditingTool* _tmp0_ = NULL; GdkEventKey* _tmp1_ = NULL; gboolean _tmp2_ = FALSE; -#line 1368 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1370 "/home/jens/Source/shotwell/src/PhotoPage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EDITING_HOST_PAGE, EditingHostPage); -#line 1369 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1371 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp0_ = self->priv->current_tool; -#line 1369 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1371 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp0_ == NULL) { -#line 1370 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1372 "/home/jens/Source/shotwell/src/PhotoPage.vala" editing_host_page_swap_out_original (self); -#line 9698 "PhotoPage.c" +#line 9599 "PhotoPage.c" } -#line 1372 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1374 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp1_ = event; -#line 1372 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1374 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp2_ = PAGE_CLASS (editing_host_page_parent_class)->on_shift_released (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), TYPE_PAGE, Page), _tmp1_); -#line 1372 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1374 "/home/jens/Source/shotwell/src/PhotoPage.vala" result = _tmp2_; -#line 1372 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1374 "/home/jens/Source/shotwell/src/PhotoPage.vala" return result; -#line 9708 "PhotoPage.c" +#line 9609 "PhotoPage.c" } @@ -9719,25 +9620,25 @@ static gboolean editing_host_page_real_on_alt_pressed (Page* base, GdkEventKey* EditingToolsEditingTool* _tmp0_ = NULL; GdkEventKey* _tmp1_ = NULL; gboolean _tmp2_ = FALSE; -#line 1375 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1377 "/home/jens/Source/shotwell/src/PhotoPage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EDITING_HOST_PAGE, EditingHostPage); -#line 1376 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1378 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp0_ = self->priv->current_tool; -#line 1376 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1378 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp0_ == NULL) { -#line 1377 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1379 "/home/jens/Source/shotwell/src/PhotoPage.vala" editing_host_page_swap_out_original (self); -#line 9726 "PhotoPage.c" +#line 9627 "PhotoPage.c" } -#line 1379 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1381 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp1_ = event; -#line 1379 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1381 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp2_ = PAGE_CLASS (editing_host_page_parent_class)->on_alt_pressed (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), TYPE_PAGE, Page), _tmp1_); -#line 1379 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1381 "/home/jens/Source/shotwell/src/PhotoPage.vala" result = _tmp2_; -#line 1379 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1381 "/home/jens/Source/shotwell/src/PhotoPage.vala" return result; -#line 9736 "PhotoPage.c" +#line 9637 "PhotoPage.c" } @@ -9749,53 +9650,53 @@ static gboolean editing_host_page_real_on_alt_released (Page* base, GdkEventKey* EditingToolsEditingTool* _tmp2_ = NULL; GdkEventKey* _tmp5_ = NULL; gboolean _tmp6_ = FALSE; -#line 1382 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1384 "/home/jens/Source/shotwell/src/PhotoPage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EDITING_HOST_PAGE, EditingHostPage); -#line 1383 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1385 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp2_ = self->priv->current_tool; -#line 1383 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1385 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp2_ == NULL) { -#line 9754 "PhotoPage.c" +#line 9655 "PhotoPage.c" gboolean _tmp3_ = FALSE; -#line 1383 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1385 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp3_ = page_get_shift_pressed (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); -#line 1383 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1385 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp1_ = _tmp3_; -#line 9760 "PhotoPage.c" +#line 9661 "PhotoPage.c" } else { -#line 1383 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1385 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp1_ = FALSE; -#line 9764 "PhotoPage.c" +#line 9665 "PhotoPage.c" } -#line 1383 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1385 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp1_) { -#line 9768 "PhotoPage.c" +#line 9669 "PhotoPage.c" gboolean _tmp4_ = FALSE; -#line 1383 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1385 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp4_ = page_get_ctrl_pressed (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); -#line 1383 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1385 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp0_ = !_tmp4_; -#line 9774 "PhotoPage.c" +#line 9675 "PhotoPage.c" } else { -#line 1383 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1385 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp0_ = FALSE; -#line 9778 "PhotoPage.c" +#line 9679 "PhotoPage.c" } -#line 1383 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1385 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp0_) { -#line 1384 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1386 "/home/jens/Source/shotwell/src/PhotoPage.vala" editing_host_page_swap_in_original (self); -#line 9784 "PhotoPage.c" +#line 9685 "PhotoPage.c" } -#line 1386 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1388 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp5_ = event; -#line 1386 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1388 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp6_ = PAGE_CLASS (editing_host_page_parent_class)->on_alt_released (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), TYPE_PAGE, Page), _tmp5_); -#line 1386 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1388 "/home/jens/Source/shotwell/src/PhotoPage.vala" result = _tmp6_; -#line 1386 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1388 "/home/jens/Source/shotwell/src/PhotoPage.vala" return result; -#line 9794 "PhotoPage.c" +#line 9695 "PhotoPage.c" } @@ -9809,9 +9710,9 @@ static void editing_host_page_swap_in_original (EditingHostPage* self) { Photo* _tmp14_ = NULL; Dimensions _tmp15_ = {0}; GError * _inner_error_ = NULL; -#line 1389 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1391 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_if_fail (IS_EDITING_HOST_PAGE (self)); -#line 9810 "PhotoPage.c" +#line 9711 "PhotoPage.c" { GdkPixbuf* _tmp0_ = NULL; Photo* _tmp1_ = NULL; @@ -9822,148 +9723,148 @@ static void editing_host_page_swap_in_original (EditingHostPage* self) { Photo* _tmp6_ = NULL; Orientation _tmp7_ = 0; GdkPixbuf* _tmp8_ = NULL; -#line 1393 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1395 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp1_ = editing_host_page_get_photo (self); -#line 1393 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1395 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp2_ = _tmp1_; -#line 1393 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1395 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp3_ = photo_get_prefetched_copy (_tmp2_, &_inner_error_); -#line 1393 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1395 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp4_ = _tmp3_; -#line 1393 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1395 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (_tmp2_); -#line 1393 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1395 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp0_ = _tmp4_; -#line 1393 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1395 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 9835 "PhotoPage.c" - goto __catch249_g_error; +#line 9736 "PhotoPage.c" + goto __catch246_g_error; } -#line 1392 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1394 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp5_ = editing_host_page_get_photo (self); -#line 1392 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1394 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp6_ = _tmp5_; -#line 1392 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1394 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp7_ = photo_get_original_orientation (_tmp6_); -#line 1392 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1394 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp8_ = orientation_rotate_pixbuf (_tmp7_, _tmp0_); -#line 1392 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1394 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (original); -#line 1392 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1394 "/home/jens/Source/shotwell/src/PhotoPage.vala" original = _tmp8_; -#line 1392 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1394 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (_tmp6_); -#line 1391 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1393 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (_tmp0_); -#line 9854 "PhotoPage.c" +#line 9755 "PhotoPage.c" } - goto __finally249; - __catch249_g_error: + goto __finally246; + __catch246_g_error: { GError* err = NULL; -#line 1391 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1393 "/home/jens/Source/shotwell/src/PhotoPage.vala" err = _inner_error_; -#line 1391 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1393 "/home/jens/Source/shotwell/src/PhotoPage.vala" _inner_error_ = NULL; -#line 1395 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1397 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_error_free0 (err); -#line 1395 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1397 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (original); -#line 1395 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1397 "/home/jens/Source/shotwell/src/PhotoPage.vala" return; -#line 9870 "PhotoPage.c" +#line 9771 "PhotoPage.c" } - __finally249: -#line 1391 "/home/jens/Source/shotwell/src/PhotoPage.vala" + __finally246: +#line 1393 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1391 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1393 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (original); -#line 1391 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1393 "/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 1391 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1393 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_clear_error (&_inner_error_); -#line 1391 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1393 "/home/jens/Source/shotwell/src/PhotoPage.vala" return; -#line 9883 "PhotoPage.c" +#line 9784 "PhotoPage.c" } -#line 1399 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#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)); -#line 1399 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1401 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (self->priv->swapped); -#line 1399 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1401 "/home/jens/Source/shotwell/src/PhotoPage.vala" self->priv->swapped = _tmp9_; -#line 1403 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1405 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp10_ = self->priv->zoom_slider; -#line 1403 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1405 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp11_ = gtk_range_get_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, gtk_range_get_type (), GtkRange)); -#line 1403 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1405 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp11_ != 0.0) { -#line 1404 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1406 "/home/jens/Source/shotwell/src/PhotoPage.vala" single_photo_page_save_zoom_state (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage)); -#line 1405 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#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 9901 "PhotoPage.c" +#line 9802 "PhotoPage.c" } -#line 1408 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1410 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp12_ = original; -#line 1408 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1410 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp13_ = editing_host_page_get_photo (self); -#line 1408 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1410 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp14_ = _tmp13_; -#line 1408 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1410 "/home/jens/Source/shotwell/src/PhotoPage.vala" photo_get_master_dimensions (_tmp14_, &_tmp15_); -#line 1408 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1410 "/home/jens/Source/shotwell/src/PhotoPage.vala" single_photo_page_set_pixbuf (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), _tmp12_, &_tmp15_, NULL); -#line 1408 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1410 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (_tmp14_); -#line 1389 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1391 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (original); -#line 9917 "PhotoPage.c" +#line 9818 "PhotoPage.c" } static void editing_host_page_swap_out_original (EditingHostPage* self) { GdkPixbuf* _tmp0_ = NULL; -#line 1411 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1413 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_if_fail (IS_EDITING_HOST_PAGE (self)); -#line 1412 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1414 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp0_ = self->priv->swapped; -#line 1412 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1414 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp0_ != NULL) { -#line 9929 "PhotoPage.c" +#line 9830 "PhotoPage.c" GdkPixbuf* _tmp1_ = NULL; Photo* _tmp2_ = NULL; Photo* _tmp3_ = NULL; Dimensions _tmp4_ = {0}; -#line 1413 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1415 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp1_ = self->priv->swapped; -#line 1413 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1415 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp2_ = editing_host_page_get_photo (self); -#line 1413 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1415 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp3_ = _tmp2_; -#line 1413 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1415 "/home/jens/Source/shotwell/src/PhotoPage.vala" media_source_get_dimensions (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_MEDIA_SOURCE, MediaSource), PHOTO_EXCEPTION_NONE, &_tmp4_); -#line 1413 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1415 "/home/jens/Source/shotwell/src/PhotoPage.vala" single_photo_page_set_pixbuf (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), _tmp1_, &_tmp4_, NULL); -#line 1413 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _g_object_unref0 (_tmp3_); #line 1415 "/home/jens/Source/shotwell/src/PhotoPage.vala" + _g_object_unref0 (_tmp3_); +#line 1417 "/home/jens/Source/shotwell/src/PhotoPage.vala" single_photo_page_restore_zoom_state (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage)); -#line 1416 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1418 "/home/jens/Source/shotwell/src/PhotoPage.vala" editing_host_page_update_cursor_for_zoom_context (self); -#line 1419 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1421 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (self->priv->swapped); -#line 1419 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1421 "/home/jens/Source/shotwell/src/PhotoPage.vala" self->priv->swapped = NULL; -#line 9954 "PhotoPage.c" +#line 9855 "PhotoPage.c" } } static gpointer _editing_tools_editing_tool_ref0 (gpointer self) { -#line 1463 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1465 "/home/jens/Source/shotwell/src/PhotoPage.vala" return self ? editing_tools_editing_tool_ref (self) : NULL; -#line 9962 "PhotoPage.c" +#line 9863 "PhotoPage.c" } @@ -9984,37 +9885,37 @@ static void editing_host_page_activate_tool (EditingHostPage* self, EditingTools EditingToolsEditingTool* _tmp28_ = NULL; EditingToolsPhotoCanvas* _tmp29_ = NULL; GError * _inner_error_ = NULL; -#line 1423 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1425 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_if_fail (IS_EDITING_HOST_PAGE (self)); -#line 1423 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1425 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_if_fail (EDITING_TOOLS_IS_EDITING_TOOL (tool)); -#line 1426 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1428 "/home/jens/Source/shotwell/src/PhotoPage.vala" single_photo_page_save_zoom_state (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage)); -#line 1427 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1429 "/home/jens/Source/shotwell/src/PhotoPage.vala" single_photo_page_cancel_zoom (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage)); -#line 1431 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1433 "/home/jens/Source/shotwell/src/PhotoPage.vala" dimensions_init (&_tmp0_, 0, 0); -#line 1431 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1433 "/home/jens/Source/shotwell/src/PhotoPage.vala" editing_host_page_deactivate_tool (self, NULL, NULL, &_tmp0_, FALSE); -#line 1434 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1436 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp1_ = single_photo_page_get_unscaled_pixbuf (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage)); -#line 1434 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1436 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (self->priv->cancel_editing_pixbuf); -#line 1434 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1436 "/home/jens/Source/shotwell/src/PhotoPage.vala" self->priv->cancel_editing_pixbuf = _tmp1_; -#line 1438 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1440 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp2_ = editing_host_page_get_photo (self); -#line 1438 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1440 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp3_ = _tmp2_; -#line 1438 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1440 "/home/jens/Source/shotwell/src/PhotoPage.vala" media_source_get_dimensions (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_MEDIA_SOURCE, MediaSource), PHOTO_EXCEPTION_NONE, &_tmp4_); -#line 1438 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1440 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp5_ = _tmp4_; -#line 1438 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1440 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (_tmp3_); -#line 1438 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1440 "/home/jens/Source/shotwell/src/PhotoPage.vala" max_dim = _tmp5_; -#line 10013 "PhotoPage.c" +#line 9914 "PhotoPage.c" { Dimensions tool_pixbuf_dim = {0}; Dimensions _tmp6_ = {0}; @@ -10028,192 +9929,192 @@ static void editing_host_page_activate_tool (EditingHostPage* self, EditingTools GdkPixbuf* _tmp14_ = NULL; GdkPixbuf* _tmp15_ = NULL; GdkPixbuf* _tmp16_ = NULL; -#line 1440 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1442 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp6_.width = 0; -#line 1440 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1442 "/home/jens/Source/shotwell/src/PhotoPage.vala" tool_pixbuf_dim = _tmp6_; -#line 1441 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1443 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp8_ = tool; -#line 1441 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1443 "/home/jens/Source/shotwell/src/PhotoPage.vala" single_photo_page_get_canvas_scaling (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), &_tmp9_); -#line 1441 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1443 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp10_ = editing_host_page_get_photo (self); -#line 1441 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1443 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp11_ = _tmp10_; -#line 1441 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1443 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp13_ = editing_tools_editing_tool_get_display_pixbuf (_tmp8_, &_tmp9_, _tmp11_, &_tmp12_, &_inner_error_); -#line 1441 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1443 "/home/jens/Source/shotwell/src/PhotoPage.vala" tool_pixbuf_dim = _tmp12_; -#line 1441 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1443 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp14_ = _tmp13_; -#line 1441 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1443 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (_tmp11_); -#line 1441 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1443 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp7_ = _tmp14_; -#line 1441 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1443 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 10051 "PhotoPage.c" - goto __catch250_g_error; +#line 9952 "PhotoPage.c" + goto __catch247_g_error; } -#line 1441 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1443 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp15_ = _tmp7_; -#line 1441 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1443 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp7_ = NULL; -#line 1441 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1443 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (unscaled); -#line 1441 "/home/jens/Source/shotwell/src/PhotoPage.vala" - unscaled = _tmp15_; #line 1443 "/home/jens/Source/shotwell/src/PhotoPage.vala" + unscaled = _tmp15_; +#line 1445 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp16_ = unscaled; -#line 1443 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1445 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp16_ != NULL) { -#line 10066 "PhotoPage.c" +#line 9967 "PhotoPage.c" Dimensions _tmp17_ = {0}; -#line 1444 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1446 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp17_ = tool_pixbuf_dim; -#line 1444 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1446 "/home/jens/Source/shotwell/src/PhotoPage.vala" max_dim = _tmp17_; -#line 10072 "PhotoPage.c" +#line 9973 "PhotoPage.c" } -#line 1439 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1441 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (_tmp7_); -#line 10076 "PhotoPage.c" +#line 9977 "PhotoPage.c" } - goto __finally250; - __catch250_g_error: + goto __finally247; + __catch247_g_error: { GError* err = NULL; GError* _tmp18_ = NULL; const gchar* _tmp19_ = NULL; GtkToggleToolButton* _tmp20_ = NULL; GtkToggleToolButton* _tmp21_ = NULL; -#line 1439 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1441 "/home/jens/Source/shotwell/src/PhotoPage.vala" err = _inner_error_; -#line 1439 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1441 "/home/jens/Source/shotwell/src/PhotoPage.vala" _inner_error_ = NULL; -#line 1446 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1448 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp18_ = err; -#line 1446 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1448 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp19_ = _tmp18_->message; -#line 1446 "/home/jens/Source/shotwell/src/PhotoPage.vala" - g_warning ("PhotoPage.vala:1446: %s", _tmp19_); -#line 1447 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1448 "/home/jens/Source/shotwell/src/PhotoPage.vala" + g_warning ("PhotoPage.vala:1448: %s", _tmp19_); +#line 1449 "/home/jens/Source/shotwell/src/PhotoPage.vala" editing_host_page_set_photo_missing (self, TRUE); -#line 1450 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1452 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp20_ = self->priv->current_editing_toggle; -#line 1450 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1452 "/home/jens/Source/shotwell/src/PhotoPage.vala" _vala_assert (_tmp20_ != NULL, "current_editing_toggle != null"); -#line 1451 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1453 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp21_ = self->priv->current_editing_toggle; -#line 1451 "/home/jens/Source/shotwell/src/PhotoPage.vala" - gtk_toggle_tool_button_set_active (_tmp21_, FALSE); #line 1453 "/home/jens/Source/shotwell/src/PhotoPage.vala" + gtk_toggle_tool_button_set_active (_tmp21_, FALSE); +#line 1455 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_error_free0 (err); -#line 1453 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1455 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (unscaled); -#line 1453 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1455 "/home/jens/Source/shotwell/src/PhotoPage.vala" return; -#line 10112 "PhotoPage.c" +#line 10013 "PhotoPage.c" } - __finally250: -#line 1439 "/home/jens/Source/shotwell/src/PhotoPage.vala" + __finally247: +#line 1441 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1439 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1441 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (unscaled); -#line 1439 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1441 "/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 1439 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1441 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_clear_error (&_inner_error_); -#line 1439 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1441 "/home/jens/Source/shotwell/src/PhotoPage.vala" return; -#line 10125 "PhotoPage.c" +#line 10026 "PhotoPage.c" } -#line 1456 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1458 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp22_ = unscaled; -#line 1456 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1458 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp22_ != NULL) { -#line 10131 "PhotoPage.c" +#line 10032 "PhotoPage.c" GdkPixbuf* _tmp23_ = NULL; Dimensions _tmp24_ = {0}; -#line 1457 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1459 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp23_ = unscaled; -#line 1457 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1459 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp24_ = max_dim; -#line 1457 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#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 10140 "PhotoPage.c" +#line 10041 "PhotoPage.c" } -#line 1460 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1462 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp25_ = editing_host_page_editing_host_canvas_new (self); -#line 1460 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1462 "/home/jens/Source/shotwell/src/PhotoPage.vala" photo_canvas = G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, EDITING_TOOLS_TYPE_PHOTO_CANVAS, EditingToolsPhotoCanvas); -#line 1463 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1465 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp26_ = tool; -#line 1463 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1465 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp27_ = _editing_tools_editing_tool_ref0 (_tmp26_); -#line 1463 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1465 "/home/jens/Source/shotwell/src/PhotoPage.vala" _editing_tools_editing_tool_unref0 (self->priv->current_tool); -#line 1463 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1465 "/home/jens/Source/shotwell/src/PhotoPage.vala" self->priv->current_tool = _tmp27_; -#line 1464 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1466 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp28_ = self->priv->current_tool; -#line 1464 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1466 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp29_ = photo_canvas; -#line 1464 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1466 "/home/jens/Source/shotwell/src/PhotoPage.vala" editing_tools_editing_tool_activate (_tmp28_, _tmp29_); -#line 1467 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1469 "/home/jens/Source/shotwell/src/PhotoPage.vala" editing_host_page_place_tool_window (self); -#line 1470 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1472 "/home/jens/Source/shotwell/src/PhotoPage.vala" single_photo_page_repaint (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), NULL); -#line 1423 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1425 "/home/jens/Source/shotwell/src/PhotoPage.vala" _editing_tools_photo_canvas_unref0 (photo_canvas); -#line 1423 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1425 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (unscaled); -#line 10168 "PhotoPage.c" +#line 10069 "PhotoPage.c" } static void _editing_host_page_on_tool_activated_editing_tools_editing_tool_activated (EditingToolsEditingTool* _sender, gpointer self) { -#line 1494 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1496 "/home/jens/Source/shotwell/src/PhotoPage.vala" editing_host_page_on_tool_activated ((EditingHostPage*) self); -#line 10175 "PhotoPage.c" +#line 10076 "PhotoPage.c" } static void _editing_host_page_on_tool_deactivated_editing_tools_editing_tool_deactivated (EditingToolsEditingTool* _sender, gpointer self) { -#line 1495 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1497 "/home/jens/Source/shotwell/src/PhotoPage.vala" editing_host_page_on_tool_deactivated ((EditingHostPage*) self); -#line 10182 "PhotoPage.c" +#line 10083 "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 1496 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#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 10189 "PhotoPage.c" +#line 10090 "PhotoPage.c" } static void _editing_host_page_on_tool_cancelled_editing_tools_editing_tool_cancelled (EditingToolsEditingTool* _sender, gpointer self) { -#line 1497 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1499 "/home/jens/Source/shotwell/src/PhotoPage.vala" editing_host_page_on_tool_cancelled ((EditingHostPage*) self); -#line 10196 "PhotoPage.c" +#line 10097 "PhotoPage.c" } static void _editing_host_page_on_tool_aborted_editing_tools_editing_tool_aborted (EditingToolsEditingTool* _sender, gpointer self) { -#line 1498 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1500 "/home/jens/Source/shotwell/src/PhotoPage.vala" editing_host_page_on_tool_aborted ((EditingHostPage*) self); -#line 10203 "PhotoPage.c" +#line 10104 "PhotoPage.c" } static gboolean _editing_host_page_update_pixbuf_gsource_func (gpointer self) { gboolean result; result = editing_host_page_update_pixbuf ((EditingHostPage*) self); -#line 1525 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1527 "/home/jens/Source/shotwell/src/PhotoPage.vala" return result; -#line 10212 "PhotoPage.c" +#line 10113 "PhotoPage.c" } @@ -10243,60 +10144,60 @@ static void editing_host_page_deactivate_tool (EditingHostPage* self, Command* c GdkPixbuf* _tmp43_ = NULL; gboolean _tmp46_ = FALSE; Command* _tmp47_ = NULL; -#line 1473 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1475 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_if_fail (IS_EDITING_HOST_PAGE (self)); -#line 1473 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1475 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_if_fail ((command == NULL) || IS_COMMAND (command)); -#line 1473 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1475 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_if_fail ((new_pixbuf == NULL) || GDK_IS_PIXBUF (new_pixbuf)); -#line 1473 "/home/jens/Source/shotwell/src/PhotoPage.vala" - g_return_if_fail (new_max_dim != NULL); #line 1475 "/home/jens/Source/shotwell/src/PhotoPage.vala" + g_return_if_fail (new_max_dim != NULL); +#line 1477 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp0_ = self->priv->current_tool; -#line 1475 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1477 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp0_ == NULL) { -#line 1476 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1478 "/home/jens/Source/shotwell/src/PhotoPage.vala" return; -#line 10256 "PhotoPage.c" +#line 10157 "PhotoPage.c" } -#line 1478 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1480 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp1_ = self->priv->current_tool; -#line 1478 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1480 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp2_ = _editing_tools_editing_tool_ref0 (_tmp1_); -#line 1478 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1480 "/home/jens/Source/shotwell/src/PhotoPage.vala" tool = _tmp2_; -#line 1479 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1481 "/home/jens/Source/shotwell/src/PhotoPage.vala" _editing_tools_editing_tool_unref0 (self->priv->current_tool); -#line 1479 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1481 "/home/jens/Source/shotwell/src/PhotoPage.vala" self->priv->current_tool = NULL; -#line 1482 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1484 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp3_ = tool; -#line 1482 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1484 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp4_ = editing_tools_editing_tool_get_tool_window (_tmp3_); -#line 1482 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1484 "/home/jens/Source/shotwell/src/PhotoPage.vala" tool_window = _tmp4_; -#line 1483 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1485 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp6_ = tool_window; -#line 1483 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1485 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp6_ != NULL) { -#line 10278 "PhotoPage.c" +#line 10179 "PhotoPage.c" EditingToolsEditingToolWindow* _tmp7_ = NULL; gboolean _tmp8_ = FALSE; -#line 1483 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1485 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp7_ = tool_window; -#line 1483 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1485 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp8_ = editing_tools_editing_tool_window_has_user_moved (_tmp7_); -#line 1483 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1485 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp5_ = _tmp8_; -#line 10287 "PhotoPage.c" +#line 10188 "PhotoPage.c" } else { -#line 1483 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1485 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp5_ = FALSE; -#line 10291 "PhotoPage.c" +#line 10192 "PhotoPage.c" } -#line 1483 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1485 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp5_) { -#line 10295 "PhotoPage.c" +#line 10196 "PhotoPage.c" gint last_location_x = 0; gint last_location_y = 0; EditingToolsEditingToolWindow* _tmp9_ = NULL; @@ -10314,219 +10215,219 @@ static void editing_host_page_deactivate_tool (EditingHostPage* self, Command* c gchar* _tmp21_ = NULL; gchar* _tmp22_ = NULL; gint _tmp23_ = 0; -#line 1485 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1487 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp9_ = tool_window; -#line 1485 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1487 "/home/jens/Source/shotwell/src/PhotoPage.vala" gtk_window_get_position (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, gtk_window_get_type (), GtkWindow), &_tmp10_, &_tmp11_); -#line 1485 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1487 "/home/jens/Source/shotwell/src/PhotoPage.vala" last_location_x = _tmp10_; -#line 1485 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1487 "/home/jens/Source/shotwell/src/PhotoPage.vala" last_location_y = _tmp11_; -#line 1486 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1488 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp12_ = self->priv->last_locations; -#line 1486 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1488 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp13_ = tool; -#line 1486 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1488 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp14_ = _tmp13_->name; -#line 1486 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1488 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp15_ = g_strconcat (_tmp14_, "_x", NULL); -#line 1486 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1488 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp16_ = _tmp15_; -#line 1486 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1488 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp17_ = last_location_x; -#line 1486 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1488 "/home/jens/Source/shotwell/src/PhotoPage.vala" gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp16_, (gpointer) ((gintptr) _tmp17_)); -#line 1486 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1488 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_free0 (_tmp16_); -#line 1487 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1489 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp18_ = self->priv->last_locations; -#line 1487 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1489 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp19_ = tool; -#line 1487 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1489 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp20_ = _tmp19_->name; -#line 1487 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1489 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp21_ = g_strconcat (_tmp20_, "_y", NULL); -#line 1487 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1489 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp22_ = _tmp21_; -#line 1487 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1489 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp23_ = last_location_y; -#line 1487 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1489 "/home/jens/Source/shotwell/src/PhotoPage.vala" gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp22_, (gpointer) ((gintptr) _tmp23_)); -#line 1487 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1489 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_free0 (_tmp22_); -#line 10353 "PhotoPage.c" +#line 10254 "PhotoPage.c" } -#line 1492 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1494 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp24_ = tool; -#line 1492 "/home/jens/Source/shotwell/src/PhotoPage.vala" - editing_tools_editing_tool_deactivate (_tmp24_); #line 1494 "/home/jens/Source/shotwell/src/PhotoPage.vala" + editing_tools_editing_tool_deactivate (_tmp24_); +#line 1496 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp25_ = tool; -#line 1494 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1496 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_signal_parse_name ("activated", EDITING_TOOLS_TYPE_EDITING_TOOL, &_tmp26_, NULL, FALSE); -#line 1494 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1496 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_signal_handlers_disconnect_matched (_tmp25_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp26_, 0, NULL, (GCallback) _editing_host_page_on_tool_activated_editing_tools_editing_tool_activated, self); -#line 1495 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1497 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp27_ = tool; -#line 1495 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1497 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_signal_parse_name ("deactivated", EDITING_TOOLS_TYPE_EDITING_TOOL, &_tmp28_, NULL, FALSE); -#line 1495 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1497 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_signal_handlers_disconnect_matched (_tmp27_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp28_, 0, NULL, (GCallback) _editing_host_page_on_tool_deactivated_editing_tools_editing_tool_deactivated, self); -#line 1496 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1498 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp29_ = tool; -#line 1496 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1498 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_signal_parse_name ("applied", EDITING_TOOLS_TYPE_EDITING_TOOL, &_tmp30_, NULL, FALSE); -#line 1496 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1498 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_signal_handlers_disconnect_matched (_tmp29_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp30_, 0, NULL, (GCallback) _editing_host_page_on_tool_applied_editing_tools_editing_tool_applied, self); -#line 1497 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1499 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp31_ = tool; -#line 1497 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1499 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_signal_parse_name ("cancelled", EDITING_TOOLS_TYPE_EDITING_TOOL, &_tmp32_, NULL, FALSE); -#line 1497 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1499 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_signal_handlers_disconnect_matched (_tmp31_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp32_, 0, NULL, (GCallback) _editing_host_page_on_tool_cancelled_editing_tools_editing_tool_cancelled, self); -#line 1498 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1500 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp33_ = tool; -#line 1498 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1500 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_signal_parse_name ("aborted", EDITING_TOOLS_TYPE_EDITING_TOOL, &_tmp34_, NULL, FALSE); -#line 1498 "/home/jens/Source/shotwell/src/PhotoPage.vala" - g_signal_handlers_disconnect_matched (_tmp33_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp34_, 0, NULL, (GCallback) _editing_host_page_on_tool_aborted_editing_tools_editing_tool_aborted, self); #line 1500 "/home/jens/Source/shotwell/src/PhotoPage.vala" + g_signal_handlers_disconnect_matched (_tmp33_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp34_, 0, NULL, (GCallback) _editing_host_page_on_tool_aborted_editing_tools_editing_tool_aborted, self); +#line 1502 "/home/jens/Source/shotwell/src/PhotoPage.vala" _editing_tools_editing_tool_unref0 (tool); -#line 1500 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1502 "/home/jens/Source/shotwell/src/PhotoPage.vala" tool = NULL; -#line 1504 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1506 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (self->priv->current_editing_toggle); -#line 1504 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1506 "/home/jens/Source/shotwell/src/PhotoPage.vala" self->priv->current_editing_toggle = NULL; -#line 1507 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1509 "/home/jens/Source/shotwell/src/PhotoPage.vala" replacement = NULL; -#line 1508 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1510 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp35_ = new_pixbuf; -#line 1508 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1510 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp35_ != NULL) { -#line 10403 "PhotoPage.c" +#line 10304 "PhotoPage.c" GdkPixbuf* _tmp36_ = NULL; GdkPixbuf* _tmp37_ = NULL; -#line 1509 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1511 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp36_ = new_pixbuf; -#line 1509 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1511 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp37_ = _g_object_ref0 (_tmp36_); -#line 1509 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1511 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (replacement); -#line 1509 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1511 "/home/jens/Source/shotwell/src/PhotoPage.vala" replacement = _tmp37_; -#line 10414 "PhotoPage.c" +#line 10315 "PhotoPage.c" } else { GdkPixbuf* _tmp38_ = NULL; -#line 1510 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1512 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp38_ = self->priv->cancel_editing_pixbuf; -#line 1510 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1512 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp38_ != NULL) { -#line 10421 "PhotoPage.c" +#line 10322 "PhotoPage.c" GdkPixbuf* _tmp39_ = NULL; GdkPixbuf* _tmp40_ = NULL; GdkPixbuf* _tmp41_ = NULL; Dimensions _tmp42_ = {0}; -#line 1511 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1513 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp39_ = self->priv->cancel_editing_pixbuf; -#line 1511 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1513 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp40_ = _g_object_ref0 (_tmp39_); -#line 1511 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1513 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (replacement); -#line 1511 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1513 "/home/jens/Source/shotwell/src/PhotoPage.vala" replacement = _tmp40_; -#line 1512 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1514 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp41_ = replacement; -#line 1512 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1514 "/home/jens/Source/shotwell/src/PhotoPage.vala" dimensions_for_pixbuf (_tmp41_, &_tmp42_); -#line 1512 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1514 "/home/jens/Source/shotwell/src/PhotoPage.vala" *new_max_dim = _tmp42_; -#line 1513 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1515 "/home/jens/Source/shotwell/src/PhotoPage.vala" needs_improvement = FALSE; -#line 10442 "PhotoPage.c" +#line 10343 "PhotoPage.c" } else { -#line 1515 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1517 "/home/jens/Source/shotwell/src/PhotoPage.vala" needs_improvement = TRUE; -#line 10446 "PhotoPage.c" +#line 10347 "PhotoPage.c" } } -#line 1518 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1520 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp43_ = replacement; -#line 1518 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1520 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp43_ != NULL) { -#line 10453 "PhotoPage.c" +#line 10354 "PhotoPage.c" GdkPixbuf* _tmp44_ = NULL; Dimensions _tmp45_ = {0}; -#line 1519 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1521 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp44_ = replacement; -#line 1519 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1521 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp45_ = *new_max_dim; -#line 1519 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#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 10462 "PhotoPage.c" +#line 10363 "PhotoPage.c" } -#line 1520 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1522 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (self->priv->cancel_editing_pixbuf); -#line 1520 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1522 "/home/jens/Source/shotwell/src/PhotoPage.vala" self->priv->cancel_editing_pixbuf = NULL; -#line 1523 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1525 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp46_ = needs_improvement; -#line 1523 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1525 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp46_) { -#line 1524 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1526 "/home/jens/Source/shotwell/src/PhotoPage.vala" self->priv->pixbuf_dirty = TRUE; -#line 1525 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#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 10476 "PhotoPage.c" +#line 10377 "PhotoPage.c" } -#line 1529 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1531 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp47_ = command; -#line 1529 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1531 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp47_ != NULL) { -#line 10482 "PhotoPage.c" +#line 10383 "PhotoPage.c" CommandManager* _tmp48_ = NULL; CommandManager* _tmp49_ = NULL; Command* _tmp50_ = NULL; -#line 1530 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1532 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp48_ = page_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); -#line 1530 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1532 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp49_ = _tmp48_; -#line 1530 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1532 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp50_ = command; -#line 1530 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1532 "/home/jens/Source/shotwell/src/PhotoPage.vala" command_manager_execute (_tmp49_, _tmp50_); -#line 1530 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1532 "/home/jens/Source/shotwell/src/PhotoPage.vala" _command_manager_unref0 (_tmp49_); -#line 10496 "PhotoPage.c" +#line 10397 "PhotoPage.c" } -#line 1473 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1475 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (replacement); -#line 1473 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1475 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (tool_window); -#line 1473 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1475 "/home/jens/Source/shotwell/src/PhotoPage.vala" _editing_tools_editing_tool_unref0 (tool); -#line 10504 "PhotoPage.c" +#line 10405 "PhotoPage.c" } static gboolean editing_host_page_real_on_double_click (EditingHostPage* self, GdkEventButton* event) { gboolean result = FALSE; -#line 1535 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1537 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_val_if_fail (event != NULL, FALSE); -#line 1536 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1538 "/home/jens/Source/shotwell/src/PhotoPage.vala" result = FALSE; -#line 1536 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1538 "/home/jens/Source/shotwell/src/PhotoPage.vala" return result; -#line 10516 "PhotoPage.c" +#line 10417 "PhotoPage.c" } gboolean editing_host_page_on_double_click (EditingHostPage* self, GdkEventButton* event) { -#line 1535 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1537 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_val_if_fail (IS_EDITING_HOST_PAGE (self), FALSE); -#line 1535 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1537 "/home/jens/Source/shotwell/src/PhotoPage.vala" return EDITING_HOST_PAGE_GET_CLASS (self)->on_double_click (self, event); -#line 10525 "PhotoPage.c" +#line 10426 "PhotoPage.c" } @@ -10550,141 +10451,141 @@ static gboolean editing_host_page_real_on_left_click (Page* base, GdkEventButton EditingToolsEditingTool* _tmp22_ = NULL; gint _tmp23_ = 0; gint _tmp24_ = 0; -#line 1540 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1542 "/home/jens/Source/shotwell/src/PhotoPage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EDITING_HOST_PAGE, EditingHostPage); -#line 1540 "/home/jens/Source/shotwell/src/PhotoPage.vala" - g_return_val_if_fail (event != NULL, FALSE); #line 1542 "/home/jens/Source/shotwell/src/PhotoPage.vala" + g_return_val_if_fail (event != NULL, FALSE); +#line 1544 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp0_ = event; -#line 1542 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1544 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp1_ = _tmp0_->type; -#line 1542 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1544 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp1_ == GDK_2BUTTON_PRESS) { -#line 10559 "PhotoPage.c" +#line 10460 "PhotoPage.c" gboolean _tmp2_ = FALSE; EditingToolsEditingTool* _tmp3_ = NULL; -#line 1543 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1545 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp3_ = self->priv->current_tool; -#line 1543 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1545 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp3_ == NULL) { -#line 10566 "PhotoPage.c" +#line 10467 "PhotoPage.c" GdkEventButton* _tmp4_ = NULL; gboolean _tmp5_ = FALSE; -#line 1543 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1545 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp4_ = event; -#line 1543 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1545 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp5_ = editing_host_page_on_double_click (self, _tmp4_); -#line 1543 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1545 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp2_ = _tmp5_; -#line 10575 "PhotoPage.c" +#line 10476 "PhotoPage.c" } else { -#line 1543 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1545 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp2_ = FALSE; -#line 10579 "PhotoPage.c" +#line 10480 "PhotoPage.c" } -#line 1543 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1545 "/home/jens/Source/shotwell/src/PhotoPage.vala" result = _tmp2_; -#line 1543 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1545 "/home/jens/Source/shotwell/src/PhotoPage.vala" return result; -#line 10585 "PhotoPage.c" +#line 10486 "PhotoPage.c" } -#line 1545 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1547 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp6_ = event; -#line 1545 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1547 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp7_ = _tmp6_->x; -#line 1545 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1547 "/home/jens/Source/shotwell/src/PhotoPage.vala" x = (gint) _tmp7_; -#line 1546 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1548 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp8_ = event; -#line 1546 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1548 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp9_ = _tmp8_->y; -#line 1546 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1548 "/home/jens/Source/shotwell/src/PhotoPage.vala" y = (gint) _tmp9_; -#line 1550 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1552 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp11_ = self->priv->current_tool; -#line 1550 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1552 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp11_ == NULL) { -#line 10603 "PhotoPage.c" +#line 10504 "PhotoPage.c" GtkScale* _tmp12_ = NULL; gdouble _tmp13_ = 0.0; -#line 1550 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1552 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp12_ = self->priv->zoom_slider; -#line 1550 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1552 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp13_ = gtk_range_get_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, gtk_range_get_type (), GtkRange)); -#line 1550 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1552 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp10_ = _tmp13_ != 0.0; -#line 10612 "PhotoPage.c" +#line 10513 "PhotoPage.c" } else { -#line 1550 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1552 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp10_ = FALSE; -#line 10616 "PhotoPage.c" +#line 10517 "PhotoPage.c" } -#line 1550 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1552 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp10_) { -#line 10620 "PhotoPage.c" +#line 10521 "PhotoPage.c" GdkEventButton* _tmp14_ = NULL; gdouble _tmp15_ = 0.0; GdkEventButton* _tmp16_ = NULL; gdouble _tmp17_ = 0.0; -#line 1551 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1553 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp14_ = event; -#line 1551 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1553 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp15_ = _tmp14_->x; -#line 1551 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1553 "/home/jens/Source/shotwell/src/PhotoPage.vala" self->priv->zoom_pan_start_point.x = (gint) _tmp15_; -#line 1552 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1554 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp16_ = event; -#line 1552 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1554 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp17_ = _tmp16_->y; -#line 1552 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1554 "/home/jens/Source/shotwell/src/PhotoPage.vala" self->priv->zoom_pan_start_point.y = (gint) _tmp17_; -#line 1553 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1555 "/home/jens/Source/shotwell/src/PhotoPage.vala" self->priv->is_pan_in_progress = TRUE; -#line 1554 "/home/jens/Source/shotwell/src/PhotoPage.vala" - page_suspend_cursor_hiding (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); #line 1556 "/home/jens/Source/shotwell/src/PhotoPage.vala" + page_suspend_cursor_hiding (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); +#line 1558 "/home/jens/Source/shotwell/src/PhotoPage.vala" result = TRUE; -#line 1556 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1558 "/home/jens/Source/shotwell/src/PhotoPage.vala" return result; -#line 10645 "PhotoPage.c" +#line 10546 "PhotoPage.c" } -#line 1560 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1562 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp18_ = self->priv->current_tool; -#line 1560 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1562 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp18_ == NULL) { -#line 1561 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1563 "/home/jens/Source/shotwell/src/PhotoPage.vala" result = FALSE; -#line 1561 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1563 "/home/jens/Source/shotwell/src/PhotoPage.vala" return result; -#line 10655 "PhotoPage.c" +#line 10556 "PhotoPage.c" } -#line 1566 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1568 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp19_ = x; -#line 1566 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1568 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp20_ = y; -#line 1566 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1568 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp21_ = single_photo_page_is_inside_pixbuf (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), _tmp19_, _tmp20_); -#line 1566 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1568 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (!_tmp21_) { -#line 1567 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1569 "/home/jens/Source/shotwell/src/PhotoPage.vala" result = TRUE; -#line 1567 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1569 "/home/jens/Source/shotwell/src/PhotoPage.vala" return result; -#line 10669 "PhotoPage.c" +#line 10570 "PhotoPage.c" } -#line 1569 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1571 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp22_ = self->priv->current_tool; -#line 1569 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1571 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp23_ = x; -#line 1569 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1571 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp24_ = y; -#line 1569 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1571 "/home/jens/Source/shotwell/src/PhotoPage.vala" editing_tools_editing_tool_on_left_click (_tmp22_, _tmp23_, _tmp24_); -#line 1572 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1574 "/home/jens/Source/shotwell/src/PhotoPage.vala" result = TRUE; -#line 1572 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1574 "/home/jens/Source/shotwell/src/PhotoPage.vala" return result; -#line 10683 "PhotoPage.c" +#line 10584 "PhotoPage.c" } @@ -10702,15 +10603,15 @@ static gboolean editing_host_page_real_on_left_released (Page* base, GdkEventBut EditingToolsEditingToolWindow* _tmp28_ = NULL; EditingToolsEditingToolWindow* _tmp29_ = NULL; gboolean _tmp30_ = FALSE; -#line 1575 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1577 "/home/jens/Source/shotwell/src/PhotoPage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EDITING_HOST_PAGE, EditingHostPage); -#line 1575 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1577 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_val_if_fail (event != NULL, FALSE); -#line 1576 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1578 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp0_ = self->priv->is_pan_in_progress; -#line 1576 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1578 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp0_) { -#line 10709 "PhotoPage.c" +#line 10610 "PhotoPage.c" GdkPoint viewport_center = {0}; ZoomState _tmp1_ = {0}; GdkPoint _tmp2_ = {0}; @@ -10735,125 +10636,125 @@ static gboolean editing_host_page_real_on_left_released (Page* base, GdkEventBut ZoomBuffer* _tmp18_ = NULL; ZoomBuffer* _tmp19_ = NULL; ZoomState _tmp20_ = {0}; -#line 1577 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1579 "/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 1577 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1579 "/home/jens/Source/shotwell/src/PhotoPage.vala" zoom_state_get_viewport_center (&_tmp1_, &_tmp2_); -#line 1577 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1579 "/home/jens/Source/shotwell/src/PhotoPage.vala" viewport_center = _tmp2_; -#line 1578 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1580 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp3_ = event; -#line 1578 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1580 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp4_ = _tmp3_->x; -#line 1578 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1580 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp5_ = self->priv->zoom_pan_start_point; -#line 1578 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1580 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp6_ = _tmp5_.x; -#line 1578 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1580 "/home/jens/Source/shotwell/src/PhotoPage.vala" delta_x = ((gint) _tmp4_) - _tmp6_; -#line 1579 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1581 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp7_ = event; -#line 1579 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1581 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp8_ = _tmp7_->y; -#line 1579 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1581 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp9_ = self->priv->zoom_pan_start_point; -#line 1579 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1581 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp10_ = _tmp9_.y; -#line 1579 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1581 "/home/jens/Source/shotwell/src/PhotoPage.vala" delta_y = ((gint) _tmp8_) - _tmp10_; -#line 1580 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1582 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp11_ = viewport_center.x; -#line 1580 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1582 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp12_ = delta_x; -#line 1580 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1582 "/home/jens/Source/shotwell/src/PhotoPage.vala" viewport_center.x = _tmp11_ - _tmp12_; -#line 1581 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1583 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp13_ = viewport_center.y; -#line 1581 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1583 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp14_ = delta_y; -#line 1581 "/home/jens/Source/shotwell/src/PhotoPage.vala" - viewport_center.y = _tmp13_ - _tmp14_; #line 1583 "/home/jens/Source/shotwell/src/PhotoPage.vala" + viewport_center.y = _tmp13_ - _tmp14_; +#line 1585 "/home/jens/Source/shotwell/src/PhotoPage.vala" single_photo_page_get_zoom_state (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), &_tmp15_); -#line 1583 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1585 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp16_ = viewport_center; -#line 1583 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1585 "/home/jens/Source/shotwell/src/PhotoPage.vala" zoom_state_init_pan (&zoom_state, &_tmp15_, &_tmp16_); -#line 1584 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1586 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp17_ = zoom_state; -#line 1584 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1586 "/home/jens/Source/shotwell/src/PhotoPage.vala" single_photo_page_set_zoom_state (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), &_tmp17_); -#line 1585 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1587 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp18_ = single_photo_page_get_zoom_buffer (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage)); -#line 1585 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1587 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp19_ = _tmp18_; -#line 1585 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1587 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp20_ = zoom_state; -#line 1585 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1587 "/home/jens/Source/shotwell/src/PhotoPage.vala" zoom_buffer_flush_demand_cache (_tmp19_, &_tmp20_); -#line 1585 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _g_object_unref0 (_tmp19_); #line 1587 "/home/jens/Source/shotwell/src/PhotoPage.vala" + _g_object_unref0 (_tmp19_); +#line 1589 "/home/jens/Source/shotwell/src/PhotoPage.vala" self->priv->is_pan_in_progress = FALSE; -#line 1588 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1590 "/home/jens/Source/shotwell/src/PhotoPage.vala" page_restore_cursor_hiding (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); -#line 10796 "PhotoPage.c" +#line 10697 "PhotoPage.c" } -#line 1593 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1595 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp21_ = self->priv->current_tool; -#line 1593 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1595 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp21_ == NULL) { -#line 1594 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1596 "/home/jens/Source/shotwell/src/PhotoPage.vala" result = FALSE; -#line 1594 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1596 "/home/jens/Source/shotwell/src/PhotoPage.vala" return result; -#line 10806 "PhotoPage.c" +#line 10707 "PhotoPage.c" } -#line 1596 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1598 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp22_ = self->priv->current_tool; -#line 1596 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1598 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp23_ = event; -#line 1596 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1598 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp24_ = _tmp23_->x; -#line 1596 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1598 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp25_ = event; -#line 1596 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1598 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp26_ = _tmp25_->y; -#line 1596 "/home/jens/Source/shotwell/src/PhotoPage.vala" - editing_tools_editing_tool_on_left_released (_tmp22_, (gint) _tmp24_, (gint) _tmp26_); #line 1598 "/home/jens/Source/shotwell/src/PhotoPage.vala" + editing_tools_editing_tool_on_left_released (_tmp22_, (gint) _tmp24_, (gint) _tmp26_); +#line 1600 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp27_ = self->priv->current_tool; -#line 1598 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1600 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp28_ = editing_tools_editing_tool_get_tool_window (_tmp27_); -#line 1598 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1600 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp29_ = _tmp28_; -#line 1598 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1600 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp30_ = _tmp29_ != NULL; -#line 1598 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1600 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (_tmp29_); -#line 1598 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1600 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp30_) { -#line 10832 "PhotoPage.c" +#line 10733 "PhotoPage.c" EditingToolsEditingTool* _tmp31_ = NULL; EditingToolsEditingToolWindow* _tmp32_ = NULL; EditingToolsEditingToolWindow* _tmp33_ = NULL; -#line 1599 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1601 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp31_ = self->priv->current_tool; -#line 1599 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1601 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp32_ = editing_tools_editing_tool_get_tool_window (_tmp31_); -#line 1599 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1601 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp33_ = _tmp32_; -#line 1599 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1601 "/home/jens/Source/shotwell/src/PhotoPage.vala" gtk_window_present (G_TYPE_CHECK_INSTANCE_CAST (_tmp33_, gtk_window_get_type (), GtkWindow)); -#line 1599 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1601 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (_tmp33_); -#line 10846 "PhotoPage.c" +#line 10747 "PhotoPage.c" } -#line 1601 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1603 "/home/jens/Source/shotwell/src/PhotoPage.vala" result = FALSE; -#line 1601 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1603 "/home/jens/Source/shotwell/src/PhotoPage.vala" return result; -#line 10852 "PhotoPage.c" +#line 10753 "PhotoPage.c" } @@ -10862,28 +10763,28 @@ static gboolean editing_host_page_real_on_right_click (Page* base, GdkEventButto gboolean result = FALSE; GdkEventButton* _tmp0_ = NULL; gboolean _tmp1_ = FALSE; -#line 1604 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1606 "/home/jens/Source/shotwell/src/PhotoPage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EDITING_HOST_PAGE, EditingHostPage); -#line 1604 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1606 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_val_if_fail (event != NULL, FALSE); -#line 1605 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1607 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp0_ = event; -#line 1605 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1607 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp1_ = page_on_context_buttonpress (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), _tmp0_); -#line 1605 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1607 "/home/jens/Source/shotwell/src/PhotoPage.vala" result = _tmp1_; -#line 1605 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1607 "/home/jens/Source/shotwell/src/PhotoPage.vala" return result; -#line 10873 "PhotoPage.c" +#line 10774 "PhotoPage.c" } static gboolean _editing_host_page_on_fetch_original_gsource_func (gpointer self) { gboolean result; result = editing_host_page_on_fetch_original ((EditingHostPage*) self); -#line 1617 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1619 "/home/jens/Source/shotwell/src/PhotoPage.vala" return result; -#line 10882 "PhotoPage.c" +#line 10783 "PhotoPage.c" } @@ -10903,107 +10804,107 @@ static void editing_host_page_on_photos_altered (EditingHostPage* self, GeeMap* ViewCollection* _tmp12_ = NULL; ViewCollection* _tmp13_ = NULL; gint _tmp14_ = 0; -#line 1608 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1610 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_if_fail (IS_EDITING_HOST_PAGE (self)); -#line 1608 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1610 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_if_fail (GEE_IS_MAP (map)); -#line 1609 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1611 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp0_ = map; -#line 1609 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1611 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp1_ = editing_host_page_get_photo (self); -#line 1609 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1611 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp2_ = _tmp1_; -#line 1609 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1611 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp3_ = gee_map_has_key (_tmp0_, G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_DATA_OBJECT, DataObject)); -#line 1609 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1611 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp4_ = !_tmp3_; -#line 1609 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1611 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (_tmp2_); -#line 1609 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1611 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp4_) { -#line 1610 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1612 "/home/jens/Source/shotwell/src/PhotoPage.vala" return; -#line 10922 "PhotoPage.c" +#line 10823 "PhotoPage.c" } -#line 1612 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1614 "/home/jens/Source/shotwell/src/PhotoPage.vala" self->priv->pixbuf_dirty = TRUE; -#line 1616 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1618 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp5_ = editing_host_page_get_photo (self); -#line 1616 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1618 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp6_ = _tmp5_; -#line 1616 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1618 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp7_ = photo_has_transformations (_tmp6_); -#line 1616 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1618 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp8_ = _tmp7_; -#line 1616 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1618 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (_tmp6_); -#line 1616 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1618 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp8_) { -#line 1617 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#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 10940 "PhotoPage.c" +#line 10841 "PhotoPage.c" } -#line 1619 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1621 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp9_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); -#line 1619 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1621 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp10_ = _tmp9_; -#line 1619 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1621 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp11_ = view_collection_get_selected_count (_tmp10_); -#line 1619 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1621 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp12_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); -#line 1619 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1621 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp13_ = _tmp12_; -#line 1619 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1621 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp14_ = data_collection_get_count (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, TYPE_DATA_COLLECTION, DataCollection)); -#line 1619 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1621 "/home/jens/Source/shotwell/src/PhotoPage.vala" page_update_actions (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), _tmp11_, _tmp14_); -#line 1619 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1621 "/home/jens/Source/shotwell/src/PhotoPage.vala" _data_collection_unref0 (_tmp13_); -#line 1619 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1621 "/home/jens/Source/shotwell/src/PhotoPage.vala" _data_collection_unref0 (_tmp10_); -#line 10960 "PhotoPage.c" +#line 10861 "PhotoPage.c" } static void editing_host_page_on_view_contents_ordering_altered (EditingHostPage* self) { -#line 1622 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1624 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_if_fail (IS_EDITING_HOST_PAGE (self)); -#line 1623 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1625 "/home/jens/Source/shotwell/src/PhotoPage.vala" editing_host_page_refresh_caches (self, "on_view_contents_ordering_altered"); -#line 10969 "PhotoPage.c" +#line 10870 "PhotoPage.c" } static gboolean editing_host_page_on_fetch_original (EditingHostPage* self) { gboolean result = FALSE; gboolean _tmp0_ = FALSE; -#line 1626 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1628 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_val_if_fail (IS_EDITING_HOST_PAGE (self), FALSE); -#line 1627 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1629 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp0_ = editing_host_page_has_photo (self); -#line 1627 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1629 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp0_) { -#line 10982 "PhotoPage.c" +#line 10883 "PhotoPage.c" PixbufCache* _tmp1_ = NULL; Photo* _tmp2_ = NULL; Photo* _tmp3_ = NULL; -#line 1628 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1630 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp1_ = self->priv->master_cache; -#line 1628 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1630 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp2_ = editing_host_page_get_photo (self); -#line 1628 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1630 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp3_ = _tmp2_; -#line 1628 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1630 "/home/jens/Source/shotwell/src/PhotoPage.vala" pixbuf_cache_prefetch (_tmp1_, _tmp3_, BACKGROUND_JOB_JOB_PRIORITY_LOW, FALSE); -#line 1628 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1630 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (_tmp3_); -#line 10996 "PhotoPage.c" +#line 10897 "PhotoPage.c" } -#line 1630 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1632 "/home/jens/Source/shotwell/src/PhotoPage.vala" result = FALSE; -#line 1630 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1632 "/home/jens/Source/shotwell/src/PhotoPage.vala" return result; -#line 11002 "PhotoPage.c" +#line 10903 "PhotoPage.c" } @@ -11022,82 +10923,82 @@ static gboolean editing_host_page_is_panning_possible (EditingHostPage* self) { gint _tmp8_ = 0; Dimensions _tmp9_ = {0}; gint _tmp10_ = 0; -#line 1633 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1635 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_val_if_fail (IS_EDITING_HOST_PAGE (self), FALSE); -#line 1636 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1638 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp0_.width = 0; -#line 1636 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1638 "/home/jens/Source/shotwell/src/PhotoPage.vala" content_dim = _tmp0_; -#line 1637 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1639 "/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 1637 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1639 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp2_ = zoom_state_get_zoomed_width (&_tmp1_); -#line 1637 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1639 "/home/jens/Source/shotwell/src/PhotoPage.vala" content_dim.width = _tmp2_; -#line 1638 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1640 "/home/jens/Source/shotwell/src/PhotoPage.vala" single_photo_page_get_zoom_state (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), &_tmp3_); -#line 1638 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1640 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp4_ = zoom_state_get_zoomed_height (&_tmp3_); -#line 1638 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1640 "/home/jens/Source/shotwell/src/PhotoPage.vala" content_dim.height = _tmp4_; -#line 1639 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1641 "/home/jens/Source/shotwell/src/PhotoPage.vala" single_photo_page_get_surface_dim (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), &_tmp5_); -#line 1639 "/home/jens/Source/shotwell/src/PhotoPage.vala" - canvas_dim = _tmp5_; #line 1641 "/home/jens/Source/shotwell/src/PhotoPage.vala" + canvas_dim = _tmp5_; +#line 1643 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp7_ = canvas_dim; -#line 1641 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1643 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp8_ = _tmp7_.width; -#line 1641 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1643 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp9_ = content_dim; -#line 1641 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1643 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp10_ = _tmp9_.width; -#line 1641 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1643 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp8_ >= _tmp10_) { -#line 11053 "PhotoPage.c" +#line 10954 "PhotoPage.c" Dimensions _tmp11_ = {0}; gint _tmp12_ = 0; Dimensions _tmp13_ = {0}; gint _tmp14_ = 0; -#line 1641 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1643 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp11_ = canvas_dim; -#line 1641 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1643 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp12_ = _tmp11_.height; -#line 1641 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1643 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp13_ = content_dim; -#line 1641 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1643 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp14_ = _tmp13_.height; -#line 1641 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1643 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp6_ = _tmp12_ >= _tmp14_; -#line 11068 "PhotoPage.c" +#line 10969 "PhotoPage.c" } else { -#line 1641 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1643 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp6_ = FALSE; -#line 11072 "PhotoPage.c" +#line 10973 "PhotoPage.c" } -#line 1641 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1643 "/home/jens/Source/shotwell/src/PhotoPage.vala" result = !_tmp6_; -#line 1641 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1643 "/home/jens/Source/shotwell/src/PhotoPage.vala" return result; -#line 11078 "PhotoPage.c" +#line 10979 "PhotoPage.c" } static void editing_host_page_update_cursor_for_zoom_context (EditingHostPage* self) { gboolean _tmp0_ = FALSE; -#line 1644 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1646 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_if_fail (IS_EDITING_HOST_PAGE (self)); -#line 1645 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1647 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp0_ = editing_host_page_is_panning_possible (self); -#line 1645 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1647 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp0_) { -#line 1646 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#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 11092 "PhotoPage.c" +#line 10993 "PhotoPage.c" } else { -#line 1648 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#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 11096 "PhotoPage.c" +#line 10997 "PhotoPage.c" } } @@ -11112,47 +11013,47 @@ static gboolean editing_host_page_real_on_motion (Page* base, GdkEventMotion* ev gint _tmp26_ = 0; GdkModifierType _tmp27_ = 0; gboolean _tmp28_ = FALSE; -#line 1652 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1654 "/home/jens/Source/shotwell/src/PhotoPage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EDITING_HOST_PAGE, EditingHostPage); -#line 1652 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1654 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_val_if_fail (event != NULL, FALSE); -#line 1653 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1655 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp0_ = self->priv->current_tool; -#line 1653 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1655 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp0_ != NULL) { -#line 11119 "PhotoPage.c" +#line 11020 "PhotoPage.c" EditingToolsEditingTool* _tmp1_ = NULL; gint _tmp2_ = 0; gint _tmp3_ = 0; GdkModifierType _tmp4_ = 0; GdkEventMotion* _tmp5_ = NULL; -#line 1654 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1656 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp1_ = self->priv->current_tool; -#line 1654 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1656 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp2_ = x; -#line 1654 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1656 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp3_ = y; -#line 1654 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1656 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp4_ = mask; -#line 1654 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1656 "/home/jens/Source/shotwell/src/PhotoPage.vala" editing_tools_editing_tool_on_motion (_tmp1_, _tmp2_, _tmp3_, _tmp4_); -#line 1657 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1659 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp5_ = event; -#line 1657 "/home/jens/Source/shotwell/src/PhotoPage.vala" - gdk_event_request_motions (_tmp5_); #line 1659 "/home/jens/Source/shotwell/src/PhotoPage.vala" + gdk_event_request_motions (_tmp5_); +#line 1661 "/home/jens/Source/shotwell/src/PhotoPage.vala" result = TRUE; -#line 1659 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1661 "/home/jens/Source/shotwell/src/PhotoPage.vala" return result; -#line 11143 "PhotoPage.c" +#line 11044 "PhotoPage.c" } -#line 1662 "/home/jens/Source/shotwell/src/PhotoPage.vala" - editing_host_page_update_cursor_for_zoom_context (self); #line 1664 "/home/jens/Source/shotwell/src/PhotoPage.vala" + editing_host_page_update_cursor_for_zoom_context (self); +#line 1666 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp6_ = self->priv->is_pan_in_progress; -#line 1664 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1666 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp6_) { -#line 11151 "PhotoPage.c" +#line 11052 "PhotoPage.c" gint delta_x = 0; GdkEventMotion* _tmp7_ = NULL; gdouble _tmp8_ = 0.0; @@ -11174,75 +11075,75 @@ static gboolean editing_host_page_real_on_motion (Page* base, GdkEventMotion* ev ZoomState _tmp21_ = {0}; GdkPoint _tmp22_ = {0}; ZoomState _tmp23_ = {0}; -#line 1665 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1667 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp7_ = event; -#line 1665 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1667 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp8_ = _tmp7_->x; -#line 1665 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1667 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp9_ = self->priv->zoom_pan_start_point; -#line 1665 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1667 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp10_ = _tmp9_.x; -#line 1665 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1667 "/home/jens/Source/shotwell/src/PhotoPage.vala" delta_x = ((gint) _tmp8_) - _tmp10_; -#line 1666 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1668 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp11_ = event; -#line 1666 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1668 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp12_ = _tmp11_->y; -#line 1666 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1668 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp13_ = self->priv->zoom_pan_start_point; -#line 1666 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1668 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp14_ = _tmp13_.y; -#line 1666 "/home/jens/Source/shotwell/src/PhotoPage.vala" - delta_y = ((gint) _tmp12_) - _tmp14_; #line 1668 "/home/jens/Source/shotwell/src/PhotoPage.vala" + delta_y = ((gint) _tmp12_) - _tmp14_; +#line 1670 "/home/jens/Source/shotwell/src/PhotoPage.vala" single_photo_page_get_zoom_state (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), &_tmp15_); -#line 1668 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1670 "/home/jens/Source/shotwell/src/PhotoPage.vala" zoom_state_get_viewport_center (&_tmp15_, &_tmp16_); -#line 1668 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1670 "/home/jens/Source/shotwell/src/PhotoPage.vala" viewport_center = _tmp16_; -#line 1669 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1671 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp17_ = viewport_center.x; -#line 1669 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1671 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp18_ = delta_x; -#line 1669 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1671 "/home/jens/Source/shotwell/src/PhotoPage.vala" viewport_center.x = _tmp17_ - _tmp18_; -#line 1670 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1672 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp19_ = viewport_center.y; -#line 1670 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1672 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp20_ = delta_y; -#line 1670 "/home/jens/Source/shotwell/src/PhotoPage.vala" - viewport_center.y = _tmp19_ - _tmp20_; #line 1672 "/home/jens/Source/shotwell/src/PhotoPage.vala" + viewport_center.y = _tmp19_ - _tmp20_; +#line 1674 "/home/jens/Source/shotwell/src/PhotoPage.vala" single_photo_page_get_zoom_state (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), &_tmp21_); -#line 1672 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1674 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp22_ = viewport_center; -#line 1672 "/home/jens/Source/shotwell/src/PhotoPage.vala" - zoom_state_init_pan (&zoom_state, &_tmp21_, &_tmp22_); #line 1674 "/home/jens/Source/shotwell/src/PhotoPage.vala" + zoom_state_init_pan (&zoom_state, &_tmp21_, &_tmp22_); +#line 1676 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp23_ = zoom_state; -#line 1674 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1676 "/home/jens/Source/shotwell/src/PhotoPage.vala" single_photo_page_on_interactive_pan (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), &_tmp23_); -#line 1675 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1677 "/home/jens/Source/shotwell/src/PhotoPage.vala" result = TRUE; -#line 1675 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1677 "/home/jens/Source/shotwell/src/PhotoPage.vala" return result; -#line 11225 "PhotoPage.c" +#line 11126 "PhotoPage.c" } -#line 1678 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1680 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp24_ = event; -#line 1678 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1680 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp25_ = x; -#line 1678 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1680 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp26_ = y; -#line 1678 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1680 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp27_ = mask; -#line 1678 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1680 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp28_ = PAGE_CLASS (editing_host_page_parent_class)->on_motion (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), TYPE_PAGE, Page), _tmp24_, _tmp25_, _tmp26_, _tmp27_); -#line 1678 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1680 "/home/jens/Source/shotwell/src/PhotoPage.vala" result = _tmp28_; -#line 1678 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1680 "/home/jens/Source/shotwell/src/PhotoPage.vala" return result; -#line 11241 "PhotoPage.c" +#line 11142 "PhotoPage.c" } @@ -11251,83 +11152,83 @@ static gboolean editing_host_page_real_on_leave_notify_event (Page* base) { gboolean result = FALSE; EditingToolsEditingTool* _tmp0_ = NULL; gboolean _tmp3_ = FALSE; -#line 1681 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1683 "/home/jens/Source/shotwell/src/PhotoPage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EDITING_HOST_PAGE, EditingHostPage); -#line 1682 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1684 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp0_ = self->priv->current_tool; -#line 1682 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1684 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp0_ != NULL) { -#line 11256 "PhotoPage.c" +#line 11157 "PhotoPage.c" EditingToolsEditingTool* _tmp1_ = NULL; gboolean _tmp2_ = FALSE; -#line 1683 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1685 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp1_ = self->priv->current_tool; -#line 1683 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1685 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp2_ = editing_tools_editing_tool_on_leave_notify_event (_tmp1_); -#line 1683 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1685 "/home/jens/Source/shotwell/src/PhotoPage.vala" result = _tmp2_; -#line 1683 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1685 "/home/jens/Source/shotwell/src/PhotoPage.vala" return result; -#line 11267 "PhotoPage.c" +#line 11168 "PhotoPage.c" } -#line 1685 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#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)); -#line 1685 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1687 "/home/jens/Source/shotwell/src/PhotoPage.vala" result = _tmp3_; -#line 1685 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1687 "/home/jens/Source/shotwell/src/PhotoPage.vala" return result; -#line 11275 "PhotoPage.c" +#line 11176 "PhotoPage.c" } static void editing_host_page_track_tool_window (EditingHostPage* self) { EditingToolsEditingTool* _tmp0_ = NULL; -#line 1688 "/home/jens/Source/shotwell/src/PhotoPage.vala" - g_return_if_fail (IS_EDITING_HOST_PAGE (self)); #line 1690 "/home/jens/Source/shotwell/src/PhotoPage.vala" + g_return_if_fail (IS_EDITING_HOST_PAGE (self)); +#line 1692 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp0_ = self->priv->current_tool; -#line 1690 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1692 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp0_ != NULL) { -#line 11287 "PhotoPage.c" +#line 11188 "PhotoPage.c" EditingToolsEditingToolWindow* tool_window = NULL; EditingToolsEditingTool* _tmp1_ = NULL; EditingToolsEditingToolWindow* _tmp2_ = NULL; gboolean _tmp3_ = FALSE; EditingToolsEditingToolWindow* _tmp4_ = NULL; -#line 1691 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1693 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp1_ = self->priv->current_tool; -#line 1691 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1693 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp2_ = editing_tools_editing_tool_get_tool_window (_tmp1_); -#line 1691 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1693 "/home/jens/Source/shotwell/src/PhotoPage.vala" tool_window = _tmp2_; -#line 1692 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1694 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp4_ = tool_window; -#line 1692 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1694 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp4_ != NULL) { -#line 11303 "PhotoPage.c" +#line 11204 "PhotoPage.c" EditingToolsEditingToolWindow* _tmp5_ = NULL; gboolean _tmp6_ = FALSE; -#line 1692 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1694 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp5_ = tool_window; -#line 1692 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1694 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp6_ = editing_tools_editing_tool_window_has_user_moved (_tmp5_); -#line 1692 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1694 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp3_ = !_tmp6_; -#line 11312 "PhotoPage.c" +#line 11213 "PhotoPage.c" } else { -#line 1692 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1694 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp3_ = FALSE; -#line 11316 "PhotoPage.c" +#line 11217 "PhotoPage.c" } -#line 1692 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1694 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp3_) { -#line 1693 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1695 "/home/jens/Source/shotwell/src/PhotoPage.vala" editing_host_page_place_tool_window (self); -#line 11322 "PhotoPage.c" +#line 11223 "PhotoPage.c" } -#line 1690 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1692 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (tool_window); -#line 11326 "PhotoPage.c" +#line 11227 "PhotoPage.c" } } @@ -11335,17 +11236,17 @@ static void editing_host_page_track_tool_window (EditingHostPage* self) { static void editing_host_page_real_on_move (Page* base, GdkRectangle* rect) { EditingHostPage * self; GdkRectangle _tmp0_ = {0}; -#line 1697 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1699 "/home/jens/Source/shotwell/src/PhotoPage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EDITING_HOST_PAGE, EditingHostPage); -#line 1697 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1699 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_if_fail (rect != NULL); -#line 1698 "/home/jens/Source/shotwell/src/PhotoPage.vala" - editing_host_page_track_tool_window (self); #line 1700 "/home/jens/Source/shotwell/src/PhotoPage.vala" + editing_host_page_track_tool_window (self); +#line 1702 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp0_ = *rect; -#line 1700 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#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 11344 "PhotoPage.c" +#line 11245 "PhotoPage.c" } @@ -11353,19 +11254,19 @@ static void editing_host_page_real_on_move_finished (Page* base, GdkRectangle* r EditingHostPage * self; GeeHashMap* _tmp0_ = NULL; GdkRectangle _tmp1_ = {0}; -#line 1703 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1705 "/home/jens/Source/shotwell/src/PhotoPage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EDITING_HOST_PAGE, EditingHostPage); -#line 1703 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1705 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_if_fail (rect != NULL); -#line 1704 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1706 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp0_ = self->priv->last_locations; -#line 1704 "/home/jens/Source/shotwell/src/PhotoPage.vala" - gee_abstract_map_clear (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap)); #line 1706 "/home/jens/Source/shotwell/src/PhotoPage.vala" + gee_abstract_map_clear (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap)); +#line 1708 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp1_ = *rect; -#line 1706 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#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 11364 "PhotoPage.c" +#line 11265 "PhotoPage.c" } @@ -11380,153 +11281,153 @@ static gboolean editing_host_page_on_keyboard_pan_event (EditingHostPage* self, const gchar* _tmp4_ = NULL; const gchar* _tmp5_ = NULL; GQuark _tmp7_ = 0U; -#line 1713 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1715 "/home/jens/Source/shotwell/src/PhotoPage.vala" static GQuark _tmp6_label0 = 0; -#line 1713 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1715 "/home/jens/Source/shotwell/src/PhotoPage.vala" static GQuark _tmp6_label1 = 0; -#line 1713 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1715 "/home/jens/Source/shotwell/src/PhotoPage.vala" static GQuark _tmp6_label2 = 0; -#line 1713 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1715 "/home/jens/Source/shotwell/src/PhotoPage.vala" static GQuark _tmp6_label3 = 0; -#line 1713 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1715 "/home/jens/Source/shotwell/src/PhotoPage.vala" static GQuark _tmp6_label4 = 0; -#line 1713 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1715 "/home/jens/Source/shotwell/src/PhotoPage.vala" static GQuark _tmp6_label5 = 0; -#line 1713 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1715 "/home/jens/Source/shotwell/src/PhotoPage.vala" static GQuark _tmp6_label6 = 0; -#line 1713 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1715 "/home/jens/Source/shotwell/src/PhotoPage.vala" static GQuark _tmp6_label7 = 0; -#line 1713 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1715 "/home/jens/Source/shotwell/src/PhotoPage.vala" static GQuark _tmp6_label8 = 0; -#line 1713 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1715 "/home/jens/Source/shotwell/src/PhotoPage.vala" static GQuark _tmp6_label9 = 0; -#line 1713 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1715 "/home/jens/Source/shotwell/src/PhotoPage.vala" static GQuark _tmp6_label10 = 0; -#line 1713 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1715 "/home/jens/Source/shotwell/src/PhotoPage.vala" static GQuark _tmp6_label11 = 0; -#line 11403 "PhotoPage.c" +#line 11304 "PhotoPage.c" ZoomState new_zoom_state = {0}; ZoomState _tmp12_ = {0}; GdkPoint _tmp13_ = {0}; ZoomState _tmp14_ = {0}; -#line 1709 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1711 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_val_if_fail (IS_EDITING_HOST_PAGE (self), FALSE); -#line 1709 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1711 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_val_if_fail (event != NULL, FALSE); -#line 1710 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1712 "/home/jens/Source/shotwell/src/PhotoPage.vala" single_photo_page_get_zoom_state (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), &_tmp0_); -#line 1710 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1712 "/home/jens/Source/shotwell/src/PhotoPage.vala" current_zoom_state = _tmp0_; -#line 1711 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1713 "/home/jens/Source/shotwell/src/PhotoPage.vala" zoom_state_get_viewport_center (¤t_zoom_state, &_tmp1_); -#line 1711 "/home/jens/Source/shotwell/src/PhotoPage.vala" - viewport_center = _tmp1_; #line 1713 "/home/jens/Source/shotwell/src/PhotoPage.vala" + viewport_center = _tmp1_; +#line 1715 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp2_ = event; -#line 1713 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1715 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp3_ = _tmp2_->keyval; -#line 1713 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1715 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp4_ = gdk_keyval_name (_tmp3_); -#line 1713 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1715 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp5_ = _tmp4_; -#line 1713 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1715 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp7_ = (NULL == _tmp5_) ? 0 : g_quark_from_string (_tmp5_); -#line 1713 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1715 "/home/jens/Source/shotwell/src/PhotoPage.vala" 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 1713 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1715 "/home/jens/Source/shotwell/src/PhotoPage.vala" switch (0) { -#line 11434 "PhotoPage.c" +#line 11335 "PhotoPage.c" default: { gint _tmp8_ = 0; -#line 1717 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1719 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp8_ = viewport_center.x; -#line 1717 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1719 "/home/jens/Source/shotwell/src/PhotoPage.vala" viewport_center.x = _tmp8_ - EDITING_HOST_PAGE_PAN_INCREMENT_SIZE; -#line 1718 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1720 "/home/jens/Source/shotwell/src/PhotoPage.vala" break; -#line 11444 "PhotoPage.c" +#line 11345 "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 1713 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1715 "/home/jens/Source/shotwell/src/PhotoPage.vala" switch (0) { -#line 11450 "PhotoPage.c" +#line 11351 "PhotoPage.c" default: { gint _tmp9_ = 0; -#line 1723 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1725 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp9_ = viewport_center.x; -#line 1723 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1725 "/home/jens/Source/shotwell/src/PhotoPage.vala" viewport_center.x = _tmp9_ + EDITING_HOST_PAGE_PAN_INCREMENT_SIZE; -#line 1724 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1726 "/home/jens/Source/shotwell/src/PhotoPage.vala" break; -#line 11460 "PhotoPage.c" +#line 11361 "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 1713 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1715 "/home/jens/Source/shotwell/src/PhotoPage.vala" switch (0) { -#line 11466 "PhotoPage.c" +#line 11367 "PhotoPage.c" default: { gint _tmp10_ = 0; -#line 1729 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1731 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp10_ = viewport_center.y; -#line 1729 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1731 "/home/jens/Source/shotwell/src/PhotoPage.vala" viewport_center.y = _tmp10_ + EDITING_HOST_PAGE_PAN_INCREMENT_SIZE; -#line 1730 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1732 "/home/jens/Source/shotwell/src/PhotoPage.vala" break; -#line 11476 "PhotoPage.c" +#line 11377 "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 1713 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1715 "/home/jens/Source/shotwell/src/PhotoPage.vala" switch (0) { -#line 11482 "PhotoPage.c" +#line 11383 "PhotoPage.c" default: { gint _tmp11_ = 0; -#line 1735 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1737 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp11_ = viewport_center.y; -#line 1735 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1737 "/home/jens/Source/shotwell/src/PhotoPage.vala" viewport_center.y = _tmp11_ - EDITING_HOST_PAGE_PAN_INCREMENT_SIZE; -#line 1736 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1738 "/home/jens/Source/shotwell/src/PhotoPage.vala" break; -#line 11492 "PhotoPage.c" +#line 11393 "PhotoPage.c" } } } else { -#line 1713 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1715 "/home/jens/Source/shotwell/src/PhotoPage.vala" switch (0) { -#line 11498 "PhotoPage.c" +#line 11399 "PhotoPage.c" default: { -#line 1739 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1741 "/home/jens/Source/shotwell/src/PhotoPage.vala" result = FALSE; -#line 1739 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1741 "/home/jens/Source/shotwell/src/PhotoPage.vala" return result; -#line 11505 "PhotoPage.c" +#line 11406 "PhotoPage.c" } } } -#line 1742 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1744 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp12_ = current_zoom_state; -#line 1742 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1744 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp13_ = viewport_center; -#line 1742 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1744 "/home/jens/Source/shotwell/src/PhotoPage.vala" zoom_state_init_pan (&new_zoom_state, &_tmp12_, &_tmp13_); -#line 1743 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1745 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp14_ = new_zoom_state; -#line 1743 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1745 "/home/jens/Source/shotwell/src/PhotoPage.vala" single_photo_page_set_zoom_state (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), &_tmp14_); -#line 1744 "/home/jens/Source/shotwell/src/PhotoPage.vala" - single_photo_page_repaint (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), NULL); #line 1746 "/home/jens/Source/shotwell/src/PhotoPage.vala" + single_photo_page_repaint (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), NULL); +#line 1748 "/home/jens/Source/shotwell/src/PhotoPage.vala" result = TRUE; -#line 1746 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1748 "/home/jens/Source/shotwell/src/PhotoPage.vala" return result; -#line 11525 "PhotoPage.c" +#line 11426 "PhotoPage.c" } @@ -11543,212 +11444,212 @@ static gboolean editing_host_page_real_key_press_event (GtkWidget* base, GdkEven const gchar* _tmp11_ = NULL; const gchar* _tmp12_ = NULL; GQuark _tmp14_ = 0U; -#line 1770 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1772 "/home/jens/Source/shotwell/src/PhotoPage.vala" static GQuark _tmp13_label0 = 0; -#line 1770 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1772 "/home/jens/Source/shotwell/src/PhotoPage.vala" static GQuark _tmp13_label1 = 0; -#line 1770 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1772 "/home/jens/Source/shotwell/src/PhotoPage.vala" static GQuark _tmp13_label2 = 0; -#line 1770 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1772 "/home/jens/Source/shotwell/src/PhotoPage.vala" static GQuark _tmp13_label3 = 0; -#line 1770 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1772 "/home/jens/Source/shotwell/src/PhotoPage.vala" static GQuark _tmp13_label4 = 0; -#line 1770 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1772 "/home/jens/Source/shotwell/src/PhotoPage.vala" static GQuark _tmp13_label5 = 0; -#line 1770 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1772 "/home/jens/Source/shotwell/src/PhotoPage.vala" static GQuark _tmp13_label6 = 0; -#line 1770 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1772 "/home/jens/Source/shotwell/src/PhotoPage.vala" static GQuark _tmp13_label7 = 0; -#line 11558 "PhotoPage.c" +#line 11459 "PhotoPage.c" gboolean _tmp15_ = FALSE; gboolean _tmp16_ = FALSE; -#line 1749 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1751 "/home/jens/Source/shotwell/src/PhotoPage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EDITING_HOST_PAGE, EditingHostPage); -#line 1749 "/home/jens/Source/shotwell/src/PhotoPage.vala" - g_return_val_if_fail (event != NULL, FALSE); #line 1751 "/home/jens/Source/shotwell/src/PhotoPage.vala" + g_return_val_if_fail (event != NULL, FALSE); +#line 1753 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp0_ = self->priv->current_tool; -#line 1751 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1753 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp0_ != NULL) { -#line 11569 "PhotoPage.c" +#line 11470 "PhotoPage.c" EditingToolsEditingTool* _tmp1_ = NULL; GdkEventKey* _tmp2_ = NULL; gboolean _tmp3_ = FALSE; -#line 1752 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1754 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp1_ = self->priv->current_tool; -#line 1752 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1754 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp2_ = event; -#line 1752 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1754 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp3_ = editing_tools_editing_tool_on_keypress (_tmp1_, _tmp2_); -#line 1752 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1754 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp3_) { -#line 1753 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1755 "/home/jens/Source/shotwell/src/PhotoPage.vala" result = TRUE; -#line 1753 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1755 "/home/jens/Source/shotwell/src/PhotoPage.vala" return result; -#line 11585 "PhotoPage.c" +#line 11486 "PhotoPage.c" } } -#line 1757 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1759 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp4_ = editing_host_page_is_panning_possible (self); -#line 1757 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1759 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp4_) { -#line 11592 "PhotoPage.c" +#line 11493 "PhotoPage.c" GdkEventKey* _tmp5_ = NULL; gboolean _tmp6_ = FALSE; -#line 1758 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1760 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp5_ = event; -#line 1758 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1760 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp6_ = editing_host_page_on_keyboard_pan_event (self, _tmp5_); -#line 1758 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1760 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp6_) { -#line 1759 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1761 "/home/jens/Source/shotwell/src/PhotoPage.vala" result = TRUE; -#line 1759 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1761 "/home/jens/Source/shotwell/src/PhotoPage.vala" return result; -#line 11605 "PhotoPage.c" +#line 11506 "PhotoPage.c" } } -#line 1765 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1767 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp7_ = event; -#line 1765 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1767 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp8_ = editing_host_page_on_zoom_slider_key_press (self, _tmp7_); -#line 1765 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1767 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp8_) { -#line 1766 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1768 "/home/jens/Source/shotwell/src/PhotoPage.vala" result = TRUE; -#line 1766 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1768 "/home/jens/Source/shotwell/src/PhotoPage.vala" return result; -#line 11618 "PhotoPage.c" +#line 11519 "PhotoPage.c" } -#line 1768 "/home/jens/Source/shotwell/src/PhotoPage.vala" - handled = TRUE; #line 1770 "/home/jens/Source/shotwell/src/PhotoPage.vala" + handled = TRUE; +#line 1772 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp9_ = event; -#line 1770 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1772 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp10_ = _tmp9_->keyval; -#line 1770 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1772 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp11_ = gdk_keyval_name (_tmp10_); -#line 1770 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1772 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp12_ = _tmp11_; -#line 1770 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1772 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp14_ = (NULL == _tmp12_) ? 0 : g_quark_from_string (_tmp12_); -#line 1770 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1772 "/home/jens/Source/shotwell/src/PhotoPage.vala" 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 1770 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1772 "/home/jens/Source/shotwell/src/PhotoPage.vala" switch (0) { -#line 11636 "PhotoPage.c" +#line 11537 "PhotoPage.c" default: { -#line 1775 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1777 "/home/jens/Source/shotwell/src/PhotoPage.vala" break; -#line 11641 "PhotoPage.c" +#line 11542 "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 1770 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1772 "/home/jens/Source/shotwell/src/PhotoPage.vala" switch (0) { -#line 11647 "PhotoPage.c" +#line 11548 "PhotoPage.c" default: { -#line 1780 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1782 "/home/jens/Source/shotwell/src/PhotoPage.vala" page_activate_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "IncreaseSize"); -#line 1781 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1783 "/home/jens/Source/shotwell/src/PhotoPage.vala" break; -#line 11654 "PhotoPage.c" +#line 11555 "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 1770 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1772 "/home/jens/Source/shotwell/src/PhotoPage.vala" switch (0) { -#line 11660 "PhotoPage.c" +#line 11561 "PhotoPage.c" default: { -#line 1787 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1789 "/home/jens/Source/shotwell/src/PhotoPage.vala" page_activate_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "DecreaseSize"); -#line 1788 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1790 "/home/jens/Source/shotwell/src/PhotoPage.vala" break; -#line 11667 "PhotoPage.c" +#line 11568 "PhotoPage.c" } } } else { -#line 1770 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1772 "/home/jens/Source/shotwell/src/PhotoPage.vala" switch (0) { -#line 11673 "PhotoPage.c" +#line 11574 "PhotoPage.c" default: { -#line 1791 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1793 "/home/jens/Source/shotwell/src/PhotoPage.vala" handled = FALSE; -#line 1792 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1794 "/home/jens/Source/shotwell/src/PhotoPage.vala" break; -#line 11680 "PhotoPage.c" +#line 11581 "PhotoPage.c" } } } -#line 1795 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1797 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp15_ = handled; -#line 1795 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1797 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp15_) { -#line 1796 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1798 "/home/jens/Source/shotwell/src/PhotoPage.vala" result = TRUE; -#line 1796 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1798 "/home/jens/Source/shotwell/src/PhotoPage.vala" return result; -#line 11692 "PhotoPage.c" +#line 11593 "PhotoPage.c" } -#line 1798 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1800 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (GTK_WIDGET_CLASS (editing_host_page_parent_class)->key_press_event != NULL) { -#line 11696 "PhotoPage.c" +#line 11597 "PhotoPage.c" GdkEventKey* _tmp17_ = NULL; gboolean _tmp18_ = FALSE; -#line 1798 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1800 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp17_ = event; -#line 1798 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1800 "/home/jens/Source/shotwell/src/PhotoPage.vala" _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 1798 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1800 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp16_ = _tmp18_; -#line 11705 "PhotoPage.c" +#line 11606 "PhotoPage.c" } else { -#line 1798 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1800 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp16_ = TRUE; -#line 11709 "PhotoPage.c" +#line 11610 "PhotoPage.c" } -#line 1798 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1800 "/home/jens/Source/shotwell/src/PhotoPage.vala" result = _tmp16_; -#line 1798 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1800 "/home/jens/Source/shotwell/src/PhotoPage.vala" return result; -#line 11715 "PhotoPage.c" +#line 11616 "PhotoPage.c" } static void editing_host_page_real_new_surface (SinglePhotoPage* base, cairo_t* default_ctx, Dimensions* dim) { EditingHostPage * self; EditingToolsEditingTool* _tmp0_ = NULL; -#line 1801 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1803 "/home/jens/Source/shotwell/src/PhotoPage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EDITING_HOST_PAGE, EditingHostPage); -#line 1801 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1803 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_if_fail (default_ctx != NULL); -#line 1801 "/home/jens/Source/shotwell/src/PhotoPage.vala" - g_return_if_fail (dim != NULL); #line 1803 "/home/jens/Source/shotwell/src/PhotoPage.vala" + g_return_if_fail (dim != NULL); +#line 1805 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp0_ = self->priv->current_tool; -#line 1803 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1805 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp0_ != NULL) { -#line 11732 "PhotoPage.c" +#line 11633 "PhotoPage.c" EditingToolsEditingTool* _tmp1_ = NULL; EditingToolsPhotoCanvas* _tmp2_ = NULL; cairo_t* _tmp3_ = NULL; Dimensions _tmp4_ = {0}; -#line 1804 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1806 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp1_ = self->priv->current_tool; -#line 1804 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1806 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp2_ = _tmp1_->canvas; -#line 1804 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1806 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp3_ = default_ctx; -#line 1804 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1806 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp4_ = *dim; -#line 1804 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1806 "/home/jens/Source/shotwell/src/PhotoPage.vala" editing_tools_photo_canvas_set_surface (_tmp2_, _tmp3_, &_tmp4_); -#line 11747 "PhotoPage.c" +#line 11648 "PhotoPage.c" } } @@ -11757,130 +11658,130 @@ static void editing_host_page_real_updated_pixbuf (SinglePhotoPage* base, GdkPix EditingHostPage * self; gboolean _tmp0_ = FALSE; EditingToolsEditingTool* _tmp1_ = NULL; -#line 1807 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1809 "/home/jens/Source/shotwell/src/PhotoPage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EDITING_HOST_PAGE, EditingHostPage); -#line 1807 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1809 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_if_fail (GDK_IS_PIXBUF (pixbuf)); -#line 1807 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1809 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_if_fail (old_dim != NULL); -#line 1811 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1813 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp1_ = self->priv->current_tool; -#line 1811 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1813 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp1_ != NULL) { -#line 11766 "PhotoPage.c" +#line 11667 "PhotoPage.c" SinglePhotoPageUpdateReason _tmp2_ = 0; -#line 1811 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1813 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp2_ = reason; -#line 1811 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1813 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp0_ = _tmp2_ != SINGLE_PHOTO_PAGE_UPDATE_REASON_QUALITY_IMPROVEMENT; -#line 11772 "PhotoPage.c" +#line 11673 "PhotoPage.c" } else { -#line 1811 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1813 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp0_ = FALSE; -#line 11776 "PhotoPage.c" +#line 11677 "PhotoPage.c" } -#line 1811 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1813 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp0_) { -#line 11780 "PhotoPage.c" +#line 11681 "PhotoPage.c" EditingToolsEditingTool* _tmp3_ = NULL; EditingToolsPhotoCanvas* _tmp4_ = NULL; Dimensions _tmp5_ = {0}; GdkPixbuf* _tmp6_ = NULL; GdkRectangle _tmp7_ = {0}; -#line 1812 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1814 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp3_ = self->priv->current_tool; -#line 1812 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1814 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp4_ = _tmp3_->canvas; -#line 1812 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1814 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp5_ = *old_dim; -#line 1812 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1814 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp6_ = pixbuf; -#line 1812 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1814 "/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), &_tmp7_); -#line 1812 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1814 "/home/jens/Source/shotwell/src/PhotoPage.vala" editing_tools_photo_canvas_resized_pixbuf (_tmp4_, &_tmp5_, _tmp6_, &_tmp7_); -#line 1813 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1815 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (self->priv->cancel_editing_pixbuf); -#line 1813 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1815 "/home/jens/Source/shotwell/src/PhotoPage.vala" self->priv->cancel_editing_pixbuf = NULL; -#line 11802 "PhotoPage.c" +#line 11703 "PhotoPage.c" } } static GdkPixbuf* editing_host_page_real_get_bottom_left_trinket (EditingHostPage* self, gint scale) { GdkPixbuf* result = NULL; -#line 1818 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1820 "/home/jens/Source/shotwell/src/PhotoPage.vala" result = NULL; -#line 1818 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1820 "/home/jens/Source/shotwell/src/PhotoPage.vala" return result; -#line 11813 "PhotoPage.c" +#line 11714 "PhotoPage.c" } GdkPixbuf* editing_host_page_get_bottom_left_trinket (EditingHostPage* self, gint scale) { -#line 1817 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1819 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_val_if_fail (IS_EDITING_HOST_PAGE (self), NULL); -#line 1817 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1819 "/home/jens/Source/shotwell/src/PhotoPage.vala" return EDITING_HOST_PAGE_GET_CLASS (self)->get_bottom_left_trinket (self, scale); -#line 11822 "PhotoPage.c" +#line 11723 "PhotoPage.c" } static GdkPixbuf* editing_host_page_real_get_top_left_trinket (EditingHostPage* self, gint scale) { GdkPixbuf* result = NULL; -#line 1822 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1824 "/home/jens/Source/shotwell/src/PhotoPage.vala" result = NULL; -#line 1822 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1824 "/home/jens/Source/shotwell/src/PhotoPage.vala" return result; -#line 11832 "PhotoPage.c" +#line 11733 "PhotoPage.c" } GdkPixbuf* editing_host_page_get_top_left_trinket (EditingHostPage* self, gint scale) { -#line 1821 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1823 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_val_if_fail (IS_EDITING_HOST_PAGE (self), NULL); -#line 1821 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1823 "/home/jens/Source/shotwell/src/PhotoPage.vala" return EDITING_HOST_PAGE_GET_CLASS (self)->get_top_left_trinket (self, scale); -#line 11841 "PhotoPage.c" +#line 11742 "PhotoPage.c" } static GdkPixbuf* editing_host_page_real_get_top_right_trinket (EditingHostPage* self, gint scale) { GdkPixbuf* result = NULL; -#line 1826 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1828 "/home/jens/Source/shotwell/src/PhotoPage.vala" result = NULL; -#line 1826 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1828 "/home/jens/Source/shotwell/src/PhotoPage.vala" return result; -#line 11851 "PhotoPage.c" +#line 11752 "PhotoPage.c" } GdkPixbuf* editing_host_page_get_top_right_trinket (EditingHostPage* self, gint scale) { -#line 1825 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1827 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_val_if_fail (IS_EDITING_HOST_PAGE (self), NULL); -#line 1825 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1827 "/home/jens/Source/shotwell/src/PhotoPage.vala" return EDITING_HOST_PAGE_GET_CLASS (self)->get_top_right_trinket (self, scale); -#line 11860 "PhotoPage.c" +#line 11761 "PhotoPage.c" } static GdkPixbuf* editing_host_page_real_get_bottom_right_trinket (EditingHostPage* self, gint scale) { GdkPixbuf* result = NULL; -#line 1830 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1832 "/home/jens/Source/shotwell/src/PhotoPage.vala" result = NULL; -#line 1830 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1832 "/home/jens/Source/shotwell/src/PhotoPage.vala" return result; -#line 11870 "PhotoPage.c" +#line 11771 "PhotoPage.c" } GdkPixbuf* editing_host_page_get_bottom_right_trinket (EditingHostPage* self, gint scale) { -#line 1829 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1831 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_val_if_fail (IS_EDITING_HOST_PAGE (self), NULL); -#line 1829 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1831 "/home/jens/Source/shotwell/src/PhotoPage.vala" return EDITING_HOST_PAGE_GET_CLASS (self)->get_bottom_right_trinket (self, scale); -#line 11879 "PhotoPage.c" +#line 11780 "PhotoPage.c" } @@ -11904,48 +11805,48 @@ static void editing_host_page_real_paint (SinglePhotoPage* base, cairo_t* ctx, D GdkPixbuf* _tmp74_ = NULL; GdkPixbuf* _tmp98_ = NULL; GdkPixbuf* _tmp99_ = NULL; -#line 1833 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1835 "/home/jens/Source/shotwell/src/PhotoPage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EDITING_HOST_PAGE, EditingHostPage); -#line 1833 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1835 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_if_fail (ctx != NULL); -#line 1833 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1835 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_if_fail (ctx_dim != NULL); -#line 1834 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1836 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp0_ = self->priv->current_tool; -#line 1834 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1836 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp0_ != NULL) { -#line 11913 "PhotoPage.c" +#line 11814 "PhotoPage.c" EditingToolsEditingTool* _tmp1_ = NULL; cairo_t* _tmp2_ = NULL; -#line 1835 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1837 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp1_ = self->priv->current_tool; -#line 1835 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1837 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp2_ = ctx; -#line 1835 "/home/jens/Source/shotwell/src/PhotoPage.vala" - editing_tools_editing_tool_paint (_tmp1_, _tmp2_); #line 1837 "/home/jens/Source/shotwell/src/PhotoPage.vala" + editing_tools_editing_tool_paint (_tmp1_, _tmp2_); +#line 1839 "/home/jens/Source/shotwell/src/PhotoPage.vala" return; -#line 11924 "PhotoPage.c" +#line 11825 "PhotoPage.c" } -#line 1840 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1842 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp4_ = self->priv->photo_missing; -#line 1840 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1842 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp4_) { -#line 11930 "PhotoPage.c" +#line 11831 "PhotoPage.c" gboolean _tmp5_ = FALSE; -#line 1840 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1842 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp5_ = editing_host_page_has_photo (self); -#line 1840 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1842 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp3_ = _tmp5_; -#line 11936 "PhotoPage.c" +#line 11837 "PhotoPage.c" } else { -#line 1840 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1842 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp3_ = FALSE; -#line 11940 "PhotoPage.c" +#line 11841 "PhotoPage.c" } -#line 1840 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1842 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp3_) { -#line 11944 "PhotoPage.c" +#line 11845 "PhotoPage.c" cairo_t* _tmp6_ = NULL; cairo_t* _tmp7_ = NULL; Dimensions _tmp8_ = {0}; @@ -11963,91 +11864,91 @@ static void editing_host_page_real_paint (SinglePhotoPage* base, cairo_t* ctx, D gchar* _tmp20_ = NULL; gchar* _tmp21_ = NULL; gchar* _tmp22_ = NULL; -#line 1841 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1843 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp6_ = ctx; -#line 1841 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1843 "/home/jens/Source/shotwell/src/PhotoPage.vala" set_source_color_from_string (_tmp6_, "#000"); -#line 1842 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1844 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp7_ = ctx; -#line 1842 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1844 "/home/jens/Source/shotwell/src/PhotoPage.vala" single_photo_page_get_surface_dim (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), &_tmp8_); -#line 1842 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1844 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp9_ = _tmp8_.width; -#line 1842 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1844 "/home/jens/Source/shotwell/src/PhotoPage.vala" single_photo_page_get_surface_dim (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), &_tmp10_); -#line 1842 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1844 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp11_ = _tmp10_.height; -#line 1842 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1844 "/home/jens/Source/shotwell/src/PhotoPage.vala" cairo_rectangle (_tmp7_, (gdouble) 0, (gdouble) 0, (gdouble) _tmp9_, (gdouble) _tmp11_); -#line 1843 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1845 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp12_ = ctx; -#line 1843 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1845 "/home/jens/Source/shotwell/src/PhotoPage.vala" cairo_fill (_tmp12_); -#line 1844 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1846 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp13_ = ctx; -#line 1844 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1846 "/home/jens/Source/shotwell/src/PhotoPage.vala" cairo_paint (_tmp13_); -#line 1845 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1847 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp14_ = _ ("Photo source file missing: %s"); -#line 1845 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1847 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp15_ = editing_host_page_get_photo (self); -#line 1845 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1847 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp16_ = _tmp15_; -#line 1845 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1847 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp17_ = media_source_get_file (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, TYPE_MEDIA_SOURCE, MediaSource)); -#line 1845 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1847 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp18_ = _tmp17_; -#line 1845 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1847 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp19_ = g_file_get_path (_tmp18_); -#line 1845 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1847 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp20_ = _tmp19_; -#line 1845 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1847 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp21_ = g_strdup_printf (_tmp14_, _tmp20_); -#line 1845 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1847 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp22_ = _tmp21_; -#line 1845 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1847 "/home/jens/Source/shotwell/src/PhotoPage.vala" editing_host_page_draw_message (self, _tmp22_); -#line 1845 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1847 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_free0 (_tmp22_); -#line 1845 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1847 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_free0 (_tmp20_); -#line 1845 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1847 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (_tmp18_); -#line 1845 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1847 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (_tmp16_); -#line 1846 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1848 "/home/jens/Source/shotwell/src/PhotoPage.vala" return; -#line 12016 "PhotoPage.c" +#line 11917 "PhotoPage.c" } -#line 1849 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1851 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp23_ = ctx; -#line 1849 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1851 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp24_ = *ctx_dim; -#line 1849 "/home/jens/Source/shotwell/src/PhotoPage.vala" - SINGLE_PHOTO_PAGE_CLASS (editing_host_page_parent_class)->paint (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), _tmp23_, &_tmp24_); #line 1851 "/home/jens/Source/shotwell/src/PhotoPage.vala" + SINGLE_PHOTO_PAGE_CLASS (editing_host_page_parent_class)->paint (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), _tmp23_, &_tmp24_); +#line 1853 "/home/jens/Source/shotwell/src/PhotoPage.vala" single_photo_page_get_zoom_state (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), &_tmp25_); -#line 1851 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1853 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp26_ = zoom_state_is_default (&_tmp25_); -#line 1851 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1853 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (!_tmp26_) { -#line 1852 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1854 "/home/jens/Source/shotwell/src/PhotoPage.vala" return; -#line 12032 "PhotoPage.c" +#line 11933 "PhotoPage.c" } -#line 1855 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#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_); -#line 1855 "/home/jens/Source/shotwell/src/PhotoPage.vala" - scaled_rect = _tmp27_; #line 1857 "/home/jens/Source/shotwell/src/PhotoPage.vala" + scaled_rect = _tmp27_; +#line 1859 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp28_ = editing_host_page_get_bottom_left_trinket (self, EDITING_HOST_PAGE_TRINKET_SCALE); -#line 1857 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1859 "/home/jens/Source/shotwell/src/PhotoPage.vala" trinket = _tmp28_; -#line 1858 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1860 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp29_ = trinket; -#line 1858 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1860 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp29_ != NULL) { -#line 12046 "PhotoPage.c" +#line 11947 "PhotoPage.c" gint x = 0; GdkRectangle _tmp30_ = {0}; gint _tmp31_ = 0; @@ -12073,75 +11974,75 @@ static void editing_host_page_real_paint (SinglePhotoPage* base, cairo_t* ctx, D gint _tmp50_ = 0; gint _tmp51_ = 0; cairo_t* _tmp52_ = NULL; -#line 1859 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1861 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp30_ = scaled_rect; -#line 1859 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1861 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp31_ = _tmp30_.x; -#line 1859 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1861 "/home/jens/Source/shotwell/src/PhotoPage.vala" x = _tmp31_ + EDITING_HOST_PAGE_TRINKET_PADDING; -#line 1860 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1862 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp32_ = scaled_rect; -#line 1860 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1862 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp33_ = _tmp32_.y; -#line 1860 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1862 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp34_ = scaled_rect; -#line 1860 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1862 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp35_ = _tmp34_.height; -#line 1860 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1862 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp36_ = trinket; -#line 1860 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1862 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp37_ = gdk_pixbuf_get_height (_tmp36_); -#line 1860 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1862 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp38_ = _tmp37_; -#line 1860 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1862 "/home/jens/Source/shotwell/src/PhotoPage.vala" y = ((_tmp33_ + _tmp35_) - _tmp38_) - EDITING_HOST_PAGE_TRINKET_PADDING; -#line 1861 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1863 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp39_ = ctx; -#line 1861 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1863 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp40_ = trinket; -#line 1861 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1863 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp41_ = x; -#line 1861 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1863 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp42_ = y; -#line 1861 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1863 "/home/jens/Source/shotwell/src/PhotoPage.vala" gdk_cairo_set_source_pixbuf (_tmp39_, _tmp40_, (gdouble) _tmp41_, (gdouble) _tmp42_); -#line 1862 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1864 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp43_ = ctx; -#line 1862 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1864 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp44_ = x; -#line 1862 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1864 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp45_ = y; -#line 1862 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1864 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp46_ = trinket; -#line 1862 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1864 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp47_ = gdk_pixbuf_get_width (_tmp46_); -#line 1862 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1864 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp48_ = _tmp47_; -#line 1862 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1864 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp49_ = trinket; -#line 1862 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1864 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp50_ = gdk_pixbuf_get_height (_tmp49_); -#line 1862 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1864 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp51_ = _tmp50_; -#line 1862 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1864 "/home/jens/Source/shotwell/src/PhotoPage.vala" cairo_rectangle (_tmp43_, (gdouble) _tmp44_, (gdouble) _tmp45_, (gdouble) _tmp48_, (gdouble) _tmp51_); -#line 1863 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1865 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp52_ = ctx; -#line 1863 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1865 "/home/jens/Source/shotwell/src/PhotoPage.vala" cairo_fill (_tmp52_); -#line 12128 "PhotoPage.c" +#line 12029 "PhotoPage.c" } -#line 1866 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1868 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp53_ = editing_host_page_get_top_left_trinket (self, EDITING_HOST_PAGE_TRINKET_SCALE); -#line 1866 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1868 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (trinket); -#line 1866 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1868 "/home/jens/Source/shotwell/src/PhotoPage.vala" trinket = _tmp53_; -#line 1867 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1869 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp54_ = trinket; -#line 1867 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1869 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp54_ != NULL) { -#line 12140 "PhotoPage.c" +#line 12041 "PhotoPage.c" gint x = 0; GdkRectangle _tmp55_ = {0}; gint _tmp56_ = 0; @@ -12162,65 +12063,65 @@ static void editing_host_page_real_paint (SinglePhotoPage* base, cairo_t* ctx, D gint _tmp70_ = 0; gint _tmp71_ = 0; cairo_t* _tmp72_ = NULL; -#line 1868 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1870 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp55_ = scaled_rect; -#line 1868 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1870 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp56_ = _tmp55_.x; -#line 1868 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1870 "/home/jens/Source/shotwell/src/PhotoPage.vala" x = _tmp56_ + EDITING_HOST_PAGE_TRINKET_PADDING; -#line 1869 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1871 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp57_ = scaled_rect; -#line 1869 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1871 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp58_ = _tmp57_.y; -#line 1869 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1871 "/home/jens/Source/shotwell/src/PhotoPage.vala" y = _tmp58_ + EDITING_HOST_PAGE_TRINKET_PADDING; -#line 1870 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1872 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp59_ = ctx; -#line 1870 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1872 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp60_ = trinket; -#line 1870 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1872 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp61_ = x; -#line 1870 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1872 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp62_ = y; -#line 1870 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1872 "/home/jens/Source/shotwell/src/PhotoPage.vala" gdk_cairo_set_source_pixbuf (_tmp59_, _tmp60_, (gdouble) _tmp61_, (gdouble) _tmp62_); -#line 1871 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1873 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp63_ = ctx; -#line 1871 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1873 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp64_ = x; -#line 1871 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1873 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp65_ = y; -#line 1871 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1873 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp66_ = trinket; -#line 1871 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1873 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp67_ = gdk_pixbuf_get_width (_tmp66_); -#line 1871 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1873 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp68_ = _tmp67_; -#line 1871 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1873 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp69_ = trinket; -#line 1871 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1873 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp70_ = gdk_pixbuf_get_height (_tmp69_); -#line 1871 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1873 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp71_ = _tmp70_; -#line 1871 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1873 "/home/jens/Source/shotwell/src/PhotoPage.vala" cairo_rectangle (_tmp63_, (gdouble) _tmp64_, (gdouble) _tmp65_, (gdouble) _tmp68_, (gdouble) _tmp71_); -#line 1872 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1874 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp72_ = ctx; -#line 1872 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1874 "/home/jens/Source/shotwell/src/PhotoPage.vala" cairo_fill (_tmp72_); -#line 12207 "PhotoPage.c" +#line 12108 "PhotoPage.c" } -#line 1875 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1877 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp73_ = editing_host_page_get_top_right_trinket (self, EDITING_HOST_PAGE_TRINKET_SCALE); -#line 1875 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1877 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (trinket); -#line 1875 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1877 "/home/jens/Source/shotwell/src/PhotoPage.vala" trinket = _tmp73_; -#line 1876 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1878 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp74_ = trinket; -#line 1876 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1878 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp74_ != NULL) { -#line 12219 "PhotoPage.c" +#line 12120 "PhotoPage.c" gint x = 0; GdkRectangle _tmp75_ = {0}; gint _tmp76_ = 0; @@ -12246,75 +12147,75 @@ static void editing_host_page_real_paint (SinglePhotoPage* base, cairo_t* ctx, D gint _tmp95_ = 0; gint _tmp96_ = 0; cairo_t* _tmp97_ = NULL; -#line 1877 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1879 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp75_ = scaled_rect; -#line 1877 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1879 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp76_ = _tmp75_.x; -#line 1877 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1879 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp77_ = scaled_rect; -#line 1877 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1879 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp78_ = _tmp77_.width; -#line 1877 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1879 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp79_ = trinket; -#line 1877 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1879 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp80_ = gdk_pixbuf_get_width (_tmp79_); -#line 1877 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1879 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp81_ = _tmp80_; -#line 1877 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1879 "/home/jens/Source/shotwell/src/PhotoPage.vala" x = ((_tmp76_ + _tmp78_) - _tmp81_) - EDITING_HOST_PAGE_TRINKET_PADDING; -#line 1878 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1880 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp82_ = scaled_rect; -#line 1878 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1880 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp83_ = _tmp82_.y; -#line 1878 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1880 "/home/jens/Source/shotwell/src/PhotoPage.vala" y = _tmp83_ + EDITING_HOST_PAGE_TRINKET_PADDING; -#line 1879 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1881 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp84_ = ctx; -#line 1879 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1881 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp85_ = trinket; -#line 1879 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1881 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp86_ = x; -#line 1879 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1881 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp87_ = y; -#line 1879 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1881 "/home/jens/Source/shotwell/src/PhotoPage.vala" gdk_cairo_set_source_pixbuf (_tmp84_, _tmp85_, (gdouble) _tmp86_, (gdouble) _tmp87_); -#line 1880 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1882 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp88_ = ctx; -#line 1880 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1882 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp89_ = x; -#line 1880 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1882 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp90_ = y; -#line 1880 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1882 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp91_ = trinket; -#line 1880 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1882 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp92_ = gdk_pixbuf_get_width (_tmp91_); -#line 1880 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1882 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp93_ = _tmp92_; -#line 1880 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1882 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp94_ = trinket; -#line 1880 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1882 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp95_ = gdk_pixbuf_get_height (_tmp94_); -#line 1880 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1882 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp96_ = _tmp95_; -#line 1880 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1882 "/home/jens/Source/shotwell/src/PhotoPage.vala" cairo_rectangle (_tmp88_, (gdouble) _tmp89_, (gdouble) _tmp90_, (gdouble) _tmp93_, (gdouble) _tmp96_); -#line 1881 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1883 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp97_ = ctx; -#line 1881 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1883 "/home/jens/Source/shotwell/src/PhotoPage.vala" cairo_fill (_tmp97_); -#line 12301 "PhotoPage.c" +#line 12202 "PhotoPage.c" } -#line 1884 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1886 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp98_ = editing_host_page_get_bottom_right_trinket (self, EDITING_HOST_PAGE_TRINKET_SCALE); -#line 1884 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1886 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (trinket); -#line 1884 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1886 "/home/jens/Source/shotwell/src/PhotoPage.vala" trinket = _tmp98_; -#line 1885 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1887 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp99_ = trinket; -#line 1885 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1887 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp99_ != NULL) { -#line 12313 "PhotoPage.c" +#line 12214 "PhotoPage.c" gint x = 0; GdkRectangle _tmp100_ = {0}; gint _tmp101_ = 0; @@ -12345,94 +12246,94 @@ static void editing_host_page_real_paint (SinglePhotoPage* base, cairo_t* ctx, D gint _tmp125_ = 0; gint _tmp126_ = 0; cairo_t* _tmp127_ = NULL; -#line 1886 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1888 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp100_ = scaled_rect; -#line 1886 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1888 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp101_ = _tmp100_.x; -#line 1886 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1888 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp102_ = scaled_rect; -#line 1886 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1888 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp103_ = _tmp102_.width; -#line 1886 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1888 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp104_ = trinket; -#line 1886 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1888 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp105_ = gdk_pixbuf_get_width (_tmp104_); -#line 1886 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1888 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp106_ = _tmp105_; -#line 1886 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1888 "/home/jens/Source/shotwell/src/PhotoPage.vala" x = ((_tmp101_ + _tmp103_) - _tmp106_) - EDITING_HOST_PAGE_TRINKET_PADDING; -#line 1887 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1889 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp107_ = scaled_rect; -#line 1887 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1889 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp108_ = _tmp107_.y; -#line 1887 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1889 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp109_ = scaled_rect; -#line 1887 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1889 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp110_ = _tmp109_.height; -#line 1887 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1889 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp111_ = trinket; -#line 1887 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1889 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp112_ = gdk_pixbuf_get_height (_tmp111_); -#line 1887 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1889 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp113_ = _tmp112_; -#line 1887 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1889 "/home/jens/Source/shotwell/src/PhotoPage.vala" y = ((_tmp108_ + _tmp110_) - _tmp113_) - EDITING_HOST_PAGE_TRINKET_PADDING; -#line 1888 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1890 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp114_ = ctx; -#line 1888 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1890 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp115_ = trinket; -#line 1888 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1890 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp116_ = x; -#line 1888 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1890 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp117_ = y; -#line 1888 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1890 "/home/jens/Source/shotwell/src/PhotoPage.vala" gdk_cairo_set_source_pixbuf (_tmp114_, _tmp115_, (gdouble) _tmp116_, (gdouble) _tmp117_); -#line 1889 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1891 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp118_ = ctx; -#line 1889 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1891 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp119_ = x; -#line 1889 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1891 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp120_ = y; -#line 1889 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1891 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp121_ = trinket; -#line 1889 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1891 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp122_ = gdk_pixbuf_get_width (_tmp121_); -#line 1889 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1891 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp123_ = _tmp122_; -#line 1889 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1891 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp124_ = trinket; -#line 1889 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1891 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp125_ = gdk_pixbuf_get_height (_tmp124_); -#line 1889 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1891 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp126_ = _tmp125_; -#line 1889 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1891 "/home/jens/Source/shotwell/src/PhotoPage.vala" cairo_rectangle (_tmp118_, (gdouble) _tmp119_, (gdouble) _tmp120_, (gdouble) _tmp123_, (gdouble) _tmp126_); -#line 1890 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1892 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp127_ = ctx; -#line 1890 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1892 "/home/jens/Source/shotwell/src/PhotoPage.vala" cairo_fill (_tmp127_); -#line 12410 "PhotoPage.c" +#line 12311 "PhotoPage.c" } -#line 1833 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1835 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (trinket); -#line 12414 "PhotoPage.c" +#line 12315 "PhotoPage.c" } gboolean editing_host_page_is_rotate_available (EditingHostPage* self, Photo* photo) { gboolean result = FALSE; gboolean _tmp0_ = FALSE; -#line 1894 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1896 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_val_if_fail (IS_EDITING_HOST_PAGE (self), FALSE); -#line 1894 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1896 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_val_if_fail (IS_PHOTO (photo), FALSE); -#line 1895 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1897 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp0_ = self->priv->photo_missing; -#line 1895 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1897 "/home/jens/Source/shotwell/src/PhotoPage.vala" result = !_tmp0_; -#line 1895 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1897 "/home/jens/Source/shotwell/src/PhotoPage.vala" return result; -#line 12431 "PhotoPage.c" +#line 12332 "PhotoPage.c" } @@ -12450,93 +12351,93 @@ static void editing_host_page_rotate (EditingHostPage* self, Rotation rotation, CommandManager* _tmp9_ = NULL; CommandManager* _tmp10_ = NULL; RotateSingleCommand* _tmp11_ = NULL; -#line 1898 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1900 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_if_fail (IS_EDITING_HOST_PAGE (self)); -#line 1898 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1900 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_if_fail (name != NULL); -#line 1898 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1900 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_if_fail (description != NULL); -#line 1899 "/home/jens/Source/shotwell/src/PhotoPage.vala" - single_photo_page_cancel_zoom (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage)); #line 1901 "/home/jens/Source/shotwell/src/PhotoPage.vala" + single_photo_page_cancel_zoom (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage)); +#line 1903 "/home/jens/Source/shotwell/src/PhotoPage.vala" dimensions_init (&_tmp0_, 0, 0); -#line 1901 "/home/jens/Source/shotwell/src/PhotoPage.vala" - editing_host_page_deactivate_tool (self, NULL, NULL, &_tmp0_, FALSE); #line 1903 "/home/jens/Source/shotwell/src/PhotoPage.vala" + editing_host_page_deactivate_tool (self, NULL, NULL, &_tmp0_, FALSE); +#line 1905 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp1_ = editing_host_page_has_photo (self); -#line 1903 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1905 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (!_tmp1_) { -#line 1904 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1906 "/home/jens/Source/shotwell/src/PhotoPage.vala" return; -#line 12467 "PhotoPage.c" +#line 12368 "PhotoPage.c" } -#line 1906 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1908 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp2_ = editing_host_page_get_photo (self); -#line 1906 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1908 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp3_ = _tmp2_; -#line 1906 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1908 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp4_ = rotation; -#line 1906 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1908 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp5_ = name; -#line 1906 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1908 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp6_ = description; -#line 1906 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1908 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp7_ = rotate_single_command_new (_tmp3_, _tmp4_, _tmp5_, _tmp6_); -#line 1906 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1908 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp8_ = _tmp7_; -#line 1906 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1908 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (_tmp3_); -#line 1906 "/home/jens/Source/shotwell/src/PhotoPage.vala" - command = _tmp8_; #line 1908 "/home/jens/Source/shotwell/src/PhotoPage.vala" + command = _tmp8_; +#line 1910 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp9_ = page_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); -#line 1908 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1910 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp10_ = _tmp9_; -#line 1908 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1910 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp11_ = command; -#line 1908 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1910 "/home/jens/Source/shotwell/src/PhotoPage.vala" command_manager_execute (_tmp10_, G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, TYPE_COMMAND, Command)); -#line 1908 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1910 "/home/jens/Source/shotwell/src/PhotoPage.vala" _command_manager_unref0 (_tmp10_); -#line 1898 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1900 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (command); -#line 12499 "PhotoPage.c" +#line 12400 "PhotoPage.c" } void editing_host_page_on_rotate_clockwise (EditingHostPage* self) { -#line 1911 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1913 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_if_fail (IS_EDITING_HOST_PAGE (self)); -#line 1912 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#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 12508 "PhotoPage.c" +#line 12409 "PhotoPage.c" } void editing_host_page_on_rotate_counterclockwise (EditingHostPage* self) { -#line 1915 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1917 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_if_fail (IS_EDITING_HOST_PAGE (self)); -#line 1916 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#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 12517 "PhotoPage.c" +#line 12418 "PhotoPage.c" } void editing_host_page_on_flip_horizontally (EditingHostPage* self) { -#line 1919 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1921 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_if_fail (IS_EDITING_HOST_PAGE (self)); -#line 1920 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1922 "/home/jens/Source/shotwell/src/PhotoPage.vala" editing_host_page_rotate (self, ROTATION_MIRROR, RESOURCES_HFLIP_LABEL, ""); -#line 12526 "PhotoPage.c" +#line 12427 "PhotoPage.c" } void editing_host_page_on_flip_vertically (EditingHostPage* self) { -#line 1923 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1925 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_if_fail (IS_EDITING_HOST_PAGE (self)); -#line 1924 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1926 "/home/jens/Source/shotwell/src/PhotoPage.vala" editing_host_page_rotate (self, ROTATION_UPSIDE_DOWN, RESOURCES_VFLIP_LABEL, ""); -#line 12535 "PhotoPage.c" +#line 12436 "PhotoPage.c" } @@ -12556,41 +12457,41 @@ void editing_host_page_on_revert (EditingHostPage* self) { CommandManager* _tmp21_ = NULL; CommandManager* _tmp22_ = NULL; RevertSingleCommand* _tmp23_ = NULL; -#line 1927 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1929 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_if_fail (IS_EDITING_HOST_PAGE (self)); -#line 1928 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1930 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp0_ = self->priv->photo_missing; -#line 1928 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1930 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp0_) { -#line 1929 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1931 "/home/jens/Source/shotwell/src/PhotoPage.vala" return; -#line 12563 "PhotoPage.c" +#line 12464 "PhotoPage.c" } -#line 1931 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1933 "/home/jens/Source/shotwell/src/PhotoPage.vala" dimensions_init (&_tmp1_, 0, 0); -#line 1931 "/home/jens/Source/shotwell/src/PhotoPage.vala" - editing_host_page_deactivate_tool (self, NULL, NULL, &_tmp1_, FALSE); #line 1933 "/home/jens/Source/shotwell/src/PhotoPage.vala" + editing_host_page_deactivate_tool (self, NULL, NULL, &_tmp1_, FALSE); +#line 1935 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp2_ = editing_host_page_has_photo (self); -#line 1933 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1935 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (!_tmp2_) { -#line 1934 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1936 "/home/jens/Source/shotwell/src/PhotoPage.vala" return; -#line 12575 "PhotoPage.c" +#line 12476 "PhotoPage.c" } -#line 1936 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1938 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp3_ = editing_host_page_get_photo (self); -#line 1936 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1938 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp4_ = _tmp3_; -#line 1936 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1938 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp5_ = photo_has_editable (_tmp4_); -#line 1936 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1938 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp6_ = _tmp5_; -#line 1936 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1938 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (_tmp4_); -#line 1936 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1938 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp6_) { -#line 12589 "PhotoPage.c" +#line 12490 "PhotoPage.c" AppWindow* _tmp7_ = NULL; AppWindow* _tmp8_ = NULL; ViewCollection* _tmp9_ = NULL; @@ -12601,73 +12502,73 @@ void editing_host_page_on_revert (EditingHostPage* self) { gboolean _tmp14_ = FALSE; Photo* _tmp15_ = NULL; Photo* _tmp16_ = NULL; -#line 1937 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1939 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp7_ = app_window_get_instance (); -#line 1937 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1939 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp8_ = _tmp7_; -#line 1937 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1939 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp9_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); -#line 1937 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1939 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp10_ = _tmp9_; -#line 1937 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1939 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp11_ = view_collection_get_sources (_tmp10_); -#line 1937 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1939 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp12_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, GEE_TYPE_COLLECTION, GeeCollection); -#line 1937 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1939 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp13_ = revert_editable_dialog (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, gtk_window_get_type (), GtkWindow), _tmp12_); -#line 1937 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1939 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp14_ = !_tmp13_; -#line 1937 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1939 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (_tmp12_); -#line 1937 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1939 "/home/jens/Source/shotwell/src/PhotoPage.vala" _data_collection_unref0 (_tmp10_); -#line 1937 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1939 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (_tmp8_); -#line 1937 "/home/jens/Source/shotwell/src/PhotoPage.vala" - if (_tmp14_) { #line 1939 "/home/jens/Source/shotwell/src/PhotoPage.vala" + if (_tmp14_) { +#line 1941 "/home/jens/Source/shotwell/src/PhotoPage.vala" return; -#line 12626 "PhotoPage.c" +#line 12527 "PhotoPage.c" } -#line 1942 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1944 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp15_ = editing_host_page_get_photo (self); -#line 1942 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1944 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp16_ = _tmp15_; -#line 1942 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1944 "/home/jens/Source/shotwell/src/PhotoPage.vala" photo_revert_to_master (_tmp16_, TRUE); -#line 1942 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1944 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (_tmp16_); -#line 12636 "PhotoPage.c" +#line 12537 "PhotoPage.c" } -#line 1945 "/home/jens/Source/shotwell/src/PhotoPage.vala" - single_photo_page_cancel_zoom (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage)); #line 1947 "/home/jens/Source/shotwell/src/PhotoPage.vala" - editing_host_page_set_photo_missing (self, FALSE); + single_photo_page_cancel_zoom (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage)); #line 1949 "/home/jens/Source/shotwell/src/PhotoPage.vala" + editing_host_page_set_photo_missing (self, FALSE); +#line 1951 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp17_ = editing_host_page_get_photo (self); -#line 1949 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1951 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp18_ = _tmp17_; -#line 1949 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1951 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp19_ = revert_single_command_new (_tmp18_); -#line 1949 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1951 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp20_ = _tmp19_; -#line 1949 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1951 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (_tmp18_); -#line 1949 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1951 "/home/jens/Source/shotwell/src/PhotoPage.vala" command = _tmp20_; -#line 1950 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1952 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp21_ = page_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); -#line 1950 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1952 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp22_ = _tmp21_; -#line 1950 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1952 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp23_ = command; -#line 1950 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1952 "/home/jens/Source/shotwell/src/PhotoPage.vala" command_manager_execute (_tmp22_, G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, TYPE_COMMAND, Command)); -#line 1950 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1952 "/home/jens/Source/shotwell/src/PhotoPage.vala" _command_manager_unref0 (_tmp22_); -#line 1927 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1929 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (command); -#line 12666 "PhotoPage.c" +#line 12567 "PhotoPage.c" } @@ -12693,104 +12594,104 @@ void editing_host_page_on_edit_title (EditingHostPage* self) { CommandManager* _tmp16_ = NULL; CommandManager* _tmp17_ = NULL; EditTitleCommand* _tmp18_ = NULL; -#line 1953 "/home/jens/Source/shotwell/src/PhotoPage.vala" - g_return_if_fail (IS_EDITING_HOST_PAGE (self)); #line 1955 "/home/jens/Source/shotwell/src/PhotoPage.vala" + g_return_if_fail (IS_EDITING_HOST_PAGE (self)); +#line 1957 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp0_ = editing_host_page_get_photo (self); -#line 1955 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1957 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp1_ = _tmp0_; -#line 1955 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1957 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp2_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp1_, TYPE_LIBRARY_PHOTO); -#line 1955 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1957 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (_tmp1_); -#line 1955 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1957 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp2_) { -#line 12704 "PhotoPage.c" +#line 12605 "PhotoPage.c" Photo* _tmp3_ = NULL; LibraryPhoto* _tmp4_ = NULL; -#line 1956 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1958 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp3_ = editing_host_page_get_photo (self); -#line 1956 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1958 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp4_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp3_, TYPE_LIBRARY_PHOTO) ? ((LibraryPhoto*) _tmp3_) : NULL; -#line 1956 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1958 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp4_ == NULL) { -#line 1956 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1958 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (_tmp3_); -#line 12715 "PhotoPage.c" +#line 12616 "PhotoPage.c" } -#line 1956 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1958 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (item); -#line 1956 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1958 "/home/jens/Source/shotwell/src/PhotoPage.vala" item = _tmp4_; -#line 12721 "PhotoPage.c" +#line 12622 "PhotoPage.c" } else { -#line 1958 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1960 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (item); -#line 1958 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1960 "/home/jens/Source/shotwell/src/PhotoPage.vala" return; -#line 12727 "PhotoPage.c" +#line 12628 "PhotoPage.c" } -#line 1960 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1962 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp5_ = item; -#line 1960 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1962 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp6_ = media_source_get_title (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, TYPE_MEDIA_SOURCE, MediaSource)); -#line 1960 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1962 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp7_ = _tmp6_; -#line 1960 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1962 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp8_ = edit_title_dialog_new (_tmp7_); -#line 1960 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1962 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp9_ = _tmp8_; -#line 1960 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1962 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_free0 (_tmp7_); -#line 1960 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1962 "/home/jens/Source/shotwell/src/PhotoPage.vala" edit_title_dialog = _tmp9_; -#line 1961 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1963 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp10_ = edit_title_dialog; -#line 1961 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1963 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp11_ = edit_title_dialog_execute (_tmp10_); -#line 1961 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1963 "/home/jens/Source/shotwell/src/PhotoPage.vala" new_title = _tmp11_; -#line 1962 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1964 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp12_ = new_title; -#line 1962 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1964 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp12_ == NULL) { -#line 1963 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1965 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_free0 (new_title); -#line 1963 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1965 "/home/jens/Source/shotwell/src/PhotoPage.vala" _text_entry_dialog_mediator_unref0 (edit_title_dialog); -#line 1963 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1965 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (item); -#line 1963 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1965 "/home/jens/Source/shotwell/src/PhotoPage.vala" return; -#line 12761 "PhotoPage.c" +#line 12662 "PhotoPage.c" } -#line 1965 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1967 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp13_ = item; -#line 1965 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1967 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp14_ = new_title; -#line 1965 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1967 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp15_ = edit_title_command_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, TYPE_MEDIA_SOURCE, MediaSource), _tmp14_); -#line 1965 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1967 "/home/jens/Source/shotwell/src/PhotoPage.vala" command = _tmp15_; -#line 1966 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1968 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp16_ = page_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); -#line 1966 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1968 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp17_ = _tmp16_; -#line 1966 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1968 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp18_ = command; -#line 1966 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1968 "/home/jens/Source/shotwell/src/PhotoPage.vala" command_manager_execute (_tmp17_, G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, TYPE_COMMAND, Command)); -#line 1966 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1968 "/home/jens/Source/shotwell/src/PhotoPage.vala" _command_manager_unref0 (_tmp17_); -#line 1953 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1955 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (command); -#line 1953 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1955 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_free0 (new_title); -#line 1953 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1955 "/home/jens/Source/shotwell/src/PhotoPage.vala" _text_entry_dialog_mediator_unref0 (edit_title_dialog); -#line 1953 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1955 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (item); -#line 12789 "PhotoPage.c" +#line 12690 "PhotoPage.c" } @@ -12816,104 +12717,104 @@ void editing_host_page_on_edit_comment (EditingHostPage* self) { CommandManager* _tmp16_ = NULL; CommandManager* _tmp17_ = NULL; EditCommentCommand* _tmp18_ = NULL; -#line 1969 "/home/jens/Source/shotwell/src/PhotoPage.vala" - g_return_if_fail (IS_EDITING_HOST_PAGE (self)); #line 1971 "/home/jens/Source/shotwell/src/PhotoPage.vala" + g_return_if_fail (IS_EDITING_HOST_PAGE (self)); +#line 1973 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp0_ = editing_host_page_get_photo (self); -#line 1971 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1973 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp1_ = _tmp0_; -#line 1971 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1973 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp2_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp1_, TYPE_LIBRARY_PHOTO); -#line 1971 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1973 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (_tmp1_); -#line 1971 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1973 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp2_) { -#line 12827 "PhotoPage.c" +#line 12728 "PhotoPage.c" Photo* _tmp3_ = NULL; LibraryPhoto* _tmp4_ = NULL; -#line 1972 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1974 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp3_ = editing_host_page_get_photo (self); -#line 1972 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1974 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp4_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp3_, TYPE_LIBRARY_PHOTO) ? ((LibraryPhoto*) _tmp3_) : NULL; -#line 1972 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1974 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp4_ == NULL) { -#line 1972 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1974 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (_tmp3_); -#line 12838 "PhotoPage.c" +#line 12739 "PhotoPage.c" } -#line 1972 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1974 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (item); -#line 1972 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1974 "/home/jens/Source/shotwell/src/PhotoPage.vala" item = _tmp4_; -#line 12844 "PhotoPage.c" +#line 12745 "PhotoPage.c" } else { -#line 1974 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1976 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (item); -#line 1974 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1976 "/home/jens/Source/shotwell/src/PhotoPage.vala" return; -#line 12850 "PhotoPage.c" +#line 12751 "PhotoPage.c" } -#line 1976 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1978 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp5_ = item; -#line 1976 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1978 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp6_ = media_source_get_comment (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, TYPE_MEDIA_SOURCE, MediaSource)); -#line 1976 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1978 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp7_ = _tmp6_; -#line 1976 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1978 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp8_ = edit_comment_dialog_new (_tmp7_, FALSE); -#line 1976 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1978 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp9_ = _tmp8_; -#line 1976 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1978 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_free0 (_tmp7_); -#line 1976 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1978 "/home/jens/Source/shotwell/src/PhotoPage.vala" edit_comment_dialog = _tmp9_; -#line 1977 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1979 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp10_ = edit_comment_dialog; -#line 1977 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1979 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp11_ = edit_comment_dialog_execute (_tmp10_); -#line 1977 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1979 "/home/jens/Source/shotwell/src/PhotoPage.vala" new_comment = _tmp11_; -#line 1978 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1980 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp12_ = new_comment; -#line 1978 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1980 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp12_ == NULL) { -#line 1979 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1981 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_free0 (new_comment); -#line 1979 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1981 "/home/jens/Source/shotwell/src/PhotoPage.vala" _multi_text_entry_dialog_mediator_unref0 (edit_comment_dialog); -#line 1979 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1981 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (item); -#line 1979 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1981 "/home/jens/Source/shotwell/src/PhotoPage.vala" return; -#line 12884 "PhotoPage.c" +#line 12785 "PhotoPage.c" } -#line 1981 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1983 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp13_ = item; -#line 1981 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1983 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp14_ = new_comment; -#line 1981 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1983 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp15_ = edit_comment_command_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, TYPE_MEDIA_SOURCE, MediaSource), _tmp14_); -#line 1981 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1983 "/home/jens/Source/shotwell/src/PhotoPage.vala" command = _tmp15_; -#line 1982 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1984 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp16_ = page_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); -#line 1982 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1984 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp17_ = _tmp16_; -#line 1982 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1984 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp18_ = command; -#line 1982 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1984 "/home/jens/Source/shotwell/src/PhotoPage.vala" command_manager_execute (_tmp17_, G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, TYPE_COMMAND, Command)); -#line 1982 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1984 "/home/jens/Source/shotwell/src/PhotoPage.vala" _command_manager_unref0 (_tmp17_); -#line 1969 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1971 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (command); -#line 1969 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1971 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_free0 (new_comment); -#line 1969 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1971 "/home/jens/Source/shotwell/src/PhotoPage.vala" _multi_text_entry_dialog_mediator_unref0 (edit_comment_dialog); -#line 1969 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1971 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (item); -#line 12912 "PhotoPage.c" +#line 12813 "PhotoPage.c" } @@ -12932,43 +12833,43 @@ void editing_host_page_on_adjust_date_time (EditingHostPage* self) { gboolean _tmp7_ = FALSE; gboolean _tmp8_ = FALSE; gboolean _tmp9_ = FALSE; -#line 1985 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1987 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_if_fail (IS_EDITING_HOST_PAGE (self)); -#line 1986 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1988 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp0_ = editing_host_page_has_photo (self); -#line 1986 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1988 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (!_tmp0_) { -#line 1987 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1989 "/home/jens/Source/shotwell/src/PhotoPage.vala" return; -#line 12939 "PhotoPage.c" +#line 12840 "PhotoPage.c" } -#line 1989 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1991 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp1_ = editing_host_page_get_photo (self); -#line 1989 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1991 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp2_ = _tmp1_; -#line 1989 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1991 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp3_ = adjust_date_time_dialog_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_DATEABLE, Dateable), 1, !G_TYPE_CHECK_INSTANCE_TYPE (self, TYPE_DIRECT_PHOTO_PAGE), FALSE, FALSE); -#line 1989 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1991 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_object_ref_sink (_tmp3_); -#line 1989 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1991 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp4_ = _tmp3_; -#line 1989 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1991 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (_tmp2_); -#line 1989 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1991 "/home/jens/Source/shotwell/src/PhotoPage.vala" dialog = _tmp4_; -#line 1993 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1995 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp5_ = dialog; -#line 1993 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1995 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp9_ = adjust_date_time_dialog_execute (_tmp5_, &_tmp6_, &_tmp7_, &_tmp8_); -#line 1993 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1995 "/home/jens/Source/shotwell/src/PhotoPage.vala" time_shift = _tmp6_; -#line 1993 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1995 "/home/jens/Source/shotwell/src/PhotoPage.vala" keep_relativity = _tmp7_; -#line 1993 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1995 "/home/jens/Source/shotwell/src/PhotoPage.vala" modify_originals = _tmp8_; -#line 1993 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1995 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp9_) { -#line 12967 "PhotoPage.c" +#line 12868 "PhotoPage.c" ViewCollection* _tmp10_ = NULL; ViewCollection* _tmp11_ = NULL; GeeList* _tmp12_ = NULL; @@ -12983,63 +12884,63 @@ void editing_host_page_on_adjust_date_time (EditingHostPage* self) { CommandManager* _tmp20_ = NULL; CommandManager* _tmp21_ = NULL; AdjustDateTimePhotoCommand* _tmp22_ = NULL; -#line 1994 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1996 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp10_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); -#line 1994 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1996 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp11_ = _tmp10_; -#line 1994 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1996 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp12_ = view_collection_get_selected (_tmp11_); -#line 1994 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1996 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp13_ = _tmp12_; -#line 1994 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1996 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (_tmp13_); -#line 1994 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _data_collection_unref0 (_tmp11_); #line 1996 "/home/jens/Source/shotwell/src/PhotoPage.vala" + _data_collection_unref0 (_tmp11_); +#line 1998 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp14_ = editing_host_page_get_photo (self); -#line 1996 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1998 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp15_ = _tmp14_; -#line 1996 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1998 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp16_ = time_shift; -#line 1996 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1998 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp17_ = modify_originals; -#line 1996 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1998 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp18_ = adjust_date_time_photo_command_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, TYPE_DATEABLE, Dateable), _tmp16_, _tmp17_); -#line 1996 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1998 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp19_ = _tmp18_; -#line 1996 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1998 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (_tmp15_); -#line 1996 "/home/jens/Source/shotwell/src/PhotoPage.vala" - command = _tmp19_; #line 1998 "/home/jens/Source/shotwell/src/PhotoPage.vala" + command = _tmp19_; +#line 2000 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp20_ = page_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); -#line 1998 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2000 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp21_ = _tmp20_; -#line 1998 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2000 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp22_ = command; -#line 1998 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2000 "/home/jens/Source/shotwell/src/PhotoPage.vala" command_manager_execute (_tmp21_, G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, TYPE_COMMAND, Command)); -#line 1998 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2000 "/home/jens/Source/shotwell/src/PhotoPage.vala" _command_manager_unref0 (_tmp21_); -#line 1993 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1995 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (command); -#line 13022 "PhotoPage.c" +#line 12923 "PhotoPage.c" } -#line 1985 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 1987 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (dialog); -#line 13026 "PhotoPage.c" +#line 12927 "PhotoPage.c" } void editing_host_page_on_set_background (EditingHostPage* self) { gboolean _tmp0_ = FALSE; -#line 2002 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2004 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_if_fail (IS_EDITING_HOST_PAGE (self)); -#line 2003 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2005 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp0_ = editing_host_page_has_photo (self); -#line 2003 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2005 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp0_) { -#line 13038 "PhotoPage.c" +#line 12939 "PhotoPage.c" SetBackgroundPhotoDialog* dialog = NULL; SetBackgroundPhotoDialog* _tmp1_ = NULL; gboolean desktop = FALSE; @@ -13048,21 +12949,21 @@ void editing_host_page_on_set_background (EditingHostPage* self) { gboolean _tmp3_ = FALSE; gboolean _tmp4_ = FALSE; gboolean _tmp5_ = FALSE; -#line 2004 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2006 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp1_ = set_background_photo_dialog_new (); -#line 2004 "/home/jens/Source/shotwell/src/PhotoPage.vala" - dialog = _tmp1_; #line 2006 "/home/jens/Source/shotwell/src/PhotoPage.vala" + dialog = _tmp1_; +#line 2008 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp2_ = dialog; -#line 2006 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2008 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp5_ = set_background_photo_dialog_execute (_tmp2_, &_tmp3_, &_tmp4_); -#line 2006 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2008 "/home/jens/Source/shotwell/src/PhotoPage.vala" desktop = _tmp3_; -#line 2006 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2008 "/home/jens/Source/shotwell/src/PhotoPage.vala" screensaver = _tmp4_; -#line 2006 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2008 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp5_) { -#line 13061 "PhotoPage.c" +#line 12962 "PhotoPage.c" AppWindow* _tmp6_ = NULL; AppWindow* _tmp7_ = NULL; Photo* _tmp8_ = NULL; @@ -13071,47 +12972,47 @@ void editing_host_page_on_set_background (EditingHostPage* self) { gboolean _tmp11_ = FALSE; AppWindow* _tmp12_ = NULL; AppWindow* _tmp13_ = NULL; -#line 2007 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2009 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp6_ = app_window_get_instance (); -#line 2007 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2009 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp7_ = _tmp6_; -#line 2007 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2009 "/home/jens/Source/shotwell/src/PhotoPage.vala" page_window_set_busy_cursor (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_PAGE_WINDOW, PageWindow)); -#line 2007 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2009 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (_tmp7_); -#line 2008 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2010 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp8_ = editing_host_page_get_photo (self); -#line 2008 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2010 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp9_ = _tmp8_; -#line 2008 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2010 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp10_ = desktop; -#line 2008 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2010 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp11_ = screensaver; -#line 2008 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2010 "/home/jens/Source/shotwell/src/PhotoPage.vala" desktop_integration_set_background (_tmp9_, _tmp10_, _tmp11_); -#line 2008 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2010 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (_tmp9_); -#line 2009 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2011 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp12_ = app_window_get_instance (); -#line 2009 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2011 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp13_ = _tmp12_; -#line 2009 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2011 "/home/jens/Source/shotwell/src/PhotoPage.vala" page_window_set_normal_cursor (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, TYPE_PAGE_WINDOW, PageWindow)); -#line 2009 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2011 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (_tmp13_); -#line 13098 "PhotoPage.c" +#line 12999 "PhotoPage.c" } -#line 2003 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2005 "/home/jens/Source/shotwell/src/PhotoPage.vala" _set_background_dialog_unref0 (dialog); -#line 13102 "PhotoPage.c" +#line 13003 "PhotoPage.c" } } static void _editing_host_page_on_rotate_counterclockwise_gtk_tool_button_clicked (GtkToolButton* _sender, gpointer self) { -#line 2019 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2021 "/home/jens/Source/shotwell/src/PhotoPage.vala" editing_host_page_on_rotate_counterclockwise ((EditingHostPage*) self); -#line 13110 "PhotoPage.c" +#line 13011 "PhotoPage.c" } @@ -13127,47 +13028,47 @@ static gboolean editing_host_page_real_on_ctrl_pressed (Page* base, GdkEventKey* EditingToolsEditingTool* _tmp6_ = NULL; GdkEventKey* _tmp7_ = NULL; gboolean _tmp8_ = FALSE; -#line 2014 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2016 "/home/jens/Source/shotwell/src/PhotoPage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EDITING_HOST_PAGE, EditingHostPage); -#line 2015 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2017 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp0_ = self->priv->rotate_button; -#line 2015 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2017 "/home/jens/Source/shotwell/src/PhotoPage.vala" gtk_tool_button_set_icon_name (_tmp0_, RESOURCES_COUNTERCLOCKWISE); -#line 2016 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2018 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp1_ = self->priv->rotate_button; -#line 2016 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2018 "/home/jens/Source/shotwell/src/PhotoPage.vala" gtk_tool_button_set_label (_tmp1_, RESOURCES_ROTATE_CCW_LABEL); -#line 2017 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2019 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp2_ = self->priv->rotate_button; -#line 2017 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2019 "/home/jens/Source/shotwell/src/PhotoPage.vala" gtk_tool_item_set_tooltip_text (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_tool_item_get_type (), GtkToolItem), RESOURCES_ROTATE_CCW_TOOLTIP); -#line 2018 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2020 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp3_ = self->priv->rotate_button; -#line 2018 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2020 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_signal_parse_name ("clicked", gtk_tool_button_get_type (), &_tmp4_, NULL, FALSE); -#line 2018 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2020 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_signal_handlers_disconnect_matched (_tmp3_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp4_, 0, NULL, (GCallback) _editing_host_page_on_rotate_clockwise_gtk_tool_button_clicked, self); -#line 2019 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2021 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp5_ = self->priv->rotate_button; -#line 2019 "/home/jens/Source/shotwell/src/PhotoPage.vala" - g_signal_connect_object (_tmp5_, "clicked", (GCallback) _editing_host_page_on_rotate_counterclockwise_gtk_tool_button_clicked, self, 0); #line 2021 "/home/jens/Source/shotwell/src/PhotoPage.vala" + g_signal_connect_object (_tmp5_, "clicked", (GCallback) _editing_host_page_on_rotate_counterclockwise_gtk_tool_button_clicked, self, 0); +#line 2023 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp6_ = self->priv->current_tool; -#line 2021 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2023 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp6_ == NULL) { -#line 2022 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2024 "/home/jens/Source/shotwell/src/PhotoPage.vala" editing_host_page_swap_out_original (self); -#line 13156 "PhotoPage.c" +#line 13057 "PhotoPage.c" } -#line 2024 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2026 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp7_ = event; -#line 2024 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2026 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp8_ = PAGE_CLASS (editing_host_page_parent_class)->on_ctrl_pressed (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), TYPE_PAGE, Page), _tmp7_); -#line 2024 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2026 "/home/jens/Source/shotwell/src/PhotoPage.vala" result = _tmp8_; -#line 2024 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2026 "/home/jens/Source/shotwell/src/PhotoPage.vala" return result; -#line 13166 "PhotoPage.c" +#line 13067 "PhotoPage.c" } @@ -13185,75 +13086,75 @@ static gboolean editing_host_page_real_on_ctrl_released (Page* base, GdkEventKey EditingToolsEditingTool* _tmp8_ = NULL; GdkEventKey* _tmp11_ = NULL; gboolean _tmp12_ = FALSE; -#line 2027 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2029 "/home/jens/Source/shotwell/src/PhotoPage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EDITING_HOST_PAGE, EditingHostPage); -#line 2028 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2030 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp0_ = self->priv->rotate_button; -#line 2028 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2030 "/home/jens/Source/shotwell/src/PhotoPage.vala" gtk_tool_button_set_icon_name (_tmp0_, RESOURCES_CLOCKWISE); -#line 2029 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2031 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp1_ = self->priv->rotate_button; -#line 2029 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2031 "/home/jens/Source/shotwell/src/PhotoPage.vala" gtk_tool_button_set_label (_tmp1_, RESOURCES_ROTATE_CW_LABEL); -#line 2030 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2032 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp2_ = self->priv->rotate_button; -#line 2030 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2032 "/home/jens/Source/shotwell/src/PhotoPage.vala" gtk_tool_item_set_tooltip_text (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_tool_item_get_type (), GtkToolItem), RESOURCES_ROTATE_CW_TOOLTIP); -#line 2031 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2033 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp3_ = self->priv->rotate_button; -#line 2031 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2033 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_signal_parse_name ("clicked", gtk_tool_button_get_type (), &_tmp4_, NULL, FALSE); -#line 2031 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2033 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_signal_handlers_disconnect_matched (_tmp3_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp4_, 0, NULL, (GCallback) _editing_host_page_on_rotate_counterclockwise_gtk_tool_button_clicked, self); -#line 2032 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2034 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp5_ = self->priv->rotate_button; -#line 2032 "/home/jens/Source/shotwell/src/PhotoPage.vala" - g_signal_connect_object (_tmp5_, "clicked", (GCallback) _editing_host_page_on_rotate_clockwise_gtk_tool_button_clicked, self, 0); #line 2034 "/home/jens/Source/shotwell/src/PhotoPage.vala" + g_signal_connect_object (_tmp5_, "clicked", (GCallback) _editing_host_page_on_rotate_clockwise_gtk_tool_button_clicked, self, 0); +#line 2036 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp8_ = self->priv->current_tool; -#line 2034 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2036 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp8_ == NULL) { -#line 13212 "PhotoPage.c" +#line 13113 "PhotoPage.c" gboolean _tmp9_ = FALSE; -#line 2034 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2036 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp9_ = page_get_shift_pressed (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); -#line 2034 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2036 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp7_ = _tmp9_; -#line 13218 "PhotoPage.c" +#line 13119 "PhotoPage.c" } else { -#line 2034 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2036 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp7_ = FALSE; -#line 13222 "PhotoPage.c" +#line 13123 "PhotoPage.c" } -#line 2034 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2036 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp7_) { -#line 13226 "PhotoPage.c" +#line 13127 "PhotoPage.c" gboolean _tmp10_ = FALSE; -#line 2034 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2036 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp10_ = page_get_alt_pressed (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); -#line 2034 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2036 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp6_ = !_tmp10_; -#line 13232 "PhotoPage.c" +#line 13133 "PhotoPage.c" } else { -#line 2034 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2036 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp6_ = FALSE; -#line 13236 "PhotoPage.c" +#line 13137 "PhotoPage.c" } -#line 2034 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2036 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp6_) { -#line 2035 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2037 "/home/jens/Source/shotwell/src/PhotoPage.vala" editing_host_page_swap_in_original (self); -#line 13242 "PhotoPage.c" +#line 13143 "PhotoPage.c" } -#line 2037 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2039 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp11_ = event; -#line 2037 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2039 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp12_ = PAGE_CLASS (editing_host_page_parent_class)->on_ctrl_released (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), TYPE_PAGE, Page), _tmp11_); -#line 2037 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2039 "/home/jens/Source/shotwell/src/PhotoPage.vala" result = _tmp12_; -#line 2037 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2039 "/home/jens/Source/shotwell/src/PhotoPage.vala" return result; -#line 13252 "PhotoPage.c" +#line 13153 "PhotoPage.c" } @@ -13276,92 +13177,92 @@ void editing_host_page_on_tool_button_toggled (EditingHostPage* self, GtkToggleT EditingToolsEditingTool* _tmp15_ = NULL; EditingToolsEditingTool* _tmp16_ = NULL; EditingToolsEditingTool* _tmp17_ = NULL; -#line 2040 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2042 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_if_fail (IS_EDITING_HOST_PAGE (self)); -#line 2040 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2042 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_if_fail (GTK_IS_TOGGLE_TOOL_BUTTON (toggle)); -#line 2043 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2045 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp1_ = toggle; -#line 2043 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2045 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp2_ = gtk_toggle_tool_button_get_active (_tmp1_); -#line 2043 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2045 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp3_ = _tmp2_; -#line 2043 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2045 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (!_tmp3_) { -#line 13287 "PhotoPage.c" +#line 13188 "PhotoPage.c" GtkToggleToolButton* _tmp4_ = NULL; GtkToggleToolButton* _tmp5_ = NULL; -#line 2043 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2045 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp4_ = self->priv->current_editing_toggle; -#line 2043 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2045 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp5_ = toggle; -#line 2043 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2045 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp0_ = _tmp4_ == _tmp5_; -#line 13296 "PhotoPage.c" +#line 13197 "PhotoPage.c" } else { -#line 2043 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2045 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp0_ = FALSE; -#line 13300 "PhotoPage.c" +#line 13201 "PhotoPage.c" } -#line 2043 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2045 "/home/jens/Source/shotwell/src/PhotoPage.vala" deactivating_only = _tmp0_; -#line 2044 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2046 "/home/jens/Source/shotwell/src/PhotoPage.vala" dimensions_init (&_tmp6_, 0, 0); -#line 2044 "/home/jens/Source/shotwell/src/PhotoPage.vala" - editing_host_page_deactivate_tool (self, NULL, NULL, &_tmp6_, FALSE); #line 2046 "/home/jens/Source/shotwell/src/PhotoPage.vala" + editing_host_page_deactivate_tool (self, NULL, NULL, &_tmp6_, FALSE); +#line 2048 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp7_ = deactivating_only; -#line 2046 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2048 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp7_) { -#line 2047 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2049 "/home/jens/Source/shotwell/src/PhotoPage.vala" page_restore_cursor_hiding (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); -#line 2048 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2050 "/home/jens/Source/shotwell/src/PhotoPage.vala" return; -#line 13316 "PhotoPage.c" +#line 13217 "PhotoPage.c" } -#line 2051 "/home/jens/Source/shotwell/src/PhotoPage.vala" - page_suspend_cursor_hiding (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); #line 2053 "/home/jens/Source/shotwell/src/PhotoPage.vala" + page_suspend_cursor_hiding (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); +#line 2055 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp8_ = toggle; -#line 2053 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2055 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp9_ = _g_object_ref0 (_tmp8_); -#line 2053 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2055 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (self->priv->current_editing_toggle); -#line 2053 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2055 "/home/jens/Source/shotwell/src/PhotoPage.vala" self->priv->current_editing_toggle = _tmp9_; -#line 2056 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2058 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp10_ = factory; -#line 2056 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2058 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp11_ = _tmp10_ (); -#line 2056 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2058 "/home/jens/Source/shotwell/src/PhotoPage.vala" tool = _tmp11_; -#line 2057 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2059 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp12_ = tool; -#line 2057 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2059 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_signal_connect_object (_tmp12_, "activated", (GCallback) _editing_host_page_on_tool_activated_editing_tools_editing_tool_activated, self, 0); -#line 2058 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2060 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp13_ = tool; -#line 2058 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2060 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_signal_connect_object (_tmp13_, "deactivated", (GCallback) _editing_host_page_on_tool_deactivated_editing_tools_editing_tool_deactivated, self, 0); -#line 2059 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2061 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp14_ = tool; -#line 2059 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2061 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_signal_connect_object (_tmp14_, "applied", (GCallback) _editing_host_page_on_tool_applied_editing_tools_editing_tool_applied, self, 0); -#line 2060 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2062 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp15_ = tool; -#line 2060 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2062 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_signal_connect_object (_tmp15_, "cancelled", (GCallback) _editing_host_page_on_tool_cancelled_editing_tools_editing_tool_cancelled, self, 0); -#line 2061 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2063 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp16_ = tool; -#line 2061 "/home/jens/Source/shotwell/src/PhotoPage.vala" - g_signal_connect_object (_tmp16_, "aborted", (GCallback) _editing_host_page_on_tool_aborted_editing_tools_editing_tool_aborted, self, 0); #line 2063 "/home/jens/Source/shotwell/src/PhotoPage.vala" + g_signal_connect_object (_tmp16_, "aborted", (GCallback) _editing_host_page_on_tool_aborted_editing_tools_editing_tool_aborted, self, 0); +#line 2065 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp17_ = tool; -#line 2063 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2065 "/home/jens/Source/shotwell/src/PhotoPage.vala" editing_host_page_activate_tool (self, _tmp17_); -#line 2040 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2042 "/home/jens/Source/shotwell/src/PhotoPage.vala" _editing_tools_editing_tool_unref0 (tool); -#line 13360 "PhotoPage.c" +#line 13261 "PhotoPage.c" } @@ -13369,21 +13270,21 @@ static void editing_host_page_on_tool_activated (EditingHostPage* self) { GtkToggleToolButton* _tmp0_ = NULL; GtkScale* _tmp1_ = NULL; GtkToggleToolButton* _tmp2_ = NULL; -#line 2066 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2068 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_if_fail (IS_EDITING_HOST_PAGE (self)); -#line 2067 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2069 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp0_ = self->priv->current_editing_toggle; -#line 2067 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2069 "/home/jens/Source/shotwell/src/PhotoPage.vala" _vala_assert (_tmp0_ != NULL, "current_editing_toggle != null"); -#line 2068 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2070 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp1_ = self->priv->zoom_slider; -#line 2068 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2070 "/home/jens/Source/shotwell/src/PhotoPage.vala" gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_widget_get_type (), GtkWidget), FALSE); -#line 2069 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2071 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp2_ = self->priv->current_editing_toggle; -#line 2069 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2071 "/home/jens/Source/shotwell/src/PhotoPage.vala" gtk_toggle_tool_button_set_active (_tmp2_, TRUE); -#line 13382 "PhotoPage.c" +#line 13283 "PhotoPage.c" } @@ -13391,21 +13292,21 @@ static void editing_host_page_on_tool_deactivated (EditingHostPage* self) { GtkToggleToolButton* _tmp0_ = NULL; GtkScale* _tmp1_ = NULL; GtkToggleToolButton* _tmp2_ = NULL; -#line 2072 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2074 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_if_fail (IS_EDITING_HOST_PAGE (self)); -#line 2073 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2075 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp0_ = self->priv->current_editing_toggle; -#line 2073 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2075 "/home/jens/Source/shotwell/src/PhotoPage.vala" _vala_assert (_tmp0_ != NULL, "current_editing_toggle != null"); -#line 2074 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2076 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp1_ = self->priv->zoom_slider; -#line 2074 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2076 "/home/jens/Source/shotwell/src/PhotoPage.vala" gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_widget_get_type (), GtkWidget), TRUE); -#line 2075 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2077 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp2_ = self->priv->current_editing_toggle; -#line 2075 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2077 "/home/jens/Source/shotwell/src/PhotoPage.vala" gtk_toggle_tool_button_set_active (_tmp2_, FALSE); -#line 13404 "PhotoPage.c" +#line 13305 "PhotoPage.c" } @@ -13414,55 +13315,55 @@ static void editing_host_page_on_tool_applied (EditingHostPage* self, Command* c GdkPixbuf* _tmp1_ = NULL; Dimensions _tmp2_ = {0}; gboolean _tmp3_ = FALSE; -#line 2078 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2080 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_if_fail (IS_EDITING_HOST_PAGE (self)); -#line 2078 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2080 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_if_fail ((command == NULL) || IS_COMMAND (command)); -#line 2078 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2080 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_if_fail ((new_pixbuf == NULL) || GDK_IS_PIXBUF (new_pixbuf)); -#line 2078 "/home/jens/Source/shotwell/src/PhotoPage.vala" - g_return_if_fail (new_max_dim != NULL); #line 2080 "/home/jens/Source/shotwell/src/PhotoPage.vala" + g_return_if_fail (new_max_dim != NULL); +#line 2082 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp0_ = command; -#line 2080 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2082 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp1_ = new_pixbuf; -#line 2080 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2082 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp2_ = *new_max_dim; -#line 2080 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2082 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp3_ = needs_improvement; -#line 2080 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2082 "/home/jens/Source/shotwell/src/PhotoPage.vala" editing_host_page_deactivate_tool (self, _tmp0_, _tmp1_, &_tmp2_, _tmp3_); -#line 13431 "PhotoPage.c" +#line 13332 "PhotoPage.c" } static void editing_host_page_on_tool_cancelled (EditingHostPage* self) { Dimensions _tmp0_ = {0}; -#line 2083 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2085 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_if_fail (IS_EDITING_HOST_PAGE (self)); -#line 2084 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2086 "/home/jens/Source/shotwell/src/PhotoPage.vala" dimensions_init (&_tmp0_, 0, 0); -#line 2084 "/home/jens/Source/shotwell/src/PhotoPage.vala" - editing_host_page_deactivate_tool (self, NULL, NULL, &_tmp0_, FALSE); #line 2086 "/home/jens/Source/shotwell/src/PhotoPage.vala" + editing_host_page_deactivate_tool (self, NULL, NULL, &_tmp0_, FALSE); +#line 2088 "/home/jens/Source/shotwell/src/PhotoPage.vala" single_photo_page_restore_zoom_state (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage)); -#line 2087 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#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 13447 "PhotoPage.c" +#line 13348 "PhotoPage.c" } static void editing_host_page_on_tool_aborted (EditingHostPage* self) { Dimensions _tmp0_ = {0}; -#line 2090 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2092 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_if_fail (IS_EDITING_HOST_PAGE (self)); -#line 2091 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2093 "/home/jens/Source/shotwell/src/PhotoPage.vala" dimensions_init (&_tmp0_, 0, 0); -#line 2091 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2093 "/home/jens/Source/shotwell/src/PhotoPage.vala" editing_host_page_deactivate_tool (self, NULL, NULL, &_tmp0_, FALSE); -#line 2092 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2094 "/home/jens/Source/shotwell/src/PhotoPage.vala" editing_host_page_set_photo_missing (self, TRUE); -#line 13461 "PhotoPage.c" +#line 13362 "PhotoPage.c" } @@ -13470,17 +13371,17 @@ void editing_host_page_toggle_crop (EditingHostPage* self) { GtkToggleToolButton* _tmp0_ = NULL; GtkToggleToolButton* _tmp1_ = NULL; gboolean _tmp2_ = FALSE; -#line 2095 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2097 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_if_fail (IS_EDITING_HOST_PAGE (self)); -#line 2096 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2098 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp0_ = self->priv->crop_button; -#line 2096 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2098 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp1_ = self->priv->crop_button; -#line 2096 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2098 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp2_ = gtk_toggle_tool_button_get_active (_tmp1_); -#line 2096 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2098 "/home/jens/Source/shotwell/src/PhotoPage.vala" gtk_toggle_tool_button_set_active (_tmp0_, !_tmp2_); -#line 13479 "PhotoPage.c" +#line 13380 "PhotoPage.c" } @@ -13488,17 +13389,17 @@ void editing_host_page_toggle_straighten (EditingHostPage* self) { GtkToggleToolButton* _tmp0_ = NULL; GtkToggleToolButton* _tmp1_ = NULL; gboolean _tmp2_ = FALSE; -#line 2099 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2101 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_if_fail (IS_EDITING_HOST_PAGE (self)); -#line 2100 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2102 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp0_ = self->priv->straighten_button; -#line 2100 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2102 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp1_ = self->priv->straighten_button; -#line 2100 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2102 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp2_ = gtk_toggle_tool_button_get_active (_tmp1_); -#line 2100 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2102 "/home/jens/Source/shotwell/src/PhotoPage.vala" gtk_toggle_tool_button_set_active (_tmp0_, !_tmp2_); -#line 13497 "PhotoPage.c" +#line 13398 "PhotoPage.c" } @@ -13506,17 +13407,17 @@ void editing_host_page_toggle_redeye (EditingHostPage* self) { GtkToggleToolButton* _tmp0_ = NULL; GtkToggleToolButton* _tmp1_ = NULL; gboolean _tmp2_ = FALSE; -#line 2103 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2105 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_if_fail (IS_EDITING_HOST_PAGE (self)); -#line 2104 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2106 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp0_ = self->priv->redeye_button; -#line 2104 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2106 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp1_ = self->priv->redeye_button; -#line 2104 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2106 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp2_ = gtk_toggle_tool_button_get_active (_tmp1_); -#line 2104 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2106 "/home/jens/Source/shotwell/src/PhotoPage.vala" gtk_toggle_tool_button_set_active (_tmp0_, !_tmp2_); -#line 13515 "PhotoPage.c" +#line 13416 "PhotoPage.c" } @@ -13524,118 +13425,118 @@ void editing_host_page_toggle_adjust (EditingHostPage* self) { GtkToggleToolButton* _tmp0_ = NULL; GtkToggleToolButton* _tmp1_ = NULL; gboolean _tmp2_ = FALSE; -#line 2107 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2109 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_if_fail (IS_EDITING_HOST_PAGE (self)); -#line 2108 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2110 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp0_ = self->priv->adjust_button; -#line 2108 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2110 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp1_ = self->priv->adjust_button; -#line 2108 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2110 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp2_ = gtk_toggle_tool_button_get_active (_tmp1_); -#line 2108 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2110 "/home/jens/Source/shotwell/src/PhotoPage.vala" gtk_toggle_tool_button_set_active (_tmp0_, !_tmp2_); -#line 13533 "PhotoPage.c" +#line 13434 "PhotoPage.c" } static EditingToolsEditingTool* _editing_tools_straighten_tool_factory_editing_tools_editing_tool_factory (void) { EditingToolsEditingTool* result; result = editing_tools_straighten_tool_factory (); -#line 2112 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2114 "/home/jens/Source/shotwell/src/PhotoPage.vala" return result; -#line 13542 "PhotoPage.c" +#line 13443 "PhotoPage.c" } static void editing_host_page_on_straighten_toggled (EditingHostPage* self) { GtkToggleToolButton* _tmp0_ = NULL; -#line 2111 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2113 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_if_fail (IS_EDITING_HOST_PAGE (self)); -#line 2112 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2114 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp0_ = self->priv->straighten_button; -#line 2112 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#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 13554 "PhotoPage.c" +#line 13455 "PhotoPage.c" } static EditingToolsEditingTool* _editing_tools_crop_tool_factory_editing_tools_editing_tool_factory (void) { EditingToolsEditingTool* result; result = editing_tools_crop_tool_factory (); -#line 2116 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2118 "/home/jens/Source/shotwell/src/PhotoPage.vala" return result; -#line 13563 "PhotoPage.c" +#line 13464 "PhotoPage.c" } static void editing_host_page_on_crop_toggled (EditingHostPage* self) { GtkToggleToolButton* _tmp0_ = NULL; -#line 2115 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2117 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_if_fail (IS_EDITING_HOST_PAGE (self)); -#line 2116 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2118 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp0_ = self->priv->crop_button; -#line 2116 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#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 13575 "PhotoPage.c" +#line 13476 "PhotoPage.c" } static EditingToolsEditingTool* _editing_tools_redeye_tool_factory_editing_tools_editing_tool_factory (void) { EditingToolsEditingTool* result; result = editing_tools_redeye_tool_factory (); -#line 2120 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2122 "/home/jens/Source/shotwell/src/PhotoPage.vala" return result; -#line 13584 "PhotoPage.c" +#line 13485 "PhotoPage.c" } static void editing_host_page_on_redeye_toggled (EditingHostPage* self) { GtkToggleToolButton* _tmp0_ = NULL; -#line 2119 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2121 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_if_fail (IS_EDITING_HOST_PAGE (self)); -#line 2120 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2122 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp0_ = self->priv->redeye_button; -#line 2120 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#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 13596 "PhotoPage.c" +#line 13497 "PhotoPage.c" } static EditingToolsEditingTool* _editing_tools_adjust_tool_factory_editing_tools_editing_tool_factory (void) { EditingToolsEditingTool* result; result = editing_tools_adjust_tool_factory (); -#line 2124 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2126 "/home/jens/Source/shotwell/src/PhotoPage.vala" return result; -#line 13605 "PhotoPage.c" +#line 13506 "PhotoPage.c" } static void editing_host_page_on_adjust_toggled (EditingHostPage* self) { GtkToggleToolButton* _tmp0_ = NULL; -#line 2123 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2125 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_if_fail (IS_EDITING_HOST_PAGE (self)); -#line 2124 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2126 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp0_ = self->priv->adjust_button; -#line 2124 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#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 13617 "PhotoPage.c" +#line 13518 "PhotoPage.c" } gboolean editing_host_page_is_enhance_available (EditingHostPage* self, Photo* photo) { gboolean result = FALSE; gboolean _tmp0_ = FALSE; -#line 2127 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2129 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_val_if_fail (IS_EDITING_HOST_PAGE (self), FALSE); -#line 2127 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2129 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_val_if_fail (IS_PHOTO (photo), FALSE); -#line 2128 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2130 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp0_ = self->priv->photo_missing; -#line 2128 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2130 "/home/jens/Source/shotwell/src/PhotoPage.vala" result = !_tmp0_; -#line 2128 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2130 "/home/jens/Source/shotwell/src/PhotoPage.vala" return result; -#line 13634 "PhotoPage.c" +#line 13535 "PhotoPage.c" } @@ -13654,79 +13555,79 @@ void editing_host_page_on_enhance (EditingHostPage* self) { CommandManager* _tmp11_ = NULL; CommandManager* _tmp12_ = NULL; EnhanceSingleCommand* _tmp13_ = NULL; -#line 2131 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2133 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_if_fail (IS_EDITING_HOST_PAGE (self)); -#line 2135 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2137 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp0_ = self->priv->current_tool; -#line 2135 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2137 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (!G_TYPE_CHECK_INSTANCE_TYPE (_tmp0_, EDITING_TOOLS_TYPE_ADJUST_TOOL)) { -#line 13659 "PhotoPage.c" +#line 13560 "PhotoPage.c" Dimensions _tmp1_ = {0}; -#line 2136 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2138 "/home/jens/Source/shotwell/src/PhotoPage.vala" dimensions_init (&_tmp1_, 0, 0); -#line 2136 "/home/jens/Source/shotwell/src/PhotoPage.vala" - editing_host_page_deactivate_tool (self, NULL, NULL, &_tmp1_, FALSE); #line 2138 "/home/jens/Source/shotwell/src/PhotoPage.vala" + 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 13667 "PhotoPage.c" +#line 13568 "PhotoPage.c" } -#line 2141 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2143 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp2_ = editing_host_page_has_photo (self); -#line 2141 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2143 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (!_tmp2_) { -#line 2142 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2144 "/home/jens/Source/shotwell/src/PhotoPage.vala" return; -#line 13675 "PhotoPage.c" +#line 13576 "PhotoPage.c" } -#line 2144 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2146 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp3_ = self->priv->current_tool; -#line 2144 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2146 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp4_ = _editing_tools_editing_tool_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp3_, EDITING_TOOLS_TYPE_ADJUST_TOOL) ? ((EditingToolsAdjustTool*) _tmp3_) : NULL); -#line 2144 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2146 "/home/jens/Source/shotwell/src/PhotoPage.vala" adjust_tool = _tmp4_; -#line 2145 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2147 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp5_ = adjust_tool; -#line 2145 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2147 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp5_ != NULL) { -#line 13687 "PhotoPage.c" +#line 13588 "PhotoPage.c" EditingToolsAdjustTool* _tmp6_ = NULL; -#line 2146 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2148 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp6_ = adjust_tool; -#line 2146 "/home/jens/Source/shotwell/src/PhotoPage.vala" - editing_tools_adjust_tool_enhance (_tmp6_); #line 2148 "/home/jens/Source/shotwell/src/PhotoPage.vala" + editing_tools_adjust_tool_enhance (_tmp6_); +#line 2150 "/home/jens/Source/shotwell/src/PhotoPage.vala" _editing_tools_editing_tool_unref0 (adjust_tool); -#line 2148 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2150 "/home/jens/Source/shotwell/src/PhotoPage.vala" return; -#line 13697 "PhotoPage.c" +#line 13598 "PhotoPage.c" } -#line 2151 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2153 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp7_ = editing_host_page_get_photo (self); -#line 2151 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2153 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp8_ = _tmp7_; -#line 2151 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2153 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp9_ = enhance_single_command_new (_tmp8_); -#line 2151 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2153 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp10_ = _tmp9_; -#line 2151 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2153 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (_tmp8_); -#line 2151 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2153 "/home/jens/Source/shotwell/src/PhotoPage.vala" command = _tmp10_; -#line 2152 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2154 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp11_ = page_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); -#line 2152 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2154 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp12_ = _tmp11_; -#line 2152 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2154 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp13_ = command; -#line 2152 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2154 "/home/jens/Source/shotwell/src/PhotoPage.vala" command_manager_execute (_tmp12_, G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, TYPE_COMMAND, Command)); -#line 2152 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2154 "/home/jens/Source/shotwell/src/PhotoPage.vala" _command_manager_unref0 (_tmp12_); -#line 2131 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2133 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (command); -#line 2131 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2133 "/home/jens/Source/shotwell/src/PhotoPage.vala" _editing_tools_editing_tool_unref0 (adjust_tool); -#line 13725 "PhotoPage.c" +#line 13626 "PhotoPage.c" } @@ -13736,33 +13637,33 @@ void editing_host_page_on_copy_adjustments (EditingHostPage* self) { Photo* _tmp2_ = NULL; PixelTransformationBundle* _tmp3_ = NULL; PixelTransformationBundle* _tmp4_ = NULL; -#line 2155 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2157 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_if_fail (IS_EDITING_HOST_PAGE (self)); -#line 2156 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2158 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp0_ = editing_host_page_has_photo (self); -#line 2156 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2158 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (!_tmp0_) { -#line 2157 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2159 "/home/jens/Source/shotwell/src/PhotoPage.vala" return; -#line 13743 "PhotoPage.c" +#line 13644 "PhotoPage.c" } -#line 2158 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2160 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp1_ = editing_host_page_get_photo (self); -#line 2158 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2160 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp2_ = _tmp1_; -#line 2158 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2160 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp3_ = photo_get_color_adjustments (_tmp2_); -#line 2158 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2160 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp4_ = _tmp3_; -#line 2158 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2160 "/home/jens/Source/shotwell/src/PhotoPage.vala" pixel_transformation_bundle_set_copied_color_adjustments (_tmp4_); -#line 2158 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2160 "/home/jens/Source/shotwell/src/PhotoPage.vala" _pixel_transformation_bundle_unref0 (_tmp4_); -#line 2158 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2160 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (_tmp2_); -#line 2159 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#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 13761 "PhotoPage.c" +#line 13662 "PhotoPage.c" } @@ -13780,64 +13681,64 @@ void editing_host_page_on_paste_adjustments (EditingHostPage* self) { CommandManager* _tmp9_ = NULL; CommandManager* _tmp10_ = NULL; AdjustColorsSingleCommand* _tmp11_ = NULL; -#line 2162 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2164 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_if_fail (IS_EDITING_HOST_PAGE (self)); -#line 2163 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2165 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp0_ = pixel_transformation_bundle_get_copied_color_adjustments (); -#line 2163 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2165 "/home/jens/Source/shotwell/src/PhotoPage.vala" copied_adjustments = _tmp0_; -#line 2164 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2166 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp2_ = editing_host_page_has_photo (self); -#line 2164 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2166 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (!_tmp2_) { -#line 2164 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2166 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp1_ = TRUE; -#line 13791 "PhotoPage.c" +#line 13692 "PhotoPage.c" } else { PixelTransformationBundle* _tmp3_ = NULL; -#line 2164 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2166 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp3_ = copied_adjustments; -#line 2164 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2166 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp1_ = _tmp3_ == NULL; -#line 13798 "PhotoPage.c" +#line 13699 "PhotoPage.c" } -#line 2164 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2166 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp1_) { -#line 2165 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2167 "/home/jens/Source/shotwell/src/PhotoPage.vala" _pixel_transformation_bundle_unref0 (copied_adjustments); -#line 2165 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2167 "/home/jens/Source/shotwell/src/PhotoPage.vala" return; -#line 13806 "PhotoPage.c" +#line 13707 "PhotoPage.c" } -#line 2167 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2169 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp4_ = editing_host_page_get_photo (self); -#line 2167 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2169 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp5_ = _tmp4_; -#line 2167 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2169 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp6_ = copied_adjustments; -#line 2167 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2169 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp7_ = adjust_colors_single_command_new (_tmp5_, _tmp6_, RESOURCES_PASTE_ADJUSTMENTS_LABEL, RESOURCES_PASTE_ADJUSTMENTS_TOOLTIP); -#line 2167 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2169 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp8_ = _tmp7_; -#line 2167 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2169 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (_tmp5_); -#line 2167 "/home/jens/Source/shotwell/src/PhotoPage.vala" - command = _tmp8_; #line 2169 "/home/jens/Source/shotwell/src/PhotoPage.vala" + command = _tmp8_; +#line 2171 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp9_ = page_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); -#line 2169 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2171 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp10_ = _tmp9_; -#line 2169 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2171 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp11_ = command; -#line 2169 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2171 "/home/jens/Source/shotwell/src/PhotoPage.vala" command_manager_execute (_tmp10_, G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, TYPE_COMMAND, Command)); -#line 2169 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2171 "/home/jens/Source/shotwell/src/PhotoPage.vala" _command_manager_unref0 (_tmp10_); -#line 2162 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2164 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (command); -#line 2162 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2164 "/home/jens/Source/shotwell/src/PhotoPage.vala" _pixel_transformation_bundle_unref0 (copied_adjustments); -#line 13836 "PhotoPage.c" +#line 13737 "PhotoPage.c" } @@ -13884,65 +13785,65 @@ static void editing_host_page_place_tool_window (EditingHostPage* self) { gint _tmp103_ = 0; EditingToolsEditingToolWindow* _tmp104_ = NULL; EditingToolsEditingToolWindow* _tmp105_ = NULL; -#line 2172 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2174 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_if_fail (IS_EDITING_HOST_PAGE (self)); -#line 2173 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2175 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp0_ = self->priv->current_tool; -#line 2173 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2175 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp0_ == NULL) { -#line 2174 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2176 "/home/jens/Source/shotwell/src/PhotoPage.vala" return; -#line 13891 "PhotoPage.c" +#line 13792 "PhotoPage.c" } -#line 2176 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2178 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp1_ = self->priv->current_tool; -#line 2176 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2178 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp2_ = editing_tools_editing_tool_get_tool_window (_tmp1_); -#line 2176 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2178 "/home/jens/Source/shotwell/src/PhotoPage.vala" tool_window = _tmp2_; -#line 2177 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2179 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp3_ = tool_window; -#line 2177 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2179 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp3_ == NULL) { -#line 2178 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2180 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (tool_window); -#line 2178 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2180 "/home/jens/Source/shotwell/src/PhotoPage.vala" return; -#line 13907 "PhotoPage.c" +#line 13808 "PhotoPage.c" } -#line 2181 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2183 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp4_ = tool_window; -#line 2181 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2183 "/home/jens/Source/shotwell/src/PhotoPage.vala" gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, gtk_widget_get_type (), GtkWidget)); -#line 2182 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2184 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp5_ = tool_window; -#line 2182 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2184 "/home/jens/Source/shotwell/src/PhotoPage.vala" gtk_widget_hide (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, gtk_widget_get_type (), GtkWidget)); -#line 2185 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2187 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp6_ = tool_window; -#line 2185 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2187 "/home/jens/Source/shotwell/src/PhotoPage.vala" gtk_widget_get_allocation (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, gtk_widget_get_type (), GtkWidget), &_tmp7_); -#line 2185 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2187 "/home/jens/Source/shotwell/src/PhotoPage.vala" tool_alloc = _tmp7_; -#line 2189 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2191 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp8_ = self->priv->last_locations; -#line 2189 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2191 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp9_ = self->priv->current_tool; -#line 2189 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2191 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp10_ = _tmp9_->name; -#line 2189 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2191 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp11_ = g_strconcat (_tmp10_, "_x", NULL); -#line 2189 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2191 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp12_ = _tmp11_; -#line 2189 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2191 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp13_ = gee_abstract_map_has_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp12_); -#line 2189 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2191 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp14_ = _tmp13_; -#line 2189 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2191 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_free0 (_tmp12_); -#line 2189 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2191 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp14_) { -#line 13941 "PhotoPage.c" +#line 13842 "PhotoPage.c" GeeHashMap* _tmp15_ = NULL; EditingToolsEditingTool* _tmp16_ = NULL; const gchar* _tmp17_ = NULL; @@ -13955,62 +13856,62 @@ static void editing_host_page_place_tool_window (EditingHostPage* self) { gchar* _tmp24_ = NULL; gchar* _tmp25_ = NULL; gpointer _tmp26_ = NULL; -#line 2190 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2192 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp15_ = self->priv->last_locations; -#line 2190 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2192 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp16_ = self->priv->current_tool; -#line 2190 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2192 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp17_ = _tmp16_->name; -#line 2190 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2192 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp18_ = g_strconcat (_tmp17_, "_x", NULL); -#line 2190 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2192 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp19_ = _tmp18_; -#line 2190 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2192 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp20_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp19_); -#line 2190 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2192 "/home/jens/Source/shotwell/src/PhotoPage.vala" x = (gint) ((gintptr) _tmp20_); -#line 2190 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2192 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_free0 (_tmp19_); -#line 2191 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2193 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp21_ = self->priv->last_locations; -#line 2191 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2193 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp22_ = self->priv->current_tool; -#line 2191 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2193 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp23_ = _tmp22_->name; -#line 2191 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2193 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp24_ = g_strconcat (_tmp23_, "_y", NULL); -#line 2191 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2193 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp25_ = _tmp24_; -#line 2191 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2193 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp26_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp25_); -#line 2191 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2193 "/home/jens/Source/shotwell/src/PhotoPage.vala" y = (gint) ((gintptr) _tmp26_); -#line 2191 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2193 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_free0 (_tmp25_); -#line 13986 "PhotoPage.c" +#line 13887 "PhotoPage.c" } else { GtkWindow* _tmp27_ = NULL; GtkWindow* _tmp28_ = NULL; AppWindow* _tmp29_ = NULL; AppWindow* _tmp30_ = NULL; gboolean _tmp31_ = FALSE; -#line 2194 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2196 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp27_ = page_get_container (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); -#line 2194 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2196 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp28_ = _tmp27_; -#line 2194 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2196 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp29_ = app_window_get_instance (); -#line 2194 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2196 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp30_ = _tmp29_; -#line 2194 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2196 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp31_ = _tmp28_ == G_TYPE_CHECK_INSTANCE_CAST (_tmp30_, gtk_window_get_type (), GtkWindow); -#line 2194 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2196 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (_tmp30_); -#line 2194 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2196 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (_tmp28_); -#line 2194 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2196 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp31_) { -#line 14009 "PhotoPage.c" +#line 13910 "PhotoPage.c" gint rx = 0; gint ry = 0; GtkWindow* _tmp32_ = NULL; @@ -14039,100 +13940,100 @@ static void editing_host_page_place_tool_window (EditingHostPage* self) { gint _tmp58_ = 0; GtkAllocation _tmp59_ = {0}; gint _tmp60_ = 0; -#line 2199 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2201 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp32_ = page_get_container (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); -#line 2199 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2201 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp33_ = _tmp32_; -#line 2199 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2201 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp34_ = gtk_widget_get_window (G_TYPE_CHECK_INSTANCE_CAST (_tmp33_, gtk_widget_get_type (), GtkWidget)); -#line 2199 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2201 "/home/jens/Source/shotwell/src/PhotoPage.vala" gdk_window_get_root_origin (_tmp34_, &_tmp35_, &_tmp36_); -#line 2199 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2201 "/home/jens/Source/shotwell/src/PhotoPage.vala" rx = _tmp35_; -#line 2199 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2201 "/home/jens/Source/shotwell/src/PhotoPage.vala" ry = _tmp36_; -#line 2199 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2201 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (_tmp33_); -#line 2202 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2204 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp37_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage)->viewport; -#line 2202 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2204 "/home/jens/Source/shotwell/src/PhotoPage.vala" gtk_widget_get_allocation (G_TYPE_CHECK_INSTANCE_CAST (_tmp37_, gtk_widget_get_type (), GtkWidget), &_tmp38_); -#line 2202 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2204 "/home/jens/Source/shotwell/src/PhotoPage.vala" viewport_allocation = _tmp38_; -#line 2205 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2207 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp39_ = viewport_allocation; -#line 2205 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2207 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp40_ = _tmp39_.x; -#line 2205 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2207 "/home/jens/Source/shotwell/src/PhotoPage.vala" cx = _tmp40_; -#line 2206 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2208 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp41_ = viewport_allocation; -#line 2206 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2208 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp42_ = _tmp41_.y; -#line 2206 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2208 "/home/jens/Source/shotwell/src/PhotoPage.vala" cy = _tmp42_; -#line 2207 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2209 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp43_ = viewport_allocation; -#line 2207 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2209 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp44_ = _tmp43_.width; -#line 2207 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2209 "/home/jens/Source/shotwell/src/PhotoPage.vala" cwidth = _tmp44_; -#line 2208 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2210 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp45_ = viewport_allocation; -#line 2208 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2210 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp46_ = _tmp45_.height; -#line 2208 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2210 "/home/jens/Source/shotwell/src/PhotoPage.vala" cheight = _tmp46_; -#line 2212 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2214 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (G_TYPE_CHECK_INSTANCE_TYPE (self, TYPE_DIRECT_PHOTO_PAGE)) { -#line 14084 "PhotoPage.c" +#line 13985 "PhotoPage.c" gint _tmp48_ = 0; gint _tmp49_ = 0; gint _tmp50_ = 0; GtkAllocation _tmp51_ = {0}; gint _tmp52_ = 0; -#line 2212 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2214 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp48_ = rx; -#line 2212 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2214 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp49_ = cx; -#line 2212 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2214 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp50_ = cwidth; -#line 2212 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2214 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp51_ = tool_alloc; -#line 2212 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2214 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp52_ = _tmp51_.width; -#line 2212 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2214 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp47_ = ((_tmp48_ + _tmp49_) + (_tmp50_ / 2)) - (_tmp52_ / 2); -#line 14102 "PhotoPage.c" +#line 14003 "PhotoPage.c" } else { gint _tmp53_ = 0; gint _tmp54_ = 0; gint _tmp55_ = 0; -#line 2213 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2215 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp53_ = rx; -#line 2213 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2215 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp54_ = cx; -#line 2213 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2215 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp55_ = cwidth; -#line 2213 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2215 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp47_ = (_tmp53_ + _tmp54_) + (_tmp55_ / 2); -#line 14115 "PhotoPage.c" +#line 14016 "PhotoPage.c" } -#line 2212 "/home/jens/Source/shotwell/src/PhotoPage.vala" - x = _tmp47_; #line 2214 "/home/jens/Source/shotwell/src/PhotoPage.vala" + x = _tmp47_; +#line 2216 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp56_ = ry; -#line 2214 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2216 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp57_ = cy; -#line 2214 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2216 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp58_ = cheight; -#line 2214 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2216 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp59_ = tool_alloc; -#line 2214 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2216 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp60_ = _tmp59_.height; -#line 2214 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2216 "/home/jens/Source/shotwell/src/PhotoPage.vala" y = ((_tmp56_ + _tmp57_) + _tmp58_) - ((_tmp60_ / 4) * 3); -#line 14131 "PhotoPage.c" +#line 14032 "PhotoPage.c" } else { GtkWindow* _tmp61_ = NULL; GtkWindow* _tmp62_ = NULL; @@ -14155,151 +14056,151 @@ static void editing_host_page_place_tool_window (EditingHostPage* self) { GtkAllocation _tmp77_ = {0}; gint _tmp78_ = 0; EditingToolsEditingTool* _tmp79_ = NULL; -#line 2216 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2218 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp61_ = page_get_container (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); -#line 2216 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2218 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp62_ = _tmp61_; -#line 2216 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2218 "/home/jens/Source/shotwell/src/PhotoPage.vala" _vala_assert (G_TYPE_CHECK_INSTANCE_TYPE (_tmp62_, TYPE_FULLSCREEN_WINDOW), "get_container() is FullscreenWindow"); -#line 2216 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2218 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (_tmp62_); -#line 2221 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2223 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp63_ = page_get_toolbar (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); -#line 2221 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2223 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp64_ = _tmp63_; -#line 2221 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2223 "/home/jens/Source/shotwell/src/PhotoPage.vala" gtk_widget_get_allocation (G_TYPE_CHECK_INSTANCE_CAST (_tmp64_, gtk_widget_get_type (), GtkWidget), &_tmp65_); -#line 2221 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2223 "/home/jens/Source/shotwell/src/PhotoPage.vala" toolbar_alloc = _tmp65_; -#line 2221 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _g_object_unref0 (_tmp64_); #line 2223 "/home/jens/Source/shotwell/src/PhotoPage.vala" + _g_object_unref0 (_tmp64_); +#line 2225 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp66_ = page_get_container (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); -#line 2223 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2225 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp67_ = _tmp66_; -#line 2223 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2225 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp68_ = gtk_window_get_screen (_tmp67_); -#line 2223 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2225 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp69_ = _g_object_ref0 (_tmp68_); -#line 2223 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2225 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp70_ = _tmp69_; -#line 2223 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2225 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (_tmp67_); -#line 2223 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2225 "/home/jens/Source/shotwell/src/PhotoPage.vala" screen = _tmp70_; -#line 2224 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2226 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp71_ = screen; -#line 2224 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2226 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp72_ = gdk_screen_get_width (_tmp71_); -#line 2224 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2226 "/home/jens/Source/shotwell/src/PhotoPage.vala" x = _tmp72_; -#line 2225 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2227 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp73_ = screen; -#line 2225 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2227 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp74_ = gdk_screen_get_height (_tmp73_); -#line 2225 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2227 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp75_ = toolbar_alloc; -#line 2225 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2227 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp76_ = _tmp75_.height; -#line 2225 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2227 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp77_ = tool_alloc; -#line 2225 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2227 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp78_ = _tmp77_.height; -#line 2225 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2227 "/home/jens/Source/shotwell/src/PhotoPage.vala" y = ((_tmp74_ - _tmp76_) - _tmp78_) - EDITING_HOST_PAGE_TOOL_WINDOW_SEPARATOR; -#line 2229 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2231 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp79_ = self->priv->current_tool; -#line 2229 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2231 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp79_, EDITING_TOOLS_TYPE_ADJUST_TOOL)) { -#line 14210 "PhotoPage.c" +#line 14111 "PhotoPage.c" gint _tmp80_ = 0; -#line 2230 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2232 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp80_ = x; -#line 2230 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2232 "/home/jens/Source/shotwell/src/PhotoPage.vala" x = (_tmp80_ * 3) / 4; -#line 14216 "PhotoPage.c" +#line 14117 "PhotoPage.c" } else { gint _tmp81_ = 0; GtkAllocation _tmp82_ = {0}; gint _tmp83_ = 0; -#line 2232 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2234 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp81_ = x; -#line 2232 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2234 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp82_ = tool_alloc; -#line 2232 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2234 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp83_ = _tmp82_.width; -#line 2232 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2234 "/home/jens/Source/shotwell/src/PhotoPage.vala" x = (_tmp81_ - _tmp83_) / 2; -#line 14229 "PhotoPage.c" +#line 14130 "PhotoPage.c" } -#line 2194 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2196 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (screen); -#line 14233 "PhotoPage.c" +#line 14134 "PhotoPage.c" } } -#line 2238 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2240 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp84_ = page_get_container (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); -#line 2238 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2240 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp85_ = _tmp84_; -#line 2238 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2240 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp86_ = gtk_window_get_screen (_tmp85_); -#line 2238 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2240 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp87_ = _g_object_ref0 (_tmp86_); -#line 2238 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2240 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp88_ = _tmp87_; -#line 2238 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2240 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (_tmp85_); -#line 2238 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2240 "/home/jens/Source/shotwell/src/PhotoPage.vala" screen = _tmp88_; -#line 2239 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2241 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp89_ = x; -#line 2239 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2241 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp90_ = screen; -#line 2239 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2241 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp91_ = gdk_screen_get_width (_tmp90_); -#line 2239 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2241 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp92_ = tool_alloc; -#line 2239 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2241 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp93_ = _tmp92_.width; -#line 2239 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2241 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp94_ = CLAMP (_tmp89_, 0, _tmp91_ - _tmp93_); -#line 2239 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2241 "/home/jens/Source/shotwell/src/PhotoPage.vala" x = _tmp94_; -#line 2240 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2242 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp95_ = y; -#line 2240 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2242 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp96_ = screen; -#line 2240 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2242 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp97_ = gdk_screen_get_height (_tmp96_); -#line 2240 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2242 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp98_ = tool_alloc; -#line 2240 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2242 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp99_ = _tmp98_.height; -#line 2240 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2242 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp100_ = CLAMP (_tmp95_, 0, _tmp97_ - _tmp99_); -#line 2240 "/home/jens/Source/shotwell/src/PhotoPage.vala" - y = _tmp100_; #line 2242 "/home/jens/Source/shotwell/src/PhotoPage.vala" + y = _tmp100_; +#line 2244 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp101_ = tool_window; -#line 2242 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2244 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp102_ = x; -#line 2242 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2244 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp103_ = y; -#line 2242 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2244 "/home/jens/Source/shotwell/src/PhotoPage.vala" gtk_window_move (G_TYPE_CHECK_INSTANCE_CAST (_tmp101_, gtk_window_get_type (), GtkWindow), _tmp102_, _tmp103_); -#line 2243 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2245 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp104_ = tool_window; -#line 2243 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2245 "/home/jens/Source/shotwell/src/PhotoPage.vala" gtk_widget_show (G_TYPE_CHECK_INSTANCE_CAST (_tmp104_, gtk_widget_get_type (), GtkWidget)); -#line 2244 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2246 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp105_ = tool_window; -#line 2244 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2246 "/home/jens/Source/shotwell/src/PhotoPage.vala" gtk_window_present (G_TYPE_CHECK_INSTANCE_CAST (_tmp105_, gtk_window_get_type (), GtkWindow)); -#line 2172 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2174 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (screen); -#line 2172 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2174 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (tool_window); -#line 14298 "PhotoPage.c" +#line 14199 "PhotoPage.c" } @@ -14321,72 +14222,72 @@ static void editing_host_page_real_on_next_photo (SinglePhotoPage* base) { DataView* next = NULL; DataView* _tmp11_ = NULL; DataView* _tmp12_ = NULL; -#line 2247 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2249 "/home/jens/Source/shotwell/src/PhotoPage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EDITING_HOST_PAGE, EditingHostPage); -#line 2248 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2250 "/home/jens/Source/shotwell/src/PhotoPage.vala" dimensions_init (&_tmp0_, 0, 0); -#line 2248 "/home/jens/Source/shotwell/src/PhotoPage.vala" - editing_host_page_deactivate_tool (self, NULL, NULL, &_tmp0_, FALSE); #line 2250 "/home/jens/Source/shotwell/src/PhotoPage.vala" + editing_host_page_deactivate_tool (self, NULL, NULL, &_tmp0_, FALSE); +#line 2252 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp1_ = editing_host_page_has_photo (self); -#line 2250 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2252 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (!_tmp1_) { -#line 2251 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2253 "/home/jens/Source/shotwell/src/PhotoPage.vala" return; -#line 14332 "PhotoPage.c" +#line 14233 "PhotoPage.c" } -#line 2253 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2255 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp2_ = editing_host_page_get_photo (self); -#line 2253 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2255 "/home/jens/Source/shotwell/src/PhotoPage.vala" current_photo = _tmp2_; -#line 2254 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2256 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp3_ = current_photo; -#line 2254 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _vala_assert (_tmp3_ != NULL, "current_photo != null"); #line 2256 "/home/jens/Source/shotwell/src/PhotoPage.vala" + _vala_assert (_tmp3_ != NULL, "current_photo != null"); +#line 2258 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp4_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); -#line 2256 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2258 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp5_ = _tmp4_; -#line 2256 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2258 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp6_ = editing_host_page_get_photo (self); -#line 2256 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2258 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp7_ = _tmp6_; -#line 2256 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2258 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp8_ = view_collection_get_view_for_source (_tmp5_, G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_DATA_SOURCE, DataSource)); -#line 2256 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2258 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp9_ = _tmp8_; -#line 2256 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2258 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (_tmp7_); -#line 2256 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2258 "/home/jens/Source/shotwell/src/PhotoPage.vala" _data_collection_unref0 (_tmp5_); -#line 2256 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2258 "/home/jens/Source/shotwell/src/PhotoPage.vala" current = _tmp9_; -#line 2257 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2259 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp10_ = current; -#line 2257 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2259 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp10_ == NULL) { -#line 2258 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2260 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (current); -#line 2258 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2260 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (current_photo); -#line 2258 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2260 "/home/jens/Source/shotwell/src/PhotoPage.vala" return; -#line 14370 "PhotoPage.c" +#line 14271 "PhotoPage.c" } -#line 2261 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2263 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp11_ = current; -#line 2261 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2263 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp12_ = _g_object_ref0 (_tmp11_); -#line 2261 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2263 "/home/jens/Source/shotwell/src/PhotoPage.vala" next = _tmp12_; -#line 14378 "PhotoPage.c" +#line 14279 "PhotoPage.c" { gboolean _tmp13_ = FALSE; -#line 2262 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2264 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp13_ = TRUE; -#line 2262 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2264 "/home/jens/Source/shotwell/src/PhotoPage.vala" while (TRUE) { -#line 14385 "PhotoPage.c" +#line 14286 "PhotoPage.c" ViewCollection* _tmp14_ = NULL; ViewCollection* _tmp15_ = NULL; DataView* _tmp16_ = NULL; @@ -14400,88 +14301,88 @@ static void editing_host_page_real_on_next_photo (SinglePhotoPage* base) { Photo* _tmp23_ = NULL; Photo* _tmp24_ = NULL; Photo* _tmp25_ = NULL; -#line 2262 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2264 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (!_tmp13_) { -#line 14401 "PhotoPage.c" +#line 14302 "PhotoPage.c" } -#line 2262 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2264 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp13_ = FALSE; -#line 2263 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2265 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp14_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); -#line 2263 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2265 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp15_ = _tmp14_; -#line 2263 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2265 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp16_ = next; -#line 2263 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2265 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp17_ = view_collection_get_next (_tmp15_, _tmp16_); -#line 2263 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2265 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (next); -#line 2263 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2265 "/home/jens/Source/shotwell/src/PhotoPage.vala" next = _tmp17_; -#line 2263 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2265 "/home/jens/Source/shotwell/src/PhotoPage.vala" _data_collection_unref0 (_tmp15_); -#line 2264 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2266 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp18_ = next; -#line 2264 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2266 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp18_ == NULL) { -#line 2265 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2267 "/home/jens/Source/shotwell/src/PhotoPage.vala" break; -#line 14425 "PhotoPage.c" +#line 14326 "PhotoPage.c" } -#line 2267 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2269 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp19_ = next; -#line 2267 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2269 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp20_ = data_view_get_source (_tmp19_); -#line 2267 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2269 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp21_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp20_, TYPE_PHOTO) ? ((Photo*) _tmp20_) : NULL; -#line 2267 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2269 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp21_ == NULL) { -#line 2267 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2269 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (_tmp20_); -#line 14437 "PhotoPage.c" +#line 14338 "PhotoPage.c" } -#line 2267 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2269 "/home/jens/Source/shotwell/src/PhotoPage.vala" next_photo = _tmp21_; -#line 2268 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2270 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp22_ = next_photo; -#line 2268 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2270 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp22_ == NULL) { -#line 2269 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2271 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (next_photo); -#line 2269 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2271 "/home/jens/Source/shotwell/src/PhotoPage.vala" continue; -#line 14449 "PhotoPage.c" +#line 14350 "PhotoPage.c" } -#line 2271 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2273 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp23_ = next_photo; -#line 2271 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2273 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp24_ = current_photo; -#line 2271 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2273 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp23_ == _tmp24_) { -#line 2272 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2274 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (next_photo); -#line 2272 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2274 "/home/jens/Source/shotwell/src/PhotoPage.vala" break; -#line 14461 "PhotoPage.c" +#line 14362 "PhotoPage.c" } -#line 2274 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2276 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp25_ = next_photo; -#line 2274 "/home/jens/Source/shotwell/src/PhotoPage.vala" - editing_host_page_replace_photo (self, _tmp25_); #line 2276 "/home/jens/Source/shotwell/src/PhotoPage.vala" + editing_host_page_replace_photo (self, _tmp25_); +#line 2278 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (next_photo); -#line 2276 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2278 "/home/jens/Source/shotwell/src/PhotoPage.vala" break; -#line 14471 "PhotoPage.c" +#line 14372 "PhotoPage.c" } } -#line 2247 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2249 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (next); -#line 2247 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2249 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (current); -#line 2247 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2249 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (current_photo); -#line 14480 "PhotoPage.c" +#line 14381 "PhotoPage.c" } @@ -14503,72 +14404,72 @@ static void editing_host_page_real_on_previous_photo (SinglePhotoPage* base) { DataView* previous = NULL; DataView* _tmp11_ = NULL; DataView* _tmp12_ = NULL; -#line 2280 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2282 "/home/jens/Source/shotwell/src/PhotoPage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EDITING_HOST_PAGE, EditingHostPage); -#line 2281 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2283 "/home/jens/Source/shotwell/src/PhotoPage.vala" dimensions_init (&_tmp0_, 0, 0); -#line 2281 "/home/jens/Source/shotwell/src/PhotoPage.vala" - editing_host_page_deactivate_tool (self, NULL, NULL, &_tmp0_, FALSE); #line 2283 "/home/jens/Source/shotwell/src/PhotoPage.vala" + editing_host_page_deactivate_tool (self, NULL, NULL, &_tmp0_, FALSE); +#line 2285 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp1_ = editing_host_page_has_photo (self); -#line 2283 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2285 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (!_tmp1_) { -#line 2284 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2286 "/home/jens/Source/shotwell/src/PhotoPage.vala" return; -#line 14514 "PhotoPage.c" +#line 14415 "PhotoPage.c" } -#line 2286 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2288 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp2_ = editing_host_page_get_photo (self); -#line 2286 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2288 "/home/jens/Source/shotwell/src/PhotoPage.vala" current_photo = _tmp2_; -#line 2287 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2289 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp3_ = current_photo; -#line 2287 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _vala_assert (_tmp3_ != NULL, "current_photo != null"); #line 2289 "/home/jens/Source/shotwell/src/PhotoPage.vala" + _vala_assert (_tmp3_ != NULL, "current_photo != null"); +#line 2291 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp4_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); -#line 2289 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2291 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp5_ = _tmp4_; -#line 2289 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2291 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp6_ = editing_host_page_get_photo (self); -#line 2289 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2291 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp7_ = _tmp6_; -#line 2289 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2291 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp8_ = view_collection_get_view_for_source (_tmp5_, G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_DATA_SOURCE, DataSource)); -#line 2289 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2291 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp9_ = _tmp8_; -#line 2289 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2291 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (_tmp7_); -#line 2289 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2291 "/home/jens/Source/shotwell/src/PhotoPage.vala" _data_collection_unref0 (_tmp5_); -#line 2289 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2291 "/home/jens/Source/shotwell/src/PhotoPage.vala" current = _tmp9_; -#line 2290 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2292 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp10_ = current; -#line 2290 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2292 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp10_ == NULL) { -#line 2291 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2293 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (current); -#line 2291 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2293 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (current_photo); -#line 2291 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2293 "/home/jens/Source/shotwell/src/PhotoPage.vala" return; -#line 14552 "PhotoPage.c" +#line 14453 "PhotoPage.c" } -#line 2294 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2296 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp11_ = current; -#line 2294 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2296 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp12_ = _g_object_ref0 (_tmp11_); -#line 2294 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2296 "/home/jens/Source/shotwell/src/PhotoPage.vala" previous = _tmp12_; -#line 14560 "PhotoPage.c" +#line 14461 "PhotoPage.c" { gboolean _tmp13_ = FALSE; -#line 2295 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2297 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp13_ = TRUE; -#line 2295 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2297 "/home/jens/Source/shotwell/src/PhotoPage.vala" while (TRUE) { -#line 14567 "PhotoPage.c" +#line 14468 "PhotoPage.c" ViewCollection* _tmp14_ = NULL; ViewCollection* _tmp15_ = NULL; DataView* _tmp16_ = NULL; @@ -14582,114 +14483,114 @@ static void editing_host_page_real_on_previous_photo (SinglePhotoPage* base) { Photo* _tmp23_ = NULL; Photo* _tmp24_ = NULL; Photo* _tmp25_ = NULL; -#line 2295 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2297 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (!_tmp13_) { -#line 14583 "PhotoPage.c" +#line 14484 "PhotoPage.c" } -#line 2295 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2297 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp13_ = FALSE; -#line 2296 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2298 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp14_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); -#line 2296 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2298 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp15_ = _tmp14_; -#line 2296 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2298 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp16_ = previous; -#line 2296 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2298 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp17_ = view_collection_get_previous (_tmp15_, _tmp16_); -#line 2296 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2298 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (previous); -#line 2296 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2298 "/home/jens/Source/shotwell/src/PhotoPage.vala" previous = _tmp17_; -#line 2296 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2298 "/home/jens/Source/shotwell/src/PhotoPage.vala" _data_collection_unref0 (_tmp15_); -#line 2297 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2299 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp18_ = previous; -#line 2297 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2299 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp18_ == NULL) { -#line 2298 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2300 "/home/jens/Source/shotwell/src/PhotoPage.vala" break; -#line 14607 "PhotoPage.c" +#line 14508 "PhotoPage.c" } -#line 2300 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2302 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp19_ = previous; -#line 2300 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2302 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp20_ = data_view_get_source (_tmp19_); -#line 2300 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2302 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp21_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp20_, TYPE_PHOTO) ? ((Photo*) _tmp20_) : NULL; -#line 2300 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2302 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp21_ == NULL) { -#line 2300 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2302 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (_tmp20_); -#line 14619 "PhotoPage.c" +#line 14520 "PhotoPage.c" } -#line 2300 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2302 "/home/jens/Source/shotwell/src/PhotoPage.vala" previous_photo = _tmp21_; -#line 2301 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2303 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp22_ = previous_photo; -#line 2301 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2303 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp22_ == NULL) { -#line 2302 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2304 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (previous_photo); -#line 2302 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2304 "/home/jens/Source/shotwell/src/PhotoPage.vala" continue; -#line 14631 "PhotoPage.c" +#line 14532 "PhotoPage.c" } -#line 2304 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2306 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp23_ = previous_photo; -#line 2304 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2306 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp24_ = current_photo; -#line 2304 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2306 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp23_ == _tmp24_) { -#line 2305 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2307 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (previous_photo); -#line 2305 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2307 "/home/jens/Source/shotwell/src/PhotoPage.vala" break; -#line 14643 "PhotoPage.c" +#line 14544 "PhotoPage.c" } -#line 2307 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2309 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp25_ = previous_photo; -#line 2307 "/home/jens/Source/shotwell/src/PhotoPage.vala" - editing_host_page_replace_photo (self, _tmp25_); #line 2309 "/home/jens/Source/shotwell/src/PhotoPage.vala" + editing_host_page_replace_photo (self, _tmp25_); +#line 2311 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (previous_photo); -#line 2309 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2311 "/home/jens/Source/shotwell/src/PhotoPage.vala" break; -#line 14653 "PhotoPage.c" +#line 14554 "PhotoPage.c" } } -#line 2280 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2282 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (previous); -#line 2280 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2282 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (current); -#line 2280 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2282 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (current_photo); -#line 14662 "PhotoPage.c" +#line 14563 "PhotoPage.c" } gboolean editing_host_page_has_current_tool (EditingHostPage* self) { gboolean result = FALSE; EditingToolsEditingTool* _tmp0_ = NULL; -#line 2313 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2315 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_val_if_fail (IS_EDITING_HOST_PAGE (self), FALSE); -#line 2314 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2316 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp0_ = self->priv->current_tool; -#line 2314 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2316 "/home/jens/Source/shotwell/src/PhotoPage.vala" result = _tmp0_ != NULL; -#line 2314 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2316 "/home/jens/Source/shotwell/src/PhotoPage.vala" return result; -#line 14677 "PhotoPage.c" +#line 14578 "PhotoPage.c" } void editing_host_page_unset_view_collection (EditingHostPage* self) { -#line 2317 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2319 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_if_fail (IS_EDITING_HOST_PAGE (self)); -#line 2318 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2320 "/home/jens/Source/shotwell/src/PhotoPage.vala" _data_collection_unref0 (self->priv->parent_view); -#line 2318 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2320 "/home/jens/Source/shotwell/src/PhotoPage.vala" self->priv->parent_view = NULL; -#line 14688 "PhotoPage.c" +#line 14589 "PhotoPage.c" } @@ -14776,14 +14677,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 14775 "PhotoPage.c" +#line 14676 "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 14782 "PhotoPage.c" +#line 14683 "PhotoPage.c" } @@ -14796,7 +14697,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 14795 "PhotoPage.c" +#line 14696 "PhotoPage.c" } @@ -14809,14 +14710,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 14808 "PhotoPage.c" +#line 14709 "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 14815 "PhotoPage.c" +#line 14716 "PhotoPage.c" } @@ -14828,7 +14729,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 14827 "PhotoPage.c" +#line 14728 "PhotoPage.c" } @@ -14947,7 +14848,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 14946 "PhotoPage.c" +#line 14847 "PhotoPage.c" } @@ -15015,7 +14916,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 15014 "PhotoPage.c" +#line 14915 "PhotoPage.c" } @@ -15031,31 +14932,31 @@ static void editing_host_page_finalize (GObject* obj) { guint _tmp7_ = 0U; #line 364 "/home/jens/Source/shotwell/src/PhotoPage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_EDITING_HOST_PAGE, EditingHostPage); -#line 546 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 548 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp0_ = self->priv->sources; -#line 546 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 548 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_signal_parse_name ("items-altered", TYPE_DATA_COLLECTION, &_tmp1_, NULL, FALSE); -#line 546 "/home/jens/Source/shotwell/src/PhotoPage.vala" - g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_DATA_COLLECTION, DataCollection), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _editing_host_page_on_photos_altered_data_collection_items_altered, self); #line 548 "/home/jens/Source/shotwell/src/PhotoPage.vala" + g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_DATA_COLLECTION, DataCollection), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _editing_host_page_on_photos_altered_data_collection_items_altered, self); +#line 550 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp2_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); -#line 548 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 550 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp3_ = _tmp2_; -#line 548 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 550 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_signal_parse_name ("contents-altered", TYPE_DATA_COLLECTION, &_tmp4_, NULL, FALSE); -#line 548 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 550 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_DATA_COLLECTION, DataCollection), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp4_, 0, NULL, (GCallback) _editing_host_page_on_view_contents_ordering_altered_data_collection_contents_altered, self); -#line 548 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 550 "/home/jens/Source/shotwell/src/PhotoPage.vala" _data_collection_unref0 (_tmp3_); -#line 549 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 551 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp5_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); -#line 549 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 551 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp6_ = _tmp5_; -#line 549 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 551 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_signal_parse_name ("ordering-changed", TYPE_DATA_COLLECTION, &_tmp7_, NULL, FALSE); -#line 549 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 551 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, TYPE_DATA_COLLECTION, DataCollection), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp7_, 0, NULL, (GCallback) _editing_host_page_on_view_contents_ordering_altered_data_collection_ordering_changed, self); -#line 549 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 551 "/home/jens/Source/shotwell/src/PhotoPage.vala" _data_collection_unref0 (_tmp6_); #line 390 "/home/jens/Source/shotwell/src/PhotoPage.vala" _data_collection_unref0 (self->priv->sources); @@ -15099,7 +15000,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 15098 "PhotoPage.c" +#line 14999 "PhotoPage.c" } @@ -15116,3035 +15017,722 @@ 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 2358 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2360 "/home/jens/Source/shotwell/src/PhotoPage.vala" library_photo_page_on_photo_destroyed ((LibraryPhotoPage*) self, source); -#line 15117 "PhotoPage.c" +#line 15018 "PhotoPage.c" } static void _library_photo_page_on_metadata_altered_data_collection_items_altered (DataCollection* _sender, GeeMap* items, gpointer self) { -#line 2359 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2361 "/home/jens/Source/shotwell/src/PhotoPage.vala" library_photo_page_on_metadata_altered ((LibraryPhotoPage*) self, items); -#line 15124 "PhotoPage.c" +#line 15025 "PhotoPage.c" } static void _library_photo_page_on_external_app_changed_configuration_facade_external_app_changed (ConfigurationFacade* _sender, gpointer self) { -#line 2360 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2362 "/home/jens/Source/shotwell/src/PhotoPage.vala" library_photo_page_on_external_app_changed ((LibraryPhotoPage*) self); -#line 15131 "PhotoPage.c" +#line 15032 "PhotoPage.c" } -static void _library_photo_page_on_photos_altered_data_collection_items_altered (DataCollection* _sender, GeeMap* items, gpointer self) { -#line 2342 "/home/jens/Source/shotwell/src/PhotoPage.vala" - library_photo_page_on_photos_altered ((LibraryPhotoPage*) self); -#line 15138 "PhotoPage.c" -} - - -static void _library_photo_page_on_photo_unlinking_source_collection_items_unlinking (SourceCollection* _sender, GeeCollection* unlinking, gpointer self) { -#line 2353 "/home/jens/Source/shotwell/src/PhotoPage.vala" - library_photo_page_on_photo_unlinking ((LibraryPhotoPage*) self, unlinking); -#line 15145 "PhotoPage.c" -} - - -static void _library_photo_page_on_photo_relinked_source_collection_items_relinked (SourceCollection* _sender, GeeCollection* relinked, gpointer self) { -#line 2354 "/home/jens/Source/shotwell/src/PhotoPage.vala" - library_photo_page_on_photo_relinked ((LibraryPhotoPage*) self, relinked); -#line 15152 "PhotoPage.c" -} - - -LibraryPhotoPage* library_photo_page_construct (GType object_type) { - LibraryPhotoPage * self = NULL; - LibraryPhotoSourceCollection* _tmp0_ = NULL; - ViewCollection* _tmp1_ = NULL; - ViewCollection* _tmp2_ = NULL; - LibraryPhotoSourceCollection* _tmp3_ = NULL; - LibraryPhotoSourceCollection* _tmp4_ = NULL; - ConfigFacade* _tmp5_ = NULL; - ConfigFacade* _tmp6_ = NULL; - ViewCollection* _tmp7_ = NULL; - ViewCollection* _tmp8_ = NULL; - LibraryPhotoPageLibraryPhotoPageViewFilter* _tmp9_ = NULL; - LibraryPhotoSourceCollection* _tmp10_ = NULL; - LibraryPhotoSourceCollection* _tmp11_ = NULL; -#line 2339 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp0_ = library_photo_global; -#line 2339 "/home/jens/Source/shotwell/src/PhotoPage.vala" - self = (LibraryPhotoPage*) editing_host_page_construct (object_type, G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_SOURCE_COLLECTION, SourceCollection), "Photo"); -#line 2342 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp1_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); -#line 2342 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp2_ = _tmp1_; -#line 2342 "/home/jens/Source/shotwell/src/PhotoPage.vala" - g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_DATA_COLLECTION, DataCollection), "items-altered", (GCallback) _library_photo_page_on_photos_altered_data_collection_items_altered, self, 0); -#line 2342 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _data_collection_unref0 (_tmp2_); -#line 2345 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp3_ = library_photo_global; -#line 2345 "/home/jens/Source/shotwell/src/PhotoPage.vala" - g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_SOURCE_COLLECTION, SourceCollection), "item-destroyed", (GCallback) _library_photo_page_on_photo_destroyed_source_collection_item_destroyed, self, 0); -#line 2346 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp4_ = library_photo_global; -#line 2346 "/home/jens/Source/shotwell/src/PhotoPage.vala" - g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_DATA_COLLECTION, DataCollection), "items-altered", (GCallback) _library_photo_page_on_metadata_altered_data_collection_items_altered, self, 0); -#line 2349 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp5_ = config_facade_get_instance (); -#line 2349 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp6_ = _tmp5_; -#line 2349 "/home/jens/Source/shotwell/src/PhotoPage.vala" - g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), "external-app-changed", (GCallback) _library_photo_page_on_external_app_changed_configuration_facade_external_app_changed, self, 0); -#line 2349 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _g_object_unref0 (_tmp6_); -#line 2352 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp7_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); -#line 2352 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp8_ = _tmp7_; -#line 2352 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp9_ = self->priv->filter; -#line 2352 "/home/jens/Source/shotwell/src/PhotoPage.vala" - view_collection_install_view_filter (_tmp8_, G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, TYPE_VIEW_FILTER, ViewFilter)); -#line 2352 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _data_collection_unref0 (_tmp8_); -#line 2353 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp10_ = library_photo_global; -#line 2353 "/home/jens/Source/shotwell/src/PhotoPage.vala" - g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, TYPE_SOURCE_COLLECTION, SourceCollection), "items-unlinking", (GCallback) _library_photo_page_on_photo_unlinking_source_collection_items_unlinking, self, 0); -#line 2354 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp11_ = library_photo_global; -#line 2354 "/home/jens/Source/shotwell/src/PhotoPage.vala" - 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 2338 "/home/jens/Source/shotwell/src/PhotoPage.vala" - return self; -#line 15218 "PhotoPage.c" -} - - -LibraryPhotoPage* library_photo_page_new (void) { -#line 2338 "/home/jens/Source/shotwell/src/PhotoPage.vala" - return library_photo_page_construct (TYPE_LIBRARY_PHOTO_PAGE); -#line 15225 "PhotoPage.c" -} - - -gboolean library_photo_page_not_trashed_view_filter (LibraryPhotoPage* self, DataView* view) { - gboolean result = FALSE; - DataView* _tmp0_ = NULL; - DataSource* _tmp1_ = NULL; - MediaSource* _tmp2_ = NULL; - gboolean _tmp3_ = FALSE; - gboolean _tmp4_ = FALSE; -#line 2363 "/home/jens/Source/shotwell/src/PhotoPage.vala" - g_return_val_if_fail (IS_LIBRARY_PHOTO_PAGE (self), FALSE); -#line 2363 "/home/jens/Source/shotwell/src/PhotoPage.vala" - g_return_val_if_fail (IS_DATA_VIEW (view), FALSE); -#line 2364 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp0_ = view; -#line 2364 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp1_ = data_view_get_source (_tmp0_); -#line 2364 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp2_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_MEDIA_SOURCE, MediaSource); -#line 2364 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp3_ = media_source_is_trashed (_tmp2_); -#line 2364 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp4_ = !_tmp3_; -#line 2364 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _g_object_unref0 (_tmp2_); -#line 2364 "/home/jens/Source/shotwell/src/PhotoPage.vala" - result = _tmp4_; -#line 2364 "/home/jens/Source/shotwell/src/PhotoPage.vala" - return result; -#line 15256 "PhotoPage.c" -} - - -static void library_photo_page_on_photo_unlinking (LibraryPhotoPage* self, GeeCollection* unlinking) { - LibraryPhotoPageLibraryPhotoPageViewFilter* _tmp0_ = NULL; -#line 2367 "/home/jens/Source/shotwell/src/PhotoPage.vala" - g_return_if_fail (IS_LIBRARY_PHOTO_PAGE (self)); -#line 2367 "/home/jens/Source/shotwell/src/PhotoPage.vala" - g_return_if_fail (GEE_IS_COLLECTION (unlinking)); -#line 2368 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp0_ = self->priv->filter; -#line 2368 "/home/jens/Source/shotwell/src/PhotoPage.vala" - g_signal_emit_by_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_VIEW_FILTER, ViewFilter), "refresh"); -#line 15270 "PhotoPage.c" -} - - -static void library_photo_page_on_photo_relinked (LibraryPhotoPage* self, GeeCollection* relinked) { - LibraryPhotoPageLibraryPhotoPageViewFilter* _tmp0_ = NULL; -#line 2371 "/home/jens/Source/shotwell/src/PhotoPage.vala" - g_return_if_fail (IS_LIBRARY_PHOTO_PAGE (self)); -#line 2371 "/home/jens/Source/shotwell/src/PhotoPage.vala" - g_return_if_fail (GEE_IS_COLLECTION (relinked)); -#line 2372 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp0_ = self->priv->filter; -#line 2372 "/home/jens/Source/shotwell/src/PhotoPage.vala" - g_signal_emit_by_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_VIEW_FILTER, ViewFilter), "refresh"); -#line 15284 "PhotoPage.c" -} - - -static void library_photo_page_real_init_collect_ui_filenames (Page* base, GeeList* ui_filenames) { - LibraryPhotoPage * self; - GeeList* _tmp0_ = NULL; - GeeList* _tmp1_ = NULL; - GeeList* _tmp2_ = NULL; -#line 2375 "/home/jens/Source/shotwell/src/PhotoPage.vala" - self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO_PAGE, LibraryPhotoPage); -#line 2375 "/home/jens/Source/shotwell/src/PhotoPage.vala" - g_return_if_fail (GEE_IS_LIST (ui_filenames)); -#line 2376 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp0_ = ui_filenames; -#line 2376 "/home/jens/Source/shotwell/src/PhotoPage.vala" - PAGE_CLASS (library_photo_page_parent_class)->init_collect_ui_filenames (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage), TYPE_PAGE, Page), _tmp0_); -#line 2378 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp1_ = ui_filenames; -#line 2378 "/home/jens/Source/shotwell/src/PhotoPage.vala" - gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_COLLECTION, GeeCollection), "photo_context.ui"); -#line 2379 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp2_ = ui_filenames; -#line 2379 "/home/jens/Source/shotwell/src/PhotoPage.vala" - gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_COLLECTION, GeeCollection), "photo.ui"); -#line 15309 "PhotoPage.c" -} - - -static void _library_photo_page_on_export_gtk_action_callback (GtkAction* action, gpointer self) { -#line 2385 "/home/jens/Source/shotwell/src/PhotoPage.vala" +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 15316 "PhotoPage.c" -} - - -static void _vala_array_add193 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value) { -#line 2388 "/home/jens/Source/shotwell/src/PhotoPage.vala" - if ((*length) == (*size)) { -#line 2388 "/home/jens/Source/shotwell/src/PhotoPage.vala" - *size = (*size) ? (2 * (*size)) : 4; -#line 2388 "/home/jens/Source/shotwell/src/PhotoPage.vala" - *array = g_renew (GtkActionEntry, *array, *size); -#line 15327 "PhotoPage.c" - } -#line 2388 "/home/jens/Source/shotwell/src/PhotoPage.vala" - (*array)[(*length)++] = *value; -#line 15331 "PhotoPage.c" +#line 15039 "PhotoPage.c" } -static void _library_photo_page_on_print_gtk_action_callback (GtkAction* action, gpointer self) { -#line 2390 "/home/jens/Source/shotwell/src/PhotoPage.vala" +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 15338 "PhotoPage.c" +#line 15046 "PhotoPage.c" } -static void _vala_array_add194 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value) { -#line 2393 "/home/jens/Source/shotwell/src/PhotoPage.vala" - if ((*length) == (*size)) { -#line 2393 "/home/jens/Source/shotwell/src/PhotoPage.vala" - *size = (*size) ? (2 * (*size)) : 4; -#line 2393 "/home/jens/Source/shotwell/src/PhotoPage.vala" - *array = g_renew (GtkActionEntry, *array, *size); -#line 15349 "PhotoPage.c" - } -#line 2393 "/home/jens/Source/shotwell/src/PhotoPage.vala" - (*array)[(*length)++] = *value; -#line 15353 "PhotoPage.c" -} - - -static void _library_photo_page_on_publish_gtk_action_callback (GtkAction* action, gpointer self) { -#line 2395 "/home/jens/Source/shotwell/src/PhotoPage.vala" +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 15360 "PhotoPage.c" +#line 15053 "PhotoPage.c" } -static void _vala_array_add195 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value) { -#line 2399 "/home/jens/Source/shotwell/src/PhotoPage.vala" - if ((*length) == (*size)) { -#line 2399 "/home/jens/Source/shotwell/src/PhotoPage.vala" - *size = (*size) ? (2 * (*size)) : 4; -#line 2399 "/home/jens/Source/shotwell/src/PhotoPage.vala" - *array = g_renew (GtkActionEntry, *array, *size); -#line 15371 "PhotoPage.c" - } -#line 2399 "/home/jens/Source/shotwell/src/PhotoPage.vala" - (*array)[(*length)++] = *value; -#line 15375 "PhotoPage.c" -} - - -static void _library_photo_page_on_remove_from_library_gtk_action_callback (GtkAction* action, gpointer self) { -#line 2401 "/home/jens/Source/shotwell/src/PhotoPage.vala" +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 15382 "PhotoPage.c" -} - - -static void _vala_array_add196 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value) { -#line 2404 "/home/jens/Source/shotwell/src/PhotoPage.vala" - if ((*length) == (*size)) { -#line 2404 "/home/jens/Source/shotwell/src/PhotoPage.vala" - *size = (*size) ? (2 * (*size)) : 4; -#line 2404 "/home/jens/Source/shotwell/src/PhotoPage.vala" - *array = g_renew (GtkActionEntry, *array, *size); -#line 15393 "PhotoPage.c" - } -#line 2404 "/home/jens/Source/shotwell/src/PhotoPage.vala" - (*array)[(*length)++] = *value; -#line 15397 "PhotoPage.c" +#line 15060 "PhotoPage.c" } -static void _library_photo_page_on_move_to_trash_gtk_action_callback (GtkAction* action, gpointer self) { -#line 2406 "/home/jens/Source/shotwell/src/PhotoPage.vala" +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 15404 "PhotoPage.c" -} - - -static void _vala_array_add197 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value) { -#line 2409 "/home/jens/Source/shotwell/src/PhotoPage.vala" - if ((*length) == (*size)) { -#line 2409 "/home/jens/Source/shotwell/src/PhotoPage.vala" - *size = (*size) ? (2 * (*size)) : 4; -#line 2409 "/home/jens/Source/shotwell/src/PhotoPage.vala" - *array = g_renew (GtkActionEntry, *array, *size); -#line 15415 "PhotoPage.c" - } -#line 2409 "/home/jens/Source/shotwell/src/PhotoPage.vala" - (*array)[(*length)++] = *value; -#line 15419 "PhotoPage.c" +#line 15067 "PhotoPage.c" } -static void _library_photo_page_on_view_menu_gtk_action_callback (GtkAction* action, gpointer self) { -#line 2411 "/home/jens/Source/shotwell/src/PhotoPage.vala" - library_photo_page_on_view_menu ((LibraryPhotoPage*) self); -#line 15426 "PhotoPage.c" -} - - -static void _vala_array_add198 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value) { -#line 2413 "/home/jens/Source/shotwell/src/PhotoPage.vala" - if ((*length) == (*size)) { -#line 2413 "/home/jens/Source/shotwell/src/PhotoPage.vala" - *size = (*size) ? (2 * (*size)) : 4; -#line 2413 "/home/jens/Source/shotwell/src/PhotoPage.vala" - *array = g_renew (GtkActionEntry, *array, *size); -#line 15437 "PhotoPage.c" - } -#line 2413 "/home/jens/Source/shotwell/src/PhotoPage.vala" - (*array)[(*length)++] = *value; -#line 15441 "PhotoPage.c" -} - - -static void _vala_array_add199 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value) { -#line 2417 "/home/jens/Source/shotwell/src/PhotoPage.vala" - if ((*length) == (*size)) { -#line 2417 "/home/jens/Source/shotwell/src/PhotoPage.vala" - *size = (*size) ? (2 * (*size)) : 4; -#line 2417 "/home/jens/Source/shotwell/src/PhotoPage.vala" - *array = g_renew (GtkActionEntry, *array, *size); -#line 15452 "PhotoPage.c" - } -#line 2417 "/home/jens/Source/shotwell/src/PhotoPage.vala" - (*array)[(*length)++] = *value; -#line 15456 "PhotoPage.c" -} - - -static void _single_photo_page_on_previous_photo_gtk_action_callback (GtkAction* action, gpointer self) { -#line 2419 "/home/jens/Source/shotwell/src/PhotoPage.vala" +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 15463 "PhotoPage.c" +#line 15074 "PhotoPage.c" } -static void _vala_array_add200 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value) { -#line 2423 "/home/jens/Source/shotwell/src/PhotoPage.vala" - if ((*length) == (*size)) { -#line 2423 "/home/jens/Source/shotwell/src/PhotoPage.vala" - *size = (*size) ? (2 * (*size)) : 4; -#line 2423 "/home/jens/Source/shotwell/src/PhotoPage.vala" - *array = g_renew (GtkActionEntry, *array, *size); -#line 15474 "PhotoPage.c" - } -#line 2423 "/home/jens/Source/shotwell/src/PhotoPage.vala" - (*array)[(*length)++] = *value; -#line 15478 "PhotoPage.c" -} - - -static void _single_photo_page_on_next_photo_gtk_action_callback (GtkAction* action, gpointer self) { -#line 2425 "/home/jens/Source/shotwell/src/PhotoPage.vala" +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 15485 "PhotoPage.c" +#line 15081 "PhotoPage.c" } -static void _vala_array_add201 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value) { -#line 2429 "/home/jens/Source/shotwell/src/PhotoPage.vala" - if ((*length) == (*size)) { -#line 2429 "/home/jens/Source/shotwell/src/PhotoPage.vala" - *size = (*size) ? (2 * (*size)) : 4; -#line 2429 "/home/jens/Source/shotwell/src/PhotoPage.vala" - *array = g_renew (GtkActionEntry, *array, *size); -#line 15496 "PhotoPage.c" - } -#line 2429 "/home/jens/Source/shotwell/src/PhotoPage.vala" - (*array)[(*length)++] = *value; -#line 15500 "PhotoPage.c" -} - - -static void _editing_host_page_on_rotate_clockwise_gtk_action_callback (GtkAction* action, gpointer self) { -#line 2431 "/home/jens/Source/shotwell/src/PhotoPage.vala" +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 15507 "PhotoPage.c" +#line 15088 "PhotoPage.c" } -static void _vala_array_add202 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value) { -#line 2435 "/home/jens/Source/shotwell/src/PhotoPage.vala" - if ((*length) == (*size)) { -#line 2435 "/home/jens/Source/shotwell/src/PhotoPage.vala" - *size = (*size) ? (2 * (*size)) : 4; -#line 2435 "/home/jens/Source/shotwell/src/PhotoPage.vala" - *array = g_renew (GtkActionEntry, *array, *size); -#line 15518 "PhotoPage.c" - } -#line 2435 "/home/jens/Source/shotwell/src/PhotoPage.vala" - (*array)[(*length)++] = *value; -#line 15522 "PhotoPage.c" -} - - -static void _editing_host_page_on_rotate_counterclockwise_gtk_action_callback (GtkAction* action, gpointer self) { -#line 2437 "/home/jens/Source/shotwell/src/PhotoPage.vala" +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 15529 "PhotoPage.c" +#line 15095 "PhotoPage.c" } -static void _vala_array_add203 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value) { -#line 2441 "/home/jens/Source/shotwell/src/PhotoPage.vala" - if ((*length) == (*size)) { -#line 2441 "/home/jens/Source/shotwell/src/PhotoPage.vala" - *size = (*size) ? (2 * (*size)) : 4; -#line 2441 "/home/jens/Source/shotwell/src/PhotoPage.vala" - *array = g_renew (GtkActionEntry, *array, *size); -#line 15540 "PhotoPage.c" - } -#line 2441 "/home/jens/Source/shotwell/src/PhotoPage.vala" - (*array)[(*length)++] = *value; -#line 15544 "PhotoPage.c" -} - - -static void _editing_host_page_on_flip_horizontally_gtk_action_callback (GtkAction* action, gpointer self) { -#line 2443 "/home/jens/Source/shotwell/src/PhotoPage.vala" +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 15551 "PhotoPage.c" +#line 15102 "PhotoPage.c" } -static void _vala_array_add204 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value) { -#line 2446 "/home/jens/Source/shotwell/src/PhotoPage.vala" - if ((*length) == (*size)) { -#line 2446 "/home/jens/Source/shotwell/src/PhotoPage.vala" - *size = (*size) ? (2 * (*size)) : 4; -#line 2446 "/home/jens/Source/shotwell/src/PhotoPage.vala" - *array = g_renew (GtkActionEntry, *array, *size); -#line 15562 "PhotoPage.c" - } -#line 2446 "/home/jens/Source/shotwell/src/PhotoPage.vala" - (*array)[(*length)++] = *value; -#line 15566 "PhotoPage.c" -} - - -static void _editing_host_page_on_flip_vertically_gtk_action_callback (GtkAction* action, gpointer self) { -#line 2448 "/home/jens/Source/shotwell/src/PhotoPage.vala" +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 15573 "PhotoPage.c" +#line 15109 "PhotoPage.c" } -static void _vala_array_add205 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value) { -#line 2451 "/home/jens/Source/shotwell/src/PhotoPage.vala" - if ((*length) == (*size)) { -#line 2451 "/home/jens/Source/shotwell/src/PhotoPage.vala" - *size = (*size) ? (2 * (*size)) : 4; -#line 2451 "/home/jens/Source/shotwell/src/PhotoPage.vala" - *array = g_renew (GtkActionEntry, *array, *size); -#line 15584 "PhotoPage.c" - } -#line 2451 "/home/jens/Source/shotwell/src/PhotoPage.vala" - (*array)[(*length)++] = *value; -#line 15588 "PhotoPage.c" -} - - -static void _editing_host_page_on_enhance_gtk_action_callback (GtkAction* action, gpointer self) { -#line 2453 "/home/jens/Source/shotwell/src/PhotoPage.vala" +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 15595 "PhotoPage.c" +#line 15116 "PhotoPage.c" } -static void _vala_array_add206 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value) { -#line 2457 "/home/jens/Source/shotwell/src/PhotoPage.vala" - if ((*length) == (*size)) { -#line 2457 "/home/jens/Source/shotwell/src/PhotoPage.vala" - *size = (*size) ? (2 * (*size)) : 4; -#line 2457 "/home/jens/Source/shotwell/src/PhotoPage.vala" - *array = g_renew (GtkActionEntry, *array, *size); -#line 15606 "PhotoPage.c" - } -#line 2457 "/home/jens/Source/shotwell/src/PhotoPage.vala" - (*array)[(*length)++] = *value; -#line 15610 "PhotoPage.c" -} - - -static void _editing_host_page_on_copy_adjustments_gtk_action_callback (GtkAction* action, gpointer self) { -#line 2459 "/home/jens/Source/shotwell/src/PhotoPage.vala" +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 15617 "PhotoPage.c" +#line 15123 "PhotoPage.c" } -static void _vala_array_add207 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value) { -#line 2463 "/home/jens/Source/shotwell/src/PhotoPage.vala" - if ((*length) == (*size)) { -#line 2463 "/home/jens/Source/shotwell/src/PhotoPage.vala" - *size = (*size) ? (2 * (*size)) : 4; -#line 2463 "/home/jens/Source/shotwell/src/PhotoPage.vala" - *array = g_renew (GtkActionEntry, *array, *size); -#line 15628 "PhotoPage.c" - } -#line 2463 "/home/jens/Source/shotwell/src/PhotoPage.vala" - (*array)[(*length)++] = *value; -#line 15632 "PhotoPage.c" -} - - -static void _editing_host_page_on_paste_adjustments_gtk_action_callback (GtkAction* action, gpointer self) { -#line 2465 "/home/jens/Source/shotwell/src/PhotoPage.vala" +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 15639 "PhotoPage.c" +#line 15130 "PhotoPage.c" } -static void _vala_array_add208 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value) { -#line 2469 "/home/jens/Source/shotwell/src/PhotoPage.vala" - if ((*length) == (*size)) { -#line 2469 "/home/jens/Source/shotwell/src/PhotoPage.vala" - *size = (*size) ? (2 * (*size)) : 4; -#line 2469 "/home/jens/Source/shotwell/src/PhotoPage.vala" - *array = g_renew (GtkActionEntry, *array, *size); -#line 15650 "PhotoPage.c" - } -#line 2469 "/home/jens/Source/shotwell/src/PhotoPage.vala" - (*array)[(*length)++] = *value; -#line 15654 "PhotoPage.c" -} - - -static void _editing_host_page_toggle_crop_gtk_action_callback (GtkAction* action, gpointer self) { -#line 2471 "/home/jens/Source/shotwell/src/PhotoPage.vala" +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 15661 "PhotoPage.c" -} - - -static void _vala_array_add209 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value) { -#line 2475 "/home/jens/Source/shotwell/src/PhotoPage.vala" - if ((*length) == (*size)) { -#line 2475 "/home/jens/Source/shotwell/src/PhotoPage.vala" - *size = (*size) ? (2 * (*size)) : 4; -#line 2475 "/home/jens/Source/shotwell/src/PhotoPage.vala" - *array = g_renew (GtkActionEntry, *array, *size); -#line 15672 "PhotoPage.c" - } -#line 2475 "/home/jens/Source/shotwell/src/PhotoPage.vala" - (*array)[(*length)++] = *value; -#line 15676 "PhotoPage.c" +#line 15137 "PhotoPage.c" } -static void _editing_host_page_toggle_straighten_gtk_action_callback (GtkAction* action, gpointer self) { -#line 2477 "/home/jens/Source/shotwell/src/PhotoPage.vala" +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 15683 "PhotoPage.c" -} - - -static void _vala_array_add210 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value) { -#line 2481 "/home/jens/Source/shotwell/src/PhotoPage.vala" - if ((*length) == (*size)) { -#line 2481 "/home/jens/Source/shotwell/src/PhotoPage.vala" - *size = (*size) ? (2 * (*size)) : 4; -#line 2481 "/home/jens/Source/shotwell/src/PhotoPage.vala" - *array = g_renew (GtkActionEntry, *array, *size); -#line 15694 "PhotoPage.c" - } -#line 2481 "/home/jens/Source/shotwell/src/PhotoPage.vala" - (*array)[(*length)++] = *value; -#line 15698 "PhotoPage.c" +#line 15144 "PhotoPage.c" } -static void _editing_host_page_toggle_redeye_gtk_action_callback (GtkAction* action, gpointer self) { -#line 2483 "/home/jens/Source/shotwell/src/PhotoPage.vala" +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 15705 "PhotoPage.c" -} - - -static void _vala_array_add211 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value) { -#line 2487 "/home/jens/Source/shotwell/src/PhotoPage.vala" - if ((*length) == (*size)) { -#line 2487 "/home/jens/Source/shotwell/src/PhotoPage.vala" - *size = (*size) ? (2 * (*size)) : 4; -#line 2487 "/home/jens/Source/shotwell/src/PhotoPage.vala" - *array = g_renew (GtkActionEntry, *array, *size); -#line 15716 "PhotoPage.c" - } -#line 2487 "/home/jens/Source/shotwell/src/PhotoPage.vala" - (*array)[(*length)++] = *value; -#line 15720 "PhotoPage.c" +#line 15151 "PhotoPage.c" } -static void _editing_host_page_toggle_adjust_gtk_action_callback (GtkAction* action, gpointer self) { -#line 2489 "/home/jens/Source/shotwell/src/PhotoPage.vala" +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 15727 "PhotoPage.c" +#line 15158 "PhotoPage.c" } -static void _vala_array_add212 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value) { -#line 2493 "/home/jens/Source/shotwell/src/PhotoPage.vala" - if ((*length) == (*size)) { -#line 2493 "/home/jens/Source/shotwell/src/PhotoPage.vala" - *size = (*size) ? (2 * (*size)) : 4; -#line 2493 "/home/jens/Source/shotwell/src/PhotoPage.vala" - *array = g_renew (GtkActionEntry, *array, *size); -#line 15738 "PhotoPage.c" - } -#line 2493 "/home/jens/Source/shotwell/src/PhotoPage.vala" - (*array)[(*length)++] = *value; -#line 15742 "PhotoPage.c" -} - - -static void _editing_host_page_on_revert_gtk_action_callback (GtkAction* action, gpointer self) { -#line 2495 "/home/jens/Source/shotwell/src/PhotoPage.vala" +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 15749 "PhotoPage.c" +#line 15165 "PhotoPage.c" } -static void _vala_array_add213 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value) { -#line 2498 "/home/jens/Source/shotwell/src/PhotoPage.vala" - if ((*length) == (*size)) { -#line 2498 "/home/jens/Source/shotwell/src/PhotoPage.vala" - *size = (*size) ? (2 * (*size)) : 4; -#line 2498 "/home/jens/Source/shotwell/src/PhotoPage.vala" - *array = g_renew (GtkActionEntry, *array, *size); -#line 15760 "PhotoPage.c" - } -#line 2498 "/home/jens/Source/shotwell/src/PhotoPage.vala" - (*array)[(*length)++] = *value; -#line 15764 "PhotoPage.c" -} - - -static void _editing_host_page_on_edit_title_gtk_action_callback (GtkAction* action, gpointer self) { -#line 2500 "/home/jens/Source/shotwell/src/PhotoPage.vala" +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 15771 "PhotoPage.c" +#line 15172 "PhotoPage.c" } -static void _vala_array_add214 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value) { -#line 2503 "/home/jens/Source/shotwell/src/PhotoPage.vala" - if ((*length) == (*size)) { -#line 2503 "/home/jens/Source/shotwell/src/PhotoPage.vala" - *size = (*size) ? (2 * (*size)) : 4; -#line 2503 "/home/jens/Source/shotwell/src/PhotoPage.vala" - *array = g_renew (GtkActionEntry, *array, *size); -#line 15782 "PhotoPage.c" - } -#line 2503 "/home/jens/Source/shotwell/src/PhotoPage.vala" - (*array)[(*length)++] = *value; -#line 15786 "PhotoPage.c" -} - - -static void _editing_host_page_on_edit_comment_gtk_action_callback (GtkAction* action, gpointer self) { -#line 2505 "/home/jens/Source/shotwell/src/PhotoPage.vala" +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 15793 "PhotoPage.c" +#line 15179 "PhotoPage.c" } -static void _vala_array_add215 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value) { -#line 2508 "/home/jens/Source/shotwell/src/PhotoPage.vala" - if ((*length) == (*size)) { -#line 2508 "/home/jens/Source/shotwell/src/PhotoPage.vala" - *size = (*size) ? (2 * (*size)) : 4; -#line 2508 "/home/jens/Source/shotwell/src/PhotoPage.vala" - *array = g_renew (GtkActionEntry, *array, *size); -#line 15804 "PhotoPage.c" - } -#line 2508 "/home/jens/Source/shotwell/src/PhotoPage.vala" - (*array)[(*length)++] = *value; -#line 15808 "PhotoPage.c" -} - - -static void _editing_host_page_on_adjust_date_time_gtk_action_callback (GtkAction* action, gpointer self) { -#line 2510 "/home/jens/Source/shotwell/src/PhotoPage.vala" +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 15815 "PhotoPage.c" -} - - -static void _vala_array_add216 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value) { -#line 2513 "/home/jens/Source/shotwell/src/PhotoPage.vala" - if ((*length) == (*size)) { -#line 2513 "/home/jens/Source/shotwell/src/PhotoPage.vala" - *size = (*size) ? (2 * (*size)) : 4; -#line 2513 "/home/jens/Source/shotwell/src/PhotoPage.vala" - *array = g_renew (GtkActionEntry, *array, *size); -#line 15826 "PhotoPage.c" - } -#line 2513 "/home/jens/Source/shotwell/src/PhotoPage.vala" - (*array)[(*length)++] = *value; -#line 15830 "PhotoPage.c" +#line 15186 "PhotoPage.c" } -static void _library_photo_page_on_external_edit_gtk_action_callback (GtkAction* action, gpointer self) { -#line 2515 "/home/jens/Source/shotwell/src/PhotoPage.vala" +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 15837 "PhotoPage.c" +#line 15193 "PhotoPage.c" } -static void _vala_array_add217 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value) { -#line 2518 "/home/jens/Source/shotwell/src/PhotoPage.vala" - if ((*length) == (*size)) { -#line 2518 "/home/jens/Source/shotwell/src/PhotoPage.vala" - *size = (*size) ? (2 * (*size)) : 4; -#line 2518 "/home/jens/Source/shotwell/src/PhotoPage.vala" - *array = g_renew (GtkActionEntry, *array, *size); -#line 15848 "PhotoPage.c" - } -#line 2518 "/home/jens/Source/shotwell/src/PhotoPage.vala" - (*array)[(*length)++] = *value; -#line 15852 "PhotoPage.c" -} - - -static void _library_photo_page_on_external_edit_raw_gtk_action_callback (GtkAction* action, gpointer self) { -#line 2520 "/home/jens/Source/shotwell/src/PhotoPage.vala" +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 15859 "PhotoPage.c" -} - - -static void _vala_array_add218 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value) { -#line 2523 "/home/jens/Source/shotwell/src/PhotoPage.vala" - if ((*length) == (*size)) { -#line 2523 "/home/jens/Source/shotwell/src/PhotoPage.vala" - *size = (*size) ? (2 * (*size)) : 4; -#line 2523 "/home/jens/Source/shotwell/src/PhotoPage.vala" - *array = g_renew (GtkActionEntry, *array, *size); -#line 15870 "PhotoPage.c" - } -#line 2523 "/home/jens/Source/shotwell/src/PhotoPage.vala" - (*array)[(*length)++] = *value; -#line 15874 "PhotoPage.c" +#line 15200 "PhotoPage.c" } -static void _library_photo_page_on_send_to_gtk_action_callback (GtkAction* action, gpointer self) { -#line 2525 "/home/jens/Source/shotwell/src/PhotoPage.vala" +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 15881 "PhotoPage.c" -} - - -static void _vala_array_add219 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value) { -#line 2528 "/home/jens/Source/shotwell/src/PhotoPage.vala" - if ((*length) == (*size)) { -#line 2528 "/home/jens/Source/shotwell/src/PhotoPage.vala" - *size = (*size) ? (2 * (*size)) : 4; -#line 2528 "/home/jens/Source/shotwell/src/PhotoPage.vala" - *array = g_renew (GtkActionEntry, *array, *size); -#line 15892 "PhotoPage.c" - } -#line 2528 "/home/jens/Source/shotwell/src/PhotoPage.vala" - (*array)[(*length)++] = *value; -#line 15896 "PhotoPage.c" +#line 15207 "PhotoPage.c" } -static void _editing_host_page_on_set_background_gtk_action_callback (GtkAction* action, gpointer self) { -#line 2530 "/home/jens/Source/shotwell/src/PhotoPage.vala" +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 15903 "PhotoPage.c" +#line 15214 "PhotoPage.c" } -static void _vala_array_add220 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value) { -#line 2534 "/home/jens/Source/shotwell/src/PhotoPage.vala" - if ((*length) == (*size)) { -#line 2534 "/home/jens/Source/shotwell/src/PhotoPage.vala" - *size = (*size) ? (2 * (*size)) : 4; -#line 2534 "/home/jens/Source/shotwell/src/PhotoPage.vala" - *array = g_renew (GtkActionEntry, *array, *size); -#line 15914 "PhotoPage.c" - } -#line 2534 "/home/jens/Source/shotwell/src/PhotoPage.vala" - (*array)[(*length)++] = *value; -#line 15918 "PhotoPage.c" -} - - -static void _library_photo_page_on_flag_unflag_gtk_action_callback (GtkAction* action, gpointer self) { -#line 2536 "/home/jens/Source/shotwell/src/PhotoPage.vala" +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 15925 "PhotoPage.c" -} - - -static void _vala_array_add221 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value) { -#line 2538 "/home/jens/Source/shotwell/src/PhotoPage.vala" - if ((*length) == (*size)) { -#line 2538 "/home/jens/Source/shotwell/src/PhotoPage.vala" - *size = (*size) ? (2 * (*size)) : 4; -#line 2538 "/home/jens/Source/shotwell/src/PhotoPage.vala" - *array = g_renew (GtkActionEntry, *array, *size); -#line 15936 "PhotoPage.c" - } -#line 2538 "/home/jens/Source/shotwell/src/PhotoPage.vala" - (*array)[(*length)++] = *value; -#line 15940 "PhotoPage.c" -} - - -static void _vala_array_add222 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value) { -#line 2542 "/home/jens/Source/shotwell/src/PhotoPage.vala" - if ((*length) == (*size)) { -#line 2542 "/home/jens/Source/shotwell/src/PhotoPage.vala" - *size = (*size) ? (2 * (*size)) : 4; -#line 2542 "/home/jens/Source/shotwell/src/PhotoPage.vala" - *array = g_renew (GtkActionEntry, *array, *size); -#line 15951 "PhotoPage.c" - } -#line 2542 "/home/jens/Source/shotwell/src/PhotoPage.vala" - (*array)[(*length)++] = *value; -#line 15955 "PhotoPage.c" +#line 15221 "PhotoPage.c" } -static void _library_photo_page_on_increase_rating_gtk_action_callback (GtkAction* action, gpointer self) { -#line 2544 "/home/jens/Source/shotwell/src/PhotoPage.vala" +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 15962 "PhotoPage.c" -} - - -static void _vala_array_add223 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value) { -#line 2547 "/home/jens/Source/shotwell/src/PhotoPage.vala" - if ((*length) == (*size)) { -#line 2547 "/home/jens/Source/shotwell/src/PhotoPage.vala" - *size = (*size) ? (2 * (*size)) : 4; -#line 2547 "/home/jens/Source/shotwell/src/PhotoPage.vala" - *array = g_renew (GtkActionEntry, *array, *size); -#line 15973 "PhotoPage.c" - } -#line 2547 "/home/jens/Source/shotwell/src/PhotoPage.vala" - (*array)[(*length)++] = *value; -#line 15977 "PhotoPage.c" +#line 15228 "PhotoPage.c" } -static void _library_photo_page_on_decrease_rating_gtk_action_callback (GtkAction* action, gpointer self) { -#line 2549 "/home/jens/Source/shotwell/src/PhotoPage.vala" +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 15984 "PhotoPage.c" +#line 15235 "PhotoPage.c" } -static void _vala_array_add224 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value) { -#line 2552 "/home/jens/Source/shotwell/src/PhotoPage.vala" - if ((*length) == (*size)) { -#line 2552 "/home/jens/Source/shotwell/src/PhotoPage.vala" - *size = (*size) ? (2 * (*size)) : 4; -#line 2552 "/home/jens/Source/shotwell/src/PhotoPage.vala" - *array = g_renew (GtkActionEntry, *array, *size); -#line 15995 "PhotoPage.c" - } -#line 2552 "/home/jens/Source/shotwell/src/PhotoPage.vala" - (*array)[(*length)++] = *value; -#line 15999 "PhotoPage.c" -} - - -static void _library_photo_page_on_rate_rejected_gtk_action_callback (GtkAction* action, gpointer self) { -#line 2554 "/home/jens/Source/shotwell/src/PhotoPage.vala" +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 16006 "PhotoPage.c" +#line 15242 "PhotoPage.c" } -static void _vala_array_add225 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value) { -#line 2557 "/home/jens/Source/shotwell/src/PhotoPage.vala" - if ((*length) == (*size)) { -#line 2557 "/home/jens/Source/shotwell/src/PhotoPage.vala" - *size = (*size) ? (2 * (*size)) : 4; -#line 2557 "/home/jens/Source/shotwell/src/PhotoPage.vala" - *array = g_renew (GtkActionEntry, *array, *size); -#line 16017 "PhotoPage.c" - } -#line 2557 "/home/jens/Source/shotwell/src/PhotoPage.vala" - (*array)[(*length)++] = *value; -#line 16021 "PhotoPage.c" -} - - -static void _library_photo_page_on_rate_unrated_gtk_action_callback (GtkAction* action, gpointer self) { -#line 2559 "/home/jens/Source/shotwell/src/PhotoPage.vala" +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 16028 "PhotoPage.c" +#line 15249 "PhotoPage.c" } -static void _vala_array_add226 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value) { -#line 2562 "/home/jens/Source/shotwell/src/PhotoPage.vala" - if ((*length) == (*size)) { -#line 2562 "/home/jens/Source/shotwell/src/PhotoPage.vala" - *size = (*size) ? (2 * (*size)) : 4; -#line 2562 "/home/jens/Source/shotwell/src/PhotoPage.vala" - *array = g_renew (GtkActionEntry, *array, *size); -#line 16039 "PhotoPage.c" - } -#line 2562 "/home/jens/Source/shotwell/src/PhotoPage.vala" - (*array)[(*length)++] = *value; -#line 16043 "PhotoPage.c" -} - - -static void _library_photo_page_on_rate_one_gtk_action_callback (GtkAction* action, gpointer self) { -#line 2564 "/home/jens/Source/shotwell/src/PhotoPage.vala" +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 16050 "PhotoPage.c" -} - - -static void _vala_array_add227 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value) { -#line 2567 "/home/jens/Source/shotwell/src/PhotoPage.vala" - if ((*length) == (*size)) { -#line 2567 "/home/jens/Source/shotwell/src/PhotoPage.vala" - *size = (*size) ? (2 * (*size)) : 4; -#line 2567 "/home/jens/Source/shotwell/src/PhotoPage.vala" - *array = g_renew (GtkActionEntry, *array, *size); -#line 16061 "PhotoPage.c" - } -#line 2567 "/home/jens/Source/shotwell/src/PhotoPage.vala" - (*array)[(*length)++] = *value; -#line 16065 "PhotoPage.c" +#line 15256 "PhotoPage.c" } -static void _library_photo_page_on_rate_two_gtk_action_callback (GtkAction* action, gpointer self) { -#line 2569 "/home/jens/Source/shotwell/src/PhotoPage.vala" +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 16072 "PhotoPage.c" +#line 15263 "PhotoPage.c" } -static void _vala_array_add228 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value) { -#line 2572 "/home/jens/Source/shotwell/src/PhotoPage.vala" - if ((*length) == (*size)) { -#line 2572 "/home/jens/Source/shotwell/src/PhotoPage.vala" - *size = (*size) ? (2 * (*size)) : 4; -#line 2572 "/home/jens/Source/shotwell/src/PhotoPage.vala" - *array = g_renew (GtkActionEntry, *array, *size); -#line 16083 "PhotoPage.c" - } -#line 2572 "/home/jens/Source/shotwell/src/PhotoPage.vala" - (*array)[(*length)++] = *value; -#line 16087 "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" } -static void _library_photo_page_on_rate_three_gtk_action_callback (GtkAction* action, gpointer self) { -#line 2574 "/home/jens/Source/shotwell/src/PhotoPage.vala" - library_photo_page_on_rate_three ((LibraryPhotoPage*) self); -#line 16094 "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" } -static void _vala_array_add229 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value) { -#line 2577 "/home/jens/Source/shotwell/src/PhotoPage.vala" - if ((*length) == (*size)) { -#line 2577 "/home/jens/Source/shotwell/src/PhotoPage.vala" - *size = (*size) ? (2 * (*size)) : 4; -#line 2577 "/home/jens/Source/shotwell/src/PhotoPage.vala" - *array = g_renew (GtkActionEntry, *array, *size); -#line 16105 "PhotoPage.c" - } -#line 2577 "/home/jens/Source/shotwell/src/PhotoPage.vala" - (*array)[(*length)++] = *value; -#line 16109 "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" } -static void _library_photo_page_on_rate_four_gtk_action_callback (GtkAction* action, gpointer self) { -#line 2579 "/home/jens/Source/shotwell/src/PhotoPage.vala" - library_photo_page_on_rate_four ((LibraryPhotoPage*) self); -#line 16116 "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" } -static void _vala_array_add230 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value) { -#line 2582 "/home/jens/Source/shotwell/src/PhotoPage.vala" - if ((*length) == (*size)) { -#line 2582 "/home/jens/Source/shotwell/src/PhotoPage.vala" - *size = (*size) ? (2 * (*size)) : 4; -#line 2582 "/home/jens/Source/shotwell/src/PhotoPage.vala" - *array = g_renew (GtkActionEntry, *array, *size); -#line 16127 "PhotoPage.c" - } -#line 2582 "/home/jens/Source/shotwell/src/PhotoPage.vala" - (*array)[(*length)++] = *value; -#line 16131 "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" } -static void _library_photo_page_on_rate_five_gtk_action_callback (GtkAction* action, gpointer self) { -#line 2584 "/home/jens/Source/shotwell/src/PhotoPage.vala" - library_photo_page_on_rate_five ((LibraryPhotoPage*) self); -#line 16138 "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" } -static void _vala_array_add231 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value) { -#line 2587 "/home/jens/Source/shotwell/src/PhotoPage.vala" - if ((*length) == (*size)) { -#line 2587 "/home/jens/Source/shotwell/src/PhotoPage.vala" - *size = (*size) ? (2 * (*size)) : 4; -#line 2587 "/home/jens/Source/shotwell/src/PhotoPage.vala" - *array = g_renew (GtkActionEntry, *array, *size); -#line 16149 "PhotoPage.c" - } -#line 2587 "/home/jens/Source/shotwell/src/PhotoPage.vala" - (*array)[(*length)++] = *value; -#line 16153 "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" } -static void _editing_host_page_on_increase_size_gtk_action_callback (GtkAction* action, gpointer self) { -#line 2589 "/home/jens/Source/shotwell/src/PhotoPage.vala" - editing_host_page_on_increase_size ((EditingHostPage*) self); -#line 16160 "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" } -static void _vala_array_add232 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value) { -#line 2593 "/home/jens/Source/shotwell/src/PhotoPage.vala" - if ((*length) == (*size)) { -#line 2593 "/home/jens/Source/shotwell/src/PhotoPage.vala" - *size = (*size) ? (2 * (*size)) : 4; -#line 2593 "/home/jens/Source/shotwell/src/PhotoPage.vala" - *array = g_renew (GtkActionEntry, *array, *size); -#line 16171 "PhotoPage.c" - } -#line 2593 "/home/jens/Source/shotwell/src/PhotoPage.vala" - (*array)[(*length)++] = *value; -#line 16175 "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" } -static void _editing_host_page_on_decrease_size_gtk_action_callback (GtkAction* action, gpointer self) { -#line 2595 "/home/jens/Source/shotwell/src/PhotoPage.vala" - editing_host_page_on_decrease_size ((EditingHostPage*) self); -#line 16182 "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" } -static void _vala_array_add233 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value) { -#line 2599 "/home/jens/Source/shotwell/src/PhotoPage.vala" - if ((*length) == (*size)) { -#line 2599 "/home/jens/Source/shotwell/src/PhotoPage.vala" - *size = (*size) ? (2 * (*size)) : 4; -#line 2599 "/home/jens/Source/shotwell/src/PhotoPage.vala" - *array = g_renew (GtkActionEntry, *array, *size); -#line 16193 "PhotoPage.c" - } -#line 2599 "/home/jens/Source/shotwell/src/PhotoPage.vala" - (*array)[(*length)++] = *value; -#line 16197 "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" } -static void _editing_host_page_snap_zoom_to_min_gtk_action_callback (GtkAction* action, gpointer self) { -#line 2601 "/home/jens/Source/shotwell/src/PhotoPage.vala" - editing_host_page_snap_zoom_to_min ((EditingHostPage*) self); -#line 16204 "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" } -static void _vala_array_add234 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value) { -#line 2605 "/home/jens/Source/shotwell/src/PhotoPage.vala" - if ((*length) == (*size)) { -#line 2605 "/home/jens/Source/shotwell/src/PhotoPage.vala" - *size = (*size) ? (2 * (*size)) : 4; -#line 2605 "/home/jens/Source/shotwell/src/PhotoPage.vala" - *array = g_renew (GtkActionEntry, *array, *size); -#line 16215 "PhotoPage.c" - } -#line 2605 "/home/jens/Source/shotwell/src/PhotoPage.vala" - (*array)[(*length)++] = *value; -#line 16219 "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" } -static void _editing_host_page_snap_zoom_to_isomorphic_gtk_action_callback (GtkAction* action, gpointer self) { -#line 2607 "/home/jens/Source/shotwell/src/PhotoPage.vala" - editing_host_page_snap_zoom_to_isomorphic ((EditingHostPage*) self); -#line 16226 "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" } -static void _vala_array_add235 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value) { -#line 2613 "/home/jens/Source/shotwell/src/PhotoPage.vala" - if ((*length) == (*size)) { -#line 2613 "/home/jens/Source/shotwell/src/PhotoPage.vala" - *size = (*size) ? (2 * (*size)) : 4; -#line 2613 "/home/jens/Source/shotwell/src/PhotoPage.vala" - *array = g_renew (GtkActionEntry, *array, *size); -#line 16237 "PhotoPage.c" - } -#line 2613 "/home/jens/Source/shotwell/src/PhotoPage.vala" - (*array)[(*length)++] = *value; -#line 16241 "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" } -static void _editing_host_page_snap_zoom_to_max_gtk_action_callback (GtkAction* action, gpointer self) { -#line 2615 "/home/jens/Source/shotwell/src/PhotoPage.vala" - editing_host_page_snap_zoom_to_max ((EditingHostPage*) self); -#line 16248 "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" } -static void _vala_array_add236 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value) { -#line 2621 "/home/jens/Source/shotwell/src/PhotoPage.vala" - if ((*length) == (*size)) { -#line 2621 "/home/jens/Source/shotwell/src/PhotoPage.vala" - *size = (*size) ? (2 * (*size)) : 4; -#line 2621 "/home/jens/Source/shotwell/src/PhotoPage.vala" - *array = g_renew (GtkActionEntry, *array, *size); -#line 16259 "PhotoPage.c" - } -#line 2621 "/home/jens/Source/shotwell/src/PhotoPage.vala" - (*array)[(*length)++] = *value; -#line 16263 "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" } -static void _library_photo_page_on_add_tags_gtk_action_callback (GtkAction* action, gpointer self) { -#line 2623 "/home/jens/Source/shotwell/src/PhotoPage.vala" - library_photo_page_on_add_tags ((LibraryPhotoPage*) self); -#line 16270 "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" } -static void _vala_array_add237 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value) { -#line 2626 "/home/jens/Source/shotwell/src/PhotoPage.vala" - if ((*length) == (*size)) { -#line 2626 "/home/jens/Source/shotwell/src/PhotoPage.vala" - *size = (*size) ? (2 * (*size)) : 4; -#line 2626 "/home/jens/Source/shotwell/src/PhotoPage.vala" - *array = g_renew (GtkActionEntry, *array, *size); -#line 16281 "PhotoPage.c" - } -#line 2626 "/home/jens/Source/shotwell/src/PhotoPage.vala" - (*array)[(*length)++] = *value; -#line 16285 "PhotoPage.c" +LibraryPhotoPage* library_photo_page_construct (GType object_type) { + LibraryPhotoPage * self = NULL; + LibraryPhotoSourceCollection* _tmp0_ = NULL; + ViewCollection* _tmp1_ = NULL; + ViewCollection* _tmp2_ = NULL; + LibraryPhotoSourceCollection* _tmp3_ = NULL; + LibraryPhotoSourceCollection* _tmp4_ = NULL; + ConfigFacade* _tmp5_ = NULL; + ConfigFacade* _tmp6_ = NULL; + ViewCollection* _tmp7_ = NULL; + ViewCollection* _tmp8_ = NULL; + LibraryPhotoPageLibraryPhotoPageViewFilter* _tmp9_ = NULL; + LibraryPhotoSourceCollection* _tmp10_ = NULL; + LibraryPhotoSourceCollection* _tmp11_ = NULL; +#line 2341 "/home/jens/Source/shotwell/src/PhotoPage.vala" + _tmp0_ = library_photo_global; +#line 2341 "/home/jens/Source/shotwell/src/PhotoPage.vala" + self = (LibraryPhotoPage*) editing_host_page_construct (object_type, G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_SOURCE_COLLECTION, SourceCollection), "Photo"); +#line 2344 "/home/jens/Source/shotwell/src/PhotoPage.vala" + _tmp1_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); +#line 2344 "/home/jens/Source/shotwell/src/PhotoPage.vala" + _tmp2_ = _tmp1_; +#line 2344 "/home/jens/Source/shotwell/src/PhotoPage.vala" + g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_DATA_COLLECTION, DataCollection), "items-altered", (GCallback) _library_photo_page_on_photos_altered_data_collection_items_altered, self, 0); +#line 2344 "/home/jens/Source/shotwell/src/PhotoPage.vala" + _data_collection_unref0 (_tmp2_); +#line 2347 "/home/jens/Source/shotwell/src/PhotoPage.vala" + _tmp3_ = library_photo_global; +#line 2347 "/home/jens/Source/shotwell/src/PhotoPage.vala" + g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_SOURCE_COLLECTION, SourceCollection), "item-destroyed", (GCallback) _library_photo_page_on_photo_destroyed_source_collection_item_destroyed, self, 0); +#line 2348 "/home/jens/Source/shotwell/src/PhotoPage.vala" + _tmp4_ = library_photo_global; +#line 2348 "/home/jens/Source/shotwell/src/PhotoPage.vala" + g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_DATA_COLLECTION, DataCollection), "items-altered", (GCallback) _library_photo_page_on_metadata_altered_data_collection_items_altered, self, 0); +#line 2351 "/home/jens/Source/shotwell/src/PhotoPage.vala" + _tmp5_ = config_facade_get_instance (); +#line 2351 "/home/jens/Source/shotwell/src/PhotoPage.vala" + _tmp6_ = _tmp5_; +#line 2351 "/home/jens/Source/shotwell/src/PhotoPage.vala" + g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), "external-app-changed", (GCallback) _library_photo_page_on_external_app_changed_configuration_facade_external_app_changed, self, 0); +#line 2351 "/home/jens/Source/shotwell/src/PhotoPage.vala" + _g_object_unref0 (_tmp6_); +#line 2354 "/home/jens/Source/shotwell/src/PhotoPage.vala" + _tmp7_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); +#line 2354 "/home/jens/Source/shotwell/src/PhotoPage.vala" + _tmp8_ = _tmp7_; +#line 2354 "/home/jens/Source/shotwell/src/PhotoPage.vala" + _tmp9_ = self->priv->filter; +#line 2354 "/home/jens/Source/shotwell/src/PhotoPage.vala" + view_collection_install_view_filter (_tmp8_, G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, TYPE_VIEW_FILTER, ViewFilter)); +#line 2354 "/home/jens/Source/shotwell/src/PhotoPage.vala" + _data_collection_unref0 (_tmp8_); +#line 2355 "/home/jens/Source/shotwell/src/PhotoPage.vala" + _tmp10_ = library_photo_global; +#line 2355 "/home/jens/Source/shotwell/src/PhotoPage.vala" + g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, TYPE_SOURCE_COLLECTION, SourceCollection), "items-unlinking", (GCallback) _library_photo_page_on_photo_unlinking_source_collection_items_unlinking, self, 0); +#line 2356 "/home/jens/Source/shotwell/src/PhotoPage.vala" + _tmp11_ = library_photo_global; +#line 2356 "/home/jens/Source/shotwell/src/PhotoPage.vala" + 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" } -static void _library_photo_page_on_modify_tags_gtk_action_callback (GtkAction* action, gpointer self) { -#line 2628 "/home/jens/Source/shotwell/src/PhotoPage.vala" - library_photo_page_on_modify_tags ((LibraryPhotoPage*) self); -#line 16292 "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" } -static void _vala_array_add238 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value) { -#line 2631 "/home/jens/Source/shotwell/src/PhotoPage.vala" - if ((*length) == (*size)) { -#line 2631 "/home/jens/Source/shotwell/src/PhotoPage.vala" - *size = (*size) ? (2 * (*size)) : 4; -#line 2631 "/home/jens/Source/shotwell/src/PhotoPage.vala" - *array = g_renew (GtkActionEntry, *array, *size); -#line 16303 "PhotoPage.c" - } -#line 2631 "/home/jens/Source/shotwell/src/PhotoPage.vala" - (*array)[(*length)++] = *value; -#line 16307 "PhotoPage.c" +gboolean library_photo_page_not_trashed_view_filter (LibraryPhotoPage* self, DataView* view) { + gboolean result = FALSE; + DataView* _tmp0_ = NULL; + DataSource* _tmp1_ = NULL; + MediaSource* _tmp2_ = NULL; + gboolean _tmp3_ = FALSE; + gboolean _tmp4_ = FALSE; +#line 2365 "/home/jens/Source/shotwell/src/PhotoPage.vala" + g_return_val_if_fail (IS_LIBRARY_PHOTO_PAGE (self), FALSE); +#line 2365 "/home/jens/Source/shotwell/src/PhotoPage.vala" + g_return_val_if_fail (IS_DATA_VIEW (view), FALSE); +#line 2366 "/home/jens/Source/shotwell/src/PhotoPage.vala" + _tmp0_ = view; +#line 2366 "/home/jens/Source/shotwell/src/PhotoPage.vala" + _tmp1_ = data_view_get_source (_tmp0_); +#line 2366 "/home/jens/Source/shotwell/src/PhotoPage.vala" + _tmp2_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_MEDIA_SOURCE, MediaSource); +#line 2366 "/home/jens/Source/shotwell/src/PhotoPage.vala" + _tmp3_ = media_source_is_trashed (_tmp2_); +#line 2366 "/home/jens/Source/shotwell/src/PhotoPage.vala" + _tmp4_ = !_tmp3_; +#line 2366 "/home/jens/Source/shotwell/src/PhotoPage.vala" + _g_object_unref0 (_tmp2_); +#line 2366 "/home/jens/Source/shotwell/src/PhotoPage.vala" + result = _tmp4_; +#line 2366 "/home/jens/Source/shotwell/src/PhotoPage.vala" + return result; +#line 15493 "PhotoPage.c" } -static void _library_photo_page_on_slideshow_gtk_action_callback (GtkAction* action, gpointer self) { -#line 2633 "/home/jens/Source/shotwell/src/PhotoPage.vala" - library_photo_page_on_slideshow ((LibraryPhotoPage*) self); -#line 16314 "PhotoPage.c" +static void library_photo_page_on_photo_unlinking (LibraryPhotoPage* self, GeeCollection* unlinking) { + LibraryPhotoPageLibraryPhotoPageViewFilter* _tmp0_ = NULL; +#line 2369 "/home/jens/Source/shotwell/src/PhotoPage.vala" + g_return_if_fail (IS_LIBRARY_PHOTO_PAGE (self)); +#line 2369 "/home/jens/Source/shotwell/src/PhotoPage.vala" + g_return_if_fail (GEE_IS_COLLECTION (unlinking)); +#line 2370 "/home/jens/Source/shotwell/src/PhotoPage.vala" + _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" } -static void _vala_array_add239 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value) { -#line 2637 "/home/jens/Source/shotwell/src/PhotoPage.vala" - if ((*length) == (*size)) { -#line 2637 "/home/jens/Source/shotwell/src/PhotoPage.vala" - *size = (*size) ? (2 * (*size)) : 4; -#line 2637 "/home/jens/Source/shotwell/src/PhotoPage.vala" - *array = g_renew (GtkActionEntry, *array, *size); -#line 16325 "PhotoPage.c" - } -#line 2637 "/home/jens/Source/shotwell/src/PhotoPage.vala" - (*array)[(*length)++] = *value; -#line 16329 "PhotoPage.c" +static void library_photo_page_on_photo_relinked (LibraryPhotoPage* self, GeeCollection* relinked) { + LibraryPhotoPageLibraryPhotoPageViewFilter* _tmp0_ = NULL; +#line 2373 "/home/jens/Source/shotwell/src/PhotoPage.vala" + g_return_if_fail (IS_LIBRARY_PHOTO_PAGE (self)); +#line 2373 "/home/jens/Source/shotwell/src/PhotoPage.vala" + g_return_if_fail (GEE_IS_COLLECTION (relinked)); +#line 2374 "/home/jens/Source/shotwell/src/PhotoPage.vala" + _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" } -static void _vala_array_add240 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value) { -#line 2641 "/home/jens/Source/shotwell/src/PhotoPage.vala" - if ((*length) == (*size)) { -#line 2641 "/home/jens/Source/shotwell/src/PhotoPage.vala" - *size = (*size) ? (2 * (*size)) : 4; -#line 2641 "/home/jens/Source/shotwell/src/PhotoPage.vala" - *array = g_renew (GtkActionEntry, *array, *size); -#line 16340 "PhotoPage.c" - } -#line 2641 "/home/jens/Source/shotwell/src/PhotoPage.vala" - (*array)[(*length)++] = *value; -#line 16344 "PhotoPage.c" +static void library_photo_page_real_init_collect_ui_filenames (Page* base, GeeList* ui_filenames) { + LibraryPhotoPage * self; + GeeList* _tmp0_ = NULL; + GeeList* _tmp1_ = NULL; + GeeList* _tmp2_ = NULL; +#line 2377 "/home/jens/Source/shotwell/src/PhotoPage.vala" + self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO_PAGE, LibraryPhotoPage); +#line 2377 "/home/jens/Source/shotwell/src/PhotoPage.vala" + g_return_if_fail (GEE_IS_LIST (ui_filenames)); +#line 2378 "/home/jens/Source/shotwell/src/PhotoPage.vala" + _tmp0_ = ui_filenames; +#line 2378 "/home/jens/Source/shotwell/src/PhotoPage.vala" + PAGE_CLASS (library_photo_page_parent_class)->init_collect_ui_filenames (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage), TYPE_PAGE, Page), _tmp0_); +#line 2380 "/home/jens/Source/shotwell/src/PhotoPage.vala" + _tmp1_ = ui_filenames; +#line 2380 "/home/jens/Source/shotwell/src/PhotoPage.vala" + gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_COLLECTION, GeeCollection), "photo_context.ui"); +#line 2381 "/home/jens/Source/shotwell/src/PhotoPage.vala" + _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" } -static void _vala_array_add241 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value) { -#line 2648 "/home/jens/Source/shotwell/src/PhotoPage.vala" - if ((*length) == (*size)) { -#line 2648 "/home/jens/Source/shotwell/src/PhotoPage.vala" - *size = (*size) ? (2 * (*size)) : 4; -#line 2648 "/home/jens/Source/shotwell/src/PhotoPage.vala" - *array = g_renew (GtkActionEntry, *array, *size); -#line 16355 "PhotoPage.c" - } -#line 2648 "/home/jens/Source/shotwell/src/PhotoPage.vala" - (*array)[(*length)++] = *value; -#line 16359 "PhotoPage.c" +static GVariant* _variant_new12 (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" } -static void _vala_array_add242 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value) { -#line 2653 "/home/jens/Source/shotwell/src/PhotoPage.vala" - if ((*length) == (*size)) { -#line 2653 "/home/jens/Source/shotwell/src/PhotoPage.vala" - *size = (*size) ? (2 * (*size)) : 4; -#line 2653 "/home/jens/Source/shotwell/src/PhotoPage.vala" - *array = g_renew (GtkActionEntry, *array, *size); -#line 16370 "PhotoPage.c" - } -#line 2653 "/home/jens/Source/shotwell/src/PhotoPage.vala" - (*array)[(*length)++] = *value; -#line 16374 "PhotoPage.c" +static GVariant* _variant_new13 (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" } -static GtkActionEntry* library_photo_page_real_init_collect_action_entries (Page* base, int* result_length1) { +static void library_photo_page_real_add_actions (Page* base) { LibraryPhotoPage * self; - GtkActionEntry* result = NULL; - GtkActionEntry* actions = NULL; - gint _tmp0_ = 0; - GtkActionEntry* _tmp1_ = NULL; - gint actions_length1 = 0; - gint _actions_size_ = 0; - GtkActionEntry export = {0}; - GtkActionEntry _tmp2_ = {0}; - GtkActionEntry* _tmp3_ = NULL; - gint _tmp3__length1 = 0; - GtkActionEntry _tmp4_ = {0}; - GtkActionEntry print = {0}; - GtkActionEntry _tmp5_ = {0}; - GtkActionEntry* _tmp6_ = NULL; - gint _tmp6__length1 = 0; - GtkActionEntry _tmp7_ = {0}; - GtkActionEntry publish = {0}; - GtkActionEntry _tmp8_ = {0}; - GtkActionEntry* _tmp9_ = NULL; - gint _tmp9__length1 = 0; - GtkActionEntry _tmp10_ = {0}; - GtkActionEntry remove_from_library = {0}; - GtkActionEntry _tmp11_ = {0}; - GtkActionEntry* _tmp12_ = NULL; - gint _tmp12__length1 = 0; - GtkActionEntry _tmp13_ = {0}; - GtkActionEntry move_to_trash = {0}; - GtkActionEntry _tmp14_ = {0}; - GtkActionEntry* _tmp15_ = NULL; - gint _tmp15__length1 = 0; - GtkActionEntry _tmp16_ = {0}; - GtkActionEntry view = {0}; - GtkActionEntry _tmp17_ = {0}; - const gchar* _tmp18_ = NULL; - GtkActionEntry* _tmp19_ = NULL; - gint _tmp19__length1 = 0; - GtkActionEntry _tmp20_ = {0}; - GtkActionEntry tools = {0}; - GtkActionEntry _tmp21_ = {0}; - const gchar* _tmp22_ = NULL; - GtkActionEntry* _tmp23_ = NULL; - gint _tmp23__length1 = 0; - GtkActionEntry _tmp24_ = {0}; - GtkActionEntry prev = {0}; - GtkActionEntry _tmp25_ = {0}; - const gchar* _tmp26_ = NULL; - const gchar* _tmp27_ = NULL; - GtkActionEntry* _tmp28_ = NULL; - gint _tmp28__length1 = 0; - GtkActionEntry _tmp29_ = {0}; - GtkActionEntry next = {0}; - GtkActionEntry _tmp30_ = {0}; - const gchar* _tmp31_ = NULL; - const gchar* _tmp32_ = NULL; - GtkActionEntry* _tmp33_ = NULL; - gint _tmp33__length1 = 0; - GtkActionEntry _tmp34_ = {0}; - GtkActionEntry rotate_right = {0}; - GtkActionEntry _tmp35_ = {0}; - GtkActionEntry* _tmp36_ = NULL; - gint _tmp36__length1 = 0; - GtkActionEntry _tmp37_ = {0}; - GtkActionEntry rotate_left = {0}; - GtkActionEntry _tmp38_ = {0}; - GtkActionEntry* _tmp39_ = NULL; - gint _tmp39__length1 = 0; - GtkActionEntry _tmp40_ = {0}; - GtkActionEntry hflip = {0}; - GtkActionEntry _tmp41_ = {0}; - GtkActionEntry* _tmp42_ = NULL; - gint _tmp42__length1 = 0; - GtkActionEntry _tmp43_ = {0}; - GtkActionEntry vflip = {0}; - GtkActionEntry _tmp44_ = {0}; - GtkActionEntry* _tmp45_ = NULL; - gint _tmp45__length1 = 0; - GtkActionEntry _tmp46_ = {0}; - GtkActionEntry enhance = {0}; - GtkActionEntry _tmp47_ = {0}; - GtkActionEntry* _tmp48_ = NULL; - gint _tmp48__length1 = 0; - GtkActionEntry _tmp49_ = {0}; - GtkActionEntry copy_adjustments = {0}; - GtkActionEntry _tmp50_ = {0}; - GtkActionEntry* _tmp51_ = NULL; - gint _tmp51__length1 = 0; - GtkActionEntry _tmp52_ = {0}; - GtkActionEntry paste_adjustments = {0}; - GtkActionEntry _tmp53_ = {0}; - GtkActionEntry* _tmp54_ = NULL; - gint _tmp54__length1 = 0; - GtkActionEntry _tmp55_ = {0}; - GtkActionEntry crop = {0}; - GtkActionEntry _tmp56_ = {0}; - GtkActionEntry* _tmp57_ = NULL; - gint _tmp57__length1 = 0; - GtkActionEntry _tmp58_ = {0}; - GtkActionEntry straighten = {0}; - GtkActionEntry _tmp59_ = {0}; - GtkActionEntry* _tmp60_ = NULL; - gint _tmp60__length1 = 0; - GtkActionEntry _tmp61_ = {0}; - GtkActionEntry red_eye = {0}; - GtkActionEntry _tmp62_ = {0}; - GtkActionEntry* _tmp63_ = NULL; - gint _tmp63__length1 = 0; - GtkActionEntry _tmp64_ = {0}; - GtkActionEntry adjust = {0}; - GtkActionEntry _tmp65_ = {0}; - GtkActionEntry* _tmp66_ = NULL; - gint _tmp66__length1 = 0; - GtkActionEntry _tmp67_ = {0}; - GtkActionEntry revert = {0}; - GtkActionEntry _tmp68_ = {0}; - GtkActionEntry* _tmp69_ = NULL; - gint _tmp69__length1 = 0; - GtkActionEntry _tmp70_ = {0}; - GtkActionEntry edit_title = {0}; - GtkActionEntry _tmp71_ = {0}; - GtkActionEntry* _tmp72_ = NULL; - gint _tmp72__length1 = 0; - GtkActionEntry _tmp73_ = {0}; - GtkActionEntry edit_comment = {0}; - GtkActionEntry _tmp74_ = {0}; - GtkActionEntry* _tmp75_ = NULL; - gint _tmp75__length1 = 0; - GtkActionEntry _tmp76_ = {0}; - GtkActionEntry adjust_date_time = {0}; - GtkActionEntry _tmp77_ = {0}; - GtkActionEntry* _tmp78_ = NULL; - gint _tmp78__length1 = 0; - GtkActionEntry _tmp79_ = {0}; - GtkActionEntry external_edit = {0}; - GtkActionEntry _tmp80_ = {0}; - GtkActionEntry* _tmp81_ = NULL; - gint _tmp81__length1 = 0; - GtkActionEntry _tmp82_ = {0}; - GtkActionEntry edit_raw = {0}; - GtkActionEntry _tmp83_ = {0}; - GtkActionEntry* _tmp84_ = NULL; - gint _tmp84__length1 = 0; - GtkActionEntry _tmp85_ = {0}; - GtkActionEntry send_to = {0}; - GtkActionEntry _tmp86_ = {0}; - GtkActionEntry* _tmp87_ = NULL; - gint _tmp87__length1 = 0; - GtkActionEntry _tmp88_ = {0}; - GtkActionEntry set_background = {0}; - GtkActionEntry _tmp89_ = {0}; - GtkActionEntry* _tmp90_ = NULL; - gint _tmp90__length1 = 0; - GtkActionEntry _tmp91_ = {0}; - GtkActionEntry flag = {0}; - GtkActionEntry _tmp92_ = {0}; - GtkActionEntry* _tmp93_ = NULL; - gint _tmp93__length1 = 0; - GtkActionEntry _tmp94_ = {0}; - GtkActionEntry set_rating = {0}; - GtkActionEntry _tmp95_ = {0}; - GtkActionEntry* _tmp96_ = NULL; - gint _tmp96__length1 = 0; - GtkActionEntry _tmp97_ = {0}; - GtkActionEntry increase_rating = {0}; - GtkActionEntry _tmp98_ = {0}; - GtkActionEntry* _tmp99_ = NULL; - gint _tmp99__length1 = 0; - GtkActionEntry _tmp100_ = {0}; - GtkActionEntry decrease_rating = {0}; - GtkActionEntry _tmp101_ = {0}; - GtkActionEntry* _tmp102_ = NULL; - gint _tmp102__length1 = 0; - GtkActionEntry _tmp103_ = {0}; - GtkActionEntry rate_rejected = {0}; - GtkActionEntry _tmp104_ = {0}; - const gchar* _tmp105_ = NULL; - GtkActionEntry* _tmp106_ = NULL; - gint _tmp106__length1 = 0; - GtkActionEntry _tmp107_ = {0}; - GtkActionEntry rate_unrated = {0}; - GtkActionEntry _tmp108_ = {0}; - const gchar* _tmp109_ = NULL; - GtkActionEntry* _tmp110_ = NULL; - gint _tmp110__length1 = 0; - GtkActionEntry _tmp111_ = {0}; - GtkActionEntry rate_one = {0}; - GtkActionEntry _tmp112_ = {0}; - const gchar* _tmp113_ = NULL; - GtkActionEntry* _tmp114_ = NULL; - gint _tmp114__length1 = 0; - GtkActionEntry _tmp115_ = {0}; - GtkActionEntry rate_two = {0}; - GtkActionEntry _tmp116_ = {0}; - const gchar* _tmp117_ = NULL; - GtkActionEntry* _tmp118_ = NULL; - gint _tmp118__length1 = 0; - GtkActionEntry _tmp119_ = {0}; - GtkActionEntry rate_three = {0}; - GtkActionEntry _tmp120_ = {0}; - const gchar* _tmp121_ = NULL; - GtkActionEntry* _tmp122_ = NULL; - gint _tmp122__length1 = 0; - GtkActionEntry _tmp123_ = {0}; - GtkActionEntry rate_four = {0}; - GtkActionEntry _tmp124_ = {0}; - const gchar* _tmp125_ = NULL; - GtkActionEntry* _tmp126_ = NULL; - gint _tmp126__length1 = 0; - GtkActionEntry _tmp127_ = {0}; - GtkActionEntry rate_five = {0}; - GtkActionEntry _tmp128_ = {0}; - const gchar* _tmp129_ = NULL; - GtkActionEntry* _tmp130_ = NULL; - gint _tmp130__length1 = 0; - GtkActionEntry _tmp131_ = {0}; - GtkActionEntry increase_size = {0}; - GtkActionEntry _tmp132_ = {0}; - const gchar* _tmp133_ = NULL; - const gchar* _tmp134_ = NULL; - GtkActionEntry* _tmp135_ = NULL; - gint _tmp135__length1 = 0; - GtkActionEntry _tmp136_ = {0}; - GtkActionEntry decrease_size = {0}; - GtkActionEntry _tmp137_ = {0}; - const gchar* _tmp138_ = NULL; - const gchar* _tmp139_ = NULL; - GtkActionEntry* _tmp140_ = NULL; - gint _tmp140__length1 = 0; - GtkActionEntry _tmp141_ = {0}; - GtkActionEntry best_fit = {0}; - GtkActionEntry _tmp142_ = {0}; - const gchar* _tmp143_ = NULL; - const gchar* _tmp144_ = NULL; - GtkActionEntry* _tmp145_ = NULL; - gint _tmp145__length1 = 0; - GtkActionEntry _tmp146_ = {0}; - GtkActionEntry actual_size = {0}; - GtkActionEntry _tmp147_ = {0}; - const gchar* _tmp148_ = NULL; - const gchar* _tmp149_ = NULL; - GtkActionEntry* _tmp150_ = NULL; - gint _tmp150__length1 = 0; - GtkActionEntry _tmp151_ = {0}; - GtkActionEntry max_size = {0}; - GtkActionEntry _tmp152_ = {0}; - const gchar* _tmp153_ = NULL; - const gchar* _tmp154_ = NULL; - GtkActionEntry* _tmp155_ = NULL; - gint _tmp155__length1 = 0; - GtkActionEntry _tmp156_ = {0}; - GtkActionEntry add_tags = {0}; - GtkActionEntry _tmp157_ = {0}; - GtkActionEntry* _tmp158_ = NULL; - gint _tmp158__length1 = 0; - GtkActionEntry _tmp159_ = {0}; - GtkActionEntry modify_tags = {0}; - GtkActionEntry _tmp160_ = {0}; - GtkActionEntry* _tmp161_ = NULL; - gint _tmp161__length1 = 0; - GtkActionEntry _tmp162_ = {0}; - GtkActionEntry slideshow = {0}; - GtkActionEntry _tmp163_ = {0}; - const gchar* _tmp164_ = NULL; - const gchar* _tmp165_ = NULL; - GtkActionEntry* _tmp166_ = NULL; - gint _tmp166__length1 = 0; - GtkActionEntry _tmp167_ = {0}; - GtkActionEntry raw_developer = {0}; - GtkActionEntry _tmp168_ = {0}; - const gchar* _tmp169_ = NULL; - GtkActionEntry* _tmp170_ = NULL; - gint _tmp170__length1 = 0; - GtkActionEntry _tmp171_ = {0}; - GtkActionEntry send_to_context_menu = {0}; - GtkActionEntry _tmp172_ = {0}; - GtkActionEntry* _tmp173_ = NULL; - gint _tmp173__length1 = 0; - GtkActionEntry _tmp174_ = {0}; - GtkActionEntry add_tags_context_menu = {0}; - GtkActionEntry _tmp175_ = {0}; - GtkActionEntry* _tmp176_ = NULL; - gint _tmp176__length1 = 0; - GtkActionEntry _tmp177_ = {0}; - GtkActionEntry* _tmp178_ = NULL; - gint _tmp178__length1 = 0; -#line 2382 "/home/jens/Source/shotwell/src/PhotoPage.vala" - self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO_PAGE, LibraryPhotoPage); -#line 2383 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp1_ = PAGE_CLASS (library_photo_page_parent_class)->init_collect_action_entries (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage), TYPE_PAGE, Page), &_tmp0_); -#line 2383 "/home/jens/Source/shotwell/src/PhotoPage.vala" - actions = _tmp1_; -#line 2383 "/home/jens/Source/shotwell/src/PhotoPage.vala" - actions_length1 = _tmp0_; -#line 2383 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _actions_size_ = actions_length1; -#line 2385 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp2_.name = "Export"; -#line 2385 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp2_.stock_id = RESOURCES_SAVE_AS_LABEL; -#line 2385 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp2_.label = TRANSLATABLE; -#line 2385 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp2_.accelerator = "<Ctrl><Shift>E"; -#line 2385 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp2_.tooltip = TRANSLATABLE; -#line 2385 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp2_.callback = (GCallback) _library_photo_page_on_export_gtk_action_callback; -#line 2385 "/home/jens/Source/shotwell/src/PhotoPage.vala" - export = _tmp2_; -#line 2387 "/home/jens/Source/shotwell/src/PhotoPage.vala" - export.label = RESOURCES_EXPORT_MENU; -#line 2388 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp3_ = actions; -#line 2388 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp3__length1 = actions_length1; -#line 2388 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp4_ = export; -#line 2388 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _vala_array_add193 (&actions, &actions_length1, &_actions_size_, &_tmp4_); -#line 2390 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp5_.name = "Print"; -#line 2390 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp5_.stock_id = RESOURCES_PRINT_LABEL; -#line 2390 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp5_.label = TRANSLATABLE; -#line 2390 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp5_.accelerator = "<Ctrl>P"; -#line 2390 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp5_.tooltip = TRANSLATABLE; -#line 2390 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp5_.callback = (GCallback) _library_photo_page_on_print_gtk_action_callback; -#line 2390 "/home/jens/Source/shotwell/src/PhotoPage.vala" - print = _tmp5_; -#line 2392 "/home/jens/Source/shotwell/src/PhotoPage.vala" - print.label = RESOURCES_PRINT_MENU; -#line 2393 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp6_ = actions; -#line 2393 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp6__length1 = actions_length1; -#line 2393 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp7_ = print; -#line 2393 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _vala_array_add194 (&actions, &actions_length1, &_actions_size_, &_tmp7_); -#line 2395 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp8_.name = "Publish"; -#line 2395 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp8_.stock_id = RESOURCES_PUBLISH; -#line 2395 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp8_.label = TRANSLATABLE; -#line 2395 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp8_.accelerator = "<Ctrl><Shift>P"; -#line 2395 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp8_.tooltip = TRANSLATABLE; -#line 2395 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp8_.callback = (GCallback) _library_photo_page_on_publish_gtk_action_callback; -#line 2395 "/home/jens/Source/shotwell/src/PhotoPage.vala" - publish = _tmp8_; -#line 2397 "/home/jens/Source/shotwell/src/PhotoPage.vala" - publish.label = RESOURCES_PUBLISH_MENU; -#line 2398 "/home/jens/Source/shotwell/src/PhotoPage.vala" - publish.tooltip = RESOURCES_PUBLISH_TOOLTIP; -#line 2399 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp9_ = actions; -#line 2399 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp9__length1 = actions_length1; -#line 2399 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp10_ = publish; -#line 2399 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _vala_array_add195 (&actions, &actions_length1, &_actions_size_, &_tmp10_); -#line 2401 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp11_.name = "RemoveFromLibrary"; -#line 2401 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp11_.stock_id = RESOURCES_REMOVE_LABEL; -#line 2401 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp11_.label = TRANSLATABLE; -#line 2401 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp11_.accelerator = "<Shift>Delete"; -#line 2401 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp11_.tooltip = TRANSLATABLE; -#line 2401 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp11_.callback = (GCallback) _library_photo_page_on_remove_from_library_gtk_action_callback; -#line 2401 "/home/jens/Source/shotwell/src/PhotoPage.vala" - remove_from_library = _tmp11_; -#line 2403 "/home/jens/Source/shotwell/src/PhotoPage.vala" - remove_from_library.label = RESOURCES_REMOVE_FROM_LIBRARY_MENU; -#line 2404 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp12_ = actions; -#line 2404 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp12__length1 = actions_length1; -#line 2404 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp13_ = remove_from_library; -#line 2404 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _vala_array_add196 (&actions, &actions_length1, &_actions_size_, &_tmp13_); -#line 2406 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp14_.name = "MoveToTrash"; -#line 2406 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp14_.stock_id = "user-trash-full"; -#line 2406 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp14_.label = TRANSLATABLE; -#line 2406 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp14_.accelerator = "Delete"; -#line 2406 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp14_.tooltip = TRANSLATABLE; -#line 2406 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp14_.callback = (GCallback) _library_photo_page_on_move_to_trash_gtk_action_callback; -#line 2406 "/home/jens/Source/shotwell/src/PhotoPage.vala" - move_to_trash = _tmp14_; -#line 2408 "/home/jens/Source/shotwell/src/PhotoPage.vala" - move_to_trash.label = RESOURCES_MOVE_TO_TRASH_MENU; -#line 2409 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp15_ = actions; -#line 2409 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp15__length1 = actions_length1; -#line 2409 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp16_ = move_to_trash; -#line 2409 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _vala_array_add197 (&actions, &actions_length1, &_actions_size_, &_tmp16_); -#line 2411 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp17_.name = "ViewMenu"; -#line 2411 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp17_.stock_id = NULL; -#line 2411 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp17_.label = TRANSLATABLE; -#line 2411 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp17_.accelerator = NULL; -#line 2411 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp17_.tooltip = NULL; -#line 2411 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp17_.callback = (GCallback) _library_photo_page_on_view_menu_gtk_action_callback; -#line 2411 "/home/jens/Source/shotwell/src/PhotoPage.vala" - view = _tmp17_; -#line 2412 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp18_ = _ ("_View"); -#line 2412 "/home/jens/Source/shotwell/src/PhotoPage.vala" - view.label = _tmp18_; -#line 2413 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp19_ = actions; -#line 2413 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp19__length1 = actions_length1; -#line 2413 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp20_ = view; -#line 2413 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _vala_array_add198 (&actions, &actions_length1, &_actions_size_, &_tmp20_); -#line 2415 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp21_.name = "Tools"; -#line 2415 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp21_.stock_id = NULL; -#line 2415 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp21_.label = TRANSLATABLE; -#line 2415 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp21_.accelerator = NULL; -#line 2415 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp21_.tooltip = NULL; -#line 2415 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp21_.callback = (GCallback) NULL; -#line 2415 "/home/jens/Source/shotwell/src/PhotoPage.vala" - tools = _tmp21_; -#line 2416 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp22_ = _ ("T_ools"); -#line 2416 "/home/jens/Source/shotwell/src/PhotoPage.vala" - tools.label = _tmp22_; -#line 2417 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp23_ = actions; -#line 2417 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp23__length1 = actions_length1; -#line 2417 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp24_ = tools; -#line 2417 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _vala_array_add199 (&actions, &actions_length1, &_actions_size_, &_tmp24_); -#line 2419 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp25_.name = "PrevPhoto"; -#line 2419 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp25_.stock_id = RESOURCES_PREVIOUS_LABEL; -#line 2419 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp25_.label = TRANSLATABLE; -#line 2419 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp25_.accelerator = NULL; -#line 2419 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp25_.tooltip = TRANSLATABLE; -#line 2419 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp25_.callback = (GCallback) _single_photo_page_on_previous_photo_gtk_action_callback; -#line 2419 "/home/jens/Source/shotwell/src/PhotoPage.vala" - prev = _tmp25_; -#line 2421 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp26_ = _ ("_Previous Photo"); -#line 2421 "/home/jens/Source/shotwell/src/PhotoPage.vala" - prev.label = _tmp26_; -#line 2422 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp27_ = _ ("Previous Photo"); -#line 2422 "/home/jens/Source/shotwell/src/PhotoPage.vala" - prev.tooltip = _tmp27_; -#line 2423 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp28_ = actions; -#line 2423 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp28__length1 = actions_length1; -#line 2423 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp29_ = prev; -#line 2423 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _vala_array_add200 (&actions, &actions_length1, &_actions_size_, &_tmp29_); -#line 2425 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp30_.name = "NextPhoto"; -#line 2425 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp30_.stock_id = RESOURCES_NEXT_LABEL; -#line 2425 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp30_.label = TRANSLATABLE; -#line 2425 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp30_.accelerator = NULL; -#line 2425 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp30_.tooltip = TRANSLATABLE; -#line 2425 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp30_.callback = (GCallback) _single_photo_page_on_next_photo_gtk_action_callback; -#line 2425 "/home/jens/Source/shotwell/src/PhotoPage.vala" - next = _tmp30_; -#line 2427 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp31_ = _ ("_Next Photo"); -#line 2427 "/home/jens/Source/shotwell/src/PhotoPage.vala" - next.label = _tmp31_; -#line 2428 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp32_ = _ ("Next Photo"); -#line 2428 "/home/jens/Source/shotwell/src/PhotoPage.vala" - next.tooltip = _tmp32_; -#line 2429 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp33_ = actions; -#line 2429 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp33__length1 = actions_length1; -#line 2429 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp34_ = next; -#line 2429 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _vala_array_add201 (&actions, &actions_length1, &_actions_size_, &_tmp34_); -#line 2431 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp35_.name = "RotateClockwise"; -#line 2431 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp35_.stock_id = RESOURCES_CLOCKWISE; -#line 2431 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp35_.label = TRANSLATABLE; -#line 2431 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp35_.accelerator = "<Ctrl>R"; -#line 2431 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp35_.tooltip = TRANSLATABLE; -#line 2431 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp35_.callback = (GCallback) _editing_host_page_on_rotate_clockwise_gtk_action_callback; -#line 2431 "/home/jens/Source/shotwell/src/PhotoPage.vala" - rotate_right = _tmp35_; -#line 2433 "/home/jens/Source/shotwell/src/PhotoPage.vala" - rotate_right.label = RESOURCES_ROTATE_CW_MENU; -#line 2434 "/home/jens/Source/shotwell/src/PhotoPage.vala" - rotate_right.tooltip = RESOURCES_ROTATE_CW_TOOLTIP; -#line 2435 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp36_ = actions; -#line 2435 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp36__length1 = actions_length1; -#line 2435 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp37_ = rotate_right; -#line 2435 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _vala_array_add202 (&actions, &actions_length1, &_actions_size_, &_tmp37_); -#line 2437 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp38_.name = "RotateCounterclockwise"; -#line 2437 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp38_.stock_id = RESOURCES_COUNTERCLOCKWISE; -#line 2437 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp38_.label = TRANSLATABLE; -#line 2437 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp38_.accelerator = "<Ctrl><Shift>R"; -#line 2437 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp38_.tooltip = TRANSLATABLE; -#line 2437 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp38_.callback = (GCallback) _editing_host_page_on_rotate_counterclockwise_gtk_action_callback; + AppWindow* _tmp0_ = NULL; + AppWindow* _tmp1_ = NULL; + GAction* _tmp2_ = NULL; + GSimpleAction* _tmp3_ = NULL; + GSimpleAction* _tmp4_ = NULL; + ConfigFacade* _tmp5_ = NULL; + ConfigFacade* _tmp6_ = NULL; + gboolean _tmp7_ = FALSE; + GVariant* _tmp8_ = NULL; + RawDeveloper d = 0; + ConfigFacade* _tmp9_ = NULL; + ConfigFacade* _tmp10_ = NULL; + RawDeveloper _tmp11_ = 0; + RawDeveloper _tmp12_ = 0; + GSimpleAction* action = NULL; + GAction* _tmp13_ = NULL; + GSimpleAction* _tmp14_ = NULL; + const gchar* _tmp15_ = NULL; + RawDeveloper _tmp16_ = 0; + GSimpleAction* _tmp17_ = NULL; + GVariant* _tmp18_ = NULL; #line 2437 "/home/jens/Source/shotwell/src/PhotoPage.vala" - rotate_left = _tmp38_; -#line 2439 "/home/jens/Source/shotwell/src/PhotoPage.vala" - rotate_left.label = RESOURCES_ROTATE_CCW_MENU; + self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO_PAGE, LibraryPhotoPage); +#line 2438 "/home/jens/Source/shotwell/src/PhotoPage.vala" + PAGE_CLASS (library_photo_page_parent_class)->add_actions (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage), TYPE_PAGE, Page)); #line 2440 "/home/jens/Source/shotwell/src/PhotoPage.vala" - rotate_left.tooltip = RESOURCES_ROTATE_CCW_TOOLTIP; + _tmp0_ = app_window_get_instance (); +#line 2440 "/home/jens/Source/shotwell/src/PhotoPage.vala" + _tmp1_ = _tmp0_; +#line 2440 "/home/jens/Source/shotwell/src/PhotoPage.vala" + g_action_map_add_action_entries (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, g_action_map_get_type (), GActionMap), LIBRARY_PHOTO_PAGE_entries, G_N_ELEMENTS (LIBRARY_PHOTO_PAGE_entries), self); +#line 2440 "/home/jens/Source/shotwell/src/PhotoPage.vala" + _g_object_unref0 (_tmp1_); #line 2441 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp39_ = actions; + _tmp2_ = page_get_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "ViewRatings"); #line 2441 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp39__length1 = actions_length1; + _tmp3_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp2_, g_simple_action_get_type ()) ? ((GSimpleAction*) _tmp2_) : NULL; #line 2441 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp40_ = rotate_left; + if (_tmp3_ == NULL) { #line 2441 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _vala_array_add203 (&actions, &actions_length1, &_actions_size_, &_tmp40_); -#line 2443 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp41_.name = "FlipHorizontally"; -#line 2443 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp41_.stock_id = RESOURCES_HFLIP; -#line 2443 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp41_.label = TRANSLATABLE; + _g_object_unref0 (_tmp2_); +#line 15607 "PhotoPage.c" + } +#line 2441 "/home/jens/Source/shotwell/src/PhotoPage.vala" + _tmp4_ = _tmp3_; +#line 2441 "/home/jens/Source/shotwell/src/PhotoPage.vala" + _tmp5_ = config_facade_get_instance (); +#line 2441 "/home/jens/Source/shotwell/src/PhotoPage.vala" + _tmp6_ = _tmp5_; +#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_); +#line 2441 "/home/jens/Source/shotwell/src/PhotoPage.vala" + g_simple_action_set_state (_tmp4_, _tmp8_); +#line 2441 "/home/jens/Source/shotwell/src/PhotoPage.vala" + _g_variant_unref0 (_tmp8_); +#line 2441 "/home/jens/Source/shotwell/src/PhotoPage.vala" + _g_object_unref0 (_tmp6_); +#line 2441 "/home/jens/Source/shotwell/src/PhotoPage.vala" + _g_object_unref0 (_tmp4_); +#line 2442 "/home/jens/Source/shotwell/src/PhotoPage.vala" + _tmp9_ = config_facade_get_instance (); +#line 2442 "/home/jens/Source/shotwell/src/PhotoPage.vala" + _tmp10_ = _tmp9_; +#line 2442 "/home/jens/Source/shotwell/src/PhotoPage.vala" + _tmp11_ = configuration_facade_get_default_raw_developer (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade)); +#line 2442 "/home/jens/Source/shotwell/src/PhotoPage.vala" + _tmp12_ = _tmp11_; +#line 2442 "/home/jens/Source/shotwell/src/PhotoPage.vala" + _g_object_unref0 (_tmp10_); +#line 2442 "/home/jens/Source/shotwell/src/PhotoPage.vala" + d = _tmp12_; #line 2443 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp41_.accelerator = NULL; + _tmp13_ = page_get_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RawDeveloper"); #line 2443 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp41_.tooltip = TRANSLATABLE; + _tmp14_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp13_, g_simple_action_get_type ()) ? ((GSimpleAction*) _tmp13_) : NULL; #line 2443 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp41_.callback = (GCallback) _editing_host_page_on_flip_horizontally_gtk_action_callback; + if (_tmp14_ == NULL) { #line 2443 "/home/jens/Source/shotwell/src/PhotoPage.vala" - hflip = _tmp41_; -#line 2445 "/home/jens/Source/shotwell/src/PhotoPage.vala" - hflip.label = RESOURCES_HFLIP_MENU; -#line 2446 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp42_ = actions; -#line 2446 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp42__length1 = actions_length1; -#line 2446 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp43_ = hflip; -#line 2446 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _vala_array_add204 (&actions, &actions_length1, &_actions_size_, &_tmp43_); -#line 2448 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp44_.name = "FlipVertically"; -#line 2448 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp44_.stock_id = RESOURCES_VFLIP; -#line 2448 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp44_.label = TRANSLATABLE; -#line 2448 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp44_.accelerator = NULL; -#line 2448 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp44_.tooltip = TRANSLATABLE; -#line 2448 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp44_.callback = (GCallback) _editing_host_page_on_flip_vertically_gtk_action_callback; -#line 2448 "/home/jens/Source/shotwell/src/PhotoPage.vala" - vflip = _tmp44_; -#line 2450 "/home/jens/Source/shotwell/src/PhotoPage.vala" - vflip.label = RESOURCES_VFLIP_MENU; -#line 2451 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp45_ = actions; -#line 2451 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp45__length1 = actions_length1; -#line 2451 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp46_ = vflip; -#line 2451 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _vala_array_add205 (&actions, &actions_length1, &_actions_size_, &_tmp46_); -#line 2453 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp47_.name = "Enhance"; -#line 2453 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp47_.stock_id = RESOURCES_ENHANCE; -#line 2453 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp47_.label = TRANSLATABLE; -#line 2453 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp47_.accelerator = "<Ctrl>E"; -#line 2453 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp47_.tooltip = TRANSLATABLE; -#line 2453 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp47_.callback = (GCallback) _editing_host_page_on_enhance_gtk_action_callback; -#line 2453 "/home/jens/Source/shotwell/src/PhotoPage.vala" - enhance = _tmp47_; -#line 2455 "/home/jens/Source/shotwell/src/PhotoPage.vala" - enhance.label = RESOURCES_ENHANCE_MENU; -#line 2456 "/home/jens/Source/shotwell/src/PhotoPage.vala" - enhance.tooltip = RESOURCES_ENHANCE_TOOLTIP; -#line 2457 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp48_ = actions; -#line 2457 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp48__length1 = actions_length1; -#line 2457 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp49_ = enhance; -#line 2457 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _vala_array_add206 (&actions, &actions_length1, &_actions_size_, &_tmp49_); -#line 2459 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp50_.name = "CopyColorAdjustments"; -#line 2459 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp50_.stock_id = NULL; -#line 2459 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp50_.label = TRANSLATABLE; -#line 2459 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp50_.accelerator = "<Ctrl><Shift>C"; -#line 2459 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp50_.tooltip = TRANSLATABLE; -#line 2459 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp50_.callback = (GCallback) _editing_host_page_on_copy_adjustments_gtk_action_callback; -#line 2459 "/home/jens/Source/shotwell/src/PhotoPage.vala" - copy_adjustments = _tmp50_; -#line 2461 "/home/jens/Source/shotwell/src/PhotoPage.vala" - copy_adjustments.label = RESOURCES_COPY_ADJUSTMENTS_MENU; -#line 2462 "/home/jens/Source/shotwell/src/PhotoPage.vala" - copy_adjustments.tooltip = RESOURCES_COPY_ADJUSTMENTS_TOOLTIP; -#line 2463 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp51_ = actions; -#line 2463 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp51__length1 = actions_length1; -#line 2463 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp52_ = copy_adjustments; -#line 2463 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _vala_array_add207 (&actions, &actions_length1, &_actions_size_, &_tmp52_); -#line 2465 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp53_.name = "PasteColorAdjustments"; -#line 2465 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp53_.stock_id = NULL; -#line 2465 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp53_.label = TRANSLATABLE; -#line 2465 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp53_.accelerator = "<Ctrl><Shift>V"; -#line 2465 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp53_.tooltip = TRANSLATABLE; -#line 2465 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp53_.callback = (GCallback) _editing_host_page_on_paste_adjustments_gtk_action_callback; -#line 2465 "/home/jens/Source/shotwell/src/PhotoPage.vala" - paste_adjustments = _tmp53_; -#line 2467 "/home/jens/Source/shotwell/src/PhotoPage.vala" - paste_adjustments.label = RESOURCES_PASTE_ADJUSTMENTS_MENU; -#line 2468 "/home/jens/Source/shotwell/src/PhotoPage.vala" - paste_adjustments.tooltip = RESOURCES_PASTE_ADJUSTMENTS_TOOLTIP; -#line 2469 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp54_ = actions; -#line 2469 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp54__length1 = actions_length1; -#line 2469 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp55_ = paste_adjustments; -#line 2469 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _vala_array_add208 (&actions, &actions_length1, &_actions_size_, &_tmp55_); -#line 2471 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp56_.name = "Crop"; -#line 2471 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp56_.stock_id = RESOURCES_CROP; -#line 2471 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp56_.label = TRANSLATABLE; -#line 2471 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp56_.accelerator = "<Ctrl>O"; -#line 2471 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp56_.tooltip = TRANSLATABLE; -#line 2471 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp56_.callback = (GCallback) _editing_host_page_toggle_crop_gtk_action_callback; -#line 2471 "/home/jens/Source/shotwell/src/PhotoPage.vala" - crop = _tmp56_; -#line 2473 "/home/jens/Source/shotwell/src/PhotoPage.vala" - crop.label = RESOURCES_CROP_MENU; -#line 2474 "/home/jens/Source/shotwell/src/PhotoPage.vala" - crop.tooltip = RESOURCES_CROP_TOOLTIP; -#line 2475 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp57_ = actions; -#line 2475 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp57__length1 = actions_length1; -#line 2475 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp58_ = crop; -#line 2475 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _vala_array_add209 (&actions, &actions_length1, &_actions_size_, &_tmp58_); -#line 2477 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp59_.name = "Straighten"; -#line 2477 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp59_.stock_id = RESOURCES_REFRESH_LABEL; -#line 2477 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp59_.label = TRANSLATABLE; -#line 2477 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp59_.accelerator = "<Ctrl>A"; -#line 2477 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp59_.tooltip = TRANSLATABLE; -#line 2477 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp59_.callback = (GCallback) _editing_host_page_toggle_straighten_gtk_action_callback; -#line 2477 "/home/jens/Source/shotwell/src/PhotoPage.vala" - straighten = _tmp59_; -#line 2479 "/home/jens/Source/shotwell/src/PhotoPage.vala" - straighten.label = RESOURCES_STRAIGHTEN_MENU; -#line 2480 "/home/jens/Source/shotwell/src/PhotoPage.vala" - straighten.tooltip = RESOURCES_STRAIGHTEN_TOOLTIP; -#line 2481 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp60_ = actions; -#line 2481 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp60__length1 = actions_length1; -#line 2481 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp61_ = straighten; -#line 2481 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _vala_array_add210 (&actions, &actions_length1, &_actions_size_, &_tmp61_); -#line 2483 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp62_.name = "RedEye"; -#line 2483 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp62_.stock_id = RESOURCES_REDEYE; -#line 2483 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp62_.label = TRANSLATABLE; -#line 2483 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp62_.accelerator = "<Ctrl>Y"; -#line 2483 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp62_.tooltip = TRANSLATABLE; -#line 2483 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp62_.callback = (GCallback) _editing_host_page_toggle_redeye_gtk_action_callback; -#line 2483 "/home/jens/Source/shotwell/src/PhotoPage.vala" - red_eye = _tmp62_; -#line 2485 "/home/jens/Source/shotwell/src/PhotoPage.vala" - red_eye.label = RESOURCES_RED_EYE_MENU; -#line 2486 "/home/jens/Source/shotwell/src/PhotoPage.vala" - red_eye.tooltip = RESOURCES_RED_EYE_TOOLTIP; -#line 2487 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp63_ = actions; -#line 2487 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp63__length1 = actions_length1; -#line 2487 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp64_ = red_eye; -#line 2487 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _vala_array_add211 (&actions, &actions_length1, &_actions_size_, &_tmp64_); -#line 2489 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp65_.name = "Adjust"; -#line 2489 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp65_.stock_id = RESOURCES_ADJUST; -#line 2489 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp65_.label = TRANSLATABLE; -#line 2489 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp65_.accelerator = "<Ctrl>D"; -#line 2489 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp65_.tooltip = TRANSLATABLE; -#line 2489 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp65_.callback = (GCallback) _editing_host_page_toggle_adjust_gtk_action_callback; -#line 2489 "/home/jens/Source/shotwell/src/PhotoPage.vala" - adjust = _tmp65_; -#line 2491 "/home/jens/Source/shotwell/src/PhotoPage.vala" - adjust.label = RESOURCES_ADJUST_MENU; -#line 2492 "/home/jens/Source/shotwell/src/PhotoPage.vala" - adjust.tooltip = RESOURCES_ADJUST_TOOLTIP; -#line 2493 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp66_ = actions; -#line 2493 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp66__length1 = actions_length1; -#line 2493 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp67_ = adjust; -#line 2493 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _vala_array_add212 (&actions, &actions_length1, &_actions_size_, &_tmp67_); -#line 2495 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp68_.name = "Revert"; -#line 2495 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp68_.stock_id = RESOURCES_REVERT_TO_SAVED_LABEL; -#line 2495 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp68_.label = TRANSLATABLE; -#line 2495 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp68_.accelerator = NULL; -#line 2495 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp68_.tooltip = TRANSLATABLE; -#line 2495 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp68_.callback = (GCallback) _editing_host_page_on_revert_gtk_action_callback; -#line 2495 "/home/jens/Source/shotwell/src/PhotoPage.vala" - revert = _tmp68_; -#line 2497 "/home/jens/Source/shotwell/src/PhotoPage.vala" - revert.label = RESOURCES_REVERT_MENU; -#line 2498 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp69_ = actions; -#line 2498 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp69__length1 = actions_length1; -#line 2498 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp70_ = revert; -#line 2498 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _vala_array_add213 (&actions, &actions_length1, &_actions_size_, &_tmp70_); -#line 2500 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp71_.name = "EditTitle"; -#line 2500 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp71_.stock_id = NULL; -#line 2500 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp71_.label = TRANSLATABLE; -#line 2500 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp71_.accelerator = "F2"; -#line 2500 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp71_.tooltip = TRANSLATABLE; -#line 2500 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp71_.callback = (GCallback) _editing_host_page_on_edit_title_gtk_action_callback; -#line 2500 "/home/jens/Source/shotwell/src/PhotoPage.vala" - edit_title = _tmp71_; -#line 2502 "/home/jens/Source/shotwell/src/PhotoPage.vala" - edit_title.label = RESOURCES_EDIT_TITLE_MENU; -#line 2503 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp72_ = actions; -#line 2503 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp72__length1 = actions_length1; -#line 2503 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp73_ = edit_title; -#line 2503 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _vala_array_add214 (&actions, &actions_length1, &_actions_size_, &_tmp73_); -#line 2505 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp74_.name = "EditComment"; -#line 2505 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp74_.stock_id = NULL; -#line 2505 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp74_.label = TRANSLATABLE; -#line 2505 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp74_.accelerator = "F3"; -#line 2505 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp74_.tooltip = TRANSLATABLE; -#line 2505 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp74_.callback = (GCallback) _editing_host_page_on_edit_comment_gtk_action_callback; -#line 2505 "/home/jens/Source/shotwell/src/PhotoPage.vala" - edit_comment = _tmp74_; -#line 2507 "/home/jens/Source/shotwell/src/PhotoPage.vala" - edit_comment.label = RESOURCES_EDIT_COMMENT_MENU; -#line 2508 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp75_ = actions; -#line 2508 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp75__length1 = actions_length1; -#line 2508 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp76_ = edit_comment; -#line 2508 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _vala_array_add215 (&actions, &actions_length1, &_actions_size_, &_tmp76_); -#line 2510 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp77_.name = "AdjustDateTime"; -#line 2510 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp77_.stock_id = NULL; -#line 2510 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp77_.label = TRANSLATABLE; -#line 2510 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp77_.accelerator = NULL; -#line 2510 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp77_.tooltip = TRANSLATABLE; -#line 2510 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp77_.callback = (GCallback) _editing_host_page_on_adjust_date_time_gtk_action_callback; -#line 2510 "/home/jens/Source/shotwell/src/PhotoPage.vala" - adjust_date_time = _tmp77_; -#line 2512 "/home/jens/Source/shotwell/src/PhotoPage.vala" - adjust_date_time.label = RESOURCES_ADJUST_DATE_TIME_MENU; -#line 2513 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp78_ = actions; -#line 2513 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp78__length1 = actions_length1; -#line 2513 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp79_ = adjust_date_time; -#line 2513 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _vala_array_add216 (&actions, &actions_length1, &_actions_size_, &_tmp79_); -#line 2515 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp80_.name = "ExternalEdit"; -#line 2515 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp80_.stock_id = RESOURCES_EDIT_LABEL; -#line 2515 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp80_.label = TRANSLATABLE; -#line 2515 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp80_.accelerator = "<Ctrl>Return"; -#line 2515 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp80_.tooltip = TRANSLATABLE; -#line 2515 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp80_.callback = (GCallback) _library_photo_page_on_external_edit_gtk_action_callback; -#line 2515 "/home/jens/Source/shotwell/src/PhotoPage.vala" - external_edit = _tmp80_; -#line 2517 "/home/jens/Source/shotwell/src/PhotoPage.vala" - external_edit.label = RESOURCES_EXTERNAL_EDIT_MENU; -#line 2518 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp81_ = actions; -#line 2518 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp81__length1 = actions_length1; -#line 2518 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp82_ = external_edit; -#line 2518 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _vala_array_add217 (&actions, &actions_length1, &_actions_size_, &_tmp82_); -#line 2520 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp83_.name = "ExternalEditRAW"; -#line 2520 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp83_.stock_id = NULL; -#line 2520 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp83_.label = TRANSLATABLE; -#line 2520 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp83_.accelerator = "<Ctrl><Shift>Return"; -#line 2520 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp83_.tooltip = TRANSLATABLE; -#line 2520 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp83_.callback = (GCallback) _library_photo_page_on_external_edit_raw_gtk_action_callback; -#line 2520 "/home/jens/Source/shotwell/src/PhotoPage.vala" - edit_raw = _tmp83_; -#line 2522 "/home/jens/Source/shotwell/src/PhotoPage.vala" - edit_raw.label = RESOURCES_EXTERNAL_EDIT_RAW_MENU; -#line 2523 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp84_ = actions; -#line 2523 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp84__length1 = actions_length1; -#line 2523 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp85_ = edit_raw; -#line 2523 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _vala_array_add218 (&actions, &actions_length1, &_actions_size_, &_tmp85_); -#line 2525 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp86_.name = "SendTo"; -#line 2525 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp86_.stock_id = "document-send"; -#line 2525 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp86_.label = TRANSLATABLE; -#line 2525 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp86_.accelerator = NULL; -#line 2525 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp86_.tooltip = TRANSLATABLE; -#line 2525 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp86_.callback = (GCallback) _library_photo_page_on_send_to_gtk_action_callback; -#line 2525 "/home/jens/Source/shotwell/src/PhotoPage.vala" - send_to = _tmp86_; -#line 2527 "/home/jens/Source/shotwell/src/PhotoPage.vala" - send_to.label = RESOURCES_SEND_TO_MENU; -#line 2528 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp87_ = actions; -#line 2528 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp87__length1 = actions_length1; -#line 2528 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp88_ = send_to; -#line 2528 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _vala_array_add219 (&actions, &actions_length1, &_actions_size_, &_tmp88_); -#line 2530 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp89_.name = "SetBackground"; -#line 2530 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp89_.stock_id = NULL; -#line 2530 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp89_.label = TRANSLATABLE; -#line 2530 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp89_.accelerator = "<Ctrl>B"; -#line 2530 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp89_.tooltip = TRANSLATABLE; -#line 2530 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp89_.callback = (GCallback) _editing_host_page_on_set_background_gtk_action_callback; -#line 2530 "/home/jens/Source/shotwell/src/PhotoPage.vala" - set_background = _tmp89_; -#line 2532 "/home/jens/Source/shotwell/src/PhotoPage.vala" - set_background.label = RESOURCES_SET_BACKGROUND_MENU; -#line 2533 "/home/jens/Source/shotwell/src/PhotoPage.vala" - set_background.tooltip = RESOURCES_SET_BACKGROUND_TOOLTIP; -#line 2534 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp90_ = actions; -#line 2534 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp90__length1 = actions_length1; -#line 2534 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp91_ = set_background; -#line 2534 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _vala_array_add220 (&actions, &actions_length1, &_actions_size_, &_tmp91_); -#line 2536 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp92_.name = "Flag"; -#line 2536 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp92_.stock_id = NULL; -#line 2536 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp92_.label = TRANSLATABLE; -#line 2536 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp92_.accelerator = "<Ctrl>G"; -#line 2536 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp92_.tooltip = TRANSLATABLE; -#line 2536 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp92_.callback = (GCallback) _library_photo_page_on_flag_unflag_gtk_action_callback; -#line 2536 "/home/jens/Source/shotwell/src/PhotoPage.vala" - flag = _tmp92_; -#line 2537 "/home/jens/Source/shotwell/src/PhotoPage.vala" - flag.label = RESOURCES_FLAG_MENU; -#line 2538 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp93_ = actions; -#line 2538 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp93__length1 = actions_length1; -#line 2538 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp94_ = flag; -#line 2538 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _vala_array_add221 (&actions, &actions_length1, &_actions_size_, &_tmp94_); -#line 2540 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp95_.name = "Rate"; -#line 2540 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp95_.stock_id = NULL; -#line 2540 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp95_.label = TRANSLATABLE; -#line 2540 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp95_.accelerator = NULL; -#line 2540 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp95_.tooltip = NULL; -#line 2540 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp95_.callback = (GCallback) NULL; -#line 2540 "/home/jens/Source/shotwell/src/PhotoPage.vala" - set_rating = _tmp95_; -#line 2541 "/home/jens/Source/shotwell/src/PhotoPage.vala" - set_rating.label = RESOURCES_RATING_MENU; -#line 2542 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp96_ = actions; -#line 2542 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp96__length1 = actions_length1; -#line 2542 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp97_ = set_rating; -#line 2542 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _vala_array_add222 (&actions, &actions_length1, &_actions_size_, &_tmp97_); -#line 2544 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp98_.name = "IncreaseRating"; -#line 2544 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp98_.stock_id = NULL; -#line 2544 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp98_.label = TRANSLATABLE; -#line 2544 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp98_.accelerator = "greater"; -#line 2544 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp98_.tooltip = TRANSLATABLE; -#line 2544 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp98_.callback = (GCallback) _library_photo_page_on_increase_rating_gtk_action_callback; -#line 2544 "/home/jens/Source/shotwell/src/PhotoPage.vala" - increase_rating = _tmp98_; -#line 2546 "/home/jens/Source/shotwell/src/PhotoPage.vala" - increase_rating.label = RESOURCES_INCREASE_RATING_MENU; -#line 2547 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp99_ = actions; -#line 2547 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp99__length1 = actions_length1; -#line 2547 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp100_ = increase_rating; -#line 2547 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _vala_array_add223 (&actions, &actions_length1, &_actions_size_, &_tmp100_); -#line 2549 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp101_.name = "DecreaseRating"; -#line 2549 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp101_.stock_id = NULL; -#line 2549 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp101_.label = TRANSLATABLE; -#line 2549 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp101_.accelerator = "less"; -#line 2549 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp101_.tooltip = TRANSLATABLE; -#line 2549 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp101_.callback = (GCallback) _library_photo_page_on_decrease_rating_gtk_action_callback; -#line 2549 "/home/jens/Source/shotwell/src/PhotoPage.vala" - decrease_rating = _tmp101_; -#line 2551 "/home/jens/Source/shotwell/src/PhotoPage.vala" - decrease_rating.label = RESOURCES_DECREASE_RATING_MENU; -#line 2552 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp102_ = actions; -#line 2552 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp102__length1 = actions_length1; -#line 2552 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp103_ = decrease_rating; -#line 2552 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _vala_array_add224 (&actions, &actions_length1, &_actions_size_, &_tmp103_); -#line 2554 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp104_.name = "RateRejected"; -#line 2554 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp104_.stock_id = NULL; -#line 2554 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp104_.label = TRANSLATABLE; -#line 2554 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp104_.accelerator = "9"; -#line 2554 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp104_.tooltip = TRANSLATABLE; -#line 2554 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp104_.callback = (GCallback) _library_photo_page_on_rate_rejected_gtk_action_callback; -#line 2554 "/home/jens/Source/shotwell/src/PhotoPage.vala" - rate_rejected = _tmp104_; -#line 2556 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp105_ = resources_rating_menu (RATING_REJECTED); -#line 2556 "/home/jens/Source/shotwell/src/PhotoPage.vala" - rate_rejected.label = _tmp105_; -#line 2557 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp106_ = actions; -#line 2557 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp106__length1 = actions_length1; -#line 2557 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp107_ = rate_rejected; -#line 2557 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _vala_array_add225 (&actions, &actions_length1, &_actions_size_, &_tmp107_); -#line 2559 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp108_.name = "RateUnrated"; -#line 2559 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp108_.stock_id = NULL; -#line 2559 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp108_.label = TRANSLATABLE; -#line 2559 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp108_.accelerator = "0"; -#line 2559 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp108_.tooltip = TRANSLATABLE; -#line 2559 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp108_.callback = (GCallback) _library_photo_page_on_rate_unrated_gtk_action_callback; -#line 2559 "/home/jens/Source/shotwell/src/PhotoPage.vala" - rate_unrated = _tmp108_; -#line 2561 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp109_ = resources_rating_menu (RATING_UNRATED); -#line 2561 "/home/jens/Source/shotwell/src/PhotoPage.vala" - rate_unrated.label = _tmp109_; -#line 2562 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp110_ = actions; -#line 2562 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp110__length1 = actions_length1; -#line 2562 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp111_ = rate_unrated; -#line 2562 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _vala_array_add226 (&actions, &actions_length1, &_actions_size_, &_tmp111_); -#line 2564 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp112_.name = "RateOne"; -#line 2564 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp112_.stock_id = NULL; -#line 2564 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp112_.label = TRANSLATABLE; -#line 2564 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp112_.accelerator = "1"; -#line 2564 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp112_.tooltip = TRANSLATABLE; -#line 2564 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp112_.callback = (GCallback) _library_photo_page_on_rate_one_gtk_action_callback; -#line 2564 "/home/jens/Source/shotwell/src/PhotoPage.vala" - rate_one = _tmp112_; -#line 2566 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp113_ = resources_rating_menu (RATING_ONE); -#line 2566 "/home/jens/Source/shotwell/src/PhotoPage.vala" - rate_one.label = _tmp113_; -#line 2567 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp114_ = actions; -#line 2567 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp114__length1 = actions_length1; -#line 2567 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp115_ = rate_one; -#line 2567 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _vala_array_add227 (&actions, &actions_length1, &_actions_size_, &_tmp115_); -#line 2569 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp116_.name = "RateTwo"; -#line 2569 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp116_.stock_id = NULL; -#line 2569 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp116_.label = TRANSLATABLE; -#line 2569 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp116_.accelerator = "2"; -#line 2569 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp116_.tooltip = TRANSLATABLE; -#line 2569 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp116_.callback = (GCallback) _library_photo_page_on_rate_two_gtk_action_callback; -#line 2569 "/home/jens/Source/shotwell/src/PhotoPage.vala" - rate_two = _tmp116_; -#line 2571 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp117_ = resources_rating_menu (RATING_TWO); -#line 2571 "/home/jens/Source/shotwell/src/PhotoPage.vala" - rate_two.label = _tmp117_; -#line 2572 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp118_ = actions; -#line 2572 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp118__length1 = actions_length1; -#line 2572 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp119_ = rate_two; -#line 2572 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _vala_array_add228 (&actions, &actions_length1, &_actions_size_, &_tmp119_); -#line 2574 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp120_.name = "RateThree"; -#line 2574 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp120_.stock_id = NULL; -#line 2574 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp120_.label = TRANSLATABLE; -#line 2574 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp120_.accelerator = "3"; -#line 2574 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp120_.tooltip = TRANSLATABLE; -#line 2574 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp120_.callback = (GCallback) _library_photo_page_on_rate_three_gtk_action_callback; -#line 2574 "/home/jens/Source/shotwell/src/PhotoPage.vala" - rate_three = _tmp120_; -#line 2576 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp121_ = resources_rating_menu (RATING_THREE); -#line 2576 "/home/jens/Source/shotwell/src/PhotoPage.vala" - rate_three.label = _tmp121_; -#line 2577 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp122_ = actions; -#line 2577 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp122__length1 = actions_length1; -#line 2577 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp123_ = rate_three; -#line 2577 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _vala_array_add229 (&actions, &actions_length1, &_actions_size_, &_tmp123_); -#line 2579 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp124_.name = "RateFour"; -#line 2579 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp124_.stock_id = NULL; -#line 2579 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp124_.label = TRANSLATABLE; -#line 2579 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp124_.accelerator = "4"; -#line 2579 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp124_.tooltip = TRANSLATABLE; -#line 2579 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp124_.callback = (GCallback) _library_photo_page_on_rate_four_gtk_action_callback; -#line 2579 "/home/jens/Source/shotwell/src/PhotoPage.vala" - rate_four = _tmp124_; -#line 2581 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp125_ = resources_rating_menu (RATING_FOUR); -#line 2581 "/home/jens/Source/shotwell/src/PhotoPage.vala" - rate_four.label = _tmp125_; -#line 2582 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp126_ = actions; -#line 2582 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp126__length1 = actions_length1; -#line 2582 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp127_ = rate_four; -#line 2582 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _vala_array_add230 (&actions, &actions_length1, &_actions_size_, &_tmp127_); -#line 2584 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp128_.name = "RateFive"; -#line 2584 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp128_.stock_id = NULL; -#line 2584 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp128_.label = TRANSLATABLE; -#line 2584 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp128_.accelerator = "5"; -#line 2584 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp128_.tooltip = TRANSLATABLE; -#line 2584 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp128_.callback = (GCallback) _library_photo_page_on_rate_five_gtk_action_callback; -#line 2584 "/home/jens/Source/shotwell/src/PhotoPage.vala" - rate_five = _tmp128_; -#line 2586 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp129_ = resources_rating_menu (RATING_FIVE); -#line 2586 "/home/jens/Source/shotwell/src/PhotoPage.vala" - rate_five.label = _tmp129_; -#line 2587 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp130_ = actions; -#line 2587 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp130__length1 = actions_length1; -#line 2587 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp131_ = rate_five; -#line 2587 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _vala_array_add231 (&actions, &actions_length1, &_actions_size_, &_tmp131_); -#line 2589 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp132_.name = "IncreaseSize"; -#line 2589 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp132_.stock_id = RESOURCES_ZOOM_IN_LABEL; -#line 2589 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp132_.label = TRANSLATABLE; -#line 2589 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp132_.accelerator = "<Ctrl>plus"; -#line 2589 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp132_.tooltip = TRANSLATABLE; -#line 2589 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp132_.callback = (GCallback) _editing_host_page_on_increase_size_gtk_action_callback; -#line 2589 "/home/jens/Source/shotwell/src/PhotoPage.vala" - increase_size = _tmp132_; -#line 2591 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp133_ = _ ("Zoom _In"); -#line 2591 "/home/jens/Source/shotwell/src/PhotoPage.vala" - increase_size.label = _tmp133_; -#line 2592 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp134_ = _ ("Increase the magnification of the photo"); -#line 2592 "/home/jens/Source/shotwell/src/PhotoPage.vala" - increase_size.tooltip = _tmp134_; -#line 2593 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp135_ = actions; -#line 2593 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp135__length1 = actions_length1; -#line 2593 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp136_ = increase_size; -#line 2593 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _vala_array_add232 (&actions, &actions_length1, &_actions_size_, &_tmp136_); -#line 2595 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp137_.name = "DecreaseSize"; -#line 2595 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp137_.stock_id = RESOURCES_ZOOM_OUT_LABEL; -#line 2595 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp137_.label = TRANSLATABLE; -#line 2595 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp137_.accelerator = "<Ctrl>minus"; -#line 2595 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp137_.tooltip = TRANSLATABLE; -#line 2595 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp137_.callback = (GCallback) _editing_host_page_on_decrease_size_gtk_action_callback; -#line 2595 "/home/jens/Source/shotwell/src/PhotoPage.vala" - decrease_size = _tmp137_; -#line 2597 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp138_ = _ ("Zoom _Out"); -#line 2597 "/home/jens/Source/shotwell/src/PhotoPage.vala" - decrease_size.label = _tmp138_; -#line 2598 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp139_ = _ ("Decrease the magnification of the photo"); -#line 2598 "/home/jens/Source/shotwell/src/PhotoPage.vala" - decrease_size.tooltip = _tmp139_; -#line 2599 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp140_ = actions; -#line 2599 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp140__length1 = actions_length1; -#line 2599 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp141_ = decrease_size; -#line 2599 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _vala_array_add233 (&actions, &actions_length1, &_actions_size_, &_tmp141_); -#line 2601 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp142_.name = "ZoomFit"; -#line 2601 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp142_.stock_id = RESOURCES_ZOOM_FIT_LABEL; -#line 2601 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp142_.label = TRANSLATABLE; -#line 2601 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp142_.accelerator = "<Ctrl>0"; -#line 2601 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp142_.tooltip = TRANSLATABLE; -#line 2601 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp142_.callback = (GCallback) _editing_host_page_snap_zoom_to_min_gtk_action_callback; -#line 2601 "/home/jens/Source/shotwell/src/PhotoPage.vala" - best_fit = _tmp142_; -#line 2603 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp143_ = _ ("Fit to _Page"); -#line 2603 "/home/jens/Source/shotwell/src/PhotoPage.vala" - best_fit.label = _tmp143_; -#line 2604 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp144_ = _ ("Zoom the photo to fit on the screen"); -#line 2604 "/home/jens/Source/shotwell/src/PhotoPage.vala" - best_fit.tooltip = _tmp144_; -#line 2605 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp145_ = actions; -#line 2605 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp145__length1 = actions_length1; -#line 2605 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp146_ = best_fit; -#line 2605 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _vala_array_add234 (&actions, &actions_length1, &_actions_size_, &_tmp146_); -#line 2607 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp147_.name = "Zoom100"; -#line 2607 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp147_.stock_id = RESOURCES_ZOOM_100_LABEL; -#line 2607 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp147_.label = TRANSLATABLE; -#line 2607 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp147_.accelerator = "<Ctrl>1"; -#line 2607 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp147_.tooltip = TRANSLATABLE; -#line 2607 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp147_.callback = (GCallback) _editing_host_page_snap_zoom_to_isomorphic_gtk_action_callback; -#line 2607 "/home/jens/Source/shotwell/src/PhotoPage.vala" - actual_size = _tmp147_; -#line 2610 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp148_ = _ ("Zoom _100%"); -#line 2610 "/home/jens/Source/shotwell/src/PhotoPage.vala" - actual_size.label = _tmp148_; -#line 2612 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp149_ = _ ("Zoom the photo to 100% magnification"); -#line 2612 "/home/jens/Source/shotwell/src/PhotoPage.vala" - actual_size.tooltip = _tmp149_; -#line 2613 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp150_ = actions; -#line 2613 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp150__length1 = actions_length1; -#line 2613 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp151_ = actual_size; -#line 2613 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _vala_array_add235 (&actions, &actions_length1, &_actions_size_, &_tmp151_); -#line 2615 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp152_.name = "Zoom200"; -#line 2615 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp152_.stock_id = NULL; -#line 2615 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp152_.label = TRANSLATABLE; -#line 2615 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp152_.accelerator = "<Ctrl>2"; -#line 2615 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp152_.tooltip = TRANSLATABLE; -#line 2615 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp152_.callback = (GCallback) _editing_host_page_snap_zoom_to_max_gtk_action_callback; -#line 2615 "/home/jens/Source/shotwell/src/PhotoPage.vala" - max_size = _tmp152_; -#line 2618 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp153_ = _ ("Zoom _200%"); -#line 2618 "/home/jens/Source/shotwell/src/PhotoPage.vala" - max_size.label = _tmp153_; -#line 2620 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp154_ = _ ("Zoom the photo to 200% magnification"); -#line 2620 "/home/jens/Source/shotwell/src/PhotoPage.vala" - max_size.tooltip = _tmp154_; -#line 2621 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp155_ = actions; -#line 2621 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp155__length1 = actions_length1; -#line 2621 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp156_ = max_size; -#line 2621 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _vala_array_add236 (&actions, &actions_length1, &_actions_size_, &_tmp156_); -#line 2623 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp157_.name = "AddTags"; -#line 2623 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp157_.stock_id = NULL; -#line 2623 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp157_.label = TRANSLATABLE; -#line 2623 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp157_.accelerator = "<Ctrl>T"; -#line 2623 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp157_.tooltip = TRANSLATABLE; -#line 2623 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp157_.callback = (GCallback) _library_photo_page_on_add_tags_gtk_action_callback; -#line 2623 "/home/jens/Source/shotwell/src/PhotoPage.vala" - add_tags = _tmp157_; -#line 2625 "/home/jens/Source/shotwell/src/PhotoPage.vala" - add_tags.label = RESOURCES_ADD_TAGS_MENU; -#line 2626 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp158_ = actions; -#line 2626 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp158__length1 = actions_length1; -#line 2626 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp159_ = add_tags; -#line 2626 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _vala_array_add237 (&actions, &actions_length1, &_actions_size_, &_tmp159_); -#line 2628 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp160_.name = "ModifyTags"; -#line 2628 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp160_.stock_id = NULL; -#line 2628 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp160_.label = TRANSLATABLE; -#line 2628 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp160_.accelerator = "<Ctrl>M"; -#line 2628 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp160_.tooltip = TRANSLATABLE; -#line 2628 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp160_.callback = (GCallback) _library_photo_page_on_modify_tags_gtk_action_callback; -#line 2628 "/home/jens/Source/shotwell/src/PhotoPage.vala" - modify_tags = _tmp160_; -#line 2630 "/home/jens/Source/shotwell/src/PhotoPage.vala" - modify_tags.label = RESOURCES_MODIFY_TAGS_MENU; -#line 2631 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp161_ = actions; -#line 2631 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp161__length1 = actions_length1; -#line 2631 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp162_ = modify_tags; -#line 2631 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _vala_array_add238 (&actions, &actions_length1, &_actions_size_, &_tmp162_); -#line 2633 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp163_.name = "Slideshow"; -#line 2633 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp163_.stock_id = NULL; -#line 2633 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp163_.label = TRANSLATABLE; -#line 2633 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp163_.accelerator = "F5"; -#line 2633 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp163_.tooltip = TRANSLATABLE; -#line 2633 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp163_.callback = (GCallback) _library_photo_page_on_slideshow_gtk_action_callback; -#line 2633 "/home/jens/Source/shotwell/src/PhotoPage.vala" - slideshow = _tmp163_; -#line 2635 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp164_ = _ ("S_lideshow"); -#line 2635 "/home/jens/Source/shotwell/src/PhotoPage.vala" - slideshow.label = _tmp164_; -#line 2636 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp165_ = _ ("Play a slideshow"); -#line 2636 "/home/jens/Source/shotwell/src/PhotoPage.vala" - slideshow.tooltip = _tmp165_; -#line 2637 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp166_ = actions; -#line 2637 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp166__length1 = actions_length1; -#line 2637 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp167_ = slideshow; -#line 2637 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _vala_array_add239 (&actions, &actions_length1, &_actions_size_, &_tmp167_); -#line 2639 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp168_.name = "RawDeveloper"; -#line 2639 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp168_.stock_id = NULL; -#line 2639 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp168_.label = TRANSLATABLE; -#line 2639 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp168_.accelerator = NULL; -#line 2639 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp168_.tooltip = NULL; -#line 2639 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp168_.callback = (GCallback) NULL; -#line 2639 "/home/jens/Source/shotwell/src/PhotoPage.vala" - raw_developer = _tmp168_; -#line 2640 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp169_ = _ ("_Developer"); -#line 2640 "/home/jens/Source/shotwell/src/PhotoPage.vala" - raw_developer.label = _tmp169_; -#line 2641 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp170_ = actions; -#line 2641 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp170__length1 = actions_length1; -#line 2641 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp171_ = raw_developer; -#line 2641 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _vala_array_add240 (&actions, &actions_length1, &_actions_size_, &_tmp171_); -#line 2645 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp172_.name = "SendToContextMenu"; -#line 2645 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp172_.stock_id = "document-send"; -#line 2645 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp172_.label = TRANSLATABLE; -#line 2645 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp172_.accelerator = NULL; -#line 2645 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp172_.tooltip = TRANSLATABLE; -#line 2645 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp172_.callback = (GCallback) _library_photo_page_on_send_to_gtk_action_callback; -#line 2645 "/home/jens/Source/shotwell/src/PhotoPage.vala" - send_to_context_menu = _tmp172_; -#line 2647 "/home/jens/Source/shotwell/src/PhotoPage.vala" - send_to_context_menu.label = RESOURCES_SEND_TO_CONTEXT_MENU; -#line 2648 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp173_ = actions; -#line 2648 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp173__length1 = actions_length1; -#line 2648 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp174_ = send_to_context_menu; -#line 2648 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _vala_array_add241 (&actions, &actions_length1, &_actions_size_, &_tmp174_); -#line 2650 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp175_.name = "AddTagsContextMenu"; -#line 2650 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp175_.stock_id = NULL; -#line 2650 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp175_.label = TRANSLATABLE; -#line 2650 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp175_.accelerator = "<Ctrl>A"; -#line 2650 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp175_.tooltip = TRANSLATABLE; -#line 2650 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp175_.callback = (GCallback) _library_photo_page_on_add_tags_gtk_action_callback; -#line 2650 "/home/jens/Source/shotwell/src/PhotoPage.vala" - add_tags_context_menu = _tmp175_; -#line 2652 "/home/jens/Source/shotwell/src/PhotoPage.vala" - add_tags_context_menu.label = RESOURCES_ADD_TAGS_CONTEXT_MENU; -#line 2653 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp176_ = actions; -#line 2653 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp176__length1 = actions_length1; -#line 2653 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp177_ = add_tags_context_menu; -#line 2653 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _vala_array_add242 (&actions, &actions_length1, &_actions_size_, &_tmp177_); -#line 2655 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp178_ = actions; -#line 2655 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp178__length1 = actions_length1; -#line 2655 "/home/jens/Source/shotwell/src/PhotoPage.vala" - if (result_length1) { -#line 2655 "/home/jens/Source/shotwell/src/PhotoPage.vala" - *result_length1 = _tmp178__length1; -#line 17972 "PhotoPage.c" - } -#line 2655 "/home/jens/Source/shotwell/src/PhotoPage.vala" - result = _tmp178_; -#line 2655 "/home/jens/Source/shotwell/src/PhotoPage.vala" - return result; -#line 17978 "PhotoPage.c" -} - - -static void _library_photo_page_on_display_ratings_gtk_action_callback (GtkAction* action, gpointer self) { -#line 2661 "/home/jens/Source/shotwell/src/PhotoPage.vala" - library_photo_page_on_display_ratings ((LibraryPhotoPage*) self, action); -#line 17985 "PhotoPage.c" -} - - -static void _vala_array_add243 (GtkToggleActionEntry** array, int* length, int* size, const GtkToggleActionEntry* value) { -#line 2665 "/home/jens/Source/shotwell/src/PhotoPage.vala" - if ((*length) == (*size)) { -#line 2665 "/home/jens/Source/shotwell/src/PhotoPage.vala" - *size = (*size) ? (2 * (*size)) : 4; -#line 2665 "/home/jens/Source/shotwell/src/PhotoPage.vala" - *array = g_renew (GtkToggleActionEntry, *array, *size); -#line 17996 "PhotoPage.c" + _g_object_unref0 (_tmp13_); +#line 15647 "PhotoPage.c" } -#line 2665 "/home/jens/Source/shotwell/src/PhotoPage.vala" - (*array)[(*length)++] = *value; -#line 18000 "PhotoPage.c" -} - - -static GtkToggleActionEntry* library_photo_page_real_init_collect_toggle_action_entries (Page* base, int* result_length1) { - LibraryPhotoPage * self; - GtkToggleActionEntry* result = NULL; - GtkToggleActionEntry* toggle_actions = NULL; - gint _tmp0_ = 0; - GtkToggleActionEntry* _tmp1_ = NULL; - gint toggle_actions_length1 = 0; - gint _toggle_actions_size_ = 0; - GtkToggleActionEntry ratings = {0}; - ConfigFacade* _tmp2_ = NULL; - ConfigFacade* _tmp3_ = NULL; - gboolean _tmp4_ = FALSE; - GtkToggleActionEntry _tmp5_ = {0}; - GtkToggleActionEntry _tmp6_ = {0}; - GtkToggleActionEntry* _tmp7_ = NULL; - gint _tmp7__length1 = 0; - GtkToggleActionEntry _tmp8_ = {0}; - GtkToggleActionEntry* _tmp9_ = NULL; - gint _tmp9__length1 = 0; -#line 2658 "/home/jens/Source/shotwell/src/PhotoPage.vala" - self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO_PAGE, LibraryPhotoPage); -#line 2659 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp1_ = PAGE_CLASS (library_photo_page_parent_class)->init_collect_toggle_action_entries (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage), TYPE_PAGE, Page), &_tmp0_); -#line 2659 "/home/jens/Source/shotwell/src/PhotoPage.vala" - toggle_actions = _tmp1_; -#line 2659 "/home/jens/Source/shotwell/src/PhotoPage.vala" - toggle_actions_length1 = _tmp0_; -#line 2659 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _toggle_actions_size_ = toggle_actions_length1; -#line 2661 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp2_ = config_facade_get_instance (); -#line 2661 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp3_ = _tmp2_; -#line 2661 "/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 2661 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp5_.name = "ViewRatings"; -#line 2661 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp5_.stock_id = NULL; -#line 2661 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp5_.label = TRANSLATABLE; -#line 2661 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp5_.accelerator = "<Ctrl><Shift>N"; -#line 2661 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp5_.tooltip = TRANSLATABLE; -#line 2661 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp5_.callback = (GCallback) _library_photo_page_on_display_ratings_gtk_action_callback; -#line 2661 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp5_.is_active = _tmp4_; -#line 2661 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp6_ = _tmp5_; -#line 2661 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _g_object_unref0 (_tmp3_); -#line 2661 "/home/jens/Source/shotwell/src/PhotoPage.vala" - ratings = _tmp6_; -#line 2663 "/home/jens/Source/shotwell/src/PhotoPage.vala" - ratings.label = RESOURCES_VIEW_RATINGS_MENU; -#line 2664 "/home/jens/Source/shotwell/src/PhotoPage.vala" - ratings.tooltip = RESOURCES_VIEW_RATINGS_TOOLTIP; -#line 2665 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp7_ = toggle_actions; -#line 2665 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp7__length1 = toggle_actions_length1; -#line 2665 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp8_ = ratings; -#line 2665 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _vala_array_add243 (&toggle_actions, &toggle_actions_length1, &_toggle_actions_size_, &_tmp8_); -#line 2667 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp9_ = toggle_actions; -#line 2667 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp9__length1 = toggle_actions_length1; -#line 2667 "/home/jens/Source/shotwell/src/PhotoPage.vala" - if (result_length1) { -#line 2667 "/home/jens/Source/shotwell/src/PhotoPage.vala" - *result_length1 = _tmp9__length1; -#line 18079 "PhotoPage.c" +#line 2443 "/home/jens/Source/shotwell/src/PhotoPage.vala" + action = _tmp14_; +#line 2444 "/home/jens/Source/shotwell/src/PhotoPage.vala" + _tmp16_ = d; +#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" + } else { +#line 2444 "/home/jens/Source/shotwell/src/PhotoPage.vala" + _tmp15_ = "'Camera'"; +#line 15661 "PhotoPage.c" } -#line 2667 "/home/jens/Source/shotwell/src/PhotoPage.vala" - result = _tmp9_; -#line 2667 "/home/jens/Source/shotwell/src/PhotoPage.vala" - return result; -#line 18085 "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_); +#line 2444 "/home/jens/Source/shotwell/src/PhotoPage.vala" + g_simple_action_set_state (_tmp17_, _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" } static gpointer _injection_group_ref0 (gpointer self) { -#line 2676 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2453 "/home/jens/Source/shotwell/src/PhotoPage.vala" return self ? injection_group_ref (self) : NULL; -#line 18092 "PhotoPage.c" +#line 15680 "PhotoPage.c" } -static void _vala_array_add244 (InjectionGroup*** array, int* length, int* size, InjectionGroup* value) { -#line 2676 "/home/jens/Source/shotwell/src/PhotoPage.vala" +static void _vala_array_add82 (InjectionGroup*** array, int* length, int* size, InjectionGroup* value) { +#line 2453 "/home/jens/Source/shotwell/src/PhotoPage.vala" if ((*length) == (*size)) { -#line 2676 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2453 "/home/jens/Source/shotwell/src/PhotoPage.vala" *size = (*size) ? (2 * (*size)) : 4; -#line 2676 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2453 "/home/jens/Source/shotwell/src/PhotoPage.vala" *array = g_renew (InjectionGroup*, *array, (*size) + 1); -#line 18103 "PhotoPage.c" +#line 15691 "PhotoPage.c" } -#line 2676 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2453 "/home/jens/Source/shotwell/src/PhotoPage.vala" (*array)[(*length)++] = value; -#line 2676 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2453 "/home/jens/Source/shotwell/src/PhotoPage.vala" (*array)[*length] = NULL; -#line 18109 "PhotoPage.c" +#line 15697 "PhotoPage.c" } -static void _vala_array_add245 (InjectionGroup*** array, int* length, int* size, InjectionGroup* value) { -#line 2681 "/home/jens/Source/shotwell/src/PhotoPage.vala" +static void _vala_array_add83 (InjectionGroup*** array, int* length, int* size, InjectionGroup* value) { +#line 2458 "/home/jens/Source/shotwell/src/PhotoPage.vala" if ((*length) == (*size)) { -#line 2681 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2458 "/home/jens/Source/shotwell/src/PhotoPage.vala" *size = (*size) ? (2 * (*size)) : 4; -#line 2681 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2458 "/home/jens/Source/shotwell/src/PhotoPage.vala" *array = g_renew (InjectionGroup*, *array, (*size) + 1); -#line 18120 "PhotoPage.c" +#line 15708 "PhotoPage.c" } -#line 2681 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2458 "/home/jens/Source/shotwell/src/PhotoPage.vala" (*array)[(*length)++] = value; -#line 2681 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2458 "/home/jens/Source/shotwell/src/PhotoPage.vala" (*array)[*length] = NULL; -#line 18126 "PhotoPage.c" +#line 15714 "PhotoPage.c" } -static void _vala_array_add246 (InjectionGroup*** array, int* length, int* size, InjectionGroup* value) { -#line 2686 "/home/jens/Source/shotwell/src/PhotoPage.vala" +static void _vala_array_add84 (InjectionGroup*** array, int* length, int* size, InjectionGroup* value) { +#line 2463 "/home/jens/Source/shotwell/src/PhotoPage.vala" if ((*length) == (*size)) { -#line 2686 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2463 "/home/jens/Source/shotwell/src/PhotoPage.vala" *size = (*size) ? (2 * (*size)) : 4; -#line 2686 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2463 "/home/jens/Source/shotwell/src/PhotoPage.vala" *array = g_renew (InjectionGroup*, *array, (*size) + 1); -#line 18137 "PhotoPage.c" +#line 15725 "PhotoPage.c" } -#line 2686 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2463 "/home/jens/Source/shotwell/src/PhotoPage.vala" (*array)[(*length)++] = value; -#line 2686 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2463 "/home/jens/Source/shotwell/src/PhotoPage.vala" (*array)[*length] = NULL; -#line 18143 "PhotoPage.c" +#line 15731 "PhotoPage.c" } @@ -18158,317 +15746,181 @@ static InjectionGroup** library_photo_page_real_init_collect_injection_groups (P gint _groups_size_ = 0; InjectionGroup* print_group = NULL; InjectionGroup* _tmp2_ = NULL; - InjectionGroup** _tmp3_ = NULL; - gint _tmp3__length1 = 0; - InjectionGroup* _tmp4_ = NULL; - InjectionGroup* publish_group = NULL; + const gchar* _tmp3_ = NULL; + InjectionGroup** _tmp4_ = NULL; + gint _tmp4__length1 = 0; InjectionGroup* _tmp5_ = NULL; - InjectionGroup** _tmp6_ = NULL; - gint _tmp6__length1 = 0; - InjectionGroup* _tmp7_ = NULL; + InjectionGroup* publish_group = NULL; + InjectionGroup* _tmp6_ = NULL; + const gchar* _tmp7_ = NULL; + InjectionGroup** _tmp8_ = NULL; + gint _tmp8__length1 = 0; + InjectionGroup* _tmp9_ = NULL; InjectionGroup* bg_group = NULL; - InjectionGroup* _tmp8_ = NULL; - InjectionGroup** _tmp9_ = NULL; - gint _tmp9__length1 = 0; InjectionGroup* _tmp10_ = NULL; - InjectionGroup** _tmp11_ = NULL; - gint _tmp11__length1 = 0; -#line 2670 "/home/jens/Source/shotwell/src/PhotoPage.vala" + const gchar* _tmp11_ = NULL; + InjectionGroup** _tmp12_ = NULL; + gint _tmp12__length1 = 0; + InjectionGroup* _tmp13_ = NULL; + InjectionGroup** _tmp14_ = NULL; + gint _tmp14__length1 = 0; +#line 2447 "/home/jens/Source/shotwell/src/PhotoPage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO_PAGE, LibraryPhotoPage); -#line 2671 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2448 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp1_ = PAGE_CLASS (library_photo_page_parent_class)->init_collect_injection_groups (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage), TYPE_PAGE, Page), &_tmp0_); -#line 2671 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2448 "/home/jens/Source/shotwell/src/PhotoPage.vala" groups = _tmp1_; -#line 2671 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2448 "/home/jens/Source/shotwell/src/PhotoPage.vala" groups_length1 = _tmp0_; -#line 2671 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2448 "/home/jens/Source/shotwell/src/PhotoPage.vala" _groups_size_ = groups_length1; -#line 2673 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp2_ = injection_group_new ("/MenuBar/FileMenu/PrintPlaceholder"); -#line 2673 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2450 "/home/jens/Source/shotwell/src/PhotoPage.vala" + _tmp2_ = injection_group_new ("PrintPlaceholder"); +#line 2450 "/home/jens/Source/shotwell/src/PhotoPage.vala" print_group = _tmp2_; -#line 2674 "/home/jens/Source/shotwell/src/PhotoPage.vala" - injection_group_add_menu_item (print_group, "Print", NULL); -#line 2676 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp3_ = groups; -#line 2676 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp3__length1 = groups_length1; -#line 2676 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp4_ = _injection_group_ref0 (print_group); -#line 2676 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _vala_array_add244 (&groups, &groups_length1, &_groups_size_, _tmp4_); -#line 2678 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp5_ = injection_group_new ("/MenuBar/FileMenu/PublishPlaceholder"); -#line 2678 "/home/jens/Source/shotwell/src/PhotoPage.vala" - publish_group = _tmp5_; -#line 2679 "/home/jens/Source/shotwell/src/PhotoPage.vala" - injection_group_add_menu_item (publish_group, "Publish", NULL); -#line 2681 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp6_ = groups; -#line 2681 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp6__length1 = groups_length1; -#line 2681 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp7_ = _injection_group_ref0 (publish_group); -#line 2681 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _vala_array_add245 (&groups, &groups_length1, &_groups_size_, _tmp7_); -#line 2683 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp8_ = injection_group_new ("/MenuBar/FileMenu/SetBackgroundPlaceholder"); -#line 2683 "/home/jens/Source/shotwell/src/PhotoPage.vala" - bg_group = _tmp8_; -#line 2684 "/home/jens/Source/shotwell/src/PhotoPage.vala" - injection_group_add_menu_item (bg_group, "SetBackground", NULL); -#line 2686 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp9_ = groups; -#line 2686 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp9__length1 = groups_length1; -#line 2686 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp10_ = _injection_group_ref0 (bg_group); -#line 2686 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _vala_array_add246 (&groups, &groups_length1, &_groups_size_, _tmp10_); -#line 2688 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp11_ = groups; -#line 2688 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp11__length1 = groups_length1; -#line 2688 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2451 "/home/jens/Source/shotwell/src/PhotoPage.vala" + _tmp3_ = _ ("_Print"); +#line 2451 "/home/jens/Source/shotwell/src/PhotoPage.vala" + injection_group_add_menu_item (print_group, _tmp3_, "Print", "<Primary>p"); +#line 2453 "/home/jens/Source/shotwell/src/PhotoPage.vala" + _tmp4_ = groups; +#line 2453 "/home/jens/Source/shotwell/src/PhotoPage.vala" + _tmp4__length1 = groups_length1; +#line 2453 "/home/jens/Source/shotwell/src/PhotoPage.vala" + _tmp5_ = _injection_group_ref0 (print_group); +#line 2453 "/home/jens/Source/shotwell/src/PhotoPage.vala" + _vala_array_add82 (&groups, &groups_length1, &_groups_size_, _tmp5_); +#line 2455 "/home/jens/Source/shotwell/src/PhotoPage.vala" + _tmp6_ = injection_group_new ("PublishPlaceholder"); +#line 2455 "/home/jens/Source/shotwell/src/PhotoPage.vala" + publish_group = _tmp6_; +#line 2456 "/home/jens/Source/shotwell/src/PhotoPage.vala" + _tmp7_ = _ ("_Publish"); +#line 2456 "/home/jens/Source/shotwell/src/PhotoPage.vala" + injection_group_add_menu_item (publish_group, _tmp7_, "Publish", "<Primary><Shift>p"); +#line 2458 "/home/jens/Source/shotwell/src/PhotoPage.vala" + _tmp8_ = groups; +#line 2458 "/home/jens/Source/shotwell/src/PhotoPage.vala" + _tmp8__length1 = groups_length1; +#line 2458 "/home/jens/Source/shotwell/src/PhotoPage.vala" + _tmp9_ = _injection_group_ref0 (publish_group); +#line 2458 "/home/jens/Source/shotwell/src/PhotoPage.vala" + _vala_array_add83 (&groups, &groups_length1, &_groups_size_, _tmp9_); +#line 2460 "/home/jens/Source/shotwell/src/PhotoPage.vala" + _tmp10_ = injection_group_new ("SetBackgroundPlaceholder"); +#line 2460 "/home/jens/Source/shotwell/src/PhotoPage.vala" + bg_group = _tmp10_; +#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); +#line 2463 "/home/jens/Source/shotwell/src/PhotoPage.vala" + _tmp12_ = groups; +#line 2463 "/home/jens/Source/shotwell/src/PhotoPage.vala" + _tmp12__length1 = groups_length1; +#line 2463 "/home/jens/Source/shotwell/src/PhotoPage.vala" + _tmp13_ = _injection_group_ref0 (bg_group); +#line 2463 "/home/jens/Source/shotwell/src/PhotoPage.vala" + _vala_array_add84 (&groups, &groups_length1, &_groups_size_, _tmp13_); +#line 2465 "/home/jens/Source/shotwell/src/PhotoPage.vala" + _tmp14_ = groups; +#line 2465 "/home/jens/Source/shotwell/src/PhotoPage.vala" + _tmp14__length1 = groups_length1; +#line 2465 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (result_length1) { -#line 2688 "/home/jens/Source/shotwell/src/PhotoPage.vala" - *result_length1 = _tmp11__length1; -#line 18232 "PhotoPage.c" +#line 2465 "/home/jens/Source/shotwell/src/PhotoPage.vala" + *result_length1 = _tmp14__length1; +#line 15829 "PhotoPage.c" } -#line 2688 "/home/jens/Source/shotwell/src/PhotoPage.vala" - result = _tmp11_; -#line 2688 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2465 "/home/jens/Source/shotwell/src/PhotoPage.vala" + result = _tmp14_; +#line 2465 "/home/jens/Source/shotwell/src/PhotoPage.vala" _injection_group_unref0 (bg_group); -#line 2688 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2465 "/home/jens/Source/shotwell/src/PhotoPage.vala" _injection_group_unref0 (publish_group); -#line 2688 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2465 "/home/jens/Source/shotwell/src/PhotoPage.vala" _injection_group_unref0 (print_group); -#line 2688 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2465 "/home/jens/Source/shotwell/src/PhotoPage.vala" return result; -#line 18244 "PhotoPage.c" -} - - -static void _vala_array_add247 (GtkRadioActionEntry** array, int* length, int* size, const GtkRadioActionEntry* value) { -#line 2701 "/home/jens/Source/shotwell/src/PhotoPage.vala" - if ((*length) == (*size)) { -#line 2701 "/home/jens/Source/shotwell/src/PhotoPage.vala" - *size = (*size) ? (2 * (*size)) : 4; -#line 2701 "/home/jens/Source/shotwell/src/PhotoPage.vala" - *array = g_renew (GtkRadioActionEntry, *array, *size); -#line 18255 "PhotoPage.c" - } -#line 2701 "/home/jens/Source/shotwell/src/PhotoPage.vala" - (*array)[(*length)++] = *value; -#line 18259 "PhotoPage.c" -} - - -static void _vala_array_add248 (GtkRadioActionEntry** array, int* length, int* size, const GtkRadioActionEntry* value) { -#line 2707 "/home/jens/Source/shotwell/src/PhotoPage.vala" - if ((*length) == (*size)) { -#line 2707 "/home/jens/Source/shotwell/src/PhotoPage.vala" - *size = (*size) ? (2 * (*size)) : 4; -#line 2707 "/home/jens/Source/shotwell/src/PhotoPage.vala" - *array = g_renew (GtkRadioActionEntry, *array, *size); -#line 18270 "PhotoPage.c" - } -#line 2707 "/home/jens/Source/shotwell/src/PhotoPage.vala" - (*array)[(*length)++] = *value; -#line 18274 "PhotoPage.c" -} - - -static void _library_photo_page_on_raw_developer_changed_gtk_radio_action_callback (GtkAction* action, GtkAction* current, gpointer self) { -#line 2709 "/home/jens/Source/shotwell/src/PhotoPage.vala" - library_photo_page_on_raw_developer_changed ((LibraryPhotoPage*) self, action, current); -#line 18281 "PhotoPage.c" -} - - -static void library_photo_page_real_register_radio_actions (Page* base, GtkActionGroup* action_group) { - LibraryPhotoPage * self; - GtkRadioActionEntry* developer_actions = NULL; - GtkRadioActionEntry* _tmp0_ = NULL; - gint developer_actions_length1 = 0; - gint _developer_actions_size_ = 0; - GtkRadioActionEntry dev_shotwell = {0}; - GtkRadioActionEntry _tmp1_ = {0}; - gchar* label_shotwell = NULL; - gchar* _tmp2_ = NULL; - GtkRadioActionEntry* _tmp3_ = NULL; - gint _tmp3__length1 = 0; - GtkRadioActionEntry _tmp4_ = {0}; - GtkRadioActionEntry dev_camera = {0}; - GtkRadioActionEntry _tmp5_ = {0}; - gchar* label_camera = NULL; - gchar* _tmp6_ = NULL; - GtkRadioActionEntry* _tmp7_ = NULL; - gint _tmp7__length1 = 0; - GtkRadioActionEntry _tmp8_ = {0}; - GtkActionGroup* _tmp9_ = NULL; - GtkRadioActionEntry* _tmp10_ = NULL; - gint _tmp10__length1 = 0; - GtkActionGroup* _tmp11_ = NULL; -#line 2691 "/home/jens/Source/shotwell/src/PhotoPage.vala" - self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO_PAGE, LibraryPhotoPage); -#line 2691 "/home/jens/Source/shotwell/src/PhotoPage.vala" - g_return_if_fail (GTK_IS_ACTION_GROUP (action_group)); -#line 2695 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp0_ = g_new0 (GtkRadioActionEntry, 0); -#line 2695 "/home/jens/Source/shotwell/src/PhotoPage.vala" - developer_actions = _tmp0_; -#line 2695 "/home/jens/Source/shotwell/src/PhotoPage.vala" - developer_actions_length1 = 0; -#line 2695 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _developer_actions_size_ = developer_actions_length1; -#line 2697 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp1_.name = "RawDeveloperShotwell"; -#line 2697 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp1_.stock_id = NULL; -#line 2697 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp1_.label = TRANSLATABLE; -#line 2697 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp1_.accelerator = NULL; -#line 2697 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp1_.tooltip = TRANSLATABLE; -#line 2697 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp1_.value = (gint) RAW_DEVELOPER_SHOTWELL; -#line 2697 "/home/jens/Source/shotwell/src/PhotoPage.vala" - dev_shotwell = _tmp1_; -#line 2699 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp2_ = raw_developer_get_label (RAW_DEVELOPER_SHOTWELL); -#line 2699 "/home/jens/Source/shotwell/src/PhotoPage.vala" - label_shotwell = _tmp2_; -#line 2700 "/home/jens/Source/shotwell/src/PhotoPage.vala" - dev_shotwell.label = label_shotwell; -#line 2701 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp3_ = developer_actions; -#line 2701 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp3__length1 = developer_actions_length1; -#line 2701 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp4_ = dev_shotwell; -#line 2701 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _vala_array_add247 (&developer_actions, &developer_actions_length1, &_developer_actions_size_, &_tmp4_); -#line 2703 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp5_.name = "RawDeveloperCamera"; -#line 2703 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp5_.stock_id = NULL; -#line 2703 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp5_.label = TRANSLATABLE; -#line 2703 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp5_.accelerator = NULL; -#line 2703 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp5_.tooltip = TRANSLATABLE; -#line 2703 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp5_.value = (gint) RAW_DEVELOPER_CAMERA; -#line 2703 "/home/jens/Source/shotwell/src/PhotoPage.vala" - dev_camera = _tmp5_; -#line 2705 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp6_ = raw_developer_get_label (RAW_DEVELOPER_CAMERA); -#line 2705 "/home/jens/Source/shotwell/src/PhotoPage.vala" - label_camera = _tmp6_; -#line 2706 "/home/jens/Source/shotwell/src/PhotoPage.vala" - dev_camera.label = label_camera; -#line 2707 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp7_ = developer_actions; -#line 2707 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp7__length1 = developer_actions_length1; -#line 2707 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp8_ = dev_camera; -#line 2707 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _vala_array_add248 (&developer_actions, &developer_actions_length1, &_developer_actions_size_, &_tmp8_); -#line 2709 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp9_ = action_group; -#line 2709 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp10_ = developer_actions; -#line 2709 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp10__length1 = developer_actions_length1; -#line 2709 "/home/jens/Source/shotwell/src/PhotoPage.vala" - gtk_action_group_add_radio_actions (_tmp9_, _tmp10_, _tmp10__length1, (gint) RAW_DEVELOPER_SHOTWELL, (GCallback) _library_photo_page_on_raw_developer_changed_gtk_radio_action_callback, self); -#line 2711 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp11_ = action_group; -#line 2711 "/home/jens/Source/shotwell/src/PhotoPage.vala" - PAGE_CLASS (library_photo_page_parent_class)->register_radio_actions (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage), TYPE_PAGE, Page), _tmp11_); -#line 2691 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _g_free0 (label_camera); -#line 2691 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _g_free0 (label_shotwell); -#line 2691 "/home/jens/Source/shotwell/src/PhotoPage.vala" - developer_actions = (g_free (developer_actions), NULL); -#line 18395 "PhotoPage.c" +#line 15841 "PhotoPage.c" } -static void library_photo_page_on_display_ratings (LibraryPhotoPage* self, GtkAction* action) { +static void library_photo_page_on_display_ratings (LibraryPhotoPage* self, GSimpleAction* action, GVariant* value) { gboolean display = FALSE; - GtkAction* _tmp0_ = NULL; + GVariant* _tmp0_ = NULL; gboolean _tmp1_ = FALSE; ConfigFacade* _tmp2_ = NULL; ConfigFacade* _tmp3_ = NULL; -#line 2714 "/home/jens/Source/shotwell/src/PhotoPage.vala" + GSimpleAction* _tmp4_ = NULL; + GVariant* _tmp5_ = NULL; +#line 2468 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_if_fail (IS_LIBRARY_PHOTO_PAGE (self)); -#line 2714 "/home/jens/Source/shotwell/src/PhotoPage.vala" - g_return_if_fail (GTK_IS_ACTION (action)); -#line 2715 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp0_ = action; -#line 2715 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp1_ = gtk_toggle_action_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_toggle_action_get_type (), GtkToggleAction)); -#line 2715 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2468 "/home/jens/Source/shotwell/src/PhotoPage.vala" + g_return_if_fail (G_IS_SIMPLE_ACTION (action)); +#line 2469 "/home/jens/Source/shotwell/src/PhotoPage.vala" + _tmp0_ = value; +#line 2469 "/home/jens/Source/shotwell/src/PhotoPage.vala" + _tmp1_ = g_variant_get_boolean (_tmp0_); +#line 2469 "/home/jens/Source/shotwell/src/PhotoPage.vala" display = _tmp1_; -#line 2717 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2471 "/home/jens/Source/shotwell/src/PhotoPage.vala" library_photo_page_set_display_ratings (self, display); -#line 2719 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2473 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp2_ = config_facade_get_instance (); -#line 2719 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2473 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp3_ = _tmp2_; -#line 2719 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2473 "/home/jens/Source/shotwell/src/PhotoPage.vala" configuration_facade_set_display_photo_ratings (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), display); -#line 2719 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2473 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (_tmp3_); -#line 2720 "/home/jens/Source/shotwell/src/PhotoPage.vala" - single_photo_page_repaint (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), NULL); -#line 18427 "PhotoPage.c" +#line 2474 "/home/jens/Source/shotwell/src/PhotoPage.vala" + _tmp4_ = action; +#line 2474 "/home/jens/Source/shotwell/src/PhotoPage.vala" + _tmp5_ = value; +#line 2474 "/home/jens/Source/shotwell/src/PhotoPage.vala" + g_simple_action_set_state (_tmp4_, _tmp5_); +#line 15879 "PhotoPage.c" } static void library_photo_page_set_display_ratings (LibraryPhotoPage* self, gboolean display) { - GtkToggleAction* action = NULL; - GtkAction* _tmp0_ = NULL; - GtkToggleAction* _tmp1_ = NULL; - GtkToggleAction* _tmp2_ = NULL; -#line 2723 "/home/jens/Source/shotwell/src/PhotoPage.vala" + GSimpleAction* action = NULL; + GAction* _tmp0_ = NULL; + GSimpleAction* _tmp1_ = NULL; + GSimpleAction* _tmp2_ = NULL; +#line 2478 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_if_fail (IS_LIBRARY_PHOTO_PAGE (self)); -#line 2724 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2479 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp0_ = page_get_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "ViewRatings"); -#line 2724 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp1_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp0_, gtk_toggle_action_get_type ()) ? ((GtkToggleAction*) _tmp0_) : NULL; -#line 2724 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2479 "/home/jens/Source/shotwell/src/PhotoPage.vala" + _tmp1_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp0_, g_simple_action_get_type ()) ? ((GSimpleAction*) _tmp0_) : NULL; +#line 2479 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp1_ == NULL) { -#line 2724 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2479 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (_tmp0_); -#line 18446 "PhotoPage.c" +#line 15898 "PhotoPage.c" } -#line 2724 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2479 "/home/jens/Source/shotwell/src/PhotoPage.vala" action = _tmp1_; -#line 2725 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2480 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp2_ = action; -#line 2725 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2480 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp2_ != NULL) { -#line 18454 "PhotoPage.c" - GtkToggleAction* _tmp3_ = NULL; +#line 15906 "PhotoPage.c" + GSimpleAction* _tmp3_ = NULL; gboolean _tmp4_ = FALSE; -#line 2726 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2481 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp3_ = action; -#line 2726 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2481 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp4_ = display; -#line 2726 "/home/jens/Source/shotwell/src/PhotoPage.vala" - gtk_toggle_action_set_active (_tmp3_, _tmp4_); -#line 18463 "PhotoPage.c" +#line 2481 "/home/jens/Source/shotwell/src/PhotoPage.vala" + g_simple_action_set_enabled (_tmp3_, _tmp4_); +#line 15915 "PhotoPage.c" } -#line 2723 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2478 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (action); -#line 18467 "PhotoPage.c" +#line 15919 "PhotoPage.c" } @@ -18506,241 +15958,241 @@ static void library_photo_page_real_update_actions (Page* base, gint selected_co gboolean _tmp56_ = FALSE; gint _tmp61_ = 0; gint _tmp62_ = 0; -#line 2729 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2484 "/home/jens/Source/shotwell/src/PhotoPage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO_PAGE, LibraryPhotoPage); -#line 2730 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2485 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp0_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); -#line 2730 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2485 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp1_ = _tmp0_; -#line 2730 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2485 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp2_ = data_collection_get_count (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_DATA_COLLECTION, DataCollection)); -#line 2730 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2485 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp3_ = _tmp2_ > 1; -#line 2730 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2485 "/home/jens/Source/shotwell/src/PhotoPage.vala" _data_collection_unref0 (_tmp1_); -#line 2730 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2485 "/home/jens/Source/shotwell/src/PhotoPage.vala" multiple = _tmp3_; -#line 2731 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2486 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp5_ = editing_host_page_has_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage)); -#line 2731 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2486 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp5_) { -#line 18523 "PhotoPage.c" +#line 15975 "PhotoPage.c" Photo* _tmp6_ = NULL; Photo* _tmp7_ = NULL; gboolean _tmp8_ = FALSE; -#line 2731 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2486 "/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 2731 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2486 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp7_ = _tmp6_; -#line 2731 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2486 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp8_ = editing_host_page_is_rotate_available (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage), _tmp7_); -#line 2731 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2486 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp4_ = _tmp8_; -#line 2731 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2486 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (_tmp7_); -#line 18537 "PhotoPage.c" +#line 15989 "PhotoPage.c" } else { -#line 2731 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2486 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp4_ = FALSE; -#line 18541 "PhotoPage.c" +#line 15993 "PhotoPage.c" } -#line 2731 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2486 "/home/jens/Source/shotwell/src/PhotoPage.vala" rotate_possible = _tmp4_; -#line 2732 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2487 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp10_ = editing_host_page_has_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage)); -#line 2732 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2487 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp10_) { -#line 18549 "PhotoPage.c" +#line 16001 "PhotoPage.c" Photo* _tmp11_ = NULL; Photo* _tmp12_ = NULL; PhotoFileFormat _tmp13_ = 0; -#line 2732 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2487 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp11_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage)); -#line 2732 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2487 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp12_ = _tmp11_; -#line 2732 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2487 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp13_ = photo_get_master_file_format (_tmp12_); -#line 2732 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2487 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp9_ = _tmp13_ == PHOTO_FILE_FORMAT_RAW; -#line 2732 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2487 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (_tmp12_); -#line 18563 "PhotoPage.c" +#line 16015 "PhotoPage.c" } else { -#line 2732 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2487 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp9_ = FALSE; -#line 18567 "PhotoPage.c" +#line 16019 "PhotoPage.c" } -#line 2732 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2487 "/home/jens/Source/shotwell/src/PhotoPage.vala" is_raw = _tmp9_; -#line 2735 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2490 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp15_ = editing_host_page_has_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage)); -#line 2735 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2490 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp15_) { -#line 18575 "PhotoPage.c" +#line 16027 "PhotoPage.c" ConfigFacade* _tmp16_ = NULL; ConfigFacade* _tmp17_ = NULL; gchar* _tmp18_ = NULL; gchar* _tmp19_ = NULL; -#line 2735 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2490 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp16_ = config_facade_get_instance (); -#line 2735 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2490 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp17_ = _tmp16_; -#line 2735 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2490 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp18_ = configuration_facade_get_external_photo_app (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade)); -#line 2735 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2490 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp19_ = _tmp18_; -#line 2735 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2490 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp14_ = g_strcmp0 (_tmp19_, "") != 0; -#line 2735 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2490 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_free0 (_tmp19_); -#line 2735 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2490 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (_tmp17_); -#line 18594 "PhotoPage.c" +#line 16046 "PhotoPage.c" } else { -#line 2735 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2490 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp14_ = FALSE; -#line 18598 "PhotoPage.c" +#line 16050 "PhotoPage.c" } -#line 2734 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2489 "/home/jens/Source/shotwell/src/PhotoPage.vala" page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "ExternalEdit", _tmp14_); -#line 2737 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2492 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp21_ = editing_host_page_has_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage)); -#line 2737 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2492 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp21_) { -#line 18606 "PhotoPage.c" +#line 16058 "PhotoPage.c" gboolean _tmp22_ = FALSE; Photo* _tmp23_ = NULL; Photo* _tmp24_ = NULL; gboolean _tmp25_ = FALSE; gboolean _tmp26_ = FALSE; -#line 2738 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2493 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp23_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage)); -#line 2738 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2493 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp24_ = _tmp23_; -#line 2738 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2493 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp25_ = photo_has_transformations (_tmp24_); -#line 2738 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2493 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp26_ = _tmp25_; -#line 2738 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2493 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (_tmp24_); -#line 2738 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2493 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp26_) { -#line 2738 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2493 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp22_ = TRUE; -#line 18626 "PhotoPage.c" +#line 16078 "PhotoPage.c" } else { Photo* _tmp27_ = NULL; Photo* _tmp28_ = NULL; gboolean _tmp29_ = FALSE; -#line 2738 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2493 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp27_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage)); -#line 2738 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2493 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp28_ = _tmp27_; -#line 2738 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2493 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp29_ = photo_has_editable (_tmp28_); -#line 2738 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2493 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp22_ = _tmp29_; -#line 2738 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2493 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (_tmp28_); -#line 18641 "PhotoPage.c" +#line 16093 "PhotoPage.c" } -#line 2738 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2493 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp20_ = _tmp22_; -#line 18645 "PhotoPage.c" +#line 16097 "PhotoPage.c" } else { -#line 2738 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2493 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp20_ = FALSE; -#line 18649 "PhotoPage.c" +#line 16101 "PhotoPage.c" } -#line 2737 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2492 "/home/jens/Source/shotwell/src/PhotoPage.vala" page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Revert", _tmp20_); -#line 2740 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2495 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp31_ = editing_host_page_has_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage)); -#line 2740 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2495 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp31_) { -#line 18657 "PhotoPage.c" +#line 16109 "PhotoPage.c" gboolean _tmp32_ = FALSE; -#line 2740 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#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 2740 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2495 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp30_ = !_tmp32_; -#line 18663 "PhotoPage.c" +#line 16115 "PhotoPage.c" } else { -#line 2740 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2495 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp30_ = FALSE; -#line 18667 "PhotoPage.c" +#line 16119 "PhotoPage.c" } -#line 2740 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2495 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp30_) { -#line 2741 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2496 "/home/jens/Source/shotwell/src/PhotoPage.vala" library_photo_page_update_rating_menu_item_sensitivity (self); -#line 2742 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2497 "/home/jens/Source/shotwell/src/PhotoPage.vala" library_photo_page_update_development_menu_item_sensitivity (self); -#line 18675 "PhotoPage.c" +#line 16127 "PhotoPage.c" } -#line 2745 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#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)); -#line 2745 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2500 "/home/jens/Source/shotwell/src/PhotoPage.vala" page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "SetBackground", _tmp33_); -#line 2747 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2502 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp35_ = editing_host_page_has_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage)); -#line 2747 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2502 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp35_) { -#line 18685 "PhotoPage.c" +#line 16137 "PhotoPage.c" Photo* _tmp36_ = NULL; Photo* _tmp37_ = NULL; gboolean _tmp38_ = FALSE; -#line 2747 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2502 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp36_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage)); -#line 2747 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2502 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp37_ = _tmp36_; -#line 2747 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2502 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp38_ = photo_has_color_adjustments (_tmp37_); -#line 2747 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2502 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp34_ = _tmp38_; -#line 2747 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2502 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (_tmp37_); -#line 18699 "PhotoPage.c" +#line 16151 "PhotoPage.c" } else { -#line 2747 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2502 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp34_ = FALSE; -#line 18703 "PhotoPage.c" +#line 16155 "PhotoPage.c" } -#line 2747 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2502 "/home/jens/Source/shotwell/src/PhotoPage.vala" page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "CopyColorAdjustments", _tmp34_); -#line 2748 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2503 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp39_ = pixel_transformation_bundle_has_copied_color_adjustments (); -#line 2748 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2503 "/home/jens/Source/shotwell/src/PhotoPage.vala" page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "PasteColorAdjustments", _tmp39_); -#line 2750 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2505 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp40_ = multiple; -#line 2750 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2505 "/home/jens/Source/shotwell/src/PhotoPage.vala" page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "PrevPhoto", _tmp40_); -#line 2751 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2506 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp41_ = multiple; -#line 2751 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2506 "/home/jens/Source/shotwell/src/PhotoPage.vala" page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "NextPhoto", _tmp41_); -#line 2752 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2507 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp42_ = rotate_possible; -#line 2752 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2507 "/home/jens/Source/shotwell/src/PhotoPage.vala" page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RotateClockwise", _tmp42_); -#line 2753 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2508 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp43_ = rotate_possible; -#line 2753 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2508 "/home/jens/Source/shotwell/src/PhotoPage.vala" page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RotateCounterclockwise", _tmp43_); -#line 2754 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2509 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp44_ = rotate_possible; -#line 2754 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2509 "/home/jens/Source/shotwell/src/PhotoPage.vala" page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "FlipHorizontally", _tmp44_); -#line 2755 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2510 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp45_ = rotate_possible; -#line 2755 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2510 "/home/jens/Source/shotwell/src/PhotoPage.vala" page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "FlipVertically", _tmp45_); -#line 2757 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2512 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp46_ = editing_host_page_has_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage)); -#line 2757 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2512 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp46_) { -#line 18739 "PhotoPage.c" +#line 16191 "PhotoPage.c" Photo* _tmp47_ = NULL; Photo* _tmp48_ = NULL; Scaling _tmp49_ = {0}; @@ -18749,153 +16201,215 @@ static void library_photo_page_real_update_actions (Page* base, gint selected_co Photo* _tmp52_ = NULL; Scaling _tmp53_ = {0}; gboolean _tmp54_ = FALSE; -#line 2758 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2513 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp47_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage)); -#line 2758 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2513 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp48_ = _tmp47_; -#line 2758 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2513 "/home/jens/Source/shotwell/src/PhotoPage.vala" scaling_for_original (&_tmp49_); -#line 2758 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2513 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp50_ = editing_tools_crop_tool_is_available (_tmp48_, &_tmp49_); -#line 2758 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2513 "/home/jens/Source/shotwell/src/PhotoPage.vala" page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Crop", _tmp50_); -#line 2758 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2513 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (_tmp48_); -#line 2759 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2514 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp51_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage)); -#line 2759 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2514 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp52_ = _tmp51_; -#line 2759 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2514 "/home/jens/Source/shotwell/src/PhotoPage.vala" scaling_for_original (&_tmp53_); -#line 2759 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2514 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp54_ = editing_tools_redeye_tool_is_available (_tmp52_, &_tmp53_); -#line 2759 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2514 "/home/jens/Source/shotwell/src/PhotoPage.vala" page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RedEye", _tmp54_); -#line 2759 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2514 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (_tmp52_); -#line 18772 "PhotoPage.c" +#line 16224 "PhotoPage.c" } -#line 2763 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2518 "/home/jens/Source/shotwell/src/PhotoPage.vala" library_photo_page_update_flag_action (self); -#line 2766 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2521 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp56_ = is_raw; -#line 2766 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2521 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp56_) { -#line 18780 "PhotoPage.c" +#line 16232 "PhotoPage.c" ConfigFacade* _tmp57_ = NULL; ConfigFacade* _tmp58_ = NULL; gchar* _tmp59_ = NULL; gchar* _tmp60_ = NULL; -#line 2766 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2521 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp57_ = config_facade_get_instance (); -#line 2766 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2521 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp58_ = _tmp57_; -#line 2766 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2521 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp59_ = configuration_facade_get_external_raw_app (G_TYPE_CHECK_INSTANCE_CAST (_tmp58_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade)); -#line 2766 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2521 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp60_ = _tmp59_; -#line 2766 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2521 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp55_ = g_strcmp0 (_tmp60_, "") != 0; -#line 2766 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2521 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_free0 (_tmp60_); -#line 2766 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2521 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (_tmp58_); -#line 18799 "PhotoPage.c" +#line 16251 "PhotoPage.c" } else { -#line 2766 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2521 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp55_ = FALSE; -#line 18803 "PhotoPage.c" +#line 16255 "PhotoPage.c" } -#line 2765 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2520 "/home/jens/Source/shotwell/src/PhotoPage.vala" page_set_action_visible (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "ExternalEditRAW", _tmp55_); -#line 2768 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2523 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp61_ = selected_count; -#line 2768 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2523 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp62_ = count; -#line 2768 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#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 18813 "PhotoPage.c" +#line 16265 "PhotoPage.c" } static void library_photo_page_on_photos_altered (LibraryPhotoPage* self) { gboolean _tmp0_ = FALSE; gboolean _tmp1_ = FALSE; -#line 2771 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2526 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_if_fail (IS_LIBRARY_PHOTO_PAGE (self)); -#line 2772 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2527 "/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 2772 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2527 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp1_) { -#line 18826 "PhotoPage.c" +#line 16278 "PhotoPage.c" gboolean _tmp2_ = FALSE; Photo* _tmp3_ = NULL; Photo* _tmp4_ = NULL; gboolean _tmp5_ = FALSE; gboolean _tmp6_ = FALSE; -#line 2773 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2528 "/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 2773 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2528 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp4_ = _tmp3_; -#line 2773 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2528 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp5_ = photo_has_transformations (_tmp4_); -#line 2773 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2528 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp6_ = _tmp5_; -#line 2773 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2528 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (_tmp4_); -#line 2773 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2528 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp6_) { -#line 2773 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2528 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp2_ = TRUE; -#line 18846 "PhotoPage.c" +#line 16298 "PhotoPage.c" } else { Photo* _tmp7_ = NULL; Photo* _tmp8_ = NULL; gboolean _tmp9_ = FALSE; -#line 2773 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2528 "/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 2773 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2528 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp8_ = _tmp7_; -#line 2773 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2528 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp9_ = photo_has_editable (_tmp8_); -#line 2773 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2528 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp2_ = _tmp9_; -#line 2773 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2528 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (_tmp8_); -#line 18861 "PhotoPage.c" +#line 16313 "PhotoPage.c" } -#line 2773 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2528 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp0_ = _tmp2_; -#line 18865 "PhotoPage.c" +#line 16317 "PhotoPage.c" } else { -#line 2773 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2528 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp0_ = FALSE; -#line 18869 "PhotoPage.c" +#line 16321 "PhotoPage.c" } -#line 2772 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#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 2774 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2529 "/home/jens/Source/shotwell/src/PhotoPage.vala" library_photo_page_update_flag_action (self); -#line 18875 "PhotoPage.c" +#line 16327 "PhotoPage.c" } -static void library_photo_page_on_raw_developer_changed (LibraryPhotoPage* self, GtkAction* action, GtkAction* current) { - GtkAction* _tmp0_ = NULL; - gint _tmp1_ = 0; -#line 2777 "/home/jens/Source/shotwell/src/PhotoPage.vala" +static void library_photo_page_on_raw_developer_changed (LibraryPhotoPage* self, GSimpleAction* action, GVariant* value) { + RawDeveloper developer = 0; + GVariant* _tmp0_ = NULL; + const gchar* _tmp1_ = NULL; + const gchar* _tmp2_ = NULL; + GQuark _tmp4_ = 0U; +#line 2536 "/home/jens/Source/shotwell/src/PhotoPage.vala" + static GQuark _tmp3_label0 = 0; +#line 2536 "/home/jens/Source/shotwell/src/PhotoPage.vala" + static GQuark _tmp3_label1 = 0; +#line 16341 "PhotoPage.c" + RawDeveloper _tmp5_ = 0; + GSimpleAction* _tmp6_ = NULL; + GVariant* _tmp7_ = NULL; +#line 2532 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_if_fail (IS_LIBRARY_PHOTO_PAGE (self)); -#line 2777 "/home/jens/Source/shotwell/src/PhotoPage.vala" - g_return_if_fail (GTK_IS_ACTION (action)); -#line 2777 "/home/jens/Source/shotwell/src/PhotoPage.vala" - g_return_if_fail (GTK_IS_ACTION (current)); -#line 2778 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp0_ = current; -#line 2778 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp1_ = gtk_radio_action_get_current_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_radio_action_get_type (), GtkRadioAction)); -#line 2778 "/home/jens/Source/shotwell/src/PhotoPage.vala" - library_photo_page_developer_changed (self, (RawDeveloper) _tmp1_); -#line 18894 "PhotoPage.c" +#line 2532 "/home/jens/Source/shotwell/src/PhotoPage.vala" + g_return_if_fail (G_IS_SIMPLE_ACTION (action)); +#line 2534 "/home/jens/Source/shotwell/src/PhotoPage.vala" + developer = RAW_DEVELOPER_SHOTWELL; +#line 2536 "/home/jens/Source/shotwell/src/PhotoPage.vala" + _tmp0_ = value; +#line 2536 "/home/jens/Source/shotwell/src/PhotoPage.vala" + _tmp1_ = g_variant_get_string (_tmp0_, NULL); +#line 2536 "/home/jens/Source/shotwell/src/PhotoPage.vala" + _tmp2_ = _tmp1_; +#line 2536 "/home/jens/Source/shotwell/src/PhotoPage.vala" + _tmp4_ = (NULL == _tmp2_) ? 0 : g_quark_from_string (_tmp2_); +#line 2536 "/home/jens/Source/shotwell/src/PhotoPage.vala" + 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" + 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" + } + } + } 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" + 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" + } + } + } else { +#line 2536 "/home/jens/Source/shotwell/src/PhotoPage.vala" + switch (0) { +#line 16389 "PhotoPage.c" + default: + { +#line 2544 "/home/jens/Source/shotwell/src/PhotoPage.vala" + break; +#line 16394 "PhotoPage.c" + } + } + } +#line 2547 "/home/jens/Source/shotwell/src/PhotoPage.vala" + _tmp5_ = developer; +#line 2547 "/home/jens/Source/shotwell/src/PhotoPage.vala" + library_photo_page_developer_changed (self, _tmp5_); +#line 2549 "/home/jens/Source/shotwell/src/PhotoPage.vala" + _tmp6_ = action; +#line 2549 "/home/jens/Source/shotwell/src/PhotoPage.vala" + _tmp7_ = value; +#line 2549 "/home/jens/Source/shotwell/src/PhotoPage.vala" + g_simple_action_set_state (_tmp6_, _tmp7_); +#line 16408 "PhotoPage.c" } @@ -18919,106 +16433,106 @@ static void library_photo_page_real_developer_changed (LibraryPhotoPage* self, R gboolean _tmp19_ = FALSE; Photo* _tmp20_ = NULL; gboolean _tmp21_ = FALSE; -#line 2782 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2553 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp0_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); -#line 2782 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2553 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp1_ = _tmp0_; -#line 2782 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2553 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp2_ = view_collection_get_selected_count (_tmp1_); -#line 2782 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2553 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp3_ = _tmp2_ != 1; -#line 2782 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2553 "/home/jens/Source/shotwell/src/PhotoPage.vala" _data_collection_unref0 (_tmp1_); -#line 2782 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2553 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp3_) { -#line 2783 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2554 "/home/jens/Source/shotwell/src/PhotoPage.vala" return; -#line 18932 "PhotoPage.c" +#line 16446 "PhotoPage.c" } -#line 2785 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2556 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp4_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); -#line 2785 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2556 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp5_ = _tmp4_; -#line 2785 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2556 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp6_ = view_collection_get_selected (_tmp5_); -#line 2785 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2556 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp7_ = _tmp6_; -#line 2785 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2556 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp8_ = gee_list_get (_tmp7_, 0); -#line 2785 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2556 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp9_ = (DataView*) _tmp8_; -#line 2785 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2556 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp10_ = data_view_get_source (_tmp9_); -#line 2785 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2556 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp11_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp10_, TYPE_PHOTO) ? ((Photo*) _tmp10_) : NULL; -#line 2785 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2556 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp11_ == NULL) { -#line 2785 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2556 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (_tmp10_); -#line 18954 "PhotoPage.c" +#line 16468 "PhotoPage.c" } -#line 2785 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2556 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp12_ = _tmp11_; -#line 2785 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2556 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (_tmp9_); -#line 2785 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2556 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (_tmp7_); -#line 2785 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2556 "/home/jens/Source/shotwell/src/PhotoPage.vala" _data_collection_unref0 (_tmp5_); -#line 2785 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2556 "/home/jens/Source/shotwell/src/PhotoPage.vala" photo = _tmp12_; -#line 2786 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2557 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp14_ = photo; -#line 2786 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2557 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp14_ == NULL) { -#line 2786 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2557 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp13_ = TRUE; -#line 18972 "PhotoPage.c" +#line 16486 "PhotoPage.c" } else { RawDeveloper _tmp15_ = 0; Photo* _tmp16_ = NULL; RawDeveloper _tmp17_ = 0; gboolean _tmp18_ = FALSE; -#line 2786 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2557 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp15_ = rd; -#line 2786 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2557 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp16_ = photo; -#line 2786 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2557 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp17_ = photo_get_raw_developer (_tmp16_); -#line 2786 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2557 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp18_ = raw_developer_is_equivalent (_tmp15_, _tmp17_); -#line 2786 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2557 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp13_ = _tmp18_; -#line 18988 "PhotoPage.c" +#line 16502 "PhotoPage.c" } -#line 2786 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2557 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp13_) { -#line 2787 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2558 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (photo); -#line 2787 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2558 "/home/jens/Source/shotwell/src/PhotoPage.vala" return; -#line 18996 "PhotoPage.c" +#line 16510 "PhotoPage.c" } -#line 2791 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2562 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp20_ = photo; -#line 2791 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2562 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp21_ = photo_has_transformations (_tmp20_); -#line 2791 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2562 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (!_tmp21_) { -#line 2791 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2562 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp19_ = TRUE; -#line 19006 "PhotoPage.c" +#line 16520 "PhotoPage.c" } else { gboolean _tmp22_ = FALSE; -#line 2791 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2562 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp22_ = dialogs_confirm_warn_developer_changed (1); -#line 2791 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2562 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp19_ = _tmp22_; -#line 19013 "PhotoPage.c" +#line 16527 "PhotoPage.c" } -#line 2791 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2562 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp19_) { -#line 19017 "PhotoPage.c" +#line 16531 "PhotoPage.c" SetRawDeveloperCommand* command = NULL; ViewCollection* _tmp23_ = NULL; ViewCollection* _tmp24_ = NULL; @@ -19030,133 +16544,108 @@ static void library_photo_page_real_developer_changed (LibraryPhotoPage* self, R CommandManager* _tmp30_ = NULL; CommandManager* _tmp31_ = NULL; SetRawDeveloperCommand* _tmp32_ = NULL; -#line 2792 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2563 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp23_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); -#line 2792 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2563 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp24_ = _tmp23_; -#line 2792 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2563 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp25_ = view_collection_get_selected (_tmp24_); -#line 2792 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2563 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp26_ = _tmp25_; -#line 2792 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2563 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp27_ = rd; -#line 2792 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2563 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp28_ = set_raw_developer_command_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, GEE_TYPE_ITERABLE, GeeIterable), _tmp27_); -#line 2792 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2563 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp29_ = _tmp28_; -#line 2792 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2563 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (_tmp26_); -#line 2792 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2563 "/home/jens/Source/shotwell/src/PhotoPage.vala" _data_collection_unref0 (_tmp24_); -#line 2792 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2563 "/home/jens/Source/shotwell/src/PhotoPage.vala" command = _tmp29_; -#line 2794 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2565 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp30_ = page_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); -#line 2794 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2565 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp31_ = _tmp30_; -#line 2794 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2565 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp32_ = command; -#line 2794 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2565 "/home/jens/Source/shotwell/src/PhotoPage.vala" command_manager_execute (_tmp31_, G_TYPE_CHECK_INSTANCE_CAST (_tmp32_, TYPE_COMMAND, Command)); -#line 2794 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2565 "/home/jens/Source/shotwell/src/PhotoPage.vala" _command_manager_unref0 (_tmp31_); -#line 2796 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2567 "/home/jens/Source/shotwell/src/PhotoPage.vala" library_photo_page_update_development_menu_item_sensitivity (self); -#line 2791 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2562 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (command); -#line 19063 "PhotoPage.c" +#line 16577 "PhotoPage.c" } -#line 2781 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2552 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (photo); -#line 19067 "PhotoPage.c" +#line 16581 "PhotoPage.c" } void library_photo_page_developer_changed (LibraryPhotoPage* self, RawDeveloper rd) { -#line 2781 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2552 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_if_fail (IS_LIBRARY_PHOTO_PAGE (self)); -#line 2781 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2552 "/home/jens/Source/shotwell/src/PhotoPage.vala" LIBRARY_PHOTO_PAGE_GET_CLASS (self)->developer_changed (self, rd); -#line 19076 "PhotoPage.c" +#line 16590 "PhotoPage.c" } static void library_photo_page_update_flag_action (LibraryPhotoPage* self) { gboolean _tmp0_ = FALSE; -#line 2800 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2571 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_if_fail (IS_LIBRARY_PHOTO_PAGE (self)); -#line 2801 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#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 2801 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2572 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp0_) { -#line 19088 "PhotoPage.c" - GtkAction* action = NULL; - GtkAction* _tmp1_ = NULL; - GtkAction* _tmp2_ = NULL; - gboolean is_flagged = FALSE; - Photo* _tmp3_ = NULL; - LibraryPhoto* _tmp4_ = NULL; - gboolean _tmp5_ = FALSE; - gboolean _tmp6_ = FALSE; - const gchar* _tmp7_ = NULL; - gboolean _tmp8_ = FALSE; - GtkAction* _tmp9_ = NULL; - GtkAction* _tmp10_ = NULL; -#line 2802 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#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 2802 "/home/jens/Source/shotwell/src/PhotoPage.vala" - action = _tmp1_; -#line 2803 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp2_ = action; -#line 2803 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _vala_assert (_tmp2_ != NULL, "action != null"); -#line 2805 "/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 2805 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp4_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_LIBRARY_PHOTO, LibraryPhoto); -#line 2805 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp5_ = flaggable_is_flagged (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_FLAGGABLE, Flaggable)); -#line 2805 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp6_ = _tmp5_; -#line 2805 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _g_object_unref0 (_tmp4_); -#line 2805 "/home/jens/Source/shotwell/src/PhotoPage.vala" - is_flagged = _tmp6_; -#line 2807 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp8_ = is_flagged; -#line 2807 "/home/jens/Source/shotwell/src/PhotoPage.vala" - if (_tmp8_) { -#line 2807 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp7_ = RESOURCES_UNFLAG_MENU; -#line 19127 "PhotoPage.c" - } else { -#line 2807 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp7_ = RESOURCES_FLAG_MENU; -#line 19131 "PhotoPage.c" +#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 2807 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp9_ = action; -#line 2807 "/home/jens/Source/shotwell/src/PhotoPage.vala" - gtk_action_set_label (_tmp9_, _tmp7_); -#line 2808 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp10_ = action; -#line 2808 "/home/jens/Source/shotwell/src/PhotoPage.vala" - gtk_action_set_sensitive (_tmp10_, TRUE); -#line 2801 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#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 19143 "PhotoPage.c" +#line 16632 "PhotoPage.c" } else { -#line 2810 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#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 19147 "PhotoPage.c" +#line 16636 "PhotoPage.c" } } static void _library_photo_page_on_page_destroyed_gtk_widget_destroy (GtkWidget* _sender, gpointer self) { -#line 2821 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2593 "/home/jens/Source/shotwell/src/PhotoPage.vala" library_photo_page_on_page_destroyed ((LibraryPhotoPage*) self); -#line 19155 "PhotoPage.c" +#line 16644 "PhotoPage.c" } @@ -19167,75 +16656,75 @@ void library_photo_page_display_for_collection (LibraryPhotoPage* self, Collecti ViewCollection* _tmp3_ = NULL; ViewCollection* _tmp4_ = NULL; Photo* _tmp9_ = NULL; -#line 2818 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2590 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_if_fail (IS_LIBRARY_PHOTO_PAGE (self)); -#line 2818 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2590 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_if_fail (IS_COLLECTION_PAGE (return_page)); -#line 2818 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2590 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_if_fail (IS_PHOTO (photo)); -#line 2818 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2590 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_if_fail ((view == NULL) || IS_VIEW_COLLECTION (view)); -#line 2820 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2592 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp0_ = return_page; -#line 2820 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2592 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp1_ = _g_object_ref0 (_tmp0_); -#line 2820 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2592 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (self->priv->return_page); -#line 2820 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2592 "/home/jens/Source/shotwell/src/PhotoPage.vala" self->priv->return_page = _tmp1_; -#line 2821 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2593 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp2_ = return_page; -#line 2821 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2593 "/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 2823 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2595 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp4_ = view; -#line 2823 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2595 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp4_ != NULL) { -#line 19190 "PhotoPage.c" +#line 16679 "PhotoPage.c" ViewCollection* _tmp5_ = NULL; ViewCollection* _tmp6_ = NULL; -#line 2823 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2595 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp5_ = view; -#line 2823 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2595 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp6_ = _data_collection_ref0 (_tmp5_); -#line 2823 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2595 "/home/jens/Source/shotwell/src/PhotoPage.vala" _data_collection_unref0 (_tmp3_); -#line 2823 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2595 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp3_ = _tmp6_; -#line 19201 "PhotoPage.c" +#line 16690 "PhotoPage.c" } else { CollectionPage* _tmp7_ = NULL; ViewCollection* _tmp8_ = NULL; -#line 2823 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2595 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp7_ = return_page; -#line 2823 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2595 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp8_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_PAGE, Page)); -#line 2823 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2595 "/home/jens/Source/shotwell/src/PhotoPage.vala" _data_collection_unref0 (_tmp3_); -#line 2823 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2595 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp3_ = _tmp8_; -#line 19213 "PhotoPage.c" +#line 16702 "PhotoPage.c" } -#line 2823 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2595 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp9_ = photo; -#line 2823 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2595 "/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 2818 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2590 "/home/jens/Source/shotwell/src/PhotoPage.vala" _data_collection_unref0 (_tmp3_); -#line 19221 "PhotoPage.c" +#line 16710 "PhotoPage.c" } void library_photo_page_on_page_destroyed (LibraryPhotoPage* self) { -#line 2826 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2598 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_if_fail (IS_LIBRARY_PHOTO_PAGE (self)); -#line 2829 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2601 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (self->priv->return_page); -#line 2829 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2601 "/home/jens/Source/shotwell/src/PhotoPage.vala" self->priv->return_page = NULL; -#line 2830 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2602 "/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 19234 "PhotoPage.c" +#line 16723 "PhotoPage.c" } @@ -19243,17 +16732,17 @@ CollectionPage* library_photo_page_get_controller_page (LibraryPhotoPage* self) CollectionPage* result = NULL; CollectionPage* _tmp0_ = NULL; CollectionPage* _tmp1_ = NULL; -#line 2833 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2605 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_val_if_fail (IS_LIBRARY_PHOTO_PAGE (self), NULL); -#line 2834 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2606 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp0_ = self->priv->return_page; -#line 2834 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2606 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp1_ = _g_object_ref0 (_tmp0_); -#line 2834 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2606 "/home/jens/Source/shotwell/src/PhotoPage.vala" result = _tmp1_; -#line 2834 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2606 "/home/jens/Source/shotwell/src/PhotoPage.vala" return result; -#line 19252 "PhotoPage.c" +#line 16741 "PhotoPage.c" } @@ -19264,33 +16753,33 @@ static void library_photo_page_real_switched_to (Page* base) { ConfigFacade* _tmp2_ = NULL; ConfigFacade* _tmp3_ = NULL; gboolean _tmp4_ = FALSE; -#line 2837 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2609 "/home/jens/Source/shotwell/src/PhotoPage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO_PAGE, LibraryPhotoPage); -#line 2841 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2613 "/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 2841 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2613 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp1_ = _tmp0_; -#line 2841 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2613 "/home/jens/Source/shotwell/src/PhotoPage.vala" _vala_assert (_tmp1_ != NULL, "get_photo() != null"); -#line 2841 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2613 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (_tmp1_); -#line 2843 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2615 "/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 2845 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2617 "/home/jens/Source/shotwell/src/PhotoPage.vala" library_photo_page_update_zoom_menu_item_sensitivity (self); -#line 2846 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2618 "/home/jens/Source/shotwell/src/PhotoPage.vala" library_photo_page_update_rating_menu_item_sensitivity (self); -#line 2848 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2620 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp2_ = config_facade_get_instance (); -#line 2848 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2620 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp3_ = _tmp2_; -#line 2848 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2620 "/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 2848 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2620 "/home/jens/Source/shotwell/src/PhotoPage.vala" library_photo_page_set_display_ratings (self, _tmp4_); -#line 2848 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2620 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (_tmp3_); -#line 19289 "PhotoPage.c" +#line 16778 "PhotoPage.c" } @@ -19305,58 +16794,58 @@ static GdkPixbuf* library_photo_page_real_get_bottom_left_trinket (EditingHostPa gint _tmp8_ = 0; GdkPixbuf* _tmp9_ = NULL; GdkPixbuf* _tmp10_ = NULL; -#line 2851 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2623 "/home/jens/Source/shotwell/src/PhotoPage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO_PAGE, LibraryPhotoPage); -#line 2852 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2624 "/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 2852 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2624 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (!_tmp1_) { -#line 2852 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2624 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp0_ = TRUE; -#line 19312 "PhotoPage.c" +#line 16801 "PhotoPage.c" } else { ConfigFacade* _tmp2_ = NULL; ConfigFacade* _tmp3_ = NULL; gboolean _tmp4_ = FALSE; -#line 2852 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2624 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp2_ = config_facade_get_instance (); -#line 2852 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2624 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp3_ = _tmp2_; -#line 2852 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2624 "/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 2852 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2624 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp0_ = !_tmp4_; -#line 2852 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2624 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (_tmp3_); -#line 19327 "PhotoPage.c" +#line 16816 "PhotoPage.c" } -#line 2852 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2624 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp0_) { -#line 2853 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2625 "/home/jens/Source/shotwell/src/PhotoPage.vala" result = NULL; -#line 2853 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2625 "/home/jens/Source/shotwell/src/PhotoPage.vala" return result; -#line 19335 "PhotoPage.c" +#line 16824 "PhotoPage.c" } -#line 2855 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2627 "/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 2855 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2627 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp6_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, TYPE_LIBRARY_PHOTO, LibraryPhoto); -#line 2855 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2627 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp7_ = media_source_get_rating (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, TYPE_MEDIA_SOURCE, MediaSource)); -#line 2855 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2627 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp8_ = scale; -#line 2855 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2627 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp9_ = resources_get_rating_trinket (_tmp7_, _tmp8_); -#line 2855 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2627 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp10_ = _tmp9_; -#line 2855 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2627 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (_tmp6_); -#line 2855 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2627 "/home/jens/Source/shotwell/src/PhotoPage.vala" result = _tmp10_; -#line 2855 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2627 "/home/jens/Source/shotwell/src/PhotoPage.vala" return result; -#line 19355 "PhotoPage.c" +#line 16844 "PhotoPage.c" } @@ -19366,46 +16855,46 @@ static GdkPixbuf* library_photo_page_real_get_top_right_trinket (EditingHostPage gboolean _tmp0_ = FALSE; gboolean _tmp1_ = FALSE; GdkPixbuf* _tmp5_ = NULL; -#line 2858 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2630 "/home/jens/Source/shotwell/src/PhotoPage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO_PAGE, LibraryPhotoPage); -#line 2859 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2631 "/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 2859 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2631 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (!_tmp1_) { -#line 2859 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2631 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp0_ = TRUE; -#line 19373 "PhotoPage.c" +#line 16862 "PhotoPage.c" } else { Photo* _tmp2_ = NULL; LibraryPhoto* _tmp3_ = NULL; gboolean _tmp4_ = FALSE; -#line 2859 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2631 "/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 2859 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2631 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp3_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_LIBRARY_PHOTO, LibraryPhoto); -#line 2859 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2631 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp4_ = flaggable_is_flagged (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_FLAGGABLE, Flaggable)); -#line 2859 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2631 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp0_ = !_tmp4_; -#line 2859 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2631 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (_tmp3_); -#line 19388 "PhotoPage.c" +#line 16877 "PhotoPage.c" } -#line 2859 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2631 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp0_) { -#line 2860 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2632 "/home/jens/Source/shotwell/src/PhotoPage.vala" result = NULL; -#line 2860 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2632 "/home/jens/Source/shotwell/src/PhotoPage.vala" return result; -#line 19396 "PhotoPage.c" +#line 16885 "PhotoPage.c" } -#line 2862 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2634 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp5_ = resources_get_icon (RESOURCES_ICON_FLAGGED_TRINKET, RESOURCES_DEFAULT_ICON_SCALE); -#line 2862 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2634 "/home/jens/Source/shotwell/src/PhotoPage.vala" result = _tmp5_; -#line 2862 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2634 "/home/jens/Source/shotwell/src/PhotoPage.vala" return result; -#line 19404 "PhotoPage.c" +#line 16893 "PhotoPage.c" } @@ -19421,51 +16910,51 @@ static void library_photo_page_on_slideshow (LibraryPhotoPage* self) { LibraryPhoto* _tmp7_ = NULL; SlideshowPage* _tmp8_ = NULL; SlideshowPage* _tmp9_ = NULL; -#line 2865 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2637 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_if_fail (IS_LIBRARY_PHOTO_PAGE (self)); -#line 2866 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2638 "/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 2866 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2638 "/home/jens/Source/shotwell/src/PhotoPage.vala" photo = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_LIBRARY_PHOTO, LibraryPhoto); -#line 2867 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2639 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp1_ = photo; -#line 2867 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2639 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp1_ == NULL) { -#line 2868 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2640 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (photo); -#line 2868 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2640 "/home/jens/Source/shotwell/src/PhotoPage.vala" return; -#line 19434 "PhotoPage.c" +#line 16923 "PhotoPage.c" } -#line 2870 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2642 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp2_ = app_window_get_instance (); -#line 2870 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2642 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp3_ = _tmp2_; -#line 2870 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2642 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp4_ = library_photo_global; -#line 2870 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2642 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp5_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); -#line 2870 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2642 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp6_ = _tmp5_; -#line 2870 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2642 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp7_ = photo; -#line 2870 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2642 "/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 2870 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2642 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_object_ref_sink (_tmp8_); -#line 2870 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2642 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp9_ = _tmp8_; -#line 2870 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2642 "/home/jens/Source/shotwell/src/PhotoPage.vala" app_window_go_fullscreen (_tmp3_, G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, TYPE_PAGE, Page)); -#line 2870 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2642 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (_tmp9_); -#line 2870 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2642 "/home/jens/Source/shotwell/src/PhotoPage.vala" _data_collection_unref0 (_tmp6_); -#line 2870 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2642 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (_tmp3_); -#line 2865 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2637 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (photo); -#line 19464 "PhotoPage.c" +#line 16953 "PhotoPage.c" } @@ -19476,73 +16965,73 @@ static void library_photo_page_update_zoom_menu_item_sensitivity (LibraryPhotoPa gboolean _tmp4_ = FALSE; ZoomState _tmp5_ = {0}; gboolean _tmp6_ = FALSE; -#line 2874 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2646 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_if_fail (IS_LIBRARY_PHOTO_PAGE (self)); -#line 2875 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2647 "/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 2875 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2647 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp2_ = zoom_state_is_max (&_tmp1_); -#line 2875 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2647 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (!_tmp2_) { -#line 19483 "PhotoPage.c" +#line 16972 "PhotoPage.c" gboolean _tmp3_ = FALSE; -#line 2875 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2647 "/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 2875 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2647 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp0_ = !_tmp3_; -#line 19489 "PhotoPage.c" +#line 16978 "PhotoPage.c" } else { -#line 2875 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2647 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp0_ = FALSE; -#line 19493 "PhotoPage.c" +#line 16982 "PhotoPage.c" } -#line 2875 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2647 "/home/jens/Source/shotwell/src/PhotoPage.vala" page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "IncreaseSize", _tmp0_); -#line 2876 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2648 "/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 2876 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2648 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp6_ = zoom_state_is_default (&_tmp5_); -#line 2876 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2648 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (!_tmp6_) { -#line 19503 "PhotoPage.c" +#line 16992 "PhotoPage.c" gboolean _tmp7_ = FALSE; -#line 2876 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2648 "/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 2876 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2648 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp4_ = !_tmp7_; -#line 19509 "PhotoPage.c" +#line 16998 "PhotoPage.c" } else { -#line 2876 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2648 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp4_ = FALSE; -#line 19513 "PhotoPage.c" +#line 17002 "PhotoPage.c" } -#line 2876 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2648 "/home/jens/Source/shotwell/src/PhotoPage.vala" page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "DecreaseSize", _tmp4_); -#line 19517 "PhotoPage.c" +#line 17006 "PhotoPage.c" } static void library_photo_page_real_on_increase_size (EditingHostPage* base) { LibraryPhotoPage * self; -#line 2879 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2651 "/home/jens/Source/shotwell/src/PhotoPage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO_PAGE, LibraryPhotoPage); -#line 2880 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2652 "/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 2882 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2654 "/home/jens/Source/shotwell/src/PhotoPage.vala" library_photo_page_update_zoom_menu_item_sensitivity (self); -#line 19529 "PhotoPage.c" +#line 17018 "PhotoPage.c" } static void library_photo_page_real_on_decrease_size (EditingHostPage* base) { LibraryPhotoPage * self; -#line 2885 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2657 "/home/jens/Source/shotwell/src/PhotoPage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO_PAGE, LibraryPhotoPage); -#line 2886 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2658 "/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 2888 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2660 "/home/jens/Source/shotwell/src/PhotoPage.vala" library_photo_page_update_zoom_menu_item_sensitivity (self); -#line 19541 "PhotoPage.c" +#line 17030 "PhotoPage.c" } @@ -19554,43 +17043,43 @@ static gboolean library_photo_page_real_on_zoom_slider_key_press (EditingHostPag GdkEventKey* _tmp2_ = NULL; guint _tmp3_ = 0U; const gchar* _tmp4_ = NULL; -#line 2891 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2663 "/home/jens/Source/shotwell/src/PhotoPage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO_PAGE, LibraryPhotoPage); -#line 2891 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2663 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_val_if_fail (event != NULL, FALSE); -#line 2892 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2664 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp0_ = event; -#line 2892 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2664 "/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 2892 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2664 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp1_) { -#line 2893 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2665 "/home/jens/Source/shotwell/src/PhotoPage.vala" result = TRUE; -#line 2893 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2665 "/home/jens/Source/shotwell/src/PhotoPage.vala" return result; -#line 19567 "PhotoPage.c" +#line 17056 "PhotoPage.c" } -#line 2895 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2667 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp2_ = event; -#line 2895 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2667 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp3_ = _tmp2_->keyval; -#line 2895 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2667 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp4_ = gdk_keyval_name (_tmp3_); -#line 2895 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2667 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (g_strcmp0 (_tmp4_, "Escape") == 0) { -#line 2896 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2668 "/home/jens/Source/shotwell/src/PhotoPage.vala" library_photo_page_return_to_collection (self); -#line 2897 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2669 "/home/jens/Source/shotwell/src/PhotoPage.vala" result = TRUE; -#line 2897 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2669 "/home/jens/Source/shotwell/src/PhotoPage.vala" return result; -#line 19583 "PhotoPage.c" +#line 17072 "PhotoPage.c" } else { -#line 2899 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2671 "/home/jens/Source/shotwell/src/PhotoPage.vala" result = FALSE; -#line 2899 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2671 "/home/jens/Source/shotwell/src/PhotoPage.vala" return result; -#line 19589 "PhotoPage.c" +#line 17078 "PhotoPage.c" } } @@ -19600,77 +17089,77 @@ static void library_photo_page_real_update_ui (EditingHostPage* base, gboolean m gboolean sensitivity = FALSE; gboolean _tmp0_ = FALSE; gboolean _tmp1_ = FALSE; -#line 2903 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2675 "/home/jens/Source/shotwell/src/PhotoPage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO_PAGE, LibraryPhotoPage); -#line 2904 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2676 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp0_ = missing; -#line 2904 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2676 "/home/jens/Source/shotwell/src/PhotoPage.vala" sensitivity = !_tmp0_; -#line 2906 "/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), "SendTo", sensitivity); -#line 2907 "/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), "Publish", sensitivity); -#line 2908 "/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), "Print", sensitivity); -#line 2909 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2681 "/home/jens/Source/shotwell/src/PhotoPage.vala" page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "CommonJumpToFile", sensitivity); -#line 2911 "/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), "CommonUndo", sensitivity); -#line 2912 "/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), "CommonRedo", sensitivity); -#line 2914 "/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), "IncreaseSize", sensitivity); -#line 2915 "/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), "DecreaseSize", sensitivity); -#line 2916 "/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), "ZoomFit", sensitivity); -#line 2917 "/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), "Zoom100", sensitivity); -#line 2918 "/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), "Zoom200", sensitivity); -#line 2919 "/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), "Slideshow", sensitivity); -#line 2921 "/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), "RotateClockwise", sensitivity); -#line 2922 "/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), "RotateCounterclockwise", sensitivity); -#line 2923 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2695 "/home/jens/Source/shotwell/src/PhotoPage.vala" page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "FlipHorizontally", sensitivity); -#line 2924 "/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), "FlipVertically", sensitivity); -#line 2925 "/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), "Enhance", sensitivity); -#line 2926 "/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), "Crop", sensitivity); -#line 2927 "/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), "RedEye", sensitivity); -#line 2928 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2700 "/home/jens/Source/shotwell/src/PhotoPage.vala" page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Adjust", sensitivity); -#line 2929 "/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), "EditTitle", sensitivity); -#line 2930 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2702 "/home/jens/Source/shotwell/src/PhotoPage.vala" page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "AdjustDateTime", sensitivity); -#line 2931 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2703 "/home/jens/Source/shotwell/src/PhotoPage.vala" page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "ExternalEdit", sensitivity); -#line 2932 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2704 "/home/jens/Source/shotwell/src/PhotoPage.vala" page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "ExternalEditRAW", sensitivity); -#line 2933 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2705 "/home/jens/Source/shotwell/src/PhotoPage.vala" page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Revert", sensitivity); -#line 2935 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2707 "/home/jens/Source/shotwell/src/PhotoPage.vala" page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Rate", sensitivity); -#line 2936 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2708 "/home/jens/Source/shotwell/src/PhotoPage.vala" page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Flag", sensitivity); -#line 2937 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2709 "/home/jens/Source/shotwell/src/PhotoPage.vala" page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "AddTags", sensitivity); -#line 2938 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2710 "/home/jens/Source/shotwell/src/PhotoPage.vala" page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "ModifyTags", sensitivity); -#line 2940 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2712 "/home/jens/Source/shotwell/src/PhotoPage.vala" page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "SetBackground", sensitivity); -#line 2942 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2714 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp1_ = missing; -#line 2942 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2714 "/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 19669 "PhotoPage.c" +#line 17158 "PhotoPage.c" } @@ -19679,36 +17168,36 @@ static void library_photo_page_real_notify_photo_backing_missing (EditingHostPag gboolean _tmp0_ = FALSE; Photo* _tmp3_ = NULL; gboolean _tmp4_ = FALSE; -#line 2945 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2717 "/home/jens/Source/shotwell/src/PhotoPage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO_PAGE, LibraryPhotoPage); -#line 2945 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2717 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_if_fail (IS_PHOTO (photo)); -#line 2946 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2718 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp0_ = missing; -#line 2946 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2718 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp0_) { -#line 19686 "PhotoPage.c" +#line 17175 "PhotoPage.c" Photo* _tmp1_ = NULL; -#line 2947 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2719 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp1_ = photo; -#line 2947 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2719 "/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 19692 "PhotoPage.c" +#line 17181 "PhotoPage.c" } else { Photo* _tmp2_ = NULL; -#line 2949 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2721 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp2_ = photo; -#line 2949 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2721 "/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 19699 "PhotoPage.c" +#line 17188 "PhotoPage.c" } -#line 2951 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2723 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp3_ = photo; -#line 2951 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2723 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp4_ = missing; -#line 2951 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2723 "/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 19707 "PhotoPage.c" +#line 17196 "PhotoPage.c" } @@ -19722,300 +17211,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 2959 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2731 "/home/jens/Source/shotwell/src/PhotoPage.vala" static GQuark _tmp7_label0 = 0; -#line 2959 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2731 "/home/jens/Source/shotwell/src/PhotoPage.vala" static GQuark _tmp7_label1 = 0; -#line 2959 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2731 "/home/jens/Source/shotwell/src/PhotoPage.vala" static GQuark _tmp7_label2 = 0; -#line 2959 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2731 "/home/jens/Source/shotwell/src/PhotoPage.vala" static GQuark _tmp7_label3 = 0; -#line 2959 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2731 "/home/jens/Source/shotwell/src/PhotoPage.vala" static GQuark _tmp7_label4 = 0; -#line 2959 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2731 "/home/jens/Source/shotwell/src/PhotoPage.vala" static GQuark _tmp7_label5 = 0; -#line 2959 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2731 "/home/jens/Source/shotwell/src/PhotoPage.vala" static GQuark _tmp7_label6 = 0; -#line 2959 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2731 "/home/jens/Source/shotwell/src/PhotoPage.vala" static GQuark _tmp7_label7 = 0; -#line 2959 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2731 "/home/jens/Source/shotwell/src/PhotoPage.vala" static GQuark _tmp7_label8 = 0; -#line 2959 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2731 "/home/jens/Source/shotwell/src/PhotoPage.vala" static GQuark _tmp7_label9 = 0; -#line 2959 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2731 "/home/jens/Source/shotwell/src/PhotoPage.vala" static GQuark _tmp7_label10 = 0; -#line 2959 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2731 "/home/jens/Source/shotwell/src/PhotoPage.vala" static GQuark _tmp7_label11 = 0; -#line 2959 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2731 "/home/jens/Source/shotwell/src/PhotoPage.vala" static GQuark _tmp7_label12 = 0; -#line 2959 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2731 "/home/jens/Source/shotwell/src/PhotoPage.vala" static GQuark _tmp7_label13 = 0; -#line 2959 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2731 "/home/jens/Source/shotwell/src/PhotoPage.vala" static GQuark _tmp7_label14 = 0; -#line 2959 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2731 "/home/jens/Source/shotwell/src/PhotoPage.vala" static GQuark _tmp7_label15 = 0; -#line 2959 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2731 "/home/jens/Source/shotwell/src/PhotoPage.vala" static GQuark _tmp7_label16 = 0; -#line 2959 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2731 "/home/jens/Source/shotwell/src/PhotoPage.vala" static GQuark _tmp7_label17 = 0; -#line 2954 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2726 "/home/jens/Source/shotwell/src/PhotoPage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO_PAGE, LibraryPhotoPage); -#line 2954 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2726 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_val_if_fail (event != NULL, FALSE); -#line 2955 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2727 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (GTK_WIDGET_CLASS (library_photo_page_parent_class)->key_press_event != NULL) { -#line 19763 "PhotoPage.c" +#line 17252 "PhotoPage.c" GdkEventKey* _tmp1_ = NULL; gboolean _tmp2_ = FALSE; -#line 2955 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2727 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp1_ = event; -#line 2955 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2727 "/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 2955 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2727 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp0_ = _tmp2_ == TRUE; -#line 19772 "PhotoPage.c" +#line 17261 "PhotoPage.c" } else { -#line 2955 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2727 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp0_ = FALSE; -#line 19776 "PhotoPage.c" +#line 17265 "PhotoPage.c" } -#line 2955 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2727 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp0_) { -#line 2956 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2728 "/home/jens/Source/shotwell/src/PhotoPage.vala" result = TRUE; -#line 2956 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2728 "/home/jens/Source/shotwell/src/PhotoPage.vala" return result; -#line 19784 "PhotoPage.c" +#line 17273 "PhotoPage.c" } -#line 2958 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2730 "/home/jens/Source/shotwell/src/PhotoPage.vala" handled = TRUE; -#line 2959 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2731 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp3_ = event; -#line 2959 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2731 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp4_ = _tmp3_->keyval; -#line 2959 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2731 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp5_ = gdk_keyval_name (_tmp4_); -#line 2959 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2731 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp6_ = _tmp5_; -#line 2959 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2731 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp8_ = (NULL == _tmp6_) ? 0 : g_quark_from_string (_tmp6_); -#line 2959 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2731 "/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 2959 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2731 "/home/jens/Source/shotwell/src/PhotoPage.vala" switch (0) { -#line 19802 "PhotoPage.c" +#line 17291 "PhotoPage.c" default: { GtkWindow* _tmp9_ = NULL; GtkWindow* _tmp10_ = NULL; gboolean _tmp11_ = FALSE; -#line 2963 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2735 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp9_ = page_get_container (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); -#line 2963 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2735 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp10_ = _tmp9_; -#line 2963 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2735 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp11_ = !G_TYPE_CHECK_INSTANCE_TYPE (_tmp10_, TYPE_FULLSCREEN_WINDOW); -#line 2963 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2735 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (_tmp10_); -#line 2963 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2735 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp11_) { -#line 2964 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2736 "/home/jens/Source/shotwell/src/PhotoPage.vala" library_photo_page_return_to_collection (self); -#line 19820 "PhotoPage.c" +#line 17309 "PhotoPage.c" } -#line 2965 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2737 "/home/jens/Source/shotwell/src/PhotoPage.vala" break; -#line 19824 "PhotoPage.c" +#line 17313 "PhotoPage.c" } } } else if (_tmp8_ == ((0 != _tmp7_label3) ? _tmp7_label3 : (_tmp7_label3 = g_quark_from_static_string ("Delete")))) { -#line 2959 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2731 "/home/jens/Source/shotwell/src/PhotoPage.vala" switch (0) { -#line 19830 "PhotoPage.c" +#line 17319 "PhotoPage.c" default: { -#line 2971 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2743 "/home/jens/Source/shotwell/src/PhotoPage.vala" page_activate_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "MoveToTrash"); -#line 2972 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2744 "/home/jens/Source/shotwell/src/PhotoPage.vala" break; -#line 19837 "PhotoPage.c" +#line 17326 "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 2959 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2731 "/home/jens/Source/shotwell/src/PhotoPage.vala" switch (0) { -#line 19843 "PhotoPage.c" +#line 17332 "PhotoPage.c" default: { -#line 2976 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2748 "/home/jens/Source/shotwell/src/PhotoPage.vala" page_activate_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "IncreaseRating"); -#line 2977 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2749 "/home/jens/Source/shotwell/src/PhotoPage.vala" break; -#line 19850 "PhotoPage.c" +#line 17339 "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 2959 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2731 "/home/jens/Source/shotwell/src/PhotoPage.vala" switch (0) { -#line 19856 "PhotoPage.c" +#line 17345 "PhotoPage.c" default: { -#line 2981 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2753 "/home/jens/Source/shotwell/src/PhotoPage.vala" page_activate_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "DecreaseRating"); -#line 2982 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2754 "/home/jens/Source/shotwell/src/PhotoPage.vala" break; -#line 19863 "PhotoPage.c" +#line 17352 "PhotoPage.c" } } } else if (_tmp8_ == ((0 != _tmp7_label8) ? _tmp7_label8 : (_tmp7_label8 = g_quark_from_static_string ("KP_1")))) { -#line 2959 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2731 "/home/jens/Source/shotwell/src/PhotoPage.vala" switch (0) { -#line 19869 "PhotoPage.c" +#line 17358 "PhotoPage.c" default: { -#line 2985 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2757 "/home/jens/Source/shotwell/src/PhotoPage.vala" page_activate_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RateOne"); -#line 2986 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2758 "/home/jens/Source/shotwell/src/PhotoPage.vala" break; -#line 19876 "PhotoPage.c" +#line 17365 "PhotoPage.c" } } } else if (_tmp8_ == ((0 != _tmp7_label9) ? _tmp7_label9 : (_tmp7_label9 = g_quark_from_static_string ("KP_2")))) { -#line 2959 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2731 "/home/jens/Source/shotwell/src/PhotoPage.vala" switch (0) { -#line 19882 "PhotoPage.c" +#line 17371 "PhotoPage.c" default: { -#line 2989 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2761 "/home/jens/Source/shotwell/src/PhotoPage.vala" page_activate_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RateTwo"); -#line 2990 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2762 "/home/jens/Source/shotwell/src/PhotoPage.vala" break; -#line 19889 "PhotoPage.c" +#line 17378 "PhotoPage.c" } } } else if (_tmp8_ == ((0 != _tmp7_label10) ? _tmp7_label10 : (_tmp7_label10 = g_quark_from_static_string ("KP_3")))) { -#line 2959 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2731 "/home/jens/Source/shotwell/src/PhotoPage.vala" switch (0) { -#line 19895 "PhotoPage.c" +#line 17384 "PhotoPage.c" default: { -#line 2993 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2765 "/home/jens/Source/shotwell/src/PhotoPage.vala" page_activate_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RateThree"); -#line 2994 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2766 "/home/jens/Source/shotwell/src/PhotoPage.vala" break; -#line 19902 "PhotoPage.c" +#line 17391 "PhotoPage.c" } } } else if (_tmp8_ == ((0 != _tmp7_label11) ? _tmp7_label11 : (_tmp7_label11 = g_quark_from_static_string ("KP_4")))) { -#line 2959 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2731 "/home/jens/Source/shotwell/src/PhotoPage.vala" switch (0) { -#line 19908 "PhotoPage.c" +#line 17397 "PhotoPage.c" default: { -#line 2997 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2769 "/home/jens/Source/shotwell/src/PhotoPage.vala" page_activate_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RateFour"); -#line 2998 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2770 "/home/jens/Source/shotwell/src/PhotoPage.vala" break; -#line 19915 "PhotoPage.c" +#line 17404 "PhotoPage.c" } } } else if (_tmp8_ == ((0 != _tmp7_label12) ? _tmp7_label12 : (_tmp7_label12 = g_quark_from_static_string ("KP_5")))) { -#line 2959 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2731 "/home/jens/Source/shotwell/src/PhotoPage.vala" switch (0) { -#line 19921 "PhotoPage.c" +#line 17410 "PhotoPage.c" default: { -#line 3001 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2773 "/home/jens/Source/shotwell/src/PhotoPage.vala" page_activate_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RateFive"); -#line 3002 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2774 "/home/jens/Source/shotwell/src/PhotoPage.vala" break; -#line 19928 "PhotoPage.c" +#line 17417 "PhotoPage.c" } } } else if (_tmp8_ == ((0 != _tmp7_label13) ? _tmp7_label13 : (_tmp7_label13 = g_quark_from_static_string ("KP_0")))) { -#line 2959 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2731 "/home/jens/Source/shotwell/src/PhotoPage.vala" switch (0) { -#line 19934 "PhotoPage.c" +#line 17423 "PhotoPage.c" default: { -#line 3005 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2777 "/home/jens/Source/shotwell/src/PhotoPage.vala" page_activate_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RateUnrated"); -#line 3006 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2778 "/home/jens/Source/shotwell/src/PhotoPage.vala" break; -#line 19941 "PhotoPage.c" +#line 17430 "PhotoPage.c" } } } else if (_tmp8_ == ((0 != _tmp7_label14) ? _tmp7_label14 : (_tmp7_label14 = g_quark_from_static_string ("KP_9")))) { -#line 2959 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2731 "/home/jens/Source/shotwell/src/PhotoPage.vala" switch (0) { -#line 19947 "PhotoPage.c" +#line 17436 "PhotoPage.c" default: { -#line 3009 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2781 "/home/jens/Source/shotwell/src/PhotoPage.vala" page_activate_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RateRejected"); -#line 3010 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2782 "/home/jens/Source/shotwell/src/PhotoPage.vala" break; -#line 19954 "PhotoPage.c" +#line 17443 "PhotoPage.c" } } } else if (_tmp8_ == ((0 != _tmp7_label15) ? _tmp7_label15 : (_tmp7_label15 = g_quark_from_static_string ("bracketright")))) { -#line 2959 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2731 "/home/jens/Source/shotwell/src/PhotoPage.vala" switch (0) { -#line 19960 "PhotoPage.c" +#line 17449 "PhotoPage.c" default: { -#line 3013 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2785 "/home/jens/Source/shotwell/src/PhotoPage.vala" page_activate_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RotateClockwise"); -#line 3014 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2786 "/home/jens/Source/shotwell/src/PhotoPage.vala" break; -#line 19967 "PhotoPage.c" +#line 17456 "PhotoPage.c" } } } else if (_tmp8_ == ((0 != _tmp7_label16) ? _tmp7_label16 : (_tmp7_label16 = g_quark_from_static_string ("bracketleft")))) { -#line 2959 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2731 "/home/jens/Source/shotwell/src/PhotoPage.vala" switch (0) { -#line 19973 "PhotoPage.c" +#line 17462 "PhotoPage.c" default: { -#line 3017 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2789 "/home/jens/Source/shotwell/src/PhotoPage.vala" page_activate_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RotateCounterclockwise"); -#line 3018 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2790 "/home/jens/Source/shotwell/src/PhotoPage.vala" break; -#line 19980 "PhotoPage.c" +#line 17469 "PhotoPage.c" } } } else if (_tmp8_ == ((0 != _tmp7_label17) ? _tmp7_label17 : (_tmp7_label17 = g_quark_from_static_string ("slash")))) { -#line 2959 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2731 "/home/jens/Source/shotwell/src/PhotoPage.vala" switch (0) { -#line 19986 "PhotoPage.c" +#line 17475 "PhotoPage.c" default: { -#line 3021 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2793 "/home/jens/Source/shotwell/src/PhotoPage.vala" page_activate_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Flag"); -#line 3022 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2794 "/home/jens/Source/shotwell/src/PhotoPage.vala" break; -#line 19993 "PhotoPage.c" +#line 17482 "PhotoPage.c" } } } else { -#line 2959 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2731 "/home/jens/Source/shotwell/src/PhotoPage.vala" switch (0) { -#line 19999 "PhotoPage.c" +#line 17488 "PhotoPage.c" default: { -#line 3025 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2797 "/home/jens/Source/shotwell/src/PhotoPage.vala" handled = FALSE; -#line 3026 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2798 "/home/jens/Source/shotwell/src/PhotoPage.vala" break; -#line 20006 "PhotoPage.c" +#line 17495 "PhotoPage.c" } } } -#line 3029 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2801 "/home/jens/Source/shotwell/src/PhotoPage.vala" result = handled; -#line 3029 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2801 "/home/jens/Source/shotwell/src/PhotoPage.vala" return result; -#line 20014 "PhotoPage.c" +#line 17503 "PhotoPage.c" } @@ -20026,44 +17515,44 @@ static gboolean library_photo_page_real_on_double_click (EditingHostPage* base, GtkWindow* _tmp0_ = NULL; FullscreenWindow* _tmp1_ = NULL; FullscreenWindow* _tmp2_ = NULL; -#line 3032 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2804 "/home/jens/Source/shotwell/src/PhotoPage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO_PAGE, LibraryPhotoPage); -#line 3032 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2804 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_val_if_fail (event != NULL, FALSE); -#line 3033 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2805 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp0_ = page_get_container (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); -#line 3033 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2805 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp1_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp0_, TYPE_FULLSCREEN_WINDOW) ? ((FullscreenWindow*) _tmp0_) : NULL; -#line 3033 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2805 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp1_ == NULL) { -#line 3033 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2805 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (_tmp0_); -#line 20037 "PhotoPage.c" +#line 17526 "PhotoPage.c" } -#line 3033 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2805 "/home/jens/Source/shotwell/src/PhotoPage.vala" fs = _tmp1_; -#line 3034 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2806 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp2_ = fs; -#line 3034 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2806 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp2_ == NULL) { -#line 3035 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2807 "/home/jens/Source/shotwell/src/PhotoPage.vala" self->priv->return_to_collection_on_release = TRUE; -#line 20047 "PhotoPage.c" +#line 17536 "PhotoPage.c" } else { FullscreenWindow* _tmp3_ = NULL; -#line 3037 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2809 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp3_ = fs; -#line 3037 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2809 "/home/jens/Source/shotwell/src/PhotoPage.vala" fullscreen_window_close (_tmp3_); -#line 20054 "PhotoPage.c" +#line 17543 "PhotoPage.c" } -#line 3039 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2811 "/home/jens/Source/shotwell/src/PhotoPage.vala" result = TRUE; -#line 3039 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2811 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (fs); -#line 3039 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2811 "/home/jens/Source/shotwell/src/PhotoPage.vala" return result; -#line 20062 "PhotoPage.c" +#line 17551 "PhotoPage.c" } @@ -20073,59 +17562,90 @@ static gboolean library_photo_page_real_on_left_released (Page* base, GdkEventBu gboolean _tmp0_ = FALSE; GdkEventButton* _tmp1_ = NULL; gboolean _tmp2_ = FALSE; -#line 3042 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2814 "/home/jens/Source/shotwell/src/PhotoPage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO_PAGE, LibraryPhotoPage); -#line 3042 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2814 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_val_if_fail (event != NULL, FALSE); -#line 3043 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2815 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp0_ = self->priv->return_to_collection_on_release; -#line 3043 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2815 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp0_) { -#line 3044 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2816 "/home/jens/Source/shotwell/src/PhotoPage.vala" self->priv->return_to_collection_on_release = FALSE; -#line 3045 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2817 "/home/jens/Source/shotwell/src/PhotoPage.vala" library_photo_page_return_to_collection (self); -#line 3047 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2819 "/home/jens/Source/shotwell/src/PhotoPage.vala" result = TRUE; -#line 3047 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2819 "/home/jens/Source/shotwell/src/PhotoPage.vala" return result; -#line 20088 "PhotoPage.c" +#line 17577 "PhotoPage.c" } -#line 3050 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2822 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp1_ = event; -#line 3050 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2822 "/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 3050 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2822 "/home/jens/Source/shotwell/src/PhotoPage.vala" result = _tmp2_; -#line 3050 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2822 "/home/jens/Source/shotwell/src/PhotoPage.vala" return result; -#line 20098 "PhotoPage.c" +#line 17587 "PhotoPage.c" } static GtkMenu* library_photo_page_get_context_menu (LibraryPhotoPage* self) { GtkMenu* result = NULL; - GtkMenu* menu = NULL; - GtkUIManager* _tmp0_ = NULL; - GtkWidget* _tmp1_ = NULL; - GtkMenu* _tmp2_ = NULL; -#line 3053 "/home/jens/Source/shotwell/src/PhotoPage.vala" + GtkMenu* _tmp0_ = NULL; + GtkMenu* _tmp7_ = NULL; + GtkMenu* _tmp8_ = NULL; +#line 2827 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_val_if_fail (IS_LIBRARY_PHOTO_PAGE (self), NULL); -#line 3054 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp0_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)->ui; -#line 3054 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp1_ = gtk_ui_manager_get_widget (_tmp0_, "/PhotoContextMenu"); -#line 3054 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp2_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_menu_get_type (), GtkMenu)); -#line 3054 "/home/jens/Source/shotwell/src/PhotoPage.vala" - menu = _tmp2_; -#line 3055 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _vala_assert (menu != NULL, "menu != null"); -#line 3056 "/home/jens/Source/shotwell/src/PhotoPage.vala" - result = menu; -#line 3056 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2828 "/home/jens/Source/shotwell/src/PhotoPage.vala" + _tmp0_ = self->priv->context_menu; +#line 2828 "/home/jens/Source/shotwell/src/PhotoPage.vala" + if (_tmp0_ == NULL) { +#line 17602 "PhotoPage.c" + GMenuModel* model = NULL; + GtkBuilder* _tmp1_ = NULL; + GObject* _tmp2_ = NULL; + GMenuModel* _tmp3_ = NULL; + GMenuModel* _tmp4_ = NULL; + GtkMenu* _tmp5_ = NULL; + GtkMenu* _tmp6_ = NULL; +#line 2829 "/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" + _tmp2_ = gtk_builder_get_object (_tmp1_, "PhotoContextMenu"); +#line 2829 "/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" + model = _tmp3_; +#line 2831 "/home/jens/Source/shotwell/src/PhotoPage.vala" + _tmp4_ = model; +#line 2831 "/home/jens/Source/shotwell/src/PhotoPage.vala" + _tmp5_ = (GtkMenu*) gtk_menu_new_from_model (_tmp4_); +#line 2831 "/home/jens/Source/shotwell/src/PhotoPage.vala" + g_object_ref_sink (_tmp5_); +#line 2831 "/home/jens/Source/shotwell/src/PhotoPage.vala" + _g_object_unref0 (self->priv->context_menu); +#line 2831 "/home/jens/Source/shotwell/src/PhotoPage.vala" + self->priv->context_menu = _tmp5_; +#line 2832 "/home/jens/Source/shotwell/src/PhotoPage.vala" + _tmp6_ = self->priv->context_menu; +#line 2832 "/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" + _g_object_unref0 (model); +#line 17634 "PhotoPage.c" + } +#line 2835 "/home/jens/Source/shotwell/src/PhotoPage.vala" + _tmp7_ = self->priv->context_menu; +#line 2835 "/home/jens/Source/shotwell/src/PhotoPage.vala" + _tmp8_ = _g_object_ref0 (_tmp7_); +#line 2835 "/home/jens/Source/shotwell/src/PhotoPage.vala" + result = _tmp8_; +#line 2835 "/home/jens/Source/shotwell/src/PhotoPage.vala" return result; -#line 20124 "PhotoPage.c" +#line 17644 "PhotoPage.c" } @@ -20135,25 +17655,25 @@ static gboolean library_photo_page_real_on_context_buttonpress (Page* base, GdkE GtkMenu* _tmp0_ = NULL; GtkMenu* _tmp1_ = NULL; GdkEventButton* _tmp2_ = NULL; -#line 3059 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2838 "/home/jens/Source/shotwell/src/PhotoPage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO_PAGE, LibraryPhotoPage); -#line 3059 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2838 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_val_if_fail (event != NULL, FALSE); -#line 3060 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2839 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp0_ = library_photo_page_get_context_menu (self); -#line 3060 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2839 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp1_ = _tmp0_; -#line 3060 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2839 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp2_ = event; -#line 3060 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2839 "/home/jens/Source/shotwell/src/PhotoPage.vala" page_popup_context_menu (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), _tmp1_, _tmp2_); -#line 3060 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2839 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (_tmp1_); -#line 3062 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2841 "/home/jens/Source/shotwell/src/PhotoPage.vala" result = TRUE; -#line 3062 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2841 "/home/jens/Source/shotwell/src/PhotoPage.vala" return result; -#line 20152 "PhotoPage.c" +#line 17672 "PhotoPage.c" } @@ -20162,59 +17682,59 @@ static gboolean library_photo_page_real_on_context_keypress (Page* base) { gboolean result = FALSE; GtkMenu* _tmp0_ = NULL; GtkMenu* _tmp1_ = NULL; -#line 3065 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2844 "/home/jens/Source/shotwell/src/PhotoPage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO_PAGE, LibraryPhotoPage); -#line 3066 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2845 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp0_ = library_photo_page_get_context_menu (self); -#line 3066 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2845 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp1_ = _tmp0_; -#line 3066 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2845 "/home/jens/Source/shotwell/src/PhotoPage.vala" page_popup_context_menu (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), _tmp1_, NULL); -#line 3066 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2845 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (_tmp1_); -#line 3068 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2847 "/home/jens/Source/shotwell/src/PhotoPage.vala" result = TRUE; -#line 3068 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2847 "/home/jens/Source/shotwell/src/PhotoPage.vala" return result; -#line 20175 "PhotoPage.c" +#line 17695 "PhotoPage.c" } static void library_photo_page_return_to_collection (LibraryPhotoPage* self) { CollectionPage* _tmp0_ = NULL; -#line 3071 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2850 "/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 2852 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp0_ = self->priv->return_page; -#line 3073 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2852 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (NULL != _tmp0_) { -#line 20187 "PhotoPage.c" +#line 17707 "PhotoPage.c" LibraryWindow* _tmp1_ = NULL; LibraryWindow* _tmp2_ = NULL; CollectionPage* _tmp3_ = NULL; -#line 3074 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2853 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp1_ = library_window_get_app (); -#line 3074 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2853 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp2_ = _tmp1_; -#line 3074 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2853 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp3_ = self->priv->return_page; -#line 3074 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2853 "/home/jens/Source/shotwell/src/PhotoPage.vala" library_window_switch_to_page (_tmp2_, G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_PAGE, Page)); -#line 3074 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2853 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (_tmp2_); -#line 20201 "PhotoPage.c" +#line 17721 "PhotoPage.c" } else { LibraryWindow* _tmp4_ = NULL; LibraryWindow* _tmp5_ = NULL; -#line 3076 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2855 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp4_ = library_window_get_app (); -#line 3076 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2855 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp5_ = _tmp4_; -#line 3076 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2855 "/home/jens/Source/shotwell/src/PhotoPage.vala" library_window_switch_to_library_page (_tmp5_); -#line 3076 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2855 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (_tmp5_); -#line 20213 "PhotoPage.c" +#line 17733 "PhotoPage.c" } } @@ -20226,29 +17746,29 @@ static void library_photo_page_on_remove_from_library (LibraryPhotoPage* self) { GeeArrayList* _tmp1_ = NULL; const gchar* _tmp2_ = NULL; const gchar* _tmp3_ = NULL; -#line 3079 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2858 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_if_fail (IS_LIBRARY_PHOTO_PAGE (self)); -#line 3080 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2859 "/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 3080 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2859 "/home/jens/Source/shotwell/src/PhotoPage.vala" photo = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_LIBRARY_PHOTO, LibraryPhoto); -#line 3082 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2861 "/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 3082 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2861 "/home/jens/Source/shotwell/src/PhotoPage.vala" photos = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_COLLECTION, GeeCollection); -#line 3083 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2862 "/home/jens/Source/shotwell/src/PhotoPage.vala" gee_collection_add (photos, photo); -#line 3085 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2864 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp2_ = _ ("Remove From Library"); -#line 3085 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2864 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp3_ = _ ("Removing Photo From Library"); -#line 3085 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2864 "/home/jens/Source/shotwell/src/PhotoPage.vala" remove_from_app (photos, _tmp2_, _tmp3_); -#line 3079 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2858 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (photos); -#line 3079 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2858 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (photo); -#line 20247 "PhotoPage.c" +#line 17767 "PhotoPage.c" } @@ -20273,64 +17793,64 @@ static void library_photo_page_on_move_to_trash (LibraryPhotoPage* self) { TrashUntrashPhotosCommand* _tmp26_ = NULL; LibraryWindow* _tmp27_ = NULL; LibraryWindow* _tmp28_ = NULL; -#line 3088 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2867 "/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 2868 "/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 3089 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2868 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (!_tmp0_) { -#line 3090 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2869 "/home/jens/Source/shotwell/src/PhotoPage.vala" return; -#line 20280 "PhotoPage.c" +#line 17800 "PhotoPage.c" } -#line 3097 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2876 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp1_ = self->priv->return_page; -#line 3097 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2876 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp1_, TYPE_EVENT_PAGE)) { -#line 20286 "PhotoPage.c" +#line 17806 "PhotoPage.c" LibraryWindow* _tmp2_ = NULL; LibraryWindow* _tmp3_ = NULL; -#line 3098 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2877 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp2_ = library_window_get_app (); -#line 3098 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2877 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp3_ = _tmp2_; -#line 3098 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2877 "/home/jens/Source/shotwell/src/PhotoPage.vala" library_window_set_page_switching_enabled (_tmp3_, FALSE); -#line 3098 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2877 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (_tmp3_); -#line 20297 "PhotoPage.c" +#line 17817 "PhotoPage.c" } -#line 3101 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2880 "/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 3101 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2880 "/home/jens/Source/shotwell/src/PhotoPage.vala" photo = G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_LIBRARY_PHOTO, LibraryPhoto); -#line 3103 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2882 "/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 3103 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2882 "/home/jens/Source/shotwell/src/PhotoPage.vala" photos = G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, GEE_TYPE_COLLECTION, GeeCollection); -#line 3104 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2883 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp6_ = photos; -#line 3104 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2883 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp7_ = photo; -#line 3104 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2883 "/home/jens/Source/shotwell/src/PhotoPage.vala" gee_collection_add (_tmp6_, _tmp7_); -#line 3107 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2886 "/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 3111 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2890 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp8_ = photo; -#line 3111 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2890 "/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 3111 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2890 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp10_ = _tmp9_; -#line 3111 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2890 "/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 3111 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2890 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp12_ = _tmp11_; -#line 3111 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2890 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (_tmp10_); -#line 3111 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2890 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp12_) { -#line 20329 "PhotoPage.c" +#line 17849 "PhotoPage.c" LibraryWindow* _tmp13_ = NULL; LibraryWindow* _tmp14_ = NULL; GtkWindow* _tmp15_ = NULL; @@ -20338,88 +17858,88 @@ static void library_photo_page_on_move_to_trash (LibraryPhotoPage* self) { gboolean _tmp17_ = FALSE; LibraryWindow* _tmp20_ = NULL; LibraryWindow* _tmp21_ = NULL; -#line 3114 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2893 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp13_ = library_window_get_app (); -#line 3114 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2893 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp14_ = _tmp13_; -#line 3114 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2893 "/home/jens/Source/shotwell/src/PhotoPage.vala" library_window_set_page_switching_enabled (_tmp14_, TRUE); -#line 3114 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2893 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (_tmp14_); -#line 3116 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2895 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp15_ = page_get_container (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); -#line 3116 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2895 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp16_ = _tmp15_; -#line 3116 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2895 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp17_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp16_, TYPE_FULLSCREEN_WINDOW); -#line 3116 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2895 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (_tmp16_); -#line 3116 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2895 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp17_) { -#line 20355 "PhotoPage.c" +#line 17875 "PhotoPage.c" GtkWindow* _tmp18_ = NULL; FullscreenWindow* _tmp19_ = NULL; -#line 3117 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2896 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp18_ = page_get_container (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); -#line 3117 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2896 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp19_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, TYPE_FULLSCREEN_WINDOW, FullscreenWindow); -#line 3117 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2896 "/home/jens/Source/shotwell/src/PhotoPage.vala" fullscreen_window_close (_tmp19_); -#line 3117 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2896 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (_tmp19_); -#line 20366 "PhotoPage.c" +#line 17886 "PhotoPage.c" } -#line 3119 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2898 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp20_ = library_window_get_app (); -#line 3119 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2898 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp21_ = _tmp20_; -#line 3119 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2898 "/home/jens/Source/shotwell/src/PhotoPage.vala" library_window_switch_to_library_page (_tmp21_); -#line 3119 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2898 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (_tmp21_); -#line 20376 "PhotoPage.c" +#line 17896 "PhotoPage.c" } -#line 3122 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2901 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp22_ = page_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); -#line 3122 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2901 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp23_ = _tmp22_; -#line 3122 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2901 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp24_ = photos; -#line 3122 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2901 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp25_ = trash_untrash_photos_command_new (_tmp24_, TRUE); -#line 3122 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2901 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp26_ = _tmp25_; -#line 3122 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2901 "/home/jens/Source/shotwell/src/PhotoPage.vala" command_manager_execute (_tmp23_, G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, TYPE_COMMAND, Command)); -#line 3122 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2901 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (_tmp26_); -#line 3122 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2901 "/home/jens/Source/shotwell/src/PhotoPage.vala" _command_manager_unref0 (_tmp23_); -#line 3123 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2902 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp27_ = library_window_get_app (); -#line 3123 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2902 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp28_ = _tmp27_; -#line 3123 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2902 "/home/jens/Source/shotwell/src/PhotoPage.vala" library_window_set_page_switching_enabled (_tmp28_, TRUE); -#line 3123 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2902 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (_tmp28_); -#line 3088 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2867 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (photos); -#line 3088 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2867 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (photo); -#line 20406 "PhotoPage.c" +#line 17926 "PhotoPage.c" } static void library_photo_page_on_flag_unflag (LibraryPhotoPage* self) { gboolean _tmp0_ = FALSE; -#line 3126 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2905 "/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 2906 "/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 3127 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2906 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp0_) { -#line 20418 "PhotoPage.c" +#line 17938 "PhotoPage.c" GeeArrayList* photo_list = NULL; GeeArrayList* _tmp1_ = NULL; GeeArrayList* _tmp2_ = NULL; @@ -20433,62 +17953,62 @@ static void library_photo_page_on_flag_unflag (LibraryPhotoPage* self) { gboolean _tmp10_ = FALSE; FlagUnflagCommand* _tmp11_ = NULL; FlagUnflagCommand* _tmp12_ = NULL; -#line 3128 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2907 "/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 3128 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2907 "/home/jens/Source/shotwell/src/PhotoPage.vala" photo_list = _tmp1_; -#line 3129 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2908 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp2_ = photo_list; -#line 3129 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2908 "/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 3129 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2908 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp4_ = _tmp3_; -#line 3129 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2908 "/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 3129 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2908 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (_tmp4_); -#line 3130 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2909 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp5_ = page_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); -#line 3130 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2909 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp6_ = _tmp5_; -#line 3130 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2909 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp7_ = photo_list; -#line 3130 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2909 "/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 3130 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2909 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp9_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_LIBRARY_PHOTO, LibraryPhoto); -#line 3130 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2909 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp10_ = flaggable_is_flagged (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, TYPE_FLAGGABLE, Flaggable)); -#line 3130 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2909 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp11_ = flag_unflag_command_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GEE_TYPE_COLLECTION, GeeCollection), !_tmp10_); -#line 3130 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2909 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp12_ = _tmp11_; -#line 3130 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2909 "/home/jens/Source/shotwell/src/PhotoPage.vala" command_manager_execute (_tmp6_, G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, TYPE_COMMAND, Command)); -#line 3130 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2909 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (_tmp12_); -#line 3130 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2909 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (_tmp9_); -#line 3130 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2909 "/home/jens/Source/shotwell/src/PhotoPage.vala" _command_manager_unref0 (_tmp6_); -#line 3127 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2906 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (photo_list); -#line 20472 "PhotoPage.c" +#line 17992 "PhotoPage.c" } } static void library_photo_page_on_photo_destroyed (LibraryPhotoPage* self, DataSource* source) { DataSource* _tmp0_ = NULL; -#line 3135 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2914 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_if_fail (IS_LIBRARY_PHOTO_PAGE (self)); -#line 3135 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2914 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_if_fail (IS_DATA_SOURCE (source)); -#line 3136 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2915 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp0_ = source; -#line 3136 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2915 "/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 20487 "PhotoPage.c" +#line 18007 "PhotoPage.c" } @@ -20510,100 +18030,100 @@ static void library_photo_page_on_photo_removed (LibraryPhotoPage* self, Library Photo* _tmp17_ = NULL; gboolean _tmp18_ = FALSE; gboolean _tmp19_ = FALSE; -#line 3139 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2918 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_if_fail (IS_LIBRARY_PHOTO_PAGE (self)); -#line 3139 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2918 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_if_fail (IS_LIBRARY_PHOTO (photo)); -#line 3141 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2920 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp1_ = photo; -#line 3141 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2920 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp1_ == NULL) { -#line 3141 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2920 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp0_ = TRUE; -#line 20519 "PhotoPage.c" +#line 18039 "PhotoPage.c" } else { LibraryPhoto* _tmp2_ = NULL; Photo* _tmp3_ = NULL; Photo* _tmp4_ = NULL; gboolean _tmp5_ = FALSE; -#line 3141 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2920 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp2_ = photo; -#line 3141 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2920 "/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 3141 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2920 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp4_ = _tmp3_; -#line 3141 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2920 "/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 3141 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2920 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp0_ = !_tmp5_; -#line 3141 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2920 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (_tmp4_); -#line 20537 "PhotoPage.c" +#line 18057 "PhotoPage.c" } -#line 3141 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2920 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp0_) { -#line 3142 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2921 "/home/jens/Source/shotwell/src/PhotoPage.vala" return; -#line 20543 "PhotoPage.c" +#line 18063 "PhotoPage.c" } -#line 3145 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2924 "/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 3147 "/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 3147 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2926 "/home/jens/Source/shotwell/src/PhotoPage.vala" view = _tmp6_; -#line 3148 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2927 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp7_ = view; -#line 3148 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2927 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp8_ = view; -#line 3148 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2927 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp9_ = view; -#line 3148 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2927 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp10_ = photo; -#line 3148 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2927 "/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 3148 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2927 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp12_ = _tmp11_; -#line 3148 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2927 "/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 3148 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2927 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp14_ = _tmp13_; -#line 3148 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2927 "/home/jens/Source/shotwell/src/PhotoPage.vala" data_collection_remove_marked (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_DATA_COLLECTION, DataCollection), _tmp14_); -#line 3148 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2927 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (_tmp14_); -#line 3148 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2927 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (_tmp12_); -#line 3149 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2928 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp15_ = photo; -#line 3149 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2928 "/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 3149 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2928 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp17_ = _tmp16_; -#line 3149 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2928 "/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 3149 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2928 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp19_ = _tmp18_; -#line 3149 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2928 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (_tmp17_); -#line 3149 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2928 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp19_) { -#line 20587 "PhotoPage.c" +#line 18107 "PhotoPage.c" LibraryWindow* _tmp20_ = NULL; LibraryWindow* _tmp21_ = NULL; -#line 3152 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2931 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp20_ = library_window_get_app (); -#line 3152 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2931 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp21_ = _tmp20_; -#line 3152 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2931 "/home/jens/Source/shotwell/src/PhotoPage.vala" library_window_switch_to_library_page (_tmp21_); -#line 3152 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2931 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (_tmp21_); -#line 20598 "PhotoPage.c" +#line 18118 "PhotoPage.c" } -#line 3139 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2918 "/home/jens/Source/shotwell/src/PhotoPage.vala" _data_collection_unref0 (view); -#line 20602 "PhotoPage.c" +#line 18122 "PhotoPage.c" } @@ -20612,48 +18132,48 @@ static void library_photo_page_on_print (LibraryPhotoPage* self) { ViewCollection* _tmp1_ = NULL; gint _tmp2_ = 0; gboolean _tmp3_ = FALSE; -#line 3156 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2935 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_if_fail (IS_LIBRARY_PHOTO_PAGE (self)); -#line 3157 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2936 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp0_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); -#line 3157 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2936 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp1_ = _tmp0_; -#line 3157 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2936 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp2_ = view_collection_get_selected_count (_tmp1_); -#line 3157 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2936 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp3_ = _tmp2_ > 0; -#line 3157 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2936 "/home/jens/Source/shotwell/src/PhotoPage.vala" _data_collection_unref0 (_tmp1_); -#line 3157 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2936 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp3_) { -#line 20625 "PhotoPage.c" +#line 18145 "PhotoPage.c" PrintManager* _tmp4_ = NULL; PrintManager* _tmp5_ = NULL; ViewCollection* _tmp6_ = NULL; ViewCollection* _tmp7_ = NULL; GeeList* _tmp8_ = NULL; GeeCollection* _tmp9_ = NULL; -#line 3158 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2937 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp4_ = print_manager_get_instance (); -#line 3158 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2937 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp5_ = _tmp4_; -#line 3158 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2937 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp6_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); -#line 3158 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2937 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp7_ = _tmp6_; -#line 3158 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2937 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp8_ = view_collection_get_selected_sources_of_type (_tmp7_, TYPE_PHOTO); -#line 3158 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2937 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp9_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, GEE_TYPE_COLLECTION, GeeCollection); -#line 3158 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2937 "/home/jens/Source/shotwell/src/PhotoPage.vala" print_manager_spool_photo (_tmp5_, _tmp9_); -#line 3158 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2937 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (_tmp9_); -#line 3158 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2937 "/home/jens/Source/shotwell/src/PhotoPage.vala" _data_collection_unref0 (_tmp7_); -#line 3158 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2937 "/home/jens/Source/shotwell/src/PhotoPage.vala" _print_manager_unref0 (_tmp5_); -#line 20652 "PhotoPage.c" +#line 18172 "PhotoPage.c" } } @@ -20661,55 +18181,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 3163 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2942 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_if_fail (IS_LIBRARY_PHOTO_PAGE (self)); -#line 3164 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2943 "/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 3164 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2943 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp1_) { -#line 20666 "PhotoPage.c" +#line 18186 "PhotoPage.c" ConfigFacade* _tmp2_ = NULL; ConfigFacade* _tmp3_ = NULL; gchar* _tmp4_ = NULL; gchar* _tmp5_ = NULL; -#line 3165 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2944 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp2_ = config_facade_get_instance (); -#line 3165 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2944 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp3_ = _tmp2_; -#line 3165 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2944 "/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 3165 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2944 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp5_ = _tmp4_; -#line 3165 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2944 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp0_ = g_strcmp0 (_tmp5_, "") != 0; -#line 3165 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2944 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_free0 (_tmp5_); -#line 3165 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2944 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (_tmp3_); -#line 20685 "PhotoPage.c" +#line 18205 "PhotoPage.c" } else { -#line 3164 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2943 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp0_ = FALSE; -#line 20689 "PhotoPage.c" +#line 18209 "PhotoPage.c" } -#line 3164 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2943 "/home/jens/Source/shotwell/src/PhotoPage.vala" page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "ExternalEdit", _tmp0_); -#line 20693 "PhotoPage.c" +#line 18213 "PhotoPage.c" } static void library_photo_page_on_external_edit (LibraryPhotoPage* self) { gboolean _tmp0_ = FALSE; GError * _inner_error_ = NULL; -#line 3168 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2947 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_if_fail (IS_LIBRARY_PHOTO_PAGE (self)); -#line 3169 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2948 "/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 3169 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2948 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (!_tmp0_) { -#line 3170 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2949 "/home/jens/Source/shotwell/src/PhotoPage.vala" return; -#line 20708 "PhotoPage.c" +#line 18228 "PhotoPage.c" } { AppWindow* _tmp1_ = NULL; @@ -20718,39 +18238,39 @@ static void library_photo_page_on_external_edit (LibraryPhotoPage* self) { Photo* _tmp4_ = NULL; AppWindow* _tmp5_ = NULL; AppWindow* _tmp6_ = NULL; -#line 3173 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2952 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp1_ = app_window_get_instance (); -#line 3173 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2952 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp2_ = _tmp1_; -#line 3173 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2952 "/home/jens/Source/shotwell/src/PhotoPage.vala" page_window_set_busy_cursor (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_PAGE_WINDOW, PageWindow)); -#line 3173 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2952 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (_tmp2_); -#line 3174 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2953 "/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 3174 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2953 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp4_ = _tmp3_; -#line 3174 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2953 "/home/jens/Source/shotwell/src/PhotoPage.vala" photo_open_with_external_editor (_tmp4_, &_inner_error_); -#line 3174 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2953 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (_tmp4_); -#line 3174 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2953 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 20735 "PhotoPage.c" - goto __catch251_g_error; +#line 18255 "PhotoPage.c" + goto __catch248_g_error; } -#line 3175 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2954 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp5_ = app_window_get_instance (); -#line 3175 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2954 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp6_ = _tmp5_; -#line 3175 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2954 "/home/jens/Source/shotwell/src/PhotoPage.vala" page_window_set_normal_cursor (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, TYPE_PAGE_WINDOW, PageWindow)); -#line 3175 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2954 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (_tmp6_); -#line 20746 "PhotoPage.c" +#line 18266 "PhotoPage.c" } - goto __finally251; - __catch251_g_error: + goto __finally248; + __catch248_g_error: { GError* err = NULL; AppWindow* _tmp7_ = NULL; @@ -20758,42 +18278,42 @@ static void library_photo_page_on_external_edit (LibraryPhotoPage* self) { GError* _tmp9_ = NULL; Photo* _tmp10_ = NULL; Photo* _tmp11_ = NULL; -#line 3172 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2951 "/home/jens/Source/shotwell/src/PhotoPage.vala" err = _inner_error_; -#line 3172 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2951 "/home/jens/Source/shotwell/src/PhotoPage.vala" _inner_error_ = NULL; -#line 3177 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2956 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp7_ = app_window_get_instance (); -#line 3177 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2956 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp8_ = _tmp7_; -#line 3177 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2956 "/home/jens/Source/shotwell/src/PhotoPage.vala" page_window_set_normal_cursor (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_PAGE_WINDOW, PageWindow)); -#line 3177 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2956 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (_tmp8_); -#line 3178 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2957 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp9_ = err; -#line 3178 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2957 "/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 3178 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2957 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp11_ = _tmp10_; -#line 3178 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2957 "/home/jens/Source/shotwell/src/PhotoPage.vala" open_external_editor_error_dialog (_tmp9_, _tmp11_); -#line 3178 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2957 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (_tmp11_); -#line 3172 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2951 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_error_free0 (err); -#line 20781 "PhotoPage.c" +#line 18301 "PhotoPage.c" } - __finally251: -#line 3172 "/home/jens/Source/shotwell/src/PhotoPage.vala" + __finally248: +#line 2951 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 3172 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2951 "/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 3172 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2951 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_clear_error (&_inner_error_); -#line 3172 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2951 "/home/jens/Source/shotwell/src/PhotoPage.vala" return; -#line 20792 "PhotoPage.c" +#line 18312 "PhotoPage.c" } } @@ -20805,31 +18325,31 @@ static void library_photo_page_on_external_edit_raw (LibraryPhotoPage* self) { PhotoFileFormat _tmp3_ = 0; gboolean _tmp4_ = FALSE; GError * _inner_error_ = NULL; -#line 3183 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2962 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_if_fail (IS_LIBRARY_PHOTO_PAGE (self)); -#line 3184 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2963 "/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 3184 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2963 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (!_tmp0_) { -#line 3185 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2964 "/home/jens/Source/shotwell/src/PhotoPage.vala" return; -#line 20812 "PhotoPage.c" +#line 18332 "PhotoPage.c" } -#line 3187 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2966 "/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 3187 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2966 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp2_ = _tmp1_; -#line 3187 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2966 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp3_ = photo_get_master_file_format (_tmp2_); -#line 3187 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2966 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp4_ = _tmp3_ != PHOTO_FILE_FORMAT_RAW; -#line 3187 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2966 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (_tmp2_); -#line 3187 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2966 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp4_) { -#line 3188 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2967 "/home/jens/Source/shotwell/src/PhotoPage.vala" return; -#line 20828 "PhotoPage.c" +#line 18348 "PhotoPage.c" } { AppWindow* _tmp5_ = NULL; @@ -20838,39 +18358,39 @@ static void library_photo_page_on_external_edit_raw (LibraryPhotoPage* self) { Photo* _tmp8_ = NULL; AppWindow* _tmp9_ = NULL; AppWindow* _tmp10_ = NULL; -#line 3191 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2970 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp5_ = app_window_get_instance (); -#line 3191 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2970 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp6_ = _tmp5_; -#line 3191 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2970 "/home/jens/Source/shotwell/src/PhotoPage.vala" page_window_set_busy_cursor (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, TYPE_PAGE_WINDOW, PageWindow)); -#line 3191 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2970 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (_tmp6_); -#line 3192 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2971 "/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 3192 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2971 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp8_ = _tmp7_; -#line 3192 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2971 "/home/jens/Source/shotwell/src/PhotoPage.vala" photo_open_with_raw_external_editor (_tmp8_, &_inner_error_); -#line 3192 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2971 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (_tmp8_); -#line 3192 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2971 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 20855 "PhotoPage.c" - goto __catch252_g_error; +#line 18375 "PhotoPage.c" + goto __catch249_g_error; } -#line 3193 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2972 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp9_ = app_window_get_instance (); -#line 3193 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2972 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp10_ = _tmp9_; -#line 3193 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2972 "/home/jens/Source/shotwell/src/PhotoPage.vala" page_window_set_normal_cursor (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, TYPE_PAGE_WINDOW, PageWindow)); -#line 3193 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2972 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (_tmp10_); -#line 20866 "PhotoPage.c" +#line 18386 "PhotoPage.c" } - goto __finally252; - __catch252_g_error: + goto __finally249; + __catch249_g_error: { GError* err = NULL; AppWindow* _tmp11_ = NULL; @@ -20878,74 +18398,74 @@ static void library_photo_page_on_external_edit_raw (LibraryPhotoPage* self) { GError* _tmp13_ = NULL; gchar* _tmp14_ = NULL; gchar* _tmp15_ = NULL; -#line 3190 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2969 "/home/jens/Source/shotwell/src/PhotoPage.vala" err = _inner_error_; -#line 3190 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2969 "/home/jens/Source/shotwell/src/PhotoPage.vala" _inner_error_ = NULL; -#line 3195 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2974 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp11_ = app_window_get_instance (); -#line 3195 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2974 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp12_ = _tmp11_; -#line 3195 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2974 "/home/jens/Source/shotwell/src/PhotoPage.vala" page_window_set_normal_cursor (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, TYPE_PAGE_WINDOW, PageWindow)); -#line 3195 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2974 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (_tmp12_); -#line 3196 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2975 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp13_ = err; -#line 3196 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2975 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp14_ = resources_launch_editor_failed (_tmp13_); -#line 3196 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2975 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp15_ = _tmp14_; -#line 3196 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2975 "/home/jens/Source/shotwell/src/PhotoPage.vala" app_window_error_message (_tmp15_, NULL); -#line 3196 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2975 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_free0 (_tmp15_); -#line 3190 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2969 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_error_free0 (err); -#line 20901 "PhotoPage.c" +#line 18421 "PhotoPage.c" } - __finally252: -#line 3190 "/home/jens/Source/shotwell/src/PhotoPage.vala" + __finally249: +#line 2969 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 3190 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2969 "/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 3190 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2969 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_clear_error (&_inner_error_); -#line 3190 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2969 "/home/jens/Source/shotwell/src/PhotoPage.vala" return; -#line 20912 "PhotoPage.c" +#line 18432 "PhotoPage.c" } } static void library_photo_page_on_send_to (LibraryPhotoPage* self) { gboolean _tmp0_ = FALSE; -#line 3200 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2979 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_if_fail (IS_LIBRARY_PHOTO_PAGE (self)); -#line 3201 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2980 "/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 3201 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2980 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp0_) { -#line 20925 "PhotoPage.c" +#line 18445 "PhotoPage.c" ViewCollection* _tmp1_ = NULL; ViewCollection* _tmp2_ = NULL; GeeList* _tmp3_ = NULL; GeeCollection* _tmp4_ = NULL; -#line 3202 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2981 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp1_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); -#line 3202 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2981 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp2_ = _tmp1_; -#line 3202 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2981 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp3_ = view_collection_get_selected_sources (_tmp2_); -#line 3202 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2981 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp4_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_COLLECTION, GeeCollection); -#line 3202 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2981 "/home/jens/Source/shotwell/src/PhotoPage.vala" desktop_integration_send_to (_tmp4_); -#line 3202 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2981 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (_tmp4_); -#line 3202 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2981 "/home/jens/Source/shotwell/src/PhotoPage.vala" _data_collection_unref0 (_tmp2_); -#line 20944 "PhotoPage.c" +#line 18464 "PhotoPage.c" } } @@ -20977,85 +18497,85 @@ static void library_photo_page_on_export (LibraryPhotoPage* self) { gint _tmp17_ = 0; Scaling _tmp18_ = {0}; GError * _inner_error_ = NULL; -#line 3205 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2984 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_if_fail (IS_LIBRARY_PHOTO_PAGE (self)); -#line 3206 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2985 "/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 3206 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2985 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (!_tmp0_) { -#line 3207 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2986 "/home/jens/Source/shotwell/src/PhotoPage.vala" return; -#line 20984 "PhotoPage.c" +#line 18504 "PhotoPage.c" } -#line 3209 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2988 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp1_ = _ ("Export Photo"); -#line 3209 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2988 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp2_ = export_dialog_new (_tmp1_); -#line 3209 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2988 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_object_ref_sink (_tmp2_); -#line 3209 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2988 "/home/jens/Source/shotwell/src/PhotoPage.vala" export_dialog = _tmp2_; -#line 3213 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2992 "/home/jens/Source/shotwell/src/PhotoPage.vala" export_format_parameters_last (&_tmp3_); -#line 3213 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2992 "/home/jens/Source/shotwell/src/PhotoPage.vala" export_params = _tmp3_; -#line 3214 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2993 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp4_ = export_dialog; -#line 3214 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2993 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp7_ = export_dialog_execute (_tmp4_, &_tmp5_, &_tmp6_, &export_params); -#line 3214 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2993 "/home/jens/Source/shotwell/src/PhotoPage.vala" scale = _tmp5_; -#line 3214 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2993 "/home/jens/Source/shotwell/src/PhotoPage.vala" constraint = _tmp6_; -#line 3214 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2993 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (!_tmp7_) { -#line 3215 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2994 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (export_dialog); -#line 3215 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2994 "/home/jens/Source/shotwell/src/PhotoPage.vala" return; -#line 21012 "PhotoPage.c" +#line 18532 "PhotoPage.c" } -#line 3217 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2996 "/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 3217 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2996 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp9_ = _tmp8_; -#line 3217 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2996 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp10_ = export_params; -#line 3217 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2996 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp11_ = photo_get_export_basename_for_parameters (_tmp9_, &_tmp10_); -#line 3217 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2996 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp12_ = _tmp11_; -#line 3217 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2996 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp13_ = export_ui_choose_file (_tmp12_); -#line 3217 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2996 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp14_ = _tmp13_; -#line 3217 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2996 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_free0 (_tmp12_); -#line 3217 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2996 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (_tmp9_); -#line 3217 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2996 "/home/jens/Source/shotwell/src/PhotoPage.vala" save_as = _tmp14_; -#line 3219 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2998 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp15_ = save_as; -#line 3219 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2998 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp15_ == NULL) { -#line 3220 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2999 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (save_as); -#line 3220 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2999 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (export_dialog); -#line 3220 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2999 "/home/jens/Source/shotwell/src/PhotoPage.vala" return; -#line 21044 "PhotoPage.c" +#line 18564 "PhotoPage.c" } -#line 3222 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3001 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp16_ = constraint; -#line 3222 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3001 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp17_ = scale; -#line 3222 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3001 "/home/jens/Source/shotwell/src/PhotoPage.vala" scaling_for_constraint (_tmp16_, _tmp17_, FALSE, &_tmp18_); -#line 3222 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3001 "/home/jens/Source/shotwell/src/PhotoPage.vala" scaling = _tmp18_; -#line 21054 "PhotoPage.c" +#line 18574 "PhotoPage.c" { Photo* _tmp19_ = NULL; Photo* _tmp20_ = NULL; @@ -21071,48 +18591,48 @@ static void library_photo_page_on_export (LibraryPhotoPage* self) { ExportFormatMode _tmp30_ = 0; ExportFormatParameters _tmp31_ = {0}; gboolean _tmp32_ = FALSE; -#line 3225 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3004 "/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 3225 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3004 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp20_ = _tmp19_; -#line 3225 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3004 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp21_ = save_as; -#line 3225 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3004 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp22_ = scaling; -#line 3225 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3004 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp23_ = export_params; -#line 3225 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3004 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp24_ = _tmp23_.quality; -#line 3225 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3004 "/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 3225 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3004 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp26_ = _tmp25_; -#line 3225 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3004 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp27_ = export_params; -#line 3225 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3004 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp28_ = photo_get_export_format_for_parameters (_tmp26_, &_tmp27_); -#line 3225 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3004 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp29_ = export_params; -#line 3225 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3004 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp30_ = _tmp29_.mode; -#line 3225 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3004 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp31_ = export_params; -#line 3225 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3004 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp32_ = _tmp31_.export_metadata; -#line 3225 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3004 "/home/jens/Source/shotwell/src/PhotoPage.vala" photo_export (_tmp20_, _tmp21_, &_tmp22_, _tmp24_, _tmp28_, _tmp30_ == EXPORT_FORMAT_MODE_UNMODIFIED, _tmp32_, &_inner_error_); -#line 3225 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3004 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (_tmp26_); -#line 3225 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3004 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (_tmp20_); -#line 3225 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3004 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 21106 "PhotoPage.c" - goto __catch253_g_error; +#line 18626 "PhotoPage.c" + goto __catch250_g_error; } } - goto __finally253; - __catch253_g_error: + goto __finally250; + __catch250_g_error: { GError* err = NULL; const gchar* _tmp33_ = NULL; @@ -21123,56 +18643,56 @@ static void library_photo_page_on_export (LibraryPhotoPage* self) { const gchar* _tmp38_ = NULL; gchar* _tmp39_ = NULL; gchar* _tmp40_ = NULL; -#line 3224 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3003 "/home/jens/Source/shotwell/src/PhotoPage.vala" err = _inner_error_; -#line 3224 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3003 "/home/jens/Source/shotwell/src/PhotoPage.vala" _inner_error_ = NULL; -#line 3229 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3008 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp33_ = _ ("Unable to export %s: %s"); -#line 3229 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3008 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp34_ = save_as; -#line 3229 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3008 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp35_ = g_file_get_path (_tmp34_); -#line 3229 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3008 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp36_ = _tmp35_; -#line 3229 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3008 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp37_ = err; -#line 3229 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3008 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp38_ = _tmp37_->message; -#line 3229 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3008 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp39_ = g_strdup_printf (_tmp33_, _tmp36_, _tmp38_); -#line 3229 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3008 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp40_ = _tmp39_; -#line 3229 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3008 "/home/jens/Source/shotwell/src/PhotoPage.vala" app_window_error_message (_tmp40_, NULL); -#line 3229 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3008 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_free0 (_tmp40_); -#line 3229 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3008 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_free0 (_tmp36_); -#line 3224 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3003 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_error_free0 (err); -#line 21150 "PhotoPage.c" +#line 18670 "PhotoPage.c" } - __finally253: -#line 3224 "/home/jens/Source/shotwell/src/PhotoPage.vala" + __finally250: +#line 3003 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 3224 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3003 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (save_as); -#line 3224 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3003 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (export_dialog); -#line 3224 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3003 "/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 3224 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3003 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_clear_error (&_inner_error_); -#line 3224 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3003 "/home/jens/Source/shotwell/src/PhotoPage.vala" return; -#line 21165 "PhotoPage.c" +#line 18685 "PhotoPage.c" } -#line 3205 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2984 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (save_as); -#line 3205 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2984 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (export_dialog); -#line 21171 "PhotoPage.c" +#line 18691 "PhotoPage.c" } @@ -21181,53 +18701,44 @@ static void library_photo_page_on_publish (LibraryPhotoPage* self) { ViewCollection* _tmp1_ = NULL; gint _tmp2_ = 0; gboolean _tmp3_ = FALSE; -#line 3233 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3012 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_if_fail (IS_LIBRARY_PHOTO_PAGE (self)); -#line 3234 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3013 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp0_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); -#line 3234 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3013 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp1_ = _tmp0_; -#line 3234 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3013 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp2_ = data_collection_get_count (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_DATA_COLLECTION, DataCollection)); -#line 3234 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3013 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp3_ = _tmp2_ > 0; -#line 3234 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3013 "/home/jens/Source/shotwell/src/PhotoPage.vala" _data_collection_unref0 (_tmp1_); -#line 3234 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3013 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp3_) { -#line 21194 "PhotoPage.c" +#line 18714 "PhotoPage.c" ViewCollection* _tmp4_ = NULL; ViewCollection* _tmp5_ = NULL; GeeList* _tmp6_ = NULL; GeeCollection* _tmp7_ = NULL; -#line 3235 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3014 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp4_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); -#line 3235 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3014 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp5_ = _tmp4_; -#line 3235 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3014 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp6_ = view_collection_get_selected_sources (_tmp5_); -#line 3235 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3014 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp7_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_COLLECTION, GeeCollection); -#line 3235 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3014 "/home/jens/Source/shotwell/src/PhotoPage.vala" publishing_ui_publishing_dialog_go (_tmp7_); -#line 3235 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3014 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (_tmp7_); -#line 3235 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3014 "/home/jens/Source/shotwell/src/PhotoPage.vala" _data_collection_unref0 (_tmp5_); -#line 21213 "PhotoPage.c" +#line 18733 "PhotoPage.c" } } -static void library_photo_page_on_view_menu (LibraryPhotoPage* self) { -#line 3239 "/home/jens/Source/shotwell/src/PhotoPage.vala" - g_return_if_fail (IS_LIBRARY_PHOTO_PAGE (self)); -#line 3240 "/home/jens/Source/shotwell/src/PhotoPage.vala" - library_photo_page_update_zoom_menu_item_sensitivity (self); -#line 21223 "PhotoPage.c" -} - - static void library_photo_page_on_increase_rating (LibraryPhotoPage* self) { gboolean _tmp0_ = FALSE; gboolean _tmp1_ = FALSE; @@ -21239,56 +18750,56 @@ static void library_photo_page_on_increase_rating (LibraryPhotoPage* self) { CommandManager* _tmp7_ = NULL; CommandManager* _tmp8_ = NULL; SetRatingSingleCommand* _tmp9_ = NULL; -#line 3243 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3018 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_if_fail (IS_LIBRARY_PHOTO_PAGE (self)); -#line 3244 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3019 "/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 3244 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3019 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (!_tmp1_) { -#line 3244 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3019 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp0_ = TRUE; -#line 21246 "PhotoPage.c" +#line 18757 "PhotoPage.c" } else { gboolean _tmp2_ = FALSE; -#line 3244 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3019 "/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 3244 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3019 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp0_ = _tmp2_; -#line 21253 "PhotoPage.c" +#line 18764 "PhotoPage.c" } -#line 3244 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3019 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp0_) { -#line 3245 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3020 "/home/jens/Source/shotwell/src/PhotoPage.vala" return; -#line 21259 "PhotoPage.c" +#line 18770 "PhotoPage.c" } -#line 3247 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3022 "/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 3247 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3022 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp4_ = _tmp3_; -#line 3247 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3022 "/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 3247 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3022 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp6_ = _tmp5_; -#line 3247 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3022 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (_tmp4_); -#line 3247 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3022 "/home/jens/Source/shotwell/src/PhotoPage.vala" command = _tmp6_; -#line 3248 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3023 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp7_ = page_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); -#line 3248 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3023 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp8_ = _tmp7_; -#line 3248 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3023 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp9_ = command; -#line 3248 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3023 "/home/jens/Source/shotwell/src/PhotoPage.vala" command_manager_execute (_tmp8_, G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, TYPE_COMMAND, Command)); -#line 3248 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3023 "/home/jens/Source/shotwell/src/PhotoPage.vala" _command_manager_unref0 (_tmp8_); -#line 3250 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3025 "/home/jens/Source/shotwell/src/PhotoPage.vala" library_photo_page_update_rating_menu_item_sensitivity (self); -#line 3243 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3018 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (command); -#line 21287 "PhotoPage.c" +#line 18798 "PhotoPage.c" } @@ -21303,56 +18814,56 @@ static void library_photo_page_on_decrease_rating (LibraryPhotoPage* self) { CommandManager* _tmp7_ = NULL; CommandManager* _tmp8_ = NULL; SetRatingSingleCommand* _tmp9_ = NULL; -#line 3253 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3028 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_if_fail (IS_LIBRARY_PHOTO_PAGE (self)); -#line 3254 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3029 "/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 3254 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3029 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (!_tmp1_) { -#line 3254 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3029 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp0_ = TRUE; -#line 21310 "PhotoPage.c" +#line 18821 "PhotoPage.c" } else { gboolean _tmp2_ = FALSE; -#line 3254 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3029 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp2_ = editing_host_page_get_photo_missing (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage)); -#line 3254 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3029 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp0_ = _tmp2_; -#line 21317 "PhotoPage.c" +#line 18828 "PhotoPage.c" } -#line 3254 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3029 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp0_) { -#line 3255 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3030 "/home/jens/Source/shotwell/src/PhotoPage.vala" return; -#line 21323 "PhotoPage.c" +#line 18834 "PhotoPage.c" } -#line 3257 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3032 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp3_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage)); -#line 3257 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3032 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp4_ = _tmp3_; -#line 3257 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3032 "/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 3257 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3032 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp6_ = _tmp5_; -#line 3257 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3032 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (_tmp4_); -#line 3257 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3032 "/home/jens/Source/shotwell/src/PhotoPage.vala" command = _tmp6_; -#line 3258 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3033 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp7_ = page_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); -#line 3258 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3033 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp8_ = _tmp7_; -#line 3258 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3033 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp9_ = command; -#line 3258 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3033 "/home/jens/Source/shotwell/src/PhotoPage.vala" command_manager_execute (_tmp8_, G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, TYPE_COMMAND, Command)); -#line 3258 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3033 "/home/jens/Source/shotwell/src/PhotoPage.vala" _command_manager_unref0 (_tmp8_); -#line 3260 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3035 "/home/jens/Source/shotwell/src/PhotoPage.vala" library_photo_page_update_rating_menu_item_sensitivity (self); -#line 3253 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3028 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (command); -#line 21351 "PhotoPage.c" +#line 18862 "PhotoPage.c" } @@ -21368,121 +18879,121 @@ static void library_photo_page_on_set_rating (LibraryPhotoPage* self, Rating rat CommandManager* _tmp8_ = NULL; CommandManager* _tmp9_ = NULL; SetRatingSingleCommand* _tmp10_ = NULL; -#line 3263 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3038 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_if_fail (IS_LIBRARY_PHOTO_PAGE (self)); -#line 3264 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3039 "/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 3264 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3039 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (!_tmp1_) { -#line 3264 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3039 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp0_ = TRUE; -#line 21375 "PhotoPage.c" +#line 18886 "PhotoPage.c" } else { gboolean _tmp2_ = FALSE; -#line 3264 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3039 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp2_ = editing_host_page_get_photo_missing (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage)); -#line 3264 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3039 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp0_ = _tmp2_; -#line 21382 "PhotoPage.c" +#line 18893 "PhotoPage.c" } -#line 3264 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3039 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp0_) { -#line 3265 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3040 "/home/jens/Source/shotwell/src/PhotoPage.vala" return; -#line 21388 "PhotoPage.c" +#line 18899 "PhotoPage.c" } -#line 3267 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3042 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp3_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage)); -#line 3267 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3042 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp4_ = _tmp3_; -#line 3267 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3042 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp5_ = rating; -#line 3267 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3042 "/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 3267 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3042 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp7_ = _tmp6_; -#line 3267 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3042 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (_tmp4_); -#line 3267 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3042 "/home/jens/Source/shotwell/src/PhotoPage.vala" command = _tmp7_; -#line 3268 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3043 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp8_ = page_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); -#line 3268 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3043 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp9_ = _tmp8_; -#line 3268 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3043 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp10_ = command; -#line 3268 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3043 "/home/jens/Source/shotwell/src/PhotoPage.vala" command_manager_execute (_tmp9_, G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, TYPE_COMMAND, Command)); -#line 3268 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3043 "/home/jens/Source/shotwell/src/PhotoPage.vala" _command_manager_unref0 (_tmp9_); -#line 3270 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3045 "/home/jens/Source/shotwell/src/PhotoPage.vala" library_photo_page_update_rating_menu_item_sensitivity (self); -#line 3263 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3038 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (command); -#line 21418 "PhotoPage.c" +#line 18929 "PhotoPage.c" } static void library_photo_page_on_rate_rejected (LibraryPhotoPage* self) { -#line 3273 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3048 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_if_fail (IS_LIBRARY_PHOTO_PAGE (self)); -#line 3274 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3049 "/home/jens/Source/shotwell/src/PhotoPage.vala" library_photo_page_on_set_rating (self, RATING_REJECTED); -#line 21427 "PhotoPage.c" +#line 18938 "PhotoPage.c" } static void library_photo_page_on_rate_unrated (LibraryPhotoPage* self) { -#line 3277 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3052 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_if_fail (IS_LIBRARY_PHOTO_PAGE (self)); -#line 3278 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3053 "/home/jens/Source/shotwell/src/PhotoPage.vala" library_photo_page_on_set_rating (self, RATING_UNRATED); -#line 21436 "PhotoPage.c" +#line 18947 "PhotoPage.c" } static void library_photo_page_on_rate_one (LibraryPhotoPage* self) { -#line 3281 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3056 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_if_fail (IS_LIBRARY_PHOTO_PAGE (self)); -#line 3282 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3057 "/home/jens/Source/shotwell/src/PhotoPage.vala" library_photo_page_on_set_rating (self, RATING_ONE); -#line 21445 "PhotoPage.c" +#line 18956 "PhotoPage.c" } static void library_photo_page_on_rate_two (LibraryPhotoPage* self) { -#line 3285 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3060 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_if_fail (IS_LIBRARY_PHOTO_PAGE (self)); -#line 3286 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3061 "/home/jens/Source/shotwell/src/PhotoPage.vala" library_photo_page_on_set_rating (self, RATING_TWO); -#line 21454 "PhotoPage.c" +#line 18965 "PhotoPage.c" } static void library_photo_page_on_rate_three (LibraryPhotoPage* self) { -#line 3289 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3064 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_if_fail (IS_LIBRARY_PHOTO_PAGE (self)); -#line 3290 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3065 "/home/jens/Source/shotwell/src/PhotoPage.vala" library_photo_page_on_set_rating (self, RATING_THREE); -#line 21463 "PhotoPage.c" +#line 18974 "PhotoPage.c" } static void library_photo_page_on_rate_four (LibraryPhotoPage* self) { -#line 3293 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3068 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_if_fail (IS_LIBRARY_PHOTO_PAGE (self)); -#line 3294 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3069 "/home/jens/Source/shotwell/src/PhotoPage.vala" library_photo_page_on_set_rating (self, RATING_FOUR); -#line 21472 "PhotoPage.c" +#line 18983 "PhotoPage.c" } static void library_photo_page_on_rate_five (LibraryPhotoPage* self) { -#line 3297 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3072 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_if_fail (IS_LIBRARY_PHOTO_PAGE (self)); -#line 3298 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3073 "/home/jens/Source/shotwell/src/PhotoPage.vala" library_photo_page_on_set_rating (self, RATING_FIVE); -#line 21481 "PhotoPage.c" +#line 18992 "PhotoPage.c" } @@ -21516,103 +19027,117 @@ static void library_photo_page_update_rating_menu_item_sensitivity (LibraryPhoto Photo* _tmp26_ = NULL; Rating _tmp27_ = 0; gboolean _tmp28_ = FALSE; -#line 3301 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3076 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_if_fail (IS_LIBRARY_PHOTO_PAGE (self)); -#line 3302 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3077 "/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 3302 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3077 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp1_ = _tmp0_; -#line 3302 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3077 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp2_ = media_source_get_rating (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_MEDIA_SOURCE, MediaSource)); -#line 3302 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3077 "/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 3302 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3077 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (_tmp1_); -#line 3303 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3078 "/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 3303 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3078 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp4_ = _tmp3_; -#line 3303 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3078 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp5_ = media_source_get_rating (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_MEDIA_SOURCE, MediaSource)); -#line 3303 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3078 "/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 3303 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3078 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (_tmp4_); -#line 3304 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3079 "/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 3304 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3079 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp7_ = _tmp6_; -#line 3304 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3079 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp8_ = media_source_get_rating (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_MEDIA_SOURCE, MediaSource)); -#line 3304 "/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), "RateOne", _tmp8_ != RATING_ONE); -#line 3304 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3079 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (_tmp7_); -#line 3305 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3080 "/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 3305 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3080 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp10_ = _tmp9_; -#line 3305 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3080 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp11_ = media_source_get_rating (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, TYPE_MEDIA_SOURCE, MediaSource)); -#line 3305 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3080 "/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 3305 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3080 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (_tmp10_); -#line 3306 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3081 "/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 3306 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3081 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp13_ = _tmp12_; -#line 3306 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3081 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp14_ = media_source_get_rating (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, TYPE_MEDIA_SOURCE, MediaSource)); -#line 3306 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3081 "/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 3306 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3081 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (_tmp13_); -#line 3307 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3082 "/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 3307 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3082 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp16_ = _tmp15_; -#line 3307 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3082 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp17_ = media_source_get_rating (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, TYPE_MEDIA_SOURCE, MediaSource)); -#line 3307 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3082 "/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 3307 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3082 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (_tmp16_); -#line 3308 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3083 "/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 3308 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3083 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp19_ = _tmp18_; -#line 3308 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3083 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp20_ = media_source_get_rating (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, TYPE_MEDIA_SOURCE, MediaSource)); -#line 3308 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3083 "/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 3308 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3083 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (_tmp19_); -#line 3309 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3084 "/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 3309 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3084 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp22_ = _tmp21_; -#line 3309 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3084 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp23_ = media_source_get_rating (G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, TYPE_MEDIA_SOURCE, MediaSource)); -#line 3309 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3084 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp24_ = rating_can_increase (_tmp23_); -#line 3309 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3084 "/home/jens/Source/shotwell/src/PhotoPage.vala" page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "IncreaseRating", _tmp24_); -#line 3309 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3084 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (_tmp22_); -#line 3310 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3085 "/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 3310 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3085 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp26_ = _tmp25_; -#line 3310 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3085 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp27_ = media_source_get_rating (G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, TYPE_MEDIA_SOURCE, MediaSource)); -#line 3310 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3085 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp28_ = rating_can_decrease (_tmp27_); -#line 3310 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3085 "/home/jens/Source/shotwell/src/PhotoPage.vala" page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "DecreaseRating", _tmp28_); -#line 3310 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3085 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (_tmp26_); -#line 21611 "PhotoPage.c" +#line 19122 "PhotoPage.c" +} + + +static GVariant* _variant_new14 (const gchar* value) { +#line 3097 "/home/jens/Source/shotwell/src/PhotoPage.vala" + return g_variant_ref_sink (g_variant_new_string (value)); +#line 19129 "PhotoPage.c" +} + + +static GVariant* _variant_new15 (const gchar* value) { +#line 3102 "/home/jens/Source/shotwell/src/PhotoPage.vala" + return g_variant_ref_sink (g_variant_new_string (value)); +#line 19136 "PhotoPage.c" } @@ -21624,123 +19149,98 @@ static void library_photo_page_update_development_menu_item_sensitivity (Library PhotoFileFormat _tmp3_ = 0; PhotoFileFormat _tmp4_ = 0; PhotoFileFormat _tmp5_ = 0; -#line 3313 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3088 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_if_fail (IS_LIBRARY_PHOTO_PAGE (self)); -#line 3314 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3089 "/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 3314 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3089 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp1_ = _tmp0_; -#line 3314 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3089 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp2_ = photo_get_master_file_format (_tmp1_); -#line 3314 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3089 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp3_ = _tmp2_; -#line 3314 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3089 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (_tmp1_); -#line 3314 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3089 "/home/jens/Source/shotwell/src/PhotoPage.vala" format = _tmp3_; -#line 3315 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3090 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp4_ = format; -#line 3315 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3090 "/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 3317 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3092 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp5_ = format; -#line 3317 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3092 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp5_ == PHOTO_FILE_FORMAT_RAW) { -#line 21645 "PhotoPage.c" +#line 19170 "PhotoPage.c" Photo* _tmp6_ = NULL; Photo* _tmp7_ = NULL; - gboolean _tmp8_ = FALSE; - gboolean _tmp9_ = FALSE; - Photo* _tmp10_ = NULL; - Photo* _tmp11_ = NULL; - gboolean _tmp12_ = FALSE; - gboolean _tmp13_ = FALSE; - Photo* _tmp17_ = NULL; - Photo* _tmp18_ = NULL; - RawDeveloper _tmp19_ = 0; - RawDeveloper _tmp20_ = 0; -#line 3319 "/home/jens/Source/shotwell/src/PhotoPage.vala" + RawDeveloper _tmp8_ = 0; + RawDeveloper _tmp9_ = 0; +#line 3095 "/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 3319 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3095 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp7_ = _tmp6_; -#line 3319 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp8_ = photo_is_raw_developer_available (_tmp7_, RAW_DEVELOPER_SHOTWELL); -#line 3319 "/home/jens/Source/shotwell/src/PhotoPage.vala" - page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RawDeveloperShotwell", _tmp8_); -#line 3319 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3095 "/home/jens/Source/shotwell/src/PhotoPage.vala" + _tmp8_ = photo_get_raw_developer (_tmp7_); +#line 3095 "/home/jens/Source/shotwell/src/PhotoPage.vala" + _tmp9_ = _tmp8_; +#line 3095 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (_tmp7_); -#line 3322 "/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 3322 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp11_ = _tmp10_; -#line 3322 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp12_ = photo_is_raw_developer_available (_tmp11_, RAW_DEVELOPER_EMBEDDED); -#line 3322 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp13_ = _tmp12_; -#line 3322 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _g_object_unref0 (_tmp11_); -#line 3322 "/home/jens/Source/shotwell/src/PhotoPage.vala" - if (_tmp13_) { -#line 3322 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp9_ = TRUE; -#line 21682 "PhotoPage.c" - } else { - Photo* _tmp14_ = NULL; - Photo* _tmp15_ = NULL; - gboolean _tmp16_ = FALSE; -#line 3323 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp14_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage)); -#line 3323 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp15_ = _tmp14_; -#line 3323 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp16_ = photo_is_raw_developer_available (_tmp15_, RAW_DEVELOPER_CAMERA); -#line 3323 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp9_ = _tmp16_; -#line 3323 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _g_object_unref0 (_tmp15_); -#line 21697 "PhotoPage.c" - } -#line 3321 "/home/jens/Source/shotwell/src/PhotoPage.vala" - page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RawDeveloperCamera", _tmp9_); -#line 3326 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp17_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage)); -#line 3326 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp18_ = _tmp17_; -#line 3326 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp19_ = photo_get_raw_developer (_tmp18_); -#line 3326 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp20_ = _tmp19_; -#line 3326 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _g_object_unref0 (_tmp18_); -#line 3326 "/home/jens/Source/shotwell/src/PhotoPage.vala" - switch (_tmp20_) { -#line 3326 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3095 "/home/jens/Source/shotwell/src/PhotoPage.vala" + switch (_tmp9_) { +#line 3095 "/home/jens/Source/shotwell/src/PhotoPage.vala" case RAW_DEVELOPER_SHOTWELL: -#line 21715 "PhotoPage.c" +#line 19189 "PhotoPage.c" { -#line 3328 "/home/jens/Source/shotwell/src/PhotoPage.vala" - page_activate_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RawDeveloperShotwell"); -#line 3329 "/home/jens/Source/shotwell/src/PhotoPage.vala" + GAction* _tmp10_ = NULL; + GAction* _tmp11_ = NULL; + GVariant* _tmp12_ = NULL; +#line 3097 "/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" + _tmp11_ = _tmp10_; +#line 3097 "/home/jens/Source/shotwell/src/PhotoPage.vala" + _tmp12_ = _variant_new14 ("'Shotwell'"); +#line 3097 "/home/jens/Source/shotwell/src/PhotoPage.vala" + g_action_change_state (_tmp11_, _tmp12_); +#line 3097 "/home/jens/Source/shotwell/src/PhotoPage.vala" + _g_variant_unref0 (_tmp12_); +#line 3097 "/home/jens/Source/shotwell/src/PhotoPage.vala" + _g_object_unref0 (_tmp11_); +#line 3098 "/home/jens/Source/shotwell/src/PhotoPage.vala" break; -#line 21721 "PhotoPage.c" +#line 19208 "PhotoPage.c" } -#line 3326 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3095 "/home/jens/Source/shotwell/src/PhotoPage.vala" case RAW_DEVELOPER_CAMERA: -#line 3326 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3095 "/home/jens/Source/shotwell/src/PhotoPage.vala" case RAW_DEVELOPER_EMBEDDED: -#line 21727 "PhotoPage.c" +#line 19214 "PhotoPage.c" { -#line 3333 "/home/jens/Source/shotwell/src/PhotoPage.vala" - page_activate_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RawDeveloperCamera"); -#line 3334 "/home/jens/Source/shotwell/src/PhotoPage.vala" + GAction* _tmp13_ = NULL; + GAction* _tmp14_ = NULL; + GVariant* _tmp15_ = NULL; +#line 3102 "/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" + _tmp14_ = _tmp13_; +#line 3102 "/home/jens/Source/shotwell/src/PhotoPage.vala" + _tmp15_ = _variant_new15 ("'Camera'"); +#line 3102 "/home/jens/Source/shotwell/src/PhotoPage.vala" + g_action_change_state (_tmp14_, _tmp15_); +#line 3102 "/home/jens/Source/shotwell/src/PhotoPage.vala" + _g_variant_unref0 (_tmp15_); +#line 3102 "/home/jens/Source/shotwell/src/PhotoPage.vala" + _g_object_unref0 (_tmp14_); +#line 3103 "/home/jens/Source/shotwell/src/PhotoPage.vala" break; -#line 21733 "PhotoPage.c" +#line 19233 "PhotoPage.c" } default: { -#line 3337 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3106 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_assert_not_reached (); -#line 21739 "PhotoPage.c" +#line 19239 "PhotoPage.c" } } } @@ -21754,60 +19254,60 @@ static void library_photo_page_on_metadata_altered (LibraryPhotoPage* self, GeeM Photo* _tmp3_ = NULL; gboolean _tmp4_ = FALSE; gboolean _tmp5_ = FALSE; -#line 3342 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3111 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_if_fail (IS_LIBRARY_PHOTO_PAGE (self)); -#line 3342 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3111 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_if_fail (GEE_IS_MAP (map)); -#line 3343 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3112 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp1_ = map; -#line 3343 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3112 "/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 3343 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3112 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp3_ = _tmp2_; -#line 3343 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3112 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp4_ = gee_map_has_key (_tmp1_, G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_DATA_OBJECT, DataObject)); -#line 3343 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3112 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp5_ = _tmp4_; -#line 3343 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3112 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (_tmp3_); -#line 3343 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3112 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp5_) { -#line 21771 "PhotoPage.c" +#line 19271 "PhotoPage.c" GeeMap* _tmp6_ = NULL; Photo* _tmp7_ = NULL; Photo* _tmp8_ = NULL; gpointer _tmp9_ = NULL; Alteration* _tmp10_ = NULL; gboolean _tmp11_ = FALSE; -#line 3343 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3112 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp6_ = map; -#line 3343 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3112 "/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 3343 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3112 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp8_ = _tmp7_; -#line 3343 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3112 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp9_ = gee_map_get (_tmp6_, G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_DATA_OBJECT, DataObject)); -#line 3343 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3112 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp10_ = (Alteration*) _tmp9_; -#line 3343 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3112 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp11_ = alteration_has_subject (_tmp10_, "metadata"); -#line 3343 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3112 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp0_ = _tmp11_; -#line 3343 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3112 "/home/jens/Source/shotwell/src/PhotoPage.vala" _alteration_unref0 (_tmp10_); -#line 3343 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3112 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (_tmp8_); -#line 21796 "PhotoPage.c" +#line 19296 "PhotoPage.c" } else { -#line 3343 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3112 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp0_ = FALSE; -#line 21800 "PhotoPage.c" +#line 19300 "PhotoPage.c" } -#line 3343 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3112 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp0_) { -#line 3344 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3113 "/home/jens/Source/shotwell/src/PhotoPage.vala" single_photo_page_repaint (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), NULL); -#line 21806 "PhotoPage.c" +#line 19306 "PhotoPage.c" } } @@ -21823,29 +19323,29 @@ static void library_photo_page_on_add_tags (LibraryPhotoPage* self) { gint _names_size_ = 0; gchar** _tmp4_ = NULL; gint _tmp4__length1 = 0; -#line 3347 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3116 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_if_fail (IS_LIBRARY_PHOTO_PAGE (self)); -#line 3348 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3117 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp0_ = add_tags_dialog_new (); -#line 3348 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3117 "/home/jens/Source/shotwell/src/PhotoPage.vala" dialog = _tmp0_; -#line 3349 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3118 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp1_ = dialog; -#line 3349 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3118 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp3_ = add_tags_dialog_execute (_tmp1_, &_tmp2_); -#line 3349 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3118 "/home/jens/Source/shotwell/src/PhotoPage.vala" names = _tmp3_; -#line 3349 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3118 "/home/jens/Source/shotwell/src/PhotoPage.vala" names_length1 = _tmp2_; -#line 3349 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3118 "/home/jens/Source/shotwell/src/PhotoPage.vala" _names_size_ = names_length1; -#line 3350 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3119 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp4_ = names; -#line 3350 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3119 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp4__length1 = names_length1; -#line 3350 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3119 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp4_ != NULL) { -#line 21844 "PhotoPage.c" +#line 19344 "PhotoPage.c" CommandManager* _tmp5_ = NULL; CommandManager* _tmp6_ = NULL; HierarchicalTagIndex* _tmp7_ = NULL; @@ -21862,57 +19362,57 @@ static void library_photo_page_on_add_tags (LibraryPhotoPage* self) { GeeCollection* _tmp16_ = NULL; AddTagsCommand* _tmp17_ = NULL; AddTagsCommand* _tmp18_ = NULL; -#line 3351 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3120 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp5_ = page_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); -#line 3351 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3120 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp6_ = _tmp5_; -#line 3351 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3120 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp7_ = hierarchical_tag_index_get_global_index (); -#line 3351 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3120 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp8_ = _tmp7_; -#line 3351 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3120 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp9_ = names; -#line 3351 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3120 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp9__length1 = names_length1; -#line 3351 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3120 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp11_ = hierarchical_tag_index_get_paths_for_names_array (_tmp8_, _tmp9_, _tmp9__length1, &_tmp10_); -#line 3351 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3120 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp12_ = _tmp11_; -#line 3351 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3120 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp12__length1 = _tmp10_; -#line 3351 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3120 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp13_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); -#line 3351 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3120 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp14_ = _tmp13_; -#line 3351 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3120 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp15_ = view_collection_get_selected_sources (_tmp14_); -#line 3351 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3120 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp16_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, GEE_TYPE_COLLECTION, GeeCollection); -#line 3351 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3120 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp17_ = add_tags_command_new (_tmp12_, _tmp10_, _tmp16_); -#line 3351 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3120 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp18_ = _tmp17_; -#line 3351 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3120 "/home/jens/Source/shotwell/src/PhotoPage.vala" command_manager_execute (_tmp6_, G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, TYPE_COMMAND, Command)); -#line 3351 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3120 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (_tmp18_); -#line 3351 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3120 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (_tmp16_); -#line 3351 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3120 "/home/jens/Source/shotwell/src/PhotoPage.vala" _data_collection_unref0 (_tmp14_); -#line 3351 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3120 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp12_ = (_vala_array_free (_tmp12_, _tmp12__length1, (GDestroyNotify) g_free), NULL); -#line 3351 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3120 "/home/jens/Source/shotwell/src/PhotoPage.vala" _hierarchical_tag_index_unref0 (_tmp8_); -#line 3351 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3120 "/home/jens/Source/shotwell/src/PhotoPage.vala" _command_manager_unref0 (_tmp6_); -#line 21905 "PhotoPage.c" +#line 19405 "PhotoPage.c" } -#line 3347 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3116 "/home/jens/Source/shotwell/src/PhotoPage.vala" names = (_vala_array_free (names, names_length1, (GDestroyNotify) g_free), NULL); -#line 3347 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3116 "/home/jens/Source/shotwell/src/PhotoPage.vala" _text_entry_dialog_mediator_unref0 (dialog); -#line 21911 "PhotoPage.c" +#line 19411 "PhotoPage.c" } @@ -21937,77 +19437,77 @@ static void library_photo_page_on_modify_tags (LibraryPhotoPage* self) { GeeArrayList* _tmp14_ = NULL; ModifyTagsCommand* _tmp15_ = NULL; ModifyTagsCommand* _tmp16_ = NULL; -#line 3357 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3126 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_if_fail (IS_LIBRARY_PHOTO_PAGE (self)); -#line 3358 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3127 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp0_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); -#line 3358 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3127 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp1_ = _tmp0_; -#line 3358 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3127 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp2_ = view_collection_get_selected_at (_tmp1_, 0); -#line 3358 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3127 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp3_ = _tmp2_; -#line 3358 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3127 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp4_ = data_view_get_source (_tmp3_); -#line 3358 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3127 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp5_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_LIBRARY_PHOTO, LibraryPhoto); -#line 3358 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3127 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (_tmp3_); -#line 3358 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3127 "/home/jens/Source/shotwell/src/PhotoPage.vala" _data_collection_unref0 (_tmp1_); -#line 3358 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3127 "/home/jens/Source/shotwell/src/PhotoPage.vala" photo = _tmp5_; -#line 3360 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3129 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp6_ = photo; -#line 3360 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3129 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp7_ = modify_tags_dialog_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, TYPE_MEDIA_SOURCE, MediaSource)); -#line 3360 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3129 "/home/jens/Source/shotwell/src/PhotoPage.vala" dialog = _tmp7_; -#line 3361 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3130 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp8_ = dialog; -#line 3361 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3130 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp9_ = modify_tags_dialog_execute (_tmp8_); -#line 3361 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3130 "/home/jens/Source/shotwell/src/PhotoPage.vala" new_tags = _tmp9_; -#line 3363 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3132 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp10_ = new_tags; -#line 3363 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3132 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp10_ == NULL) { -#line 3364 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3133 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (new_tags); -#line 3364 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3133 "/home/jens/Source/shotwell/src/PhotoPage.vala" _text_entry_dialog_mediator_unref0 (dialog); -#line 3364 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3133 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (photo); -#line 3364 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3133 "/home/jens/Source/shotwell/src/PhotoPage.vala" return; -#line 21980 "PhotoPage.c" +#line 19480 "PhotoPage.c" } -#line 3366 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3135 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp11_ = page_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); -#line 3366 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3135 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp12_ = _tmp11_; -#line 3366 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3135 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp13_ = photo; -#line 3366 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3135 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp14_ = new_tags; -#line 3366 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3135 "/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 3366 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3135 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp16_ = _tmp15_; -#line 3366 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3135 "/home/jens/Source/shotwell/src/PhotoPage.vala" command_manager_execute (_tmp12_, G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, TYPE_COMMAND, Command)); -#line 3366 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3135 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (_tmp16_); -#line 3366 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3135 "/home/jens/Source/shotwell/src/PhotoPage.vala" _command_manager_unref0 (_tmp12_); -#line 3357 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3126 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (new_tags); -#line 3357 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3126 "/home/jens/Source/shotwell/src/PhotoPage.vala" _text_entry_dialog_mediator_unref0 (dialog); -#line 3357 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 3126 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (photo); -#line 22006 "PhotoPage.c" +#line 19506 "PhotoPage.c" } @@ -22019,53 +19519,53 @@ static gboolean library_photo_page_library_photo_page_view_filter_real_predicate MediaSource* _tmp2_ = NULL; gboolean _tmp3_ = FALSE; gboolean _tmp4_ = FALSE; -#line 2329 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2331 "/home/jens/Source/shotwell/src/PhotoPage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, LIBRARY_PHOTO_PAGE_TYPE_LIBRARY_PHOTO_PAGE_VIEW_FILTER, LibraryPhotoPageLibraryPhotoPageViewFilter); -#line 2329 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2331 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_val_if_fail (IS_DATA_VIEW (view), FALSE); -#line 2330 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2332 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp0_ = view; -#line 2330 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2332 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp1_ = data_view_get_source (_tmp0_); -#line 2330 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2332 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp2_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_MEDIA_SOURCE, MediaSource); -#line 2330 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2332 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp3_ = media_source_is_trashed (_tmp2_); -#line 2330 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2332 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp4_ = !_tmp3_; -#line 2330 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2332 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (_tmp2_); -#line 2330 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2332 "/home/jens/Source/shotwell/src/PhotoPage.vala" result = _tmp4_; -#line 2330 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2332 "/home/jens/Source/shotwell/src/PhotoPage.vala" return result; -#line 22038 "PhotoPage.c" +#line 19538 "PhotoPage.c" } static LibraryPhotoPageLibraryPhotoPageViewFilter* library_photo_page_library_photo_page_view_filter_construct (GType object_type) { LibraryPhotoPageLibraryPhotoPageViewFilter* self = NULL; -#line 2328 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2330 "/home/jens/Source/shotwell/src/PhotoPage.vala" self = (LibraryPhotoPageLibraryPhotoPageViewFilter*) view_filter_construct (object_type); -#line 2328 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2330 "/home/jens/Source/shotwell/src/PhotoPage.vala" return self; -#line 22048 "PhotoPage.c" +#line 19548 "PhotoPage.c" } static LibraryPhotoPageLibraryPhotoPageViewFilter* library_photo_page_library_photo_page_view_filter_new (void) { -#line 2328 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#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 22055 "PhotoPage.c" +#line 19555 "PhotoPage.c" } static void library_photo_page_library_photo_page_view_filter_class_init (LibraryPhotoPageLibraryPhotoPageViewFilterClass * klass) { -#line 2328 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2330 "/home/jens/Source/shotwell/src/PhotoPage.vala" library_photo_page_library_photo_page_view_filter_parent_class = g_type_class_peek_parent (klass); -#line 2328 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2330 "/home/jens/Source/shotwell/src/PhotoPage.vala" ((ViewFilterClass *) klass)->predicate = library_photo_page_library_photo_page_view_filter_real_predicate; -#line 22064 "PhotoPage.c" +#line 19564 "PhotoPage.c" } @@ -22086,69 +19586,65 @@ static GType library_photo_page_library_photo_page_view_filter_get_type (void) { static void library_photo_page_class_init (LibraryPhotoPageClass * klass) { -#line 2326 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2328 "/home/jens/Source/shotwell/src/PhotoPage.vala" library_photo_page_parent_class = g_type_class_peek_parent (klass); -#line 2326 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2328 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_type_class_add_private (klass, sizeof (LibraryPhotoPagePrivate)); -#line 2326 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2328 "/home/jens/Source/shotwell/src/PhotoPage.vala" ((PageClass *) klass)->init_collect_ui_filenames = library_photo_page_real_init_collect_ui_filenames; -#line 2326 "/home/jens/Source/shotwell/src/PhotoPage.vala" - ((PageClass *) klass)->init_collect_action_entries = library_photo_page_real_init_collect_action_entries; -#line 2326 "/home/jens/Source/shotwell/src/PhotoPage.vala" - ((PageClass *) klass)->init_collect_toggle_action_entries = library_photo_page_real_init_collect_toggle_action_entries; -#line 2326 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2328 "/home/jens/Source/shotwell/src/PhotoPage.vala" + ((PageClass *) klass)->add_actions = library_photo_page_real_add_actions; +#line 2328 "/home/jens/Source/shotwell/src/PhotoPage.vala" ((PageClass *) klass)->init_collect_injection_groups = library_photo_page_real_init_collect_injection_groups; -#line 2326 "/home/jens/Source/shotwell/src/PhotoPage.vala" - ((PageClass *) klass)->register_radio_actions = library_photo_page_real_register_radio_actions; -#line 2326 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2328 "/home/jens/Source/shotwell/src/PhotoPage.vala" ((PageClass *) klass)->update_actions = library_photo_page_real_update_actions; -#line 2326 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2328 "/home/jens/Source/shotwell/src/PhotoPage.vala" ((LibraryPhotoPageClass *) klass)->developer_changed = library_photo_page_real_developer_changed; -#line 2326 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2328 "/home/jens/Source/shotwell/src/PhotoPage.vala" ((PageClass *) klass)->switched_to = library_photo_page_real_switched_to; -#line 2326 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2328 "/home/jens/Source/shotwell/src/PhotoPage.vala" ((EditingHostPageClass *) klass)->get_bottom_left_trinket = library_photo_page_real_get_bottom_left_trinket; -#line 2326 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2328 "/home/jens/Source/shotwell/src/PhotoPage.vala" ((EditingHostPageClass *) klass)->get_top_right_trinket = library_photo_page_real_get_top_right_trinket; -#line 2326 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2328 "/home/jens/Source/shotwell/src/PhotoPage.vala" ((EditingHostPageClass *) klass)->on_increase_size = library_photo_page_real_on_increase_size; -#line 2326 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2328 "/home/jens/Source/shotwell/src/PhotoPage.vala" ((EditingHostPageClass *) klass)->on_decrease_size = library_photo_page_real_on_decrease_size; -#line 2326 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2328 "/home/jens/Source/shotwell/src/PhotoPage.vala" ((EditingHostPageClass *) klass)->on_zoom_slider_key_press = library_photo_page_real_on_zoom_slider_key_press; -#line 2326 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2328 "/home/jens/Source/shotwell/src/PhotoPage.vala" ((EditingHostPageClass *) klass)->update_ui = library_photo_page_real_update_ui; -#line 2326 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2328 "/home/jens/Source/shotwell/src/PhotoPage.vala" ((EditingHostPageClass *) klass)->notify_photo_backing_missing = library_photo_page_real_notify_photo_backing_missing; -#line 2326 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2328 "/home/jens/Source/shotwell/src/PhotoPage.vala" ((GtkWidgetClass *) klass)->key_press_event = library_photo_page_real_key_press_event; -#line 2326 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2328 "/home/jens/Source/shotwell/src/PhotoPage.vala" ((EditingHostPageClass *) klass)->on_double_click = library_photo_page_real_on_double_click; -#line 2326 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2328 "/home/jens/Source/shotwell/src/PhotoPage.vala" ((PageClass *) klass)->on_left_released = library_photo_page_real_on_left_released; -#line 2326 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2328 "/home/jens/Source/shotwell/src/PhotoPage.vala" ((PageClass *) klass)->on_context_buttonpress = library_photo_page_real_on_context_buttonpress; -#line 2326 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2328 "/home/jens/Source/shotwell/src/PhotoPage.vala" ((PageClass *) klass)->on_context_keypress = library_photo_page_real_on_context_keypress; -#line 2326 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2328 "/home/jens/Source/shotwell/src/PhotoPage.vala" G_OBJECT_CLASS (klass)->finalize = library_photo_page_finalize; -#line 22131 "PhotoPage.c" +#line 19627 "PhotoPage.c" } static void library_photo_page_instance_init (LibraryPhotoPage * self) { LibraryPhotoPageLibraryPhotoPageViewFilter* _tmp0_ = NULL; -#line 2326 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2328 "/home/jens/Source/shotwell/src/PhotoPage.vala" self->priv = LIBRARY_PHOTO_PAGE_GET_PRIVATE (self); -#line 2334 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2336 "/home/jens/Source/shotwell/src/PhotoPage.vala" self->priv->return_page = NULL; -#line 2335 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2337 "/home/jens/Source/shotwell/src/PhotoPage.vala" self->priv->return_to_collection_on_release = FALSE; -#line 2336 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2338 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp0_ = library_photo_page_library_photo_page_view_filter_new (); -#line 2336 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2338 "/home/jens/Source/shotwell/src/PhotoPage.vala" self->priv->filter = _tmp0_; -#line 22147 "PhotoPage.c" +#line 19643 "PhotoPage.c" } @@ -22161,37 +19657,39 @@ static void library_photo_page_finalize (GObject* obj) { ConfigFacade* _tmp4_ = NULL; ConfigFacade* _tmp5_ = NULL; guint _tmp6_ = 0U; -#line 2326 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2328 "/home/jens/Source/shotwell/src/PhotoPage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_LIBRARY_PHOTO_PAGE, LibraryPhotoPage); -#line 2358 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2360 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp0_ = library_photo_global; -#line 2358 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2360 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_signal_parse_name ("item-destroyed", TYPE_SOURCE_COLLECTION, &_tmp1_, NULL, FALSE); -#line 2358 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2360 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_SOURCE_COLLECTION, SourceCollection), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _library_photo_page_on_photo_destroyed_source_collection_item_destroyed, self); -#line 2359 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2361 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp2_ = library_photo_global; -#line 2359 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2361 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_signal_parse_name ("items-altered", TYPE_DATA_COLLECTION, &_tmp3_, NULL, FALSE); -#line 2359 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2361 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_DATA_COLLECTION, DataCollection), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _library_photo_page_on_metadata_altered_data_collection_items_altered, self); -#line 2360 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2362 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp4_ = config_facade_get_instance (); -#line 2360 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2362 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp5_ = _tmp4_; -#line 2360 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2362 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_signal_parse_name ("external-app-changed", TYPE_CONFIGURATION_FACADE, &_tmp6_, NULL, FALSE); -#line 2360 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2362 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp6_, 0, NULL, (GCallback) _library_photo_page_on_external_app_changed_configuration_facade_external_app_changed, self); -#line 2360 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2362 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (_tmp5_); -#line 2334 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _g_object_unref0 (self->priv->return_page); #line 2336 "/home/jens/Source/shotwell/src/PhotoPage.vala" + _g_object_unref0 (self->priv->return_page); +#line 2338 "/home/jens/Source/shotwell/src/PhotoPage.vala" _view_filter_unref0 (self->priv->filter); -#line 2326 "/home/jens/Source/shotwell/src/PhotoPage.vala" +#line 2825 "/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 22190 "PhotoPage.c" +#line 19688 "PhotoPage.c" } |